activesorting 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b153abfd8dcdce3eb5441f7c4cb69b7c1de7c9
-  data.tar.gz: 9820bbde81b0b13ec2eadcace27aea620f3899fb
+  metadata.gz: c24c8e9fbc1fecc4dc1e2e96d8c0580ceb5eab7f
+  data.tar.gz: a043f97b256be42f1b73a86068a804af1177030c
 SHA512:
-  metadata.gz: 61c7e122234c614add381a063b9bfd6642b8e6b8fe0536e8ac3964aa60b7829893b0d797d32550a197f93e661eb51d9f508a31821906942652021753769a8595
-  data.tar.gz: c8ea678bee8c09ce83486826ed8a73edb4f5f3ed1fed33f958477e411df0c942369de5cd618492cc5a6397a1b1047823ca058bfa688e7fcba62250b3819304dc
+  metadata.gz: ba29eb87ce28ba1b4b70543b89acb16677be1a1e71f93e2b2f449b879624d8cb073a516af34eaa86c61893bbb06d28c59caa6a0517c87c3da9e8f766113e3d59
+  data.tar.gz: f5f2b3adce2f2282d1615e560759651274a1b45ff525dc5071802de13085dc5ad8f7d4b5d27c04a6142ab2593537baf1f45bab6fd053123f3f5f19b6d1294dfa

data/README.md

@@ -52,9 +52,11 @@ To sort by a model field `position`:
 You can customize the sorting behavior by
 passing an options hash. The following keys are supported:
 
-  `order` sorting direction, defaults to :asc
-  `step` stepping value, defaults to 500
-  `scope` scopes, defaults to []
+  `:order` sorting direction, can be one of `:asc` or `:desc`, defaults to __:asc__
+
+  `:step` stepping value, only `integers` allowed, defaults to __500__
+
+  `:scope` scopes, defines the `ActiveRecord` `scope` applied before calculating the `position` field value. Defaults to __[]__
 
 ## Development
 

data/lib/active_sorting/model.rb

@@ -34,10 +34,10 @@ module ActiveSorting
         raise ArgumentError, "Sortable list should not be empty" unless new_list.count
         conditions = {}
         conditions[id_column] = new_list
-        old_list = unscoped.where(conditions).pluck(id_column)
+        old_list = unscoped.active_sorting_default_scope.where(conditions).pluck(id_column)
         raise ArgumentError, "Sortable list should be persisted to database" unless old_list.count
         changes = active_sorting_changes_required(old_list, new_list)
-        active_sorting_make_changes(new_list, changes, id_column)
+        active_sorting_make_changes(old_list, new_list, changes, id_column)
       end
 
       # Default sorting options
@@ -107,7 +107,7 @@ module ActiveSorting
       end
 
       # Commit changes to database
-      def active_sorting_make_changes(new_list, changes, id_column)
+      def active_sorting_make_changes(old_list, new_list, changes, id_column)
         new_list.each_with_index do |id, index|
           next unless changes.include?(id)
           if index == new_list.count.pred
@@ -119,8 +119,8 @@ module ActiveSorting
           elsif index == 0
             # We're moving an item to first position
             # Calculate the gap between following 2 items
-            n1 = active_sorting_find_by(id_column, new_list[index.next]).active_sorting_value
-            n2 = active_sorting_find_by(id_column, new_list[index.next]).active_sorting_value
+            n1 = 0
+            n2 = active_sorting_find_by(id_column, old_list[index]).active_sorting_value
           else
             # We're moving a non-terminal item
             n1 = active_sorting_find_by(id_column, new_list[index.pred]).active_sorting_value

data/lib/active_sorting/version.rb

@@ -1,3 +1,3 @@
 module ActiveSorting
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesorting
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler