activerecord-turntable 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ed732d4f5ce27c8ec309d715a01e33bc4e287f2
-  data.tar.gz: e026370254d526d21205b9a72cd0a05e8df5d355
+  metadata.gz: ea1d2ba178b8f954997d629e4c9a3a15778a4665
+  data.tar.gz: 927a91641d773d1581c8fcdbdbb9597254d12994
 SHA512:
-  metadata.gz: 77aa461ca4b2c0ce44589ffb756f8c49cfa263040b435235cfd9afd38d0469086c8a6e33ee2b1d82badbefbede00d640cdae145581f4cae9363eac271ee16cbc
-  data.tar.gz: f78bc87da3c3e41717f2a2cbd797a96fd7a07dc12daa274b7b8ff30c03055950f78c0b083b788d107e5744379acafea0cdde7d5f80e2cbe896d8b0c89db0fba5
+  metadata.gz: ad6610a34a060ab4bb06c89b3c33acda3578a47b72e69b68acdd3ddb81d2beb245dd27c32f26bdc5af740ecf2b4a3d419465e54da287c46f12147285c0fce497
+  data.tar.gz: 0ab419118d5511b0176a2720d26a4cb24c29336c823f949eb5e4538fb69a567b5dc111cd40e1e5a677d15eb48c4e81a326e684b93f4ae46eca0fea8e9d9602b1

data/.travis.yml

@@ -3,9 +3,17 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2
+  - ruby-head
 gemfile:
   - gemfiles/rails4_0.gemfile
   - gemfiles/rails4_1.gemfile
+  - gemfiles/rails4_2.gemfile
 before_script:
   - bundle exec rake turntable:db:reset
 script: bundle exec rake spec
+matrix:
+  allow_failures:
+    - rvm: 2.2
+    - rvm: ruby-head
+    - gemfile: gemfiles/rails4_2.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## activerecord-turntable 2.0.1 ##
+
+### Bugfixes
+* support `update_columns`
+
 ## activerecord-turntable 2.0.0 ##
 
 First release for ActiveRecord 4.x
@@ -34,7 +39,7 @@ Supported [barrage](http://github.com/drecom/barrage) gem as sequencer
 
 When using association(or association preloading), Turntable would add shard key condition to relation object if associated models has the same shard key name.
 
-If two related models has different named keys(but same meaning), you can pass option `foreign_shard_key` to association option. 
+If two related models has different named keys(but same meaning), you can pass option `foreign_shard_key` to association option.
 
 Example:
 
@@ -58,7 +63,7 @@ Add follow option to `turntable.yml`:
 To create transaction to all shards on the cluster:
 
 ```ruby
-User.user_cluster_transaction do 
+User.user_cluster_transaction do
   # transaction opened on all shards in 'user_cluster'
 end
 ```

data/README.md

@@ -22,7 +22,7 @@ Currently supports mysql only.
 Add to Gemfile:
 
 ```ruby
-gem 'activerecord-turntable', '~> 2.0.0.beta'
+gem 'activerecord-turntable', '~> 2.0.0'
 ```
 
 Run a bundle install:

data/gemfiles/rails4_2.gemfile

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

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

@@ -56,6 +56,29 @@ module ActiveRecord::Turntable::ActiveRecordExt
 
           finder_scope.where(primary_key => self[primary_key]).update_all(changes) == 1
         end
+
+        # @note Override to add sharding scope on `update_columns`
+        def update_columns(attributes)
+          raise ActiveRecordError, "cannot update on a new record object" unless persisted?
+
+          attributes.each_key do |key|
+            verify_readonly_attribute(key.to_s)
+          end
+
+          update_scope = if turntable_enabled? and self.class.primary_key != self.class.turntable_shard_key.to_s
+                           self.class.unscoped.where(self.class.turntable_shard_key => self.send(turntable_shard_key))
+                         else
+                           self.class.unscoped
+                         end
+
+          updated_count = update_scope.where(self.class.primary_key => id).update_all(attributes)
+
+          attributes.each do |k, v|
+            raw_write_attribute(k, v)
+          end
+
+          updated_count == 1
+        end
       end
 
       private

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

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

@@ -152,6 +152,15 @@ describe ActiveRecord::Turntable::ActiveRecordExt::Persistence do
       expect { user_status.lock! }.to_not raise_error
       expect(strio.string.split("\n").select {|stmt| stmt =~ /SELECT/ and stmt !~ /Turntable/ }).to have(1).items
     end
+
+    it "should execute one query when update_columns" do
+      user; user_status
+      strio = StringIO.new
+      ActiveRecord::Base.logger = Logger.new(strio)
+
+      expect { user_status.update_columns(hp: 10) }.to_not raise_error
+      expect(strio.string.split("\n").select {|stmt| stmt =~ /UPDATE/ and stmt !~ /Turntable/ }).to have(1).items
+    end
   end
 
   context "When the model is not sharded" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -314,6 +314,7 @@ files:
 - activerecord-turntable.gemspec
 - gemfiles/rails4_0.gemfile
 - gemfiles/rails4_1.gemfile
+- gemfiles/rails4_2.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb
 - lib/active_record/turntable/active_record_ext/.gitkeep
@@ -480,4 +481,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
-has_rdoc: