activerecord-turntable 3.0.0.alpha1 → 3.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3117e04f949c697cf878879a85c2205f7e19b6
-  data.tar.gz: 5437cc1aec6b98bb507639d81e9687eac526d8d1
+  metadata.gz: ab82abdd16e36a30d5c3b55f5cb5ff61d7142dcd
+  data.tar.gz: 4ece75789087ee54b31484601390ed16392aca31
 SHA512:
-  metadata.gz: 039ffd448816f9792c8fb29fb7844e08ab0c1ea7227367158810dc718d580ee047922d1e23117875611e3d606d6a1b3a3494d732e962dc84e774a0755240a8bd
-  data.tar.gz: 939620c1056efc1b1f843dc348c5420ea811c87987a5149565b8049ed488689f4b224c28c962316b201c58cd33ebdba0cdf85ee42fb7623225561091ce1275a9
+  metadata.gz: f11dca6559d5539c44cf82d863e88acb793eace6fc527d1fe900d8c424fc3f633615242eebd9e86c7977b92b05cb64e0e2f799826e19c12fc13ac84165fac13d
+  data.tar.gz: 250ab4d9806440953e10acb8f7b94a6b0fc564f54859e8f6c99e69396c598246b1d85f6a0193d76e4555ef366baee651091740733948808c1f6111c259568e4c

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
   - ruby-head
 gemfile:
   - gemfiles/rails5_0.gemfile

data/CHANGELOG.md

@@ -1,10 +1,17 @@
-## activerecord-turntable 3.0.0.alpha (unreleased) ##
+## activerecord-turntable 3.0.0.alpha2 ##
+
+### Improvement
+
+* Fix to propagate shard conditions to `AssociationRelation` too
+
+## activerecord-turntable 3.0.0.alpha1 ##
+
+### Major Changes
 
 * Rails5 compatibility
   * Minimum ruby requirement version is `2.2.2`
   * Rails 4.x support has been dropped.
 
-
 ## activerecord-turntable 2.3.3 ##
 
 ### Bugfix

data/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activerecord", "5.0.0.1"
-gem "activesupport", "5.0.0.1"
+gem "activerecord", "~> 5.0.1"
+gem "activesupport", "~> 5.0.1"

data/activerecord-turntable.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rubocop"

data/gemfiles/rails5_0.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "activerecord", "5.0.0.1"
-gem "activesupport", "5.0.0.1"
+gem "activerecord", "5.0.1"
+gem "activesupport", "5.0.1"
 
 gemspec :path => '../'

data/lib/active_record/turntable/active_record_ext.rb

@@ -30,7 +30,7 @@ module ActiveRecord::Turntable
       ActiveRecord::Migration.include(ActiveRecord::Turntable::Migration)
       ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(ConnectionHandlerExtension)
       ActiveRecord::Associations::Preloader::Association.prepend(AssociationPreloader)
-      ActiveRecord::Associations::Association.include(Association)
+      ActiveRecord::Associations::Association.prepend(Association)
       require "active_record/turntable/active_record_ext/fixtures"
       require "active_record/turntable/active_record_ext/migration_proxy"
       require "active_record/turntable/active_record_ext/activerecord_import_ext"

data/lib/active_record/turntable/active_record_ext/association.rb

@@ -3,49 +3,24 @@ require "active_record/associations"
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module Association
-      extend ActiveSupport::Concern
       include ShardingCondition
 
-      included do
-        ActiveRecord::Associations::SingularAssociation.prepend(SingularAssociationExt)
-        ActiveRecord::Associations::CollectionAssociation.prepend(CollectionAssociationExt)
+      def self.prepended(mod)
         ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :foreign_shard_key
       end
 
-      # @note Inject to add sharding condition for singular association
-      module SingularAssociationExt
-        private
-          def get_records
-            # OPTIMIZE: statement caching
-            if should_use_shard_key?
-              return turntable_scope(scope).limit(1).records
-            end
+      protected
 
-            super
-          end
-      end
-
-      # @note Inject to add sharding condition for collection association
-      module CollectionAssociationExt
-        private
-          def get_records
-            # OPTIMIZE: statement caching
-            if should_use_shard_key?
-              return turntable_scope(scope).to_a
-            end
+      # @note Override to pass shard key conditions
+      def target_scope
+        return super unless should_use_shard_key?
 
-            super
-          end
+        scope = klass.where(
+                  klass.turntable_shard_key =>
+                    owner.send(foreign_shard_key)
+                )
+        super.merge!(scope)
       end
-
-      private
-
-        def turntable_scope(scope, bind = nil)
-          if should_use_shard_key?
-            scope = scope.where(klass.turntable_shard_key => owner.send(foreign_shard_key))
-          end
-          scope
-        end
     end
   end
 end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "3.0.0.alpha1".freeze
+    VERSION = "3.0.0.alpha2".freeze
   end
 end

data/spec/active_record/turntable/active_record_ext/association_spec.rb

@@ -47,11 +47,20 @@ describe ActiveRecord::Turntable::ActiveRecordExt::Association do
       ActiveRecord::Base.turntable_config.instance_variable_get(:@config)[:raise_on_not_specified_shard_query] = true
     end
     let(:cards_user) { CardsUser.where(user: user).first }
+    let(:cards_users_history) { cards_users_histories.find { |history| history.user_id == user.id } }
 
     context "associated objects has same turntable_key" do
-      subject { cards_user.cards_users_histories.to_a }
-      it { expect { subject }.to_not raise_error }
-      it { is_expected.to include(*cards_users_histories.select { |history| history.cards_user_id == cards_user.id }) }
+      context "AssociationRelation#to_a" do
+        subject { cards_user.cards_users_histories.to_a }
+        it { expect { subject }.to_not raise_error }
+        it { is_expected.to include(*cards_users_histories.select { |history| history.cards_user_id == cards_user.id }) }
+      end
+
+      context "AssociationRelation#where" do
+        subject { cards_user.cards_users_histories.where(id: cards_users_history.id).to_a }
+        it { expect { subject }.to_not raise_error }
+        it { is_expected.to include(cards_users_history) }
+      end
     end
 
     context "associated objects has different turntable_key" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha1
+  version: 3.0.0.alpha2
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -281,14 +281,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord sharding extension