connection_manager 0.2.6 → 0.3.0

data/spec/lib/replication_spec.rb

@@ -0,0 +1,134 @@
+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.database_name.should eql('cm_test')
+    end
+  end
+
+  describe '#replicated' do
+    it "should raise an exception if no connections are empty, and connection.replication_keys are blank" 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])    
+      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
+    end
+    
+    context "the objects return from a query" do
+      # The default connection is the orignal connection for the model
+      it "should have the connection as the replication" do
+        Fruit.replicated
+        FactoryGirl.create(:fruit)
+        Fruit.slaves.first.connection.config.should eql(Fruit.slaves.connection.config)
+        Fruit.slaves.first.should_not be_nil
+      end    
+    end
+  end
+  
+  describe'#replicated?' do
+    it "should be false if not replicated" do
+      Fruit.replicated?.should be_false
+    end
+    it "should be true if replicated" do
+      Fruit.replicated
+      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")
+      @user.save
+      @foo = Foo.new(:user_id => @user.id)
+      @foo.save
+    end
+    
+    # We'd like this to happend magically some day. Possible in 3.2
+    it "should eager load with replication instances" do
+      user = User.includes(:foos).slaves.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
+  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  
+      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
+

data/spec/lib/shards_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+describe ConnectionManager::Shards do
+  before(:each) do
+    Fruit.shard_class_names("SouthernFruit")            
+  end
+  context 'shards'do    
+    it "should return an array of results" do
+      a = Fruit.shards do |shard|
+        shard.first
+      end
+      a.should be_a_kind_of(Array)
+    end
+    
+    it "should execute the active record methods on the the provided models" do
+      fruit = FactoryGirl.create(:fruit)
+      klasses = ["Fruit","SouthernFruit"]
+      a = Fruit.shards do |shard|
+        shard.where(:id => fruit.id).first
+      end
+      klasses.include?(a[0].class.name).should be_true
+    end
+   
+      
+    it "should not matter how the where statement is formated" do
+      fruit = FactoryGirl.create(:fruit)
+      a = Fruit.shards do |shard|
+        shard.where(:id => fruit.id).first
+      end
+      b = Fruit.shards do |shard|
+        shard.where(['id = ?', fruit.id]).first
+      end
+        
+      c = Fruit.shards do |shard|
+        shard.where('id = ?', fruit.id).first    
+      end
+        
+      (a == b && b == c).should be_true
+    end
+  end
+end

data/spec/lib/using_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+class CmFooSlaveConnection < ActiveRecord::Base
+  establish_managed_connection(:slave_1_cm_test)
+end
+class CmMasterConnection < ActiveRecord::Base
+  establish_managed_connection(:master_2_cm_test)
+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)
+  end
+
+  
+  describe '#using' do
+    it "should return an ActiveRecord::Relation" do
+      Fruit.using("CmFooSlaveConnection").should be_kind_of(ActiveRecord::Relation)
+    end
+    it "should change the connection" 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
+      Fruit.where(:name => "malarky").using("CmFooSlaveConnection").to_sql.should eql(
+        Fruit.using("CmFooSlaveConnection").where(:name => "malarky").to_sql)
+    end
+  
+    it "should have the same connection if called from model or from relation" do
+      Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.config.should eql(
+        Fruit.using("CmFooSlaveConnection").where(:name => "malarky").connection.config)
+      Fruit.using("CmFooSlaveConnection").where(:name => "malarky").connection.config.should_not eql(
+        Fruit.where(:name => "malarky").connection.config)
+      Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.config.should_not eql(
+        Fruit.where(:name => "malarky").connection.config)
+    end
+    
+    it "should work" do
+      FactoryGirl.create(:fruit)
+      Fruit.using("CmFooSlaveConnection").first
+    end
+    
+    it "should really use a different connection" do   
+      f = Fruit.using("CmMasterConnection").new
+      f.name = FactoryGirl.generate(:rand_name)
+      f.save
+      Fruit.where(:name => "malarky").first.should be_nil
+      Fruit.using("CmFooSlaveConnection").where(:name => f.name).first.should be_nil
+      Fruit.using("CmMasterConnection").where(:name => f.name).first.should_not be_nil
+    end
+    
+    it "should save to schema/database set in connection class different" do
+      Fruit.table_name_prefix = "cm_test."
+      f = Fruit.using("CmMasterConnection").new
+      f.name = FactoryGirl.generate(:rand_name)
+      f.save
+      Fruit.where(:name => f.name).first.should be_nil
+      Fruit.using("CmFooSlaveConnection").where(:name => f.name).first.should be_nil
+      Fruit.using("CmMasterConnection").where(:name => f.name).first.should_not be_nil
+    end
+  end
+end
+  
+

data/spec/mysql2_database.yml

@@ -7,23 +7,49 @@ common: &common
   password: omegared
   pool: 100
   timeout: 5000
+  build_connection_class: true
+  
+master: &master
+  username: root
+  password: omegared
+  
+readonly: &readonly
+  username: readonly
+  password: omegared
   
 test:
   <<: *common
+  <<: *master
   database: cm_test
+  slaves: [slave_1_cm_test, slave_2_cm_test]
   
 cm_user_test:
   <<: *common
+  <<: *master
   database: cm_user_test
+  slaves: [slave_1_cm_user_test]
   
 slave_1_cm_test:
-  <<: *common  
+  <<: *common 
+  <<: *readonly
   database: cm_test
   
 slave_2_cm_test:
   <<: *common
+  <<: *readonly
   database: cm_test
+
+master_2_cm_test:
+  <<: *common
+  <<: *master
+  database: cm_master_2_test
   
 shard_1_cm_test:  
    <<: *common
-   database: legacy_cm_test
+   <<: *master
+   database: legacy_cm_test
+
+slave_1_cm_user_test:
+  <<: *common
+  <<: *readonly
+  database: cm_user_test

data/spec/spec_helper.rb

@@ -1,25 +1,39 @@
+ENV["AR_ENV"] ="test"
 require 'connection_manager'
 require 'rspec'
 require 'bundler/setup'
 require 'active_record'
+require 'active_support'
+require 'logger'
 require 'factory_girl'
 require 'helpers/database_spec_helper'
+if(defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE)
+  TestDB.connect('jdbcmysql')
+else
+  TestDB.connect('mysql2')
+end
 
-TestDB.connect('mysql2')
+TestMigrations.down
 TestMigrations.up
 FactoryGirl.find_definitions
-
 RSpec.configure do |config|
   config.mock_with :mocha 
   # Loads database.yml and establishes primary connection
   # Create tables when tests are completed
   config.before(:all) {
-    require 'helpers/models_spec_helper'    
-  }
+    require 'helpers/models_spec_helper.rb'    
+  }  
   # Drops tables when tests are completed
-  config.after(:each){
-     TestDB.clean
+  config.after(:all){
+    TestDB.clean
+  } 
+  # Make sure every test is isolated.
+  config.before(:each){
+    ModelsHelper.models.each{|m| Object.send(:remove_const, m)}  
+    load 'helpers/models_spec_helper.rb'
+    FactoryGirl.reload
   }
+    
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000Z
+date: 2012-06-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70275769104020 !ruby/object:Gem::Requirement
+  requirement: &70326690672520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275769104020
+  version_requirements: *70326690672520
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70275769103420 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70326690672100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275769103420
+  version_requirements: *70326690672100
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70275769102760 !ruby/object:Gem::Requirement
+  name: autotest
+  requirement: &70326690671520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275769102760
+  version_requirements: *70326690671520
 - !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: &70275769102120 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &70326690664940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275769102120
+  version_requirements: *70326690664940
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70275769101580 !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: &70326690664440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275769101580
+  version_requirements: *70326690664440
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &70275769101140 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70326690663900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70275769101140
+  version_requirements: *70326690663900
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70275769100560 !ruby/object:Gem::Requirement
+  requirement: &70326690663440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275769100560
+  version_requirements: *70326690663440
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email:
@@ -99,27 +99,29 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - connection_manager.gemspec
 - lib/connection_manager.rb
-- lib/connection_manager/associations.rb
+- lib/connection_manager/connection_builder.rb
 - lib/connection_manager/connection_manager_railtie.rb
-- lib/connection_manager/connections.rb
-- lib/connection_manager/cross_schema_patch.rb
-- lib/connection_manager/method_recorder.rb
-- lib/connection_manager/secondary_connection_builder.rb
+- 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/replication.rb
+- lib/connection_manager/shards.rb
+- lib/connection_manager/using.rb
 - lib/connection_manager/version.rb
 - spec/factories.rb
 - spec/helpers/database_spec_helper.rb
 - spec/helpers/models_spec_helper.rb
-- spec/integration/secondary_connection_builder_spec.rb
-- spec/lib/associations_spec.rb
-- spec/lib/connections_spec.rb
-- spec/lib/method_recorder_spec.rb
-- spec/lib/secondary_connection_builder_spec.rb
+- spec/jdbcmysql_database.yml
+- spec/lib/connection_builder_spec.rb
+- spec/lib/connection_helpers_spec.rb
+- spec/lib/replication_spec.rb
+- spec/lib/shards_spec.rb
+- spec/lib/using_spec.rb
 - spec/mysql2_database.yml
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -153,11 +155,12 @@ test_files:
 - spec/factories.rb
 - spec/helpers/database_spec_helper.rb
 - spec/helpers/models_spec_helper.rb
-- spec/integration/secondary_connection_builder_spec.rb
-- spec/lib/associations_spec.rb
-- spec/lib/connections_spec.rb
-- spec/lib/method_recorder_spec.rb
-- spec/lib/secondary_connection_builder_spec.rb
+- spec/jdbcmysql_database.yml
+- spec/lib/connection_builder_spec.rb
+- spec/lib/connection_helpers_spec.rb
+- spec/lib/replication_spec.rb
+- spec/lib/shards_spec.rb
+- spec/lib/using_spec.rb
 - spec/mysql2_database.yml
 - spec/spec.opts
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    connection_manager (0.2.5)
-      activerecord (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.7.0)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    factory_girl (3.2.0)
-      activesupport (>= 3.0.0)
-    i18n (0.6.0)
-    metaclass (0.0.1)
-    mocha (0.11.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.2)
-    mysql2 (0.3.11)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autotest
-  connection_manager!
-  factory_girl
-  mocha
-  mysql2
-  rspec
-  sqlite3

data/lib/connection_manager/associations.rb

@@ -1,28 +0,0 @@
-module ConnectionManager
-  module Associations
-    @defined_associations
-    
-    # Stores defined associtions and their options
-    def defined_associations
-      @defined_associations ||= {}
-    end
-        
-    def belongs_to(*options)
-      defined_associations[:belongs_to] ||= []
-      defined_associations[:belongs_to] << options
-      super
-    end
-    
-    def has_many(*options)
-      defined_associations[:has_many] ||= []
-      defined_associations[:has_many] << options
-      super
-    end
-    
-    def has_one(*options)
-      defined_associations[:has_one] ||= []
-      defined_associations[:has_one] << options
-      super
-    end   
-  end
-end