activerecord-connections 0.0.1 → 0.0.2

data/activerecord-connections.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "activerecord-connections"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Gabriel Sobrinho"]
   s.email       = ["gabriel.sobrinho@gmail.com"]
   s.homepage    = "https://github.com/sobrinho/activerecord-connections"

data/lib/active_record/connections.rb

@@ -1,8 +1,9 @@
+require 'active_support'
 require 'active_support/concern'
 
 module ActiveRecord
   module Connections
-    autoload :ConnectionFactory, 'active_record/connections/connection_factory'
+    autoload :ConnectionProxy, 'active_record/connections/connection_proxy'
 
     extend ActiveSupport::Concern
 
@@ -33,7 +34,7 @@ module ActiveRecord
       #   end
       #
       def using_connection(connection_name, connection_spec)
-        self.proxy_connection = ConnectionFactory.establish_connection(connection_name, connection_spec)
+        self.proxy_connection = ConnectionProxy.new(connection_name, connection_spec)
 
         def self.connection_pool
           connection_handler.retrieve_connection_pool(proxy_connection)

data/lib/active_record/connections/connection_proxy.rb

@@ -0,0 +1,40 @@
+require 'active_support/basic_object'
+
+module ActiveRecord
+  module Connections
+    class ConnectionProxy < ActiveSupport::BasicObject
+      def initialize(connection_name, connection_spec)
+        @connection_name, @connection_spec = connection_name, connection_spec
+      end
+
+      def respond_to?(method_name, include_private = false)
+        connection.respond_to?(method_name, include_private)
+      end
+
+      def method_missing(method_name, *arguments, &block)
+        connection.send(method_name, *arguments, &block)
+      end
+
+      private
+
+      def connection
+        @connection ||= retrieve_connection_klass rescue fabricate_connection_klass
+      end
+
+      def retrieve_connection_klass
+        "ActiveRecord::Connections::AbstractConnection#{@connection_name}".constantize
+      end
+
+      def fabricate_connection_klass
+        ::ActiveRecord::Connections.class_eval <<-RUBY
+          class AbstractConnection#{@connection_name} < ActiveRecord::Base
+            self.abstract_class = true
+            self.establish_connection(#{@connection_spec.inspect})
+
+            self
+          end
+        RUBY
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: activerecord-connections
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gabriel Sobrinho
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -03:00
+date: 2011-08-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ files:
 - Rakefile
 - activerecord-connections.gemspec
 - lib/active_record/connections.rb
-- lib/active_record/connections/connection_factory.rb
+- lib/active_record/connections/connection_proxy.rb
 - lib/activerecord-connections.rb
 - test/active_record/connections_test.rb
 - test/db/migrate/20110822114329_create_customers.rb

data/lib/active_record/connections/connection_factory.rb

@@ -1,43 +0,0 @@
-#
-# This class is used to automatically generate small abstract ActiveRecord classes
-# that would then be used as a source of database connections for ActiveRecord::Connections.
-# This way we do not need to re-implement all the connection establishing code
-# that ActiveRecord already has and we make our code less dependant on Rails versions.
-#
-module ActiveRecord
-  module Connections
-    class ConnectionFactory
-      cattr_accessor :connection_classes
-      self.connection_classes = {}
-
-      # Establishes connection or return an existing one from cache
-      def self.establish_connection(connection_name, connection_spec)
-        connection_classes[connection_name] ||= make_connection_klass(connection_name, connection_spec)
-      end
-
-      protected
-
-      # Generate an abstract AR class with specified connection established
-      def self.make_connection_klass(connection_name, connection_spec)
-        # Generate class
-        klass = generate_connection_klass(connection_name)
-
-        # Establish connection
-        klass.establish_connection(connection_spec)
-
-        # Return the class
-        return klass
-      end
-
-      def self.generate_connection_klass(connection_name)
-        class_eval <<-RUBY
-          class AbstractConnection#{connection_name} < ActiveRecord::Base
-            self.abstract_class = true
-
-            self
-          end
-        RUBY
-      end
-    end
-  end
-end