connection_manager 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    connection_manager (0.2.0)
+    connection_manager (0.2.1)
       activerecord (~> 3.0)
 
 GEM
@@ -31,14 +31,15 @@ GEM
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    mysql2 (0.3.11)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rspec-mocks (2.8.0)
     sqlite3 (1.3.5)
     tzinfo (0.3.31)
 
@@ -50,5 +51,6 @@ DEPENDENCIES
   connection_manager!
   factory_girl
   mocha
+  mysql2
   rspec
   sqlite3

data/connection_manager.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'autotest'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'mysql2'
 end

data/lib/connection_manager/connections.rb

@@ -15,6 +15,12 @@ module ConnectionManager
         @env = env
       end
     
+      def env_regex(with_underscore=true)
+        s = "#{env}$"
+        s.insert(0,"\_") if with_underscore
+        Regexp.new("(#{s})")
+      end
+      
       # Get the current environment if defined
       # Check for Rails, check for RACK_ENV, default to 'development'
       def fetch_env
@@ -27,7 +33,7 @@ module ConnectionManager
       # is blank it grabs all the connection keys
       def connection_keys
         @connection_keys ||= ActiveRecord::Base.configurations.keys.
-          select{|n| n.match(Regexp.new("(#{env}$)"))}
+          select{|n| n.match(env_regex(false))}
       end
     
       # Contains all the connection classes built
@@ -48,12 +54,12 @@ module ConnectionManager
       def clean_sqlite_db_name(name,remove_env=true)
         new_name = "#{name}".gsub(/(\.sqlite3$)/,'')  
         new_name = new_name.split("/").last 
-        new_name.gsub!(Regexp.new("(\_#{env}$)"),'') if remove_env
+        new_name.gsub!(env_regex,'') if remove_env
         new_name
       end
       
       def clean_db_name(name)
-        new_name = "#{name}".gsub(Regexp.new("#{env}$"),'')
+        new_name = "#{name}".gsub(env_regex(false),'')
         if new_name.blank?
           new_name = "#{database_name_from_yml(name)}"
         end  
@@ -64,7 +70,7 @@ module ConnectionManager
       # Given an connection key name from the database.yml, returns the string 
       # equivelent of the class name for that entry.
       def connection_class_name(name_from_yml)
-        new_class_name = clean_db_name(name_from_yml)  
+        new_class_name = clean_db_name(name_from_yml)
         new_class_name = new_class_name.gsub(/\_/,' ').titleize.gsub(/ /,'')
         new_class_name << "Connection"
         new_class_name
@@ -84,7 +90,7 @@ module ConnectionManager
       end
     
       def available_secondary_connections(rep_collection_key)
-        secondary_connections[(rep_collection_key.gsub(Regexp.new("(\_#{env}$)"),'')).to_sym]
+        secondary_connections[(rep_collection_key.gsub(env_regex,'')).to_sym]
       end
     
       # Sets class instance attributes, then builds connection classes, while populating
@@ -94,8 +100,8 @@ module ConnectionManager
           send("#{k.to_s}=",v)
         end     
         connection_keys.each do |connection|
-          new_connection = connection_class_name(connection)  
-          add_secondary_connection(connection,new_connection)
+          new_connection = connection_class_name(connection)
+          add_secondary_connection(connection,new_connection)        
           build_connection_class(new_connection,connection) 
         end
         all
@@ -109,7 +115,6 @@ module ConnectionManager
         end
         new_connection_class = Object.const_set(class_name, klass)
         new_connection_class.establish_connection(connection_key)       
-
         (const_set class_name, new_connection_class)
         all << class_name
       end

data/lib/connection_manager/secondary_connection_builder.rb

@@ -49,37 +49,43 @@ module ConnectionManager
       build_secondary_connections(options)
     end
     
-    def sharded(*settings)   
+    def shard(*settings)   
       options = {:name => "shard", :readonly => false, :shards => true}.merge(settings.extract_options!) 
       build_secondary_connections(options)
     end
-        
+    
+    def child_connection_class?
+      false
+    end    
     # Adds subclass with the class name of the type provided in the options, which 
     # defaults to 'slave' if blank, that uses the connection from a connection class.
     # If :database option is blank?, replicated will assume the database.yml has
     # slave connections defined as: slave_database_name_test or slave_1_database_name_test, 
     # where slave_1 is the secondary instance, 'database_name' is the actual 
     # name of the database and '_test' is the Rails environment
-    def build_secondary_connections(options={})     
-      connection_classes = secondary_connection_classes(options)  
-      if connection_classes.blank?
-        raise ArgumentError, " a secondary connection was not found. Check your database.yml."
-      else   
-        connection_methods = []
-        connection_classes.each do |c|
-          under_scored = c.underscore
-          method_name = under_scored.split("_")[0]
-          method_name = method_name.insert(method_name.index(/\d/),"_")
-          class_name = method_name.classify
-          connection_methods << method_name.to_sym
-          build_secondary_class(class_name,c,options)
-          build_single_secondary_method(method_name,class_name)
-          set_table_name_for_joins
+    def build_secondary_connections(options={})   
+      unless name.match(/\:\:/)
+        connection_classes = secondary_connection_classes(options)  
+        sub_classes = []
+        if connection_classes.blank?
+          raise ArgumentError, " a secondary connection was not found. Check your database.yml."
+        else   
+          connection_methods = []
+          connection_classes.each do |c|
+            under_scored = c.underscore
+            method_name = under_scored.split("_")[0]
+            method_name = method_name.insert(method_name.index(/\d/),"_")
+            class_name = method_name.classify
+            connection_methods << method_name.to_sym
+            build_secondary_class(class_name,c,options)
+            build_single_secondary_method(method_name,class_name)
+            #set_table_name_for_joins
+            sub_classes << "#{self.name}::#{class_name}".constantize if options[:shards]
+          end
         end
+        build_slaves_method(connection_methods)  if options[:replication]
+        build_shards_method(sub_classes)  if options[:shards]
       end
-      
-      build_slaves_method(connection_methods)  if options[:replication]
-      build_shards_method(connection_methods)  if options[:shards]
     end
     
     # Creats a subclass that inherets from the model. The default model_name 
@@ -93,38 +99,50 @@ module ConnectionManager
     #   User::Slave2.where(:id => 2).first => returns results from slave_2 database
     #   User::Shard1.where(:id => 2).first => returns results from slave_1 database
     def build_secondary_class(class_name,connection_name,options)
-      class_eval <<-STR, __FILE__, __LINE__
-      class #{class_name} < self
-        #{build_secondary_associations(class_name)}
+      klass = Class.new(self) do
+        class << self
+          def model_name
+            ActiveModel::Name.new(superclass)
+          end         
+          def child_connection_class?
+            true  
+          end
+        end
+        
+        if (options[:name] == "readonly" || options[:readonly])
+          def readonly?
+            true
+          end
+        end
+      end 
+ 
+      sub_class = const_set(class_name, klass)
+      sub_class.build_secondary_associations(class_name)      
+      sub_class.class_eval <<-STR, __FILE__, __LINE__
         class << self
           def connection
             Connections::#{connection_name}.connection
           end
-          def model_name
-            ActiveModel::Name.new(#{name})
-          end
         end
-        #{'def readonly?; true; end;' if (options[:name] == "readonly" || options[:readonly])}       
-      end       
       STR
+      
+      sub_class
     end
     
-    def set_table_name_for_joins
-      self.table_name_prefix = "#{database_name}." unless database_name.match(/\.sqlite3$/)
-    end
+#    def set_table_name_for_joins
+#      self.table_name_prefix = "#{database_name}." unless database_name.match(/\.sqlite3$/)
+#    end
     
     # Adds as class method to call a specific secondary conneciton.
     # Usage:
     #   User.slave_1.where(:id => 2).first => returns results from slave_1 database
     #   User.slave_2.where(:id => 2).first => returns results from slave_2 database
     def build_single_secondary_method(method_name,class_name)
-      class_eval <<-STR, __FILE__, __LINE__
-        class << self
-          def #{method_name}
-            self::#{class_name}
-          end      
-        end 
-      STR
+      self.class.instance_eval do       
+        define_method method_name.to_s do
+          "#{name}::#{class_name}".constantize
+        end
+      end
     end
     
     # add a class method that shifts through available connections methods
@@ -132,35 +150,27 @@ module ConnectionManager
     # Usage:
     #   User.slave.where(:id => 2).first => can return results from slave_1 or slave_2 
     def build_slaves_method(connection_methods)
-      class_eval <<-STR, __FILE__, __LINE__
-      @connection_methods = #{connection_methods}
-      class << self
-        def slaves
+      @connection_methods = connection_methods
+      self.class.instance_eval do       
+        define_method 'slaves' do
           current = @connection_methods.shift
           @connection_methods << current
           send(current)
         end
-        alias :slave :slaves
-        def connection_methods
-          @connection_methods
-        end
-      end     
-      STR
+        alias_method :slave, :slaves
+      end
     end
     
     # add a class method that shifts through available connections methods
     # on each call.
     # Usage:
     #   User.shards.where(:id => 2).first => can return results from slave_1 or slave_2 
-    def build_shards_method(connection_methods)
-      class_eval <<-STR, __FILE__, __LINE__
-      @shard_connection_methods = #{connection_methods}
-      class << self
-        def shards
-          ConnectionManager::MethodRecorder.new(@shard_connection_methods)
+    def build_shards_method(connection_classes)    
+      self.class.instance_eval do
+        define_method 'shards' do
+          ConnectionManager::MethodRecorder.new(connection_classes)
         end
-      end     
-      STR
+      end
     end
   end
 end

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end
 

data/spec/helpers/database_spec_helper.rb

@@ -1,6 +1,6 @@
 class TestDB
-  def self.connect
-    ActiveRecord::Base.configurations = YAML::load(File.open(File.join(File.dirname(__FILE__),'..','database.yml')))
+  def self.connect(driver='sqlite')
+    ActiveRecord::Base.configurations = YAML::load(File.open(File.join(File.dirname(__FILE__),'..',"#{driver}_database.yml")))
     ActiveRecord::Base.establish_connection('test') 
   end
   def self.clean
@@ -18,7 +18,8 @@ end
 class TestMigrations < ActiveRecord::Migration  
   
   # all the ups
-  def self.up  
+  def self.up(connection_name='test')  
+    ActiveRecord::Base.establish_connection(connection_name) 
     begin
       create_table :foos do |t|
         t.string :name
@@ -54,7 +55,8 @@ class TestMigrations < ActiveRecord::Migration
   
  
   # all the downs
-  def self.down 
+  def self.down(connection_name='test')  
+    ActiveRecord::Base.establish_connection(connection_name) 
     begin
       [:foos,:fruits,:baskets,:fruit_baskets,:regions,:types].each do |t|
         drop_table t 

data/spec/integration/secondary_connection_builder_spec.rb

@@ -33,6 +33,7 @@ describe ConnectionManager::SecondaryConnectionBuilder do
     
     context "subclasses" do
       it "should have a superclass of the parent class" do
+        
         Fruit::Slave1.superclass.should eql(Fruit)
       end
     end
@@ -94,7 +95,7 @@ describe ConnectionManager::SecondaryConnectionBuilder do
   end
   context "model_name for slave" do
     it "should return the supers model_name" do
-      Fruit.slave.model_name.should eql(Fruit.model_name)
+      Fruit.slave_1.model_name.should eql(Fruit.model_name)
     end
     
     it "should not interfear with inheritance" do
@@ -102,7 +103,6 @@ describe ConnectionManager::SecondaryConnectionBuilder do
       class MyFruit < Fruit
         replicated
       end
- 
       Fruit.model_name.should_not eql(MyFruit.model_name)
       MyFruit.model_name.should eql("MyFruit")
       MyFruit.model_name.respond_to?(:plural).should be_true

data/spec/lib/method_recorder_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe ConnectionManager::MethodRecorder do
-  before(:each) do
+  before(:all) do
+    TestMigrations.up('shard_1_cm_test')
+    ConnectionManager::Connections.initialize(:env => 'test')
     class Fruit < ActiveRecord::Base
-      #include ConnectionManager::MethodRecorder      
-      def self.shards
-        ConnectionManager::MethodRecorder.new([self])
-      end    
+      shard(:using => ["shard_1_cm_test"])    
     end
+    
   end
   context 'shards'do    
     it "it should record methods" do
@@ -36,4 +36,8 @@ describe ConnectionManager::MethodRecorder do
       end
     end
   end
+  after(:all) do
+    TestMigrations.down('shard_1_cm_test')
+    ActiveRecord::Base.establish_connection('test') 
+  end
 end

data/spec/lib/secondary_connection_builder_spec.rb

@@ -4,7 +4,7 @@ describe ConnectionManager::SecondaryConnectionBuilder do
   
   context '#database_name' do
     it "should return the name of the database the model is using" do
-      Fruit.database_name.should eql('spec/cm_test.sqlite3')
+      Fruit.database_name.should eql('cm_test')
     end
   end
 

data/spec/mysql2_database.yml

@@ -0,0 +1,25 @@
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+common: &common
+  adapter: mysql2
+  username: root
+  password: some_password
+  pool: 100
+  timeout: 5000
+  
+test:
+  <<: *common
+  database: cm_test
+ 
+slave_1_cm_test:
+  <<: *common  
+  database: cm_test
+  
+slave_2_cm_test:
+  <<: *common
+  database: cm_test
+  
+shard_1_cm_test:  
+   <<: *common
+   database: legacy_cm_test

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'active_record'
 require 'factory_girl'
 require 'helpers/database_spec_helper'
 
-TestDB.connect
+TestDB.connect('mysql2')
 TestMigrations.up
 FactoryGirl.find_definitions
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2012-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70148774706040 !ruby/object:Gem::Requirement
+  requirement: &70350833047080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148774706040
+  version_requirements: *70350833047080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70148774705620 !ruby/object:Gem::Requirement
+  requirement: &70350833046660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148774705620
+  version_requirements: *70350833046660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70148774705160 !ruby/object:Gem::Requirement
+  requirement: &70350833046200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148774705160
+  version_requirements: *70350833046200
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70148774704740 !ruby/object:Gem::Requirement
+  requirement: &70350833045780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148774704740
+  version_requirements: *70350833045780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70148774704320 !ruby/object:Gem::Requirement
+  requirement: &70350833045360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148774704320
+  version_requirements: *70350833045360
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70148774703900 !ruby/object:Gem::Requirement
+  requirement: &70350833044940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148774703900
+  version_requirements: *70350833044940
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &70350833044520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70350833044520
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email:
@@ -100,7 +111,6 @@ files:
 - lib/connection_manager/method_recorder.rb
 - lib/connection_manager/secondary_connection_builder.rb
 - lib/connection_manager/version.rb
-- spec/database.yml
 - spec/factories.rb
 - spec/helpers/database_spec_helper.rb
 - spec/helpers/models_spec_helper.rb
@@ -109,8 +119,10 @@ files:
 - spec/lib/connections_spec.rb
 - spec/lib/method_recorder_spec.rb
 - spec/lib/secondary_connection_builder_spec.rb
+- spec/mysql2_database.yml
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/sqlite_database.yml
 homepage: ''
 licenses: []
 post_install_message: 
@@ -137,7 +149,6 @@ specification_version: 3
 summary: Simplifies connecting to Muliple and Replication databases with rails and
   active_record
 test_files:
-- spec/database.yml
 - spec/factories.rb
 - spec/helpers/database_spec_helper.rb
 - spec/helpers/models_spec_helper.rb
@@ -146,5 +157,7 @@ test_files:
 - spec/lib/connections_spec.rb
 - spec/lib/method_recorder_spec.rb
 - spec/lib/secondary_connection_builder_spec.rb
+- spec/mysql2_database.yml
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/sqlite_database.yml