connection_manager 0.3.11 → 1.0.1

data/Gemfile

@@ -1,3 +1,2 @@
 source "http://rubygems.org"
-
 gemspec

data/README.md

@@ -24,7 +24,7 @@ ConnectionManager is available through [Rubygems](https://rubygems.org/gems/conn
 
     $ gem install connection_manager
 
-## Rails 3 setup (No Rails 2 at this time)
+## Rails 3/4 setup (No Rails 2 at this time)
 
 Add connection_manager to you gemfile:
     

data/connection_manager.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Joshua Mckinney"]
   s.email       = ["joshmckin@gmail.com"]
   s.homepage    = ""
-  s.summary     = %q{Simplifies connecting to Muliple and Replication databases with rails and active_record}
-  s.description = %q{Simplifies connecting to Muliple and Replication databases with rails and active_record}
+  s.summary     = %q{Simplifies connecting to Multiple and Replication databases with rails and active_record}
+  s.description = %q{Simplifies connecting to Multiple and Replication databases with rails and active_record}
 
   s.rubyforge_project = "connection_manager"
 
@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'activerecord', '~> 3.0'
+  s.add_runtime_dependency 'activerecord', '>= 3.0', '<= 4.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'autotest'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'factory_girl'
-  s.add_development_dependency 'activesupport', '~> 3.0'
+  s.add_development_dependency 'activesupport', '>= 3.0', '<= 4.0'
   
   if(defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
     s.add_development_dependency 'jruby-openssl'

data/lib/connection_manager.rb

@@ -10,6 +10,8 @@ module ConnectionManager
   require 'connection_manager/shards'  
   require 'connection_manager/replication'
   require 'connection_manager/patches/cross_schema_patch'
+  require 'connection_manager/patches/reflections_patch'
+  require 'connection_manager/patches/query_methods_patch'
   require 'connection_manager/connection_manager_railtie' if defined?(Rails)
     
   ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include,(ConnectionManager::AbstractAdapterHelper))

data/lib/connection_manager/patches/cross_schema_patch.rb

@@ -5,12 +5,12 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
   module ActiveRecord
     module ConnectionAdapters
       class Mysql2Adapter < ((ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2) ? AbstractMysqlAdapter : AbstractAdapter)
-        
+
         # Force all tables to be cached for the life connection
         def cached_tables
           @cached_tables ||= {}
         end
-        
+
         def tables(name = nil, database = nil, like =nil)
           return cached_tables[database] if cached_tables[database] && like.nil?
           cached_tables[database] ||= []
@@ -21,9 +21,9 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
           result = execute(sql, 'SCHEMA')
           cached_tables[database] = (cached_tables[database] | result.collect { |field| field[0] }).compact
         end
-        
+
         alias :new_tables :tables
-        
+
         def table_exists?(name)
           return false unless name
           name          = name.to_s
@@ -37,4 +37,4 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR <= 2
       end
     end
   end
-end
+end

data/lib/connection_manager/patches/query_methods_patch.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module QueryMethods
+    private
+    # For some reason on .include or a custom join
+    # Arel drops the table name prefix on slave classes
+    def build_select(arel, selects)
+      unless selects.empty?
+        @implicit_readonly = false
+        arel.project(*selects)
+      else
+        arel.project("#{quoted_table_name}.*")
+      end
+    end
+  end
+end

data/lib/connection_manager/patches/reflections_patch.rb

@@ -0,0 +1,19 @@
+if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 0
+  # Sometimes for some reason the quoted_table_name  instance methods
+  # drops the schema. If the quoted table name does not include a '.'
+  # want to retrieve the quoted_table_name from the class and reset
+  module ActiveRecord
+    # = Active Record Reflection
+    module Reflection # :nodoc:
+      class AssociationReflection < MacroReflection
+        def table_name
+          @table_name = klass.table_name
+        end
+
+        def quoted_table_name
+          @quoted_table_name = klass.quoted_table_name
+        end
+      end
+    end
+  end
+end

data/lib/connection_manager/using.rb

@@ -25,7 +25,8 @@ module ConnectionManager
       
       # 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 
+      # class database as the prefix, useful when shards but normally 
+      # should be the same. 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)

data/lib/connection_manager/version.rb

@@ -1,3 +1,3 @@
 module ConnectionManager
-  VERSION = "0.3.11"
+  VERSION = "1.0.1"
 end

data/spec/lib/replication_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe ConnectionManager::Replication do
-  
+
   describe '#database_name' do
     it "should return the name of the database the model is using" do
       Fruit.current_database_name.should eql('cm_test')
@@ -12,45 +12,61 @@ describe ConnectionManager::Replication do
       Fruit.connection.stubs(:replication_keys).returns([])
       lambda { Fruit.replicated }.should raise_error
     end
-    
+
     it "should not raise an exception if no connections are empty, but connection.replication_keys are not blank" do
-      Fruit.connection.stubs(:replication_keys).returns([:slave_1_cm_test])    
+      Fruit.connection.stubs(:replication_keys).returns([:slave_1_cm_test])
       lambda { Fruit.replicated }.should_not raise_error
     end
-    
+
     context "the methods created from #replicated" do
       it "should create a method with the name given for the :name option" do
         Fruit.replicated(:name => 'foozle')
         Fruit.respond_to?(:foozle).should be_true
       end
-      
+
       it "should create a method in ActiveRecord::QueryMethods with the name given for the :name option" do
         f = FactoryGirl.create(:fruit)
         Fruit.replicated(:name => 'fizzle')
         ActiveRecord::QueryMethods.instance_methods.include?(:fizzle).should be_true
         Fruit.where(:id => f.id).fizzle.first.should_not eql(Fruit.where(:id => f.id).first)
       end
-      
+
       it "should return an ActiveRecord::Relation" do
         Fruit.replicated(:name => 'slaves')
         Fruit.slaves.should be_kind_of(ActiveRecord::Relation)
       end
-      
+
       it "should have a different connection" do
         Fruit.replicated
         Fruit.slaves.connection.config.should_not eql(Fruit.connection.config)
       end
-      
+
+      it "should work" do
+        Fruit.replicated
+        Fruit.slaves.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql.should eql(Fruit.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql)
+      end
+
       it "should produce the same query string" do
         Fruit.replicated
         Fruit.slaves.joins(:region).to_sql.should eql(Fruit.joins(:region).to_sql)
         Fruit.slaves.joins(:fruit_baskets).to_sql.should eql(Fruit.joins(:fruit_baskets).to_sql)
-        Fruit.slaves.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql.should eql(Fruit.joins(:region).joins("LEFT OUTER JOIN `fruit_baskets` ON `fruit_baskets`.`fruit_id` = `cm_test`.`fruits`.`id`").to_sql)
         Fruit.slaves.includes(:fruit_baskets).to_sql.should eql(Fruit.includes(:fruit_baskets).to_sql)
         Fruit.slaves.includes(:region).to_sql.should eql(Fruit.includes(:region).to_sql)
       end
+
+      context '#slaves' do
+        it "should have the same quoted_table_name" do
+          Fruit.replicated
+
+          Fruit.slaves.quoted_table_name.should eql(Fruit.quoted_table_name)
+        end
+        it "should have the same table_name_prefix"do
+          Fruit.replicated
+          Fruit.slaves.table_name_prefix.should eql(Fruit.table_name_prefix)
+        end
+      end
     end
-    
+
     context "the objects return from a query" do
       # The default connection is the original connection for the model
       it "should have the connection as the replication" do
@@ -58,10 +74,10 @@ describe ConnectionManager::Replication do
         FactoryGirl.create(:fruit)
         Fruit.slaves.first.connection.config.should eql(Fruit.slaves.connection.config)
         Fruit.slaves.first.should_not be_nil
-      end    
+      end
     end
   end
-  
+
   describe'#replicated?' do
     it "should be false if not replicated" do
       Fruit.replicated?.should be_false
@@ -71,34 +87,34 @@ describe ConnectionManager::Replication do
       Fruit.replicated?.should be_true
     end
   end
-  
-    
+
+
 
   #ConnectionManager::Connections.build_connection_classes(:env => 'test')
   class CmFooSlaveConnection < ActiveRecord::Base
     establish_managed_connection(:slave_1_cm_test)
   end
-    
+
   class CmUserConnection < ActiveRecord::Base
     establish_managed_connection(:cm_user_test)
   end
-    
+
   class SlaveCmUserConnection < ActiveRecord::Base
     establish_managed_connection(:slave_1_cm_user_test)
   end
-    
+
   class User < CmUserConnection
     has_many :foos
     has_many(:foo_slaves, :class_name => "Foo::Slaves")
     replicated('SlaveCmUserConnection')
-    
+
   end
-    
+
   class Foo < ActiveRecord::Base
     belongs_to :user
     replicated("CmFooSlaveConnection")
   end
-    
+
   context "eager loading (#includes)" do
     before :each do
       @user = User.new(:name => "Testing")
@@ -106,38 +122,37 @@ describe ConnectionManager::Replication do
       @foo = Foo.new(:user_id => @user.id)
       @foo.save
     end
-    
+
     # We'd like this to happen magically some day. Possible in 3.2
     it "should eager load with replication instances" #do
-#      user = User.slaves.includes(:foos).where(:id => @user.id).first
-#      user.foos.first.should_not be_kind_of(Foo)
-#    end
-    
+    #      user = User.slaves.includes(:foos).where(:id => @user.id).first
+    #      user.foos.first.should_not be_kind_of(Foo)
+    #    end
+
     context "specifically defined replication association" do
       it "should eager load with replication instances" do
         user = User.slaves.includes(:foo_slaves).where(:id => @user.id).first
         user.foo_slaves.first.should_not be_kind_of(Foo)
       end
-    end   
+    end
   end
-  context "cross database joins" do   
+  context "cross database joins" do
     before :each do
       @user = User.new(:name => "Testing")
       @user.save
       @foo = Foo.new(:user_id => @user.id)
       @foo.save
     end
-    
+
     it "should work" do
-      @user.foos.blank?.should be_false  
+      @user.foos.blank?.should be_false
       found = Foo.select('users.name AS user_name').joins(:user).where(:id => @foo.id).first
       found.user_name.blank?.should be_false
     end
-    
+
     it "should work with replication" do
       found = Foo.slaves.select('foos.*, users.name AS user_name').joins(:user).where(:id => @foo.id).first
       found.user.blank?.should be_false
     end
-  end 
+  end
 end
-

data/spec/lib/shards_spec.rb

@@ -23,18 +23,18 @@ describe ConnectionManager::Shards do
       
     it "should not matter how the where statement is formated" do
       fruit = FactoryGirl.create(:fruit)
-      a = Fruit.shards do |shard|
+      afruit = Fruit.shards do |shard|
         shard.where(:id => fruit.id).first
       end
-      b = Fruit.shards do |shard|
+      
+      bfruit = Fruit.shards do |shard|
         shard.where(['id = ?', fruit.id]).first
       end
         
-      c = Fruit.shards do |shard|
+      cfruit = Fruit.shards do |shard|
         shard.where('id = ?', fruit.id).first    
       end
-        
-      (a == b && b == c).should be_true
+      (afruit == bfruit && bfruit == cfruit).should be_true
     end
   end
 end

data/spec/lib/using_spec.rb

@@ -10,7 +10,7 @@ describe ConnectionManager::Using do
   
   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)
+    lambda { "Fruit::CmFooSlaveConnectionDup".constantize}.should_not raise_error
   end
 
   describe '#using' do

data/spec/spec_helper.rb

@@ -20,11 +20,11 @@ RSpec.configure do |config|
   config.mock_with :mocha 
   # Loads database.yml and establishes primary connection
   # Create tables when tests are completed
-  config.before(:all) {
+  config.before(:suite) {
     require 'helpers/models_spec_helper.rb'    
   }  
   # Drops tables when tests are completed
-  config.after(:all){
+  config.after(:suite){
     TestDB.clean
   } 
   # Make sure every test is isolated.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -96,17 +102,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +135,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Simplifies connecting to Muliple and Replication databases with rails
+description: Simplifies connecting to Multiple and Replication databases with rails
   and active_record
 email:
 - joshmckin@gmail.com
@@ -144,6 +156,8 @@ files:
 - lib/connection_manager/helpers/abstract_adapter_helper.rb
 - lib/connection_manager/helpers/connection_helpers.rb
 - lib/connection_manager/patches/cross_schema_patch.rb
+- lib/connection_manager/patches/query_methods_patch.rb
+- lib/connection_manager/patches/reflections_patch.rb
 - lib/connection_manager/replication.rb
 - lib/connection_manager/shards.rb
 - lib/connection_manager/using.rb
@@ -184,7 +198,7 @@ rubyforge_project: connection_manager
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Simplifies connecting to Muliple and Replication databases with rails and
+summary: Simplifies connecting to Multiple and Replication databases with rails and
   active_record
 test_files:
 - spec/factories.rb