acts_as_shardable 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 682f5dff4f95776b0c2a8d19e67d7521de209bb0
-  data.tar.gz: 9f1478defcf88c299bdba64aa6fec066c9b55bfe
+  metadata.gz: 3c9172b2f82fbea155128f345ecae6cab923063c
+  data.tar.gz: 43ad2c18cc54d981ec0950a17342c9ef67703400
 SHA512:
-  metadata.gz: 4acf829b64e9391ded87d396a69daf4c20569850d76f51e967f6de2b8ab0acb22df8a74d42201030ac21330539838087f99ca78ba3bec3003ce1d633b6f30cb3
-  data.tar.gz: e1cc62c238ab080f94d802443289047d674222df0f871087d926e0095222bfa0c243f696d4467161565599d6277cd4e1c14ef1671c19180ea5c2c8eab7c3df4d
+  metadata.gz: c4c19e21693b35e9cbdba40a4aa83986460fc459a507880f030565b18b9880feb854c43300aef0ce57bbe1a36ac313a744db84f63e34726c733ef9f242b1c484
+  data.tar.gz: ce68c98e2754306f54fe456e4de992ada78d5a3a6492df3769b73ba8eb7c999187fba0206f6f2143c598b70d0c53ea85f33b3e38ffbf4a40f10d1720c2ecdbba

data/lib/acts_as_shardable.rb

@@ -43,7 +43,7 @@ module ActsAsShardable
             attribute_names.uniq!
 
             begin
-              relation = self.class.base_class.sharding(is).unscoped
+              relation = shard.unscoped
 
               affected_rows = relation.where(
                   self.class.primary_key => id,
@@ -66,7 +66,15 @@ module ActsAsShardable
               raise
             end
           else
-            attributes_values = arel_attributes_with_values_for_update(attribute_names)
+            attribute_names = attributes_for_update(attribute_names)
+
+            attributes_values = {}
+            arel_table = shard.arel_table
+
+            attribute_names.each do |name|
+              attributes_values[arel_table[name]] = typecasted_attribute_value(name)
+            end
+
             if attributes_values.empty?
               0
             else
@@ -153,8 +161,21 @@ module ActsAsShardable
         end
       end
 
-      define_method :real do
-        self.class.sharding(self[self.class.base_class.shard_method]).find(id)
+      define_method :reload do |options = nil|
+        clear_aggregation_cache
+        clear_association_cache
+        shard.connection.clear_query_cache
+
+        fresh_object =
+            if options && options[:lock]
+              shard.unscoped { shard.lock(options[:lock]).find(id) }
+            else
+              shard.unscoped { shard.find(id) }
+            end
+
+        @attributes = fresh_object.instance_variable_get('@attributes')
+        @new_record = false
+        fresh_object
       end
     end
 

data/lib/acts_as_shardable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsShardable
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shardable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - scorix