active_record_shards 3.5.0.pre.alpha → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5934528264e0c87553401c8e2c2f46c54e7da9
-  data.tar.gz: 5ab7c3b24998adf54238edaea4cb8bb088c103b3
+  metadata.gz: 9adfc3476e718a0178c8781868e0ef96fc77bc85
+  data.tar.gz: 678e2b636c88a52d427236523c417b67d32bc3e1
 SHA512:
-  metadata.gz: 8198cd8aedfc3dbebdc413fbc8c5c6eb9ade10539853700c8cd1666e574c8dcdcc777d306d9d9615aef74e331082bbdbed15a713931a80a57f324190e43a4bfa
-  data.tar.gz: 13d1be9a552f677a2ac9be01b82b372b1817868f1edeb07ffe3111b9388ab19d35563a25597fd46844385a112230d2ad2c4bedf44a661396ffae5f3d464f84ca
+  metadata.gz: 84e2df24248d209b3dcca3a6942064a84cbfabc2b2ef4afdbad24e4350b5ceca876d84e8ceec00b6821cca4c939e7aad2313fda4e06e39df0164c1dc997c188f
+  data.tar.gz: 678577457e7212e8b36c5498c0c5416a781fa0bffc31d49cd36085b0f6f4a1d7d9b09f592a13944a2df815b06578ae00d14827c704f8529cf7961267e926fb03

data/README.md

@@ -3,7 +3,7 @@
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
 switch between database connections. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
 
-ActiveRecord Shards has used and tested on Rails 3.0.x, 3.2.x, 4.0.x, and 4.1.x and has in some form or another been used in production on a large rails app for
+ActiveRecord Shards has used and tested on Rails 3.2.x, 4.0.x, 4.1.x and 4.2.x and has in some form or another been used in production on a large rails app for
 more than a year.
 
 ## Installation
@@ -47,10 +47,10 @@ All the models that live on the shared database must be marked as not\_sharded:
 
     class Account < ActiveRecord::Base
       not_sharded
-      
+
       has_many :projects
     end
-    
+
     class Project < ActiveRecord::Base
       belongs_to :account
     end
@@ -62,10 +62,10 @@ in a rack middleware and switch to the right shard:
       def initialize(app)
         @app = app
       end
-      
+
       def call(env)
         account = lookup_account(env)
-        
+
         if account
           ActiveRecord::Base.on_shard(account.shard_id) do
             @app.call(env)
@@ -74,7 +74,7 @@ in a rack middleware and switch to the right shard:
           @app.call(env)
         end
       end
-      
+
       def lookup_account(env)
         ...
       end
@@ -98,4 +98,3 @@ Copyright (c) 2011 Zendesk. See LICENSE for details.
 Mick Staugaard, Eric Chapweske
 
 [![Build Status](https://secure.travis-ci.org/osheroff/active_record_shards.png)](http://travis-ci.org/osheroff/active_record_shards)
-

data/lib/active_record_shards.rb

@@ -33,16 +33,16 @@ if ActiveRecord.const_defined?(:Relation)
 end
 
 if ActiveRecord::Associations.const_defined?(:Preloader) && ActiveRecord::Associations::Preloader.const_defined?(:HasAndBelongsToMany)
-  ActiveRecord::Associations::Preloader::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
+  ActiveRecord::Associations::Preloader::HasAndBelongsToMany.send(:prepend, ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
 end
 
-if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
-  ActiveRecord::Associations::Builder::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
+if ActiveRecord::VERSION::STRING >= '4.1.0'
+  ActiveRecord::Associations::Builder::HasAndBelongsToMany.send(:prepend, ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
 end
 
 ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
 
-if ActiveRecord::VERSION::MAJOR >= 4 && RUBY_VERSION >= '2'
+if ActiveRecord::VERSION::MAJOR >= 4
   ActiveRecord::SchemaDumper.send(:prepend, ActiveRecordShards::SchemaDumperExtension)
 end
 
@@ -53,16 +53,17 @@ module ActiveRecordShards
     env ||= ENV['RAILS_ENV']
     env ||= 'development'
   end
-end
 
-ActiveRecord::Base.singleton_class.class_eval do
-  def establish_connection_with_connection_pool_name(spec = nil)
-    case spec
-    when ActiveRecordShards::ConnectionSpecification
-      connection_handler.establish_connection(connection_pool_name, spec)
-    else
-      establish_connection_without_connection_pool_name(spec)
+  module ActiveRecordConnectionPoolName
+    def establish_connection(spec = nil)
+      case spec
+      when ActiveRecordShards::ConnectionSpecification
+        connection_handler.establish_connection(connection_pool_name, spec)
+      else
+        super
+      end
     end
   end
-  alias_method_chain :establish_connection, :connection_pool_name
 end
+
+ActiveRecord::Base.singleton_class.send(:prepend, ActiveRecordShards::ActiveRecordConnectionPoolName)

data/lib/active_record_shards/configuration_parser.rb

@@ -35,16 +35,15 @@ module ActiveRecordShards
       end
     end
 
-    def configurations_with_shard_explosion=(conf)
-      self.configurations_without_shard_explosion = explode(conf)
+    module PrependMethods
+      def configurations=(conf)
+        super(explode(conf))
+      end
     end
 
     def ConfigurationParser.extended(klass)
-      klass.singleton_class.alias_method_chain :configurations=, :shard_explosion
-
-      if !klass.configurations.nil? && !klass.configurations.empty?
-        klass.configurations = klass.configurations
-      end
+      klass.singleton_class.send(:prepend, PrependMethods)
+      klass.configurations = klass.configurations if klass.configurations.present?
     end
   end
 end

data/lib/active_record_shards/connection_pool.rb

@@ -13,21 +13,20 @@ module ActiveRecordShards
   #   ActiveRecordShards.override_connection_handler_methods(methods_to_override)
   #
   def self.override_connection_handler_methods(method_names)
+    injected_module = Module.new
     method_names.each do |method_name|
-      ActiveRecord::ConnectionAdapters::ConnectionHandler.class_eval do
-        define_method("#{method_name}_with_connection_pool_name") do |*args|
-          unless args[0].is_a? ConnectionPoolNameDecorator
-            name = if args[0].is_a? String
-                     args[0]
-                   else
-                     args[0].connection_pool_name
-                   end
-            args[0] = ConnectionPoolNameDecorator.new(name)
-          end
-          send("#{method_name}_without_connection_pool_name", *args)
+      injected_module.send(:define_method, method_name) do |*args|
+        unless args[0].is_a? ConnectionPoolNameDecorator
+          name = if args[0].is_a? String
+                   args[0]
+                 else
+                   args[0].connection_pool_name
+                 end
+          args[0] = ConnectionPoolNameDecorator.new(name)
         end
-        alias_method_chain method_name, :connection_pool_name
+        super(*args)
       end
     end
+    ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, injected_module)
   end
 end

data/lib/active_record_shards/connection_specification.rb

@@ -1,6 +1,6 @@
 class ActiveRecord::Base
   def self.establish_connection(spec = ENV["DATABASE_URL"])
-    if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
+    if ActiveRecord::VERSION::STRING >= '4.1.0'
       spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call
       spec = spec.to_sym if spec.is_a?(String)
       resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations

data/lib/active_record_shards/connection_switcher.rb

@@ -4,9 +4,28 @@ module ActiveRecordShards
   module ConnectionSwitcher
     SHARD_NAMES_CONFIG_KEY = 'shard_names'.freeze
 
+    module PrependMethods
+      def columns
+        if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
+          on_first_shard { super }
+        else
+          super
+        end
+      end
+
+      def table_exists?
+        result = super()
+
+        if !result && is_sharded? && (shard_name = shard_names.first)
+          result = on_shard(shard_name) { super }
+        end
+
+        result
+      end
+    end
+
     def self.extended(klass)
-      klass.singleton_class.alias_method_chain :columns, :default_shard
-      klass.singleton_class.alias_method_chain :table_exists?, :default_shard
+      klass.singleton_class.send(:prepend, ActiveRecordShards::ConnectionSwitcher::PrependMethods)
     end
 
     def default_shard=(new_default_shard)
@@ -181,7 +200,7 @@ 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::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
+        if ActiveRecord::VERSION::STRING >= '4.1.0'
           resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
           resolver.spec(spec)
         else
@@ -215,24 +234,6 @@ module ActiveRecordShards
       specs_to_pools.has_key?(connection_pool_key)
     end
 
-    def columns_with_default_shard
-      if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
-        on_first_shard { columns_without_default_shard }
-      else
-        columns_without_default_shard
-      end
-    end
-
-    def table_exists_with_default_shard?
-      result = table_exists_without_default_shard?
-
-      if !result && is_sharded? && (shard_name = shard_names.first)
-        result = on_shard(shard_name) { table_exists_without_default_shard? }
-      end
-
-      result
-    end
-
     def autoload_adapter(adapter_name)
       begin
         require 'rubygems'

data/lib/active_record_shards/default_slave_patches.rb

@@ -9,66 +9,59 @@ module ActiveRecordShards
       end
 
       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
-
-          alias_method_chain :#{method}#{punctuation}, :default_slave
-        #{class_method ? "end" : ""}
-      RUBY
+      injected_module = Module.new
+      injected_module.send(:define_method, method) do |*args, &block|
+        on_slave_unless_tx do
+          super(*args, &block)
+        end
+      end
+      (class_method ? base.singleton_class : base).send(:prepend, injected_module)
     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
-        def quote_value(*args, &block)
-          self.class.quote_value(*args, &block)
+    module PrependClassMethods
+      def columns
+        if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
+          read_columns_from = :slave
+        else
+          read_columns_form = :master
         end
 
-        def reload_with_slave_off(*args, &block)
-          self.class.on_master { reload_without_slave_off(*args, &block) }
-        end
-        alias_method_chain :reload, :slave_off
-
-        class << self
-          def columns_with_default_slave(*args, &block)
-            if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
-              read_columns_from = :slave
-            else
-              read_columns_form = :master
-            end
-
-            on_cx_switch_block(read_columns_from, :construct_ro_scope => false) { columns_without_default_slave(*args, &block) }
-          end
-          alias_method_chain :columns, :default_slave
+        on_cx_switch_block(read_columns_from, construct_ro_scope: false) { super }
+      end
+
+      def transaction(*args, &block)
+        if on_slave_by_default?
+          old_val = Thread.current[:_active_record_shards_slave_off]
+          Thread.current[:_active_record_shards_slave_off] = true
         end
 
-        class << self
-          def transaction_with_slave_off(*args, &block)
-            if on_slave_by_default?
-              old_val = Thread.current[:_active_record_shards_slave_off]
-              Thread.current[:_active_record_shards_slave_off] = true
-            end
-
-            transaction_without_slave_off(*args, &block)
-          ensure
-            if on_slave_by_default?
-              Thread.current[:_active_record_shards_slave_off] = old_val
-            end
-          end
-
-          alias_method_chain :transaction, :slave_off
+        super(*args, &block)
+      ensure
+        if on_slave_by_default?
+          Thread.current[:_active_record_shards_slave_off] = old_val
         end
       end
+    end
+
+    module PrependMethods
+      # fix ActiveRecord to do the right thing, and use our aliased quote_value
+      def quote_value(*args, &block)
+        self.class.quote_value(*args, &block)
+      end
+
+      def reload(*args, &block)
+        self.class.on_master { super(*args, &block) }
+      end
+    end
+
+    def self.extended(base)
+      base.send(:prepend, PrependMethods)
+      base.singleton_class.send(:prepend, PrependClassMethods)
+
+      CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
+
       if ActiveRecord::Associations.const_defined?(:HasAndBelongsToManyAssociation)
         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!)
@@ -96,7 +89,7 @@ module ActiveRecordShards
     end
 
     module HasAndBelongsToManyPreloaderPatches
-      def self.included(base)
+      def self.prepended(base)
         ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil
       end
 
@@ -104,8 +97,8 @@ module ActiveRecordShards
         klass.on_slave_unless_tx { yield }
       end
 
-      def exists_with_default_slave?(*args, &block)
-        on_slave_unless_tx { exists_without_default_slave?(*args, &block) }
+      def exists?(*args, &block)
+        on_slave_unless_tx { super(*args, &block) }
       end
     end
 
@@ -113,14 +106,8 @@ module ActiveRecordShards
     # this simplifies the hell out of our existence, because all we have to do is inerit on-slave-by-default
     # down from the parent now.
     module Rails41HasAndBelongsToManyBuilderExtension
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :through_model, :inherit_default_slave_from_lhs
-        end
-      end
-
-      def through_model_with_inherit_default_slave_from_lhs
-        model = through_model_without_inherit_default_slave_from_lhs
+      def through_model
+        model = super
         def model.on_slave_by_default?
           left_reflection.klass.on_slave_by_default?
         end

data/lib/active_record_shards/migration.rb

@@ -1,18 +1,23 @@
-module ActiveRecord
-  class Migrator
-    class << self
-      [:up, :down, :run].each do |m|
-        define_method("#{m}_with_sharding") do |*args|
-          ActiveRecord::Base.on_shard(nil) do
-            self.send("#{m}_without_sharding", *args)
-          end
-          ActiveRecord::Base.on_all_shards do
-            self.send("#{m}_without_sharding", *args)
-          end
+module ActiveRecordShards
+  module Migrator
+    [:up, :down, :run].each do |m|
+      define_method(m) do |*args|
+        ActiveRecord::Base.on_shard(nil) do
+          super(*args)
+        end
+        ActiveRecord::Base.on_all_shards do
+          super(*args)
         end
-        alias_method_chain m.to_sym, :sharding
       end
+    end
+  end
+end
 
+ActiveRecord::Migrator.singleton_class.send(:prepend, ActiveRecordShards::Migrator)
+
+module ActiveRecord
+  class Migrator
+    class << self
       def bootstrap_migrations_from_nil_shard(migrations_path, this_migration=nil)
         migrations = nil
         ActiveRecord::Base.on_shard(nil) do
@@ -83,7 +88,7 @@ module ActiveRecordShards
   # migration, where it should have been.  But this makes our monkey patch incompatible.
   # So we're forced to *either* include or extend this.
   module ActualMigrationExtension
-    def migrate_with_forced_shard(direction)
+    def migrate(direction)
       if migration_shard.blank?
         raise RuntimeError, "#{self.name}: Can't run migrations without a shard spec: this may be :all, :none,
                  or a specific shard (for data-fixups).  please call shard(arg) in your migration."
@@ -98,7 +103,7 @@ module ActiveRecordShards
         return if migration_shard != :all && migration_shard.to_s != shard.to_s
       end
 
-      migrate_without_forced_shard(direction)
+      super
     end
   end
 end
@@ -106,11 +111,10 @@ end
 ActiveRecord::Migration.class_eval do
   extend ActiveRecordShards::MigrationClassExtension
 
-  include ActiveRecordShards::ActualMigrationExtension
+  prepend 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.5.0.pre.alpha
+  version: 3.6.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -184,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.