acts_as_shardable 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a53ce6365c603eec7d28711c14a33d9d6bab72c
-  data.tar.gz: 44125788c882a34872266fbb06ebbfa0cb5c319a
+  metadata.gz: 11ce4ec7bf911d8b8eb80a615a3dc81a229f93b1
+  data.tar.gz: 1cd6cc539c4bb61e219e6d7e402b8accc75306ac
 SHA512:
-  metadata.gz: db91ff73979130de3fdbe871450d068d7133432fda696f4cc23dd9df9080c22bb37389009cd8665a6f1db467f8b180462150f29f1c61fadcf1959f62aeb8030e
-  data.tar.gz: fe6a36d12c538aa7e7cc0d9f323b37f2d9152274821d2e4c8d8e00a1769a8c40fb1efb578ea067c1e37db87a890754aecc753c83086f7154fd268ea74ef13fb4
+  metadata.gz: dea62a56bb346fe1616ca09af42773fec5fdf871b74371dcedfe7ed974d7e29f94a20981fa97bfd5c0778fe18e58d62a547a59c9a21ef0be11e335dab7692cd0
+  data.tar.gz: 7b1798568e693b7dcf7d05e723df46b1b641a3892570418a531bf18b488b5c2eeebecb9044d6e9726be5b04109eb4eb680b0c0d0b9f788d07654be24c46aad34

data/acts_as_shardable.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'sqlite3', '~> 1.0'
 
-  spec.add_dependency 'activerecord', '~> 4.0'
+  spec.add_dependency 'activerecord', '>= 4.2'
 end

data/lib/acts_as_shardable.rb

@@ -24,6 +24,7 @@ module ActsAsShardable
       # Updates the associated record with values matching those of the instance attributes.
       # Returns the number of affected rows.
       define_method :_update_record do |attribute_names = self.attribute_names|
+        attribute_names = keys_for_partial_write if self.class.base_class.partial_writes
 
         was, is = changes[self.class.base_class.shard_method]
 
@@ -66,19 +67,26 @@ module ActsAsShardable
               raise
             end
           else
-            attribute_names = attributes_for_update(attribute_names)
-
-            attributes_values = {}
-            arel_table = shard.arel_table
+            if self.respond_to?(:attributes_with_values_for_update, true)
+              attributes_values = attributes_with_values_for_update(attribute_names)
+            else
+              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)
+              attribute_names.each do |name|
+                attributes_values[arel_table[name]] = typecasted_attribute_value(name)
+              end
             end
 
             if attributes_values.empty?
               0
             else
-              shard.unscoped._update_record attributes_values, id, id_was
+              if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1
+                shard.unscoped._update_record(attributes_values, self.class.base_class.primary_key => id_in_database)
+              else
+                shard.unscoped._update_record(attributes_values, id, id_was)
+              end
             end
           end
         end
@@ -102,7 +110,16 @@ module ActsAsShardable
             changes[column] = write_attribute(column, current_time)
           end
 
-          changes[self.class.locking_column] = increment_lock if locking_enabled?
+          if locking_enabled?
+            if self.respond_to?(:increment_lock)
+              changes[self.class.base_class.locking_column] = increment_lock
+            else
+              lock_col = self.class.base_class.locking_column
+              previous_lock_value = read_attribute(lock_col)
+              self[lock_col] = previous_lock_value + 1
+              changes[lock_col] = self[lock_col]
+            end
+          end
 
           clear_attribute_changes(changes.keys)
           primary_key = self.class.primary_key
@@ -115,13 +132,27 @@ module ActsAsShardable
       # Creates a record with values matching those of the instance attributes
       # and returns its id.
       define_method :_create_record do |attribute_names = self.attribute_names|
-        attributes_values = arel_attributes_with_values_for_create(attribute_names)
+        _run_create_callbacks {
+          attribute_names = keys_for_partial_write if self.class.base_class.partial_writes
+          attribute_names |= [self.class.base_class.locking_column] if locking_enabled?
 
-        new_id = shard.unscoped.insert attributes_values
-        self.id ||= new_id if self.class.base_class.primary_key
+          if self.respond_to?(:attributes_with_values_for_create, true)
+            attributes_values = attributes_with_values_for_create(attribute_names)
+          else
+            attributes_values = arel_attributes_with_values_for_create(attribute_names)
+          end
 
-        @new_record = false
-        id
+          if shard.respond_to?(:_insert_record)
+            new_id = shard.unscoped._insert_record attributes_values
+          else
+            new_id = shard.unscoped.insert attributes_values
+          end
+
+          self.id ||= new_id if self.class.base_class.primary_key
+
+          @new_record = false
+          id
+        }
       end
 
       private :_create_record

data/lib/acts_as_shardable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsShardable
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_shardable
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - scorix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 description: Let subclasses of ActiveRecord::Base to be shardable.
 email:
 - scorix@gmail.com
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Let subclasses of ActiveRecord::Base to be shardable.