activerecord-turntable 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1d2ba178b8f954997d629e4c9a3a15778a4665
-  data.tar.gz: 927a91641d773d1581c8fcdbdbb9597254d12994
+  metadata.gz: 4906bb6f73e98fee1490a6470ec0e6fb5d46e799
+  data.tar.gz: 6304957da987dd1e9315a3a3ce8be4b1bb720bd9
 SHA512:
-  metadata.gz: ad6610a34a060ab4bb06c89b3c33acda3578a47b72e69b68acdd3ddb81d2beb245dd27c32f26bdc5af740ecf2b4a3d419465e54da287c46f12147285c0fce497
-  data.tar.gz: 0ab419118d5511b0176a2720d26a4cb24c29336c823f949eb5e4538fb69a567b5dc111cd40e1e5a677d15eb48c4e81a326e684b93f4ae46eca0fea8e9d9602b1
+  metadata.gz: 40b81ab32f081801cffa81d68921fc94b3dd6f62284d9c3cf54081c8f949203c2417c51b7e9d6a93e8bcac557d9124632d706a12eb45023f33a0a6ebaa48e95d
+  data.tar.gz: e99818a708e9b58f6d5924e6af43eb0a0f7446b50c8cfaa3c98a0bdfcb6ca1b281b62e79a39d44c1043629fd1ea08b46c1e1218d8d0200590dd356f782394df7

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## activerecord-turntable 2.0.2 ##
+
+### Bugfixes
+
+* Fix method definition bug on 2.0.1
+
 ## activerecord-turntable 2.0.1 ##
 
 ### Bugfixes
+
 * support `update_columns`
 
 ## activerecord-turntable 2.0.0 ##

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

@@ -1,5 +1,7 @@
 module ActiveRecord::Turntable::ActiveRecordExt
   module Persistence
+    extend ActiveSupport::Concern
+
     ::ActiveRecord::Persistence.class_eval do
       # @note Override to add sharding scope on reloading
       def reload(options = nil)
@@ -56,29 +58,29 @@ module ActiveRecord::Turntable::ActiveRecordExt
 
           finder_scope.where(primary_key => self[primary_key]).update_all(changes) == 1
         end
+      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
+      # @note Override to add sharding scope on `update_columns`
+      def update_columns(attributes)
+        raise ActiveRecordError, "cannot update on a new record object" unless persisted?
 
-          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
+        attributes.each_key do |key|
+          verify_readonly_attribute(key.to_s)
+        end
 
-          updated_count = update_scope.where(self.class.primary_key => id).update_all(attributes)
+        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
 
-          attributes.each do |k, v|
-            raw_write_attribute(k, v)
-          end
+        updated_count = update_scope.where(self.class.primary_key => id).update_all(attributes)
 
-          updated_count == 1
+        attributes.each do |k, v|
+          raw_write_attribute(k, v)
         end
+
+        updated_count == 1
       end
 
       private

data/lib/active_record/turntable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -481,3 +481,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
+has_rdoc: