connection_manager 0.3.8 → 0.3.9

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
-
-gem 'ZenTest', '4.8.2'
+gemspec

data/lib/connection_manager/using.rb

@@ -11,7 +11,7 @@ module ConnectionManager
         
       private       
       # We use dup here because its just too tricky to make sure we override
-      # all the methods nesseccary when using a child class of the model. This 
+      # all the methods necessary when using a child class of the model. This 
       # action is lazy and the created sub is named to a constant so we only
       # have to do it once.
       def fetch_duplicate_class(connection_class_name)     
@@ -22,6 +22,11 @@ module ConnectionManager
         end
       end
       
+      # Modifies the dup class to use the connection class connection.
+      # We want to use the current class table name, but the connection
+      # class database as the prefix. We also want the superclass method to 
+      # return the connection class as AR sometimes uses the the superclass
+      # connection
       def build_dup_class(connection_class_name)
         con_class = connection_class_name.constantize
         db_name = con_class.database_name
@@ -34,44 +39,20 @@ module ConnectionManager
             def model_name
               #{self.name}.model_name
             end
+            def connection_class
+              #{connection_class_name}
+            end
+            def connection
+              connection_class.connection
+            end
+            def superclass
+              connection_class
+            end
           end
         STR
         
-        extend_dup_class(dup_klass,connection_class_name)          
         self.const_set("#{connection_class_name}Dup", dup_klass)
       end
-    
-      # Extend the connection override module from the connetion to the supplied class
-      def extend_dup_class(dup_class,connection_class_name)
-        begin
-          mod = "#{connection_class_name}::ConnectionOverrideMod".constantize
-          dup_class.extend(mod)
-        rescue NameError
-          built = build_connection_override_module(connection_class_name).constantize
-          dup_class.extend(built)
-        end
-      end
-    
-      # Added a module to the connection class. The module is extended on dup class
-      # to override the connection and superclass
-      def build_connection_override_module(connection_class_name)
-        connection_class_name.constantize.class_eval <<-STR
-        module ConnectionOverrideMod      
-          def connection_class
-            #{connection_class_name}
-          end
-        
-          def connection
-            connection_class.connection
-          end
-
-          def superclass
-            connection_class
-          end
-        end
-        STR
-        "#{connection_class_name}::ConnectionOverrideMod"
-      end
     end
     
     # Instance method for casting to a duplication class

data/lib/connection_manager/version.rb

@@ -1,4 +1,3 @@
 module ConnectionManager
-  VERSION = "0.3.8"
-end
-
+  VERSION = "0.3.9"
+end

data/spec/lib/using_spec.rb

@@ -8,18 +8,6 @@ end
 
 describe ConnectionManager::Using do
   
-  it "should add module to provided class" do
-    Fruit.send(:build_connection_override_module,"CmFooSlaveConnection")
-    lambda { "CmFooSlaveConnection::ConnectionOverrideMod".constantize}.should_not raise_error(NameError)
-  end
-  
-  it "should extend to module to the supplied class" do
-    Fruit.send(:build_connection_override_module,"CmFooSlaveConnection")
-    d = Fruit.dup
-    d.send(:extend_dup_class,d,"CmFooSlaveConnection")
-    d.connection.config.should_not eql(Fruit.connection.config)
-  end
-  
   it "should add sub class to current class with the name of the connection" do
     Fruit.send(:fetch_duplicate_class,"CmFooSlaveConnection")
     lambda { "Fruit::CmFooSlaveConnectionDup".constantize}.should_not raise_error(NameError)
@@ -33,7 +21,7 @@ describe ConnectionManager::Using do
       Fruit.using("CmFooSlaveConnection").connection.config.should_not eql(Fruit.connection.config)
     end
   
-    it "should create the same sql if called from model or from relation" #do
+    it "should create the exact same sql if called from model or from relation" #do
 #      Fruit.where(:name => "malarky").using("CmFooSlaveConnection").to_sql.should eql(
 #        Fruit.using("CmFooSlaveConnection").where(:name => "malarky").to_sql)
 #    end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: connection_manager
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simplifies connecting to Muliple and Replication databases with rails and