acts_as_positioned 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3bc41882a5401fb9cba86783a4ec62e0a51028
-  data.tar.gz: 7dd0ca43f2a54ccc6697f58f892734f781f8e104
+  metadata.gz: 819a27e3d8d9285287dbe10dfb2185d3e0a1efee
+  data.tar.gz: 5516a75100c59844cf19a52ac92b3164a029d981
 SHA512:
-  metadata.gz: 2a41117d8ce0709ddf8c10448880b75357f9699dde310ae4a40bcf5116d8ff18203bd7d1044d7eb5d8f4ad2b04e75461ea91eec1eebbb5654ec09ea68f79a7f2
-  data.tar.gz: fd3424c2a28730f35e77bd08eaf4b5c7fca883e52e941eba8fe74734b53b54817ee7246fbe2bdc0407850dbc83864ba59010a2cfa6e2478cfb622f6296bcc1e9
+  metadata.gz: a1e97ab6a6a4983ca04fb6c8afe53f3411f3a270c5d299fc0bb13ed5a6be3e8d0118dcbfa0d8cacf871cef6451c556f3038dc73b7823f3162cc943741b2e3331
+  data.tar.gz: 0247be198970593479b415940b1c3f1af3beb05b6699805b5437d5540f8ad3f6cf6609b3276cc5318cd4a16dd0d13dd1a8e16b65e90917ef4f5cf7cfcbec8f63

data/lib/acts_as_positioned.rb

@@ -30,17 +30,22 @@ module ActsAsPositioned
 
   private
 
+  def aap_execute_query(column, scope, downwards)
+    quoted_column = scope.connection.quote_column_name(column)
+    scope.update_all("#{quoted_column} = #{quoted_column} #{downwards ? '+' : '-'} 1")
+  end
+
   def aap_insert_position(column, scope_columns)
-    scope = aap_scope(column, scope_columns)
-    scope.where(scope.arel_table[column].gteq(send(column))).update_all("#{column} = #{column} + 1")
+    scope = aap_scope(column, scope_columns, false)
+    aap_execute_query(column, scope.where(scope.arel_table[column].gteq(send(column))), true)
   end
 
   def aap_remove_position(column, scope_columns)
     scope = aap_scope(column, scope_columns, true)
-    scope.where(scope.arel_table[column].gt(send("#{column}_was"))).update_all("#{column} = #{column} - 1")
+    aap_execute_query(column, scope.where(scope.arel_table[column].gt(send("#{column}_was"))), false)
   end
 
-  def aap_scope(column, scope_columns, use_old_values = false)
+  def aap_scope(column, scope_columns, use_old_values)
     # When using the old values, make sure to overwrite the attribute values with the old values.
     attrs = use_old_values ? attributes.merge(changed_attributes) : attributes
     self.class.base_class.where(attrs.slice(*scope_columns)).where.not(column => nil)
@@ -48,12 +53,11 @@ module ActsAsPositioned
 
   def aap_switch_positions(column, scope_columns)
     old_value, new_value = changes[column]
-    from, to, sign = old_value < new_value ? [old_value + 1, new_value, '-'] : [new_value, old_value - 1, '+']
+    from = [old_value + 1, new_value].min
+    to = [old_value - 1, new_value].max
 
-    scope = aap_scope(column, scope_columns)
-    statement = "#{column} = #{column} #{sign} 1"
-    statement = ", #{locking_column} = #{locking_column} + 1" if scope.locking_enabled?
-    scope.where(column => from.eql?(to) ? from : from..to).update_all(statement)
+    aap_execute_query(column, aap_scope(column, scope_columns, false).where(column => from.eql?(to) ? from : from..to),
+                      old_value > new_value)
   end
 
   def aap_update_position(column, scope_columns)
@@ -79,7 +83,7 @@ module ActsAsPositioned
   def aap_validate_position(column, scope_columns)
     return if errors[column].present? || (changes.keys & ([column] + scope_columns)).empty?
 
-    scope = aap_scope(column, scope_columns)
+    scope = aap_scope(column, scope_columns, false)
     options = { attributes: column, allow_nil: true, greater_than_or_equal_to: 0, only_integer: true,
                 less_than_or_equal_to: scope.where.not(scope.primary_key => id).count }
     ActiveModel::Validations::NumericalityValidator.new(options).validate(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_positioned
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Walter Horstman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord