active_record_shards 3.0.0.beta1 → 3.0.0.beta2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c4ca6523464fd8739f44b617fd634d0ade3a7e3
+  data.tar.gz: d21d6cfa9601754888ff291d367732d4642c4f8f
+SHA512:
+  metadata.gz: e8553793c3c910c79ea73251306ed33f41a2bce328a365bd8ee2ca20c644fc78c5b12a700b36c1d6ddaeeb62d34ffc10d5454221c6fba40e3e114d41f4930c94
+  data.tar.gz: 6b6725a7d70a810ee440366cd892cc4af3a26ac1cbdab855d5073b6e3c62202994a7c013da7869a16026f73f021c93313728cac7e3e6bc1ce6ae902a25938f99

data/lib/active_record_shards.rb

@@ -8,14 +8,10 @@ require 'active_record_shards/association_collection_connection_selection'
 require 'active_record_shards/connection_pool'
 require 'active_record_shards/migration'
 require 'active_record_shards/default_slave_patches'
-require 'active_record_shards/arel_engine'
 require 'active_record_shards/connection_handler'
+require 'active_record_shards/connection_specification'
 
-if ActiveRecord::VERSION::STRING >= "3.2.0"
-  require 'active_record_shards/connection_specification'
-end
-
-if ActiveRecord::VERSION::STRING >= "4.0.0"
+if ActiveRecord::VERSION::MAJOR >= 4
   methods_to_override = [:establish_connection, :remove_connection, :pool_for,
                          :pool_from_any_process_for]
   ActiveRecordShards::ConnectionSpecification = ActiveRecord::ConnectionAdapters::ConnectionSpecification
@@ -35,12 +31,12 @@ if ActiveRecord.const_defined?(:Relation)
   ActiveRecord::Relation.send(:include, ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
 end
 
-if ActiveRecord::VERSION::STRING >= "3.1.0"
-  ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
-else
-  ActiveRecord::Associations::AssociationCollection.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
+if ActiveRecord::Associations.const_defined?(:Preloader)
+  ActiveRecord::Associations::Preloader::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
 end
 
+ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
+
 module ActiveRecordShards
   def self.rails_env
     env = Rails.env if Object.const_defined?(:Rails)

data/lib/active_record_shards/association_collection_connection_selection.rb

@@ -33,12 +33,7 @@ module ActiveRecordShards
       def method_missing(method, *args, &block)
         # would love to not rely on version here, unfortunately @association_collection
         # is a sensitive little bitch of an object.
-        if ActiveRecord::VERSION::STRING >= "3.1.0"
-          reflection = @association_collection.proxy_association.reflection
-        else
-          reflection = @association_collection.proxy_reflection
-        end
-
+        reflection = @association_collection.proxy_association.reflection
         reflection.klass.on_cx_switch_block(@which) { @association_collection.send(method, *args, &block) }
       end
     end

data/lib/active_record_shards/connection_specification.rb

@@ -10,7 +10,7 @@ class ActiveRecord::Base
     remove_connection
     specification_cache[connection_pool_name] = spec
 
-    if ActiveRecord::VERSION::STRING >= "4.0.0"
+    if ActiveRecord::VERSION::MAJOR >= 4
       connection_handler.establish_connection self, spec
     else
       connection_handler.establish_connection connection_pool_name, spec

data/lib/active_record_shards/connection_switcher.rb

@@ -95,11 +95,7 @@ module ActiveRecordShards
       if self == ActiveRecord::Base || !switch_to_slave || options[:construct_ro_scope] == false
         yield
       else
-        if ActiveRecord::VERSION::MAJOR == 2
-          with_scope({:find => {:readonly => true}}, &block)
-        else
-          readonly.scoping(&block)
-        end
+        readonly.scoping(&block)
       end
     ensure
       @disallow_slave -= 1 if which == :master
@@ -177,13 +173,8 @@ module ActiveRecordShards
       # note that since we're subverting the standard establish_connection path, we have to handle the funky autoloading of the
       # connection adapter ourselves.
       specification_cache[name] ||= begin
-        if ActiveRecord::VERSION::STRING >= "3.2.0"
-          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
-          resolver.spec
-        else
-          autoload_adapter(spec['adapter'])
-          ActiveRecordShards::ConnectionSpecification.new(spec, "#{spec['adapter']}_connection")
-        end
+        resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
+        resolver.spec
       end
 
       connection_handler.establish_connection(connection_pool_name, specification_cache[name])
@@ -194,15 +185,11 @@ module ActiveRecordShards
     end
 
     def connection_pool_key
-      if ActiveRecord::VERSION::STRING >= "3.1.0"
-        specification_cache[connection_pool_name]
-      else
-        connection_pool_name
-      end
+      specification_cache[connection_pool_name]
     end
 
     def connected_to_shard?
-      if ActiveRecord::VERSION::MAJOR == 4
+      if ActiveRecord::VERSION::MAJOR >= 4
         specs_to_pools = Hash[connection_handler.connection_pool_list.map { |pool| [pool.spec, pool] }]
       else
         specs_to_pools = connection_handler.connection_pools

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,23 +1,32 @@
 module ActiveRecordShards
   module DefaultSlavePatches
-    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql,  :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists? ]
+    def self.wrap_method_in_on_slave(class_method, base, method)
 
-    def self.extended(base)
-      base_methods = (base.methods | base.private_methods).map(&:to_sym)
-      (CLASS_SLAVE_METHODS & base_methods).each do |slave_method|
-        _, slave_method, punctuation = slave_method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
-        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          class << self
-            def #{slave_method}_with_default_slave#{punctuation}(*args, &block)
-              on_slave_unless_tx do
-                #{slave_method}_without_default_slave#{punctuation}(*args, &block)
-              end
-            end
+      if class_method
+        base_methods = (base.methods | base.private_methods).map(&:to_sym)
+      else
+        base_methods = (base.instance_methods | base.private_instance_methods).map(&:to_sym)
+      end
 
-            alias_method_chain :#{slave_method}#{punctuation}, :default_slave
+      return unless base_methods.include?(method)
+      _, method, punctuation = method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
+      base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        #{class_method ? "class << self" : ""}
+          def #{method}_with_default_slave#{punctuation}(*args, &block)
+            on_slave_unless_tx do
+              #{method}_without_default_slave#{punctuation}(*args, &block)
+            end
           end
-        RUBY
-      end
+
+          alias_method_chain :#{method}#{punctuation}, :default_slave
+        #{class_method ? "end" : ""}
+      RUBY
+    end
+
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql,  :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists?, :table_exists? ]
+
+    def self.extended(base)
+      CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
 
       base.class_eval do
         # fix ActiveRecord to do the right thing, and use our aliased quote_value
@@ -58,33 +67,10 @@ module ActiveRecordShards
           end
 
           alias_method_chain :transaction, :slave_off
-
-
-          def table_exists_with_default_slave?(*args)
-            on_slave_unless_tx(*args) { table_exists_without_default_slave?(*args) }
-          end
-
-          alias_method_chain :table_exists?, :default_slave
         end
       end
-
-
-      ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
-        def construct_sql_with_default_slave(*args, &block)
-          on_slave_unless_tx do
-            construct_sql_without_default_slave(*args, &block)
-          end
-        end
-
-        def construct_find_options_with_default_slave!(*args, &block)
-          on_slave_unless_tx do
-            construct_find_options_without_default_slave!(*args, &block)
-          end
-        end
-
-        alias_method_chain :construct_sql,           :default_slave if respond_to?(:construct_sql)
-        alias_method_chain :construct_find_options!, :default_slave if respond_to?(:construct_find_options!)
-      end
+      ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, ActiveRecord::Associations::HasAndBelongsToManyAssociation, :construct_sql)
+      ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, ActiveRecord::Associations::HasAndBelongsToManyAssociation, :construct_find_options!)
     end
 
     def on_slave_unless_tx(&block)
@@ -97,16 +83,23 @@ module ActiveRecordShards
 
     module ActiveRelationPatches
       def self.included(base)
-        base.send :alias_method_chain, :calculate, :default_slave
-        base.send :alias_method_chain, :exists?, :default_slave
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :calculate)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :exists?)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :pluck)
       end
 
       def on_slave_unless_tx
         @klass.on_slave_unless_tx { yield }
       end
+    end
 
-      def calculate_with_default_slave(*args, &block)
-        on_slave_unless_tx { calculate_without_default_slave(*args, &block) }
+    module HasAndBelongsToManyPreloaderPatches
+      def self.included(base)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil
+      end
+
+      def on_slave_unless_tx
+        klass.on_slave_unless_tx { yield }
       end
 
       def exists_with_default_slave?(*args, &block)

data/lib/active_record_shards/migration.rb

@@ -106,18 +106,11 @@ end
 ActiveRecord::Migration.class_eval do
   extend ActiveRecordShards::MigrationClassExtension
 
-  if ActiveRecord::VERSION::STRING >= "3.1.0"
-    include ActiveRecordShards::ActualMigrationExtension
-    define_method :migration_shard do
-      self.class.migration_shard
-    end
-    alias_method_chain :migrate, :forced_shard
-  else
-    extend ActiveRecordShards::ActualMigrationExtension
-    class << self
-      alias_method_chain :migrate, :forced_shard
-    end
+  include ActiveRecordShards::ActualMigrationExtension
+  define_method :migration_shard do
+    self.class.migration_shard
   end
+  alias_method_chain :migrate, :forced_shard
 end
 
 ActiveRecord::MigrationProxy.delegate :migration_shard, :to => :migration

data/lib/active_record_shards/model.rb

@@ -48,10 +48,6 @@ module ActiveRecordShards
 
     def self.extended(base)
       base.send(:include, InstanceMethods)
-      if ActiveRecord::VERSION::MAJOR == 2 && !base.method_defined?(:after_initialize)
-        # trick rails 2 into running callbacks
-        base.send(:define_method, :after_initialize){}
-      end
       base.after_initialize :initialize_shard_and_slave
     end
   end

data/lib/active_record_shards/tasks.rb

@@ -1,7 +1,7 @@
 require 'active_record_shards'
 
 %w[db:drop db:create db:abort_if_pending_migrations db:reset].each do |name|
-  Rake.application.instance_variable_get(:@tasks).delete(name) || warn("could not delete #{name} task, potential load-order problem")
+  Rake::Task[name].clean
 end
 
 namespace :db do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
-  prerelease: 6
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Mick Staugaard
@@ -11,27 +10,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-01-31 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: 2.3.5
+        version: 3.2.16
     - - <=
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 3.2.16
     - - <=
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -44,7 +41,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/active_record_shards/arel_engine.rb
 - lib/active_record_shards/association_collection_connection_selection.rb
 - lib/active_record_shards/configuration_parser.rb
 - lib/active_record_shards/connection_handler.rb
@@ -58,54 +54,28 @@ files:
 - lib/active_record_shards/tasks.rb
 - lib/active_record_shards.rb
 - README.md
-- test/configuration_parser_test.rb
-- test/connection_switching_test.rb
-- test/cowardly_migration/20110824010215_cowardly_migration.rb
-- test/database.yml
-- test/database_parse_test.yml
-- test/failure_migration/20110824010215_failure_migration.rb
-- test/helper.rb
-- test/migrations/20110824010216_shard_migration.rb
-- test/migrations/20110829215912_account_migration.rb
-- test/migrator_test.rb
-- test/models.rb
-- test/schema.rb
-homepage: http://github.com/zendesk/active_record_shards
+homepage: https://github.com/zendesk/active_record_shards
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple database switching for ActiveRecord.
-test_files:
-- test/configuration_parser_test.rb
-- test/connection_switching_test.rb
-- test/cowardly_migration/20110824010215_cowardly_migration.rb
-- test/database.yml
-- test/database_parse_test.yml
-- test/failure_migration/20110824010215_failure_migration.rb
-- test/helper.rb
-- test/migrations/20110824010216_shard_migration.rb
-- test/migrations/20110829215912_account_migration.rb
-- test/migrator_test.rb
-- test/models.rb
-- test/schema.rb
-has_rdoc: 
+test_files: []

data/lib/active_record_shards/arel_engine.rb

@@ -1,13 +0,0 @@
-if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
-  class ActiveRecord::Base
-    def self.arel_engine
-      @arel_engine ||= begin
-        if self == ActiveRecord::Base
-          Arel::Table.engine
-        else
-          connection_handler.connection_pools[connection_pool_name] ? self : superclass.arel_engine
-        end
-      end
-    end
-  end
-end

data/test/configuration_parser_test.rb

@@ -1,98 +0,0 @@
-require_relative 'helper'
-
-describe ActiveRecordShards::ConfigurationParser do
-  describe "exploding the database.yml" do
-    before do
-      @exploded_conf = ActiveRecordShards::ConfigurationParser.explode(YAML::load(IO.read(File.dirname(__FILE__) + '/database_parse_test.yml')))
-    end
-
-    describe "main slave" do
-      before { @conf = @exploded_conf['test_slave'] }
-      it "be exploded" do
-        @conf["shard_names"] = @conf["shard_names"].to_set
-        assert_equal({
-          "adapter"     => "mysql",
-          "encoding"    => "utf8",
-          "database"    => "ars_test",
-          "port"        => 123,
-          "username"    => "root",
-          "password"    => nil,
-          "host"        => "main_slave_host",
-          "shard_names" => ["a", "b"].to_set
-        }, @conf)
-      end
-    end
-
-    describe "shard a" do
-      describe "master" do
-        before { @conf = @exploded_conf['test_shard_a'] }
-        it "be exploded" do
-          @conf["shard_names"] = @conf["shard_names"].to_set
-          assert_equal({
-            "adapter"     => "mysql",
-            "encoding"    => "utf8",
-            "database"    => "ars_test_shard_a",
-            "port"        => 123,
-            "username"    => "root",
-            "password"    => nil,
-            "host"        => "shard_a_host",
-            "shard_names" => ["a", "b"].to_set
-          }, @conf)
-        end
-      end
-
-      describe "slave" do
-        before { @conf = @exploded_conf['test_shard_a_slave'] }
-        it "be exploded" do
-          @conf["shard_names"] = @conf["shard_names"].to_set
-          assert_equal({
-            "adapter"     => "mysql",
-            "encoding"    => "utf8",
-            "database"    => "ars_test_shard_a",
-            "port"        => 123,
-            "username"    => "root",
-            "password"    => nil,
-            "host"        => "shard_a_slave_host",
-            "shard_names" => ["a", "b"].to_set
-          }, @conf)
-        end
-      end
-    end
-
-    describe "shard b" do
-      describe "master" do
-        before { @conf = @exploded_conf['test_shard_b'] }
-        it "be exploded" do
-          @conf["shard_names"] = @conf["shard_names"].to_set
-          assert_equal({
-            "adapter"     => "mysql",
-            "encoding"    => "utf8",
-            "database"    => "ars_test_shard_b",
-            "port"        => 123,
-            "username"    => "root",
-            "password"    => nil,
-            "host"        => "shard_b_host",
-            "shard_names" => ["a", "b"].to_set
-          }, @conf)
-        end
-      end
-
-      describe "slave" do
-        before { @conf = @exploded_conf['test_shard_b_slave'] }
-        it "be exploded" do
-          @conf["shard_names"] = @conf["shard_names"].to_set
-          assert_equal({
-            "adapter"     => "mysql",
-            "encoding"    => "utf8",
-            "database"    => "ars_test_shard_b_slave",
-            "port"        => 123,
-            "username"    => "root",
-            "password"    => nil,
-            "host"        => "shard_b_host",
-            "shard_names" => ["a", "b"].to_set
-          }, @conf)
-        end
-      end
-    end
-  end
-end