one discover.rb file is enough - move jdbc/discover.rb into jdbc/extension.rb

Author: kares

lib/arjdbc/jdbc.rb

@@ -1,2 +1,2 @@
 require 'arjdbc/jdbc/adapter'
-require 'arjdbc/jdbc/discover'
+module ArJdbc; self.discover_extensions; end

lib/arjdbc/jdbc/discover.rb

@@ -1,31 +1,28 @@
 module ArJdbc
-  # Defines an AR-JDBC extension. An extension consists of a
-  # declaration using this method and an ArJdbc::XYZ module that
-  # contains implementation and overrides for methods in
-  # ActiveRecord::ConnectionAdapters::AbstractAdapter. When you
-  # declare your extension, you provide a block that detects when a
-  # database configured to use the extension is present and loads the
-  # necessary code for it. AR-JDBC will patch the code into the base
-  # ActiveRecord::ConnectionAdapters::JdbcAdapter by extending an
-  # instance of it with your extension module.
+  
+  # Defines an AR-JDBC extension. An extension consists of a declaration using 
+  # this method and an ArJdbc::XYZ module that contains implementation and 
+  # overrides for methods in ActiveRecord::ConnectionAdapters::AbstractAdapter. 
+  # When you declare your extension, you provide a block that detects when a
+  # database configured to use the extension is present and loads the necessary 
+  # code for it. AR-JDBC will patch the code into the base JdbcAdapter by 
+  # extending an instance of it with your extension module.
   #
-  # +name+ should be a symbol that is the name of a module to be
-  # defined under the +ArJdbc+ module.
+  # +name+ the name of a module to be defined under the +ArJdbc+ module.
   #
-  # +block+ should be a one- or two-arity block that receives the
-  # dialect name or driver class name as the first argument, and
-  # optionally the whole database configuration hash as a second
-  # argument.
+  # +block+ should be a one- or two-arity block that receives the dialect name 
+  # or driver class name as the first argument, and optionally the whole 
+  # database configuration hash as a second argument
   #
   # Example:
   #
-  #     ArJdbc.extension :Frob do |name|
-  #       if name =~ /frob/i
-  #         # arjdbc/frob.rb should contain the implementation
-  #         require 'arjdbc/frob'
-  #         true
-  #       end
+  #   ArJdbc.extension :FRoB do |name|
+  #     if name =~ /frob/i
+  #       require 'arjdbc/frob' # contains ArJdbc::FRoB
+  #       true
   #     end
+  #   end
+  #
   def self.extension(name, &block)
     if const_defined?(name)
       mod = const_get(name)
@@ -44,4 +41,21 @@ def self.extension(name, &block)
       end
     end
   end
+  
+  private
+  def self.discover_extensions
+    if defined?(::Gem) && ::Gem.respond_to?(:find_files)
+      files = ::Gem.find_files('arjdbc/discover')
+    else
+      files = $LOAD_PATH.map do |p|
+        discover = File.join(p, 'arjdbc', 'discover.rb')
+        File.exist?(discover) ? discover : nil
+      end.compact
+    end
+    files.each do |file|
+      puts "Loading AR-JDBC extension #{file}" if $DEBUG
+      require file
+    end
+  end
+  
 end