active_record_shards 3.1.0 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b63e3aedfb88c46446154302a20fffb1064c186
+  data.tar.gz: 3876c52d8d919ea210fce8c0697ec65475d6ca70
+SHA512:
+  metadata.gz: bfb0ab5ee2325a86ed7058e3fc0131984e1ff4730a630a518d10bb815d25bc664f6e289657ccec9c2b58707402510cdc7d345657f458dc0793712ea7502ccf1c
+  data.tar.gz: 304ea258e43a354cca27bbf611d657db0c0f102f619cf7ddfdbb5f6854e6938069da7ad453bf1ba2c61ef25329359f83224cfa40287e56058a2db7c625f1316e

data/lib/active_record_shards.rb

@@ -32,10 +32,14 @@ if ActiveRecord.const_defined?(:Relation)
   ActiveRecord::Relation.send(:include, ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
 end
 
-if ActiveRecord::Associations.const_defined?(:Preloader)
+if ActiveRecord::Associations.const_defined?(:Preloader) && ActiveRecord::Associations::Preloader.const_defined?(:HasAndBelongsToMany)
   ActiveRecord::Associations::Preloader::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
 end
 
+if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1
+  ActiveRecord::Associations::Builder::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
+end
+
 ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
 
 if ActiveRecord::VERSION::MAJOR >= 4 && RUBY_VERSION >= '2'

data/lib/active_record_shards/connection_specification.rb

@@ -1,7 +1,14 @@
 class ActiveRecord::Base
   def self.establish_connection(spec = ENV["DATABASE_URL"])
-    resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
-    spec = resolver.spec
+    if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
+      spec ||= DEFAULT_ENV.call
+      spec = spec.to_sym if spec.is_a?(String)
+      resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
+      spec = resolver.spec(spec)
+    else
+      resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
+      spec = resolver.spec
+    end
 
     unless respond_to?(spec.adapter_method)
       raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"

data/lib/active_record_shards/connection_switcher.rb

@@ -1,3 +1,5 @@
+require 'active_record_shards/shard_support'
+
 module ActiveRecordShards
   module ConnectionSwitcher
     def self.extended(klass)
@@ -23,6 +25,10 @@ module ActiveRecordShards
       on_shard(shard_name) { yield }
     end
 
+    def shards
+      ShardSupport.new(self == ActiveRecord::Base ? nil : where(nil))
+    end
+
     def on_all_shards(&block)
       old_options = current_shard_selection.options
       if supports_sharding?
@@ -173,8 +179,13 @@ 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
-        resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
-        resolver.spec
+        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1
+          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
+          resolver.spec(spec)
+        else
+          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
+          resolver.spec
+        end
       end
 
       if ActiveRecord::VERSION::MAJOR >= 4

data/lib/active_record_shards/default_slave_patches.rb

@@ -69,8 +69,10 @@ module ActiveRecordShards
           alias_method_chain :transaction, :slave_off
         end
       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!)
+      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!)
+      end
     end
 
     def on_slave_unless_tx(&block)
@@ -106,5 +108,24 @@ module ActiveRecordShards
         on_slave_unless_tx { exists_without_default_slave?(*args, &block) }
       end
     end
+
+    # in rails 4.1+, they create a join class that's used to pull in records for HABTM.
+    # 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 model.on_slave_by_default?
+          left_reflection.klass.on_slave_by_default?
+        end
+        model
+      end
+    end
   end
 end

data/lib/active_record_shards/shard_support.rb

@@ -0,0 +1,48 @@
+module ActiveRecordShards
+  class ShardSupport
+    class ShardEnumerator
+      include Enumerable
+
+      def each(&block)
+        ActiveRecord::Base.on_all_shards(&block)
+      end
+    end
+
+    def initialize(scope)
+      @scope = scope
+    end
+
+    def enum
+      ShardEnumerator.new
+    end
+
+    def find(*find_args)
+      ensure_concrete!
+
+      exception = nil
+      enum.each do
+        begin
+          record = @scope.find(*find_args)
+          return record if record
+        rescue ActiveRecord::RecordNotFound => e
+          exception = e
+        end
+      end
+      raise exception
+    end
+
+    def count
+      enum.inject(0) { |accum, shard| @scope.clone.count + accum }
+    end
+
+    def to_a
+      enum.flat_map { @scope.clone.to_a }
+    end
+
+    private
+    def ensure_concrete!
+      raise "Please call this method on a concrete model, not an abstract class!" if @scope.abstract_class?
+    end
+  end
+end
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -11,30 +10,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-11-11 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.2.16
-    - - <=
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.16
-    - - <=
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily run queries on shard and slave databases.
 email:
 - mick@staugaard.com
@@ -44,6 +159,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- lib/active_record_shards.rb
 - lib/active_record_shards/association_collection_connection_selection.rb
 - lib/active_record_shards/configuration_parser.rb
 - lib/active_record_shards/connection_handler.rb
@@ -55,32 +172,30 @@ files:
 - lib/active_record_shards/model.rb
 - lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
+- lib/active_record_shards/shard_support.rb
 - lib/active_record_shards/tasks.rb
-- lib/active_record_shards.rb
-- README.md
 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple database switching for ActiveRecord.
 test_files: []