activesorting 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643af3294f6f2bf5df3160c798121a4d171faffd
-  data.tar.gz: ea399cdc49501929b4ee0b16893ca830d69355aa
+  metadata.gz: b0f69021ec5e9e64e81c03fe39968216bb84c424
+  data.tar.gz: c2c94f2befce5784455af47bcf091eb1f11a0e5a
 SHA512:
-  metadata.gz: af691cce0f3c649d9040cbfae395af5c3c020992679393182fd2b9bb16bdac572d46c28b2c7fcbc7307d0eacdc9b37469a671ba6852eef99662a2c15092b76d6
-  data.tar.gz: 9c74a9416809a061bae119b0305b00f1afd0a234d6bf97820a70bbc314dc8b5f8f311301a316f600307d076b636692f2009f9704cb6ef237b16bdef2c57fc48a
+  metadata.gz: 96183ff9c864ef850a503612495dcac0089d21eebaa2061edc0629065bf3df7d77844ad7bec5995225aa1ac5d8db6ca35d5da26808e748a91effde0f10159aff
+  data.tar.gz: 923723716c2c1ba524dc8c4650e3a97fd0e6f147d091e7703623f752ba416f23978e9be0f25c00fe0d1ddb4e57bdeee15d94747b19008ddf1cedd7278dd579e0

data/activesorting.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'appraisal'
 

data/lib/active_sorting/engine.rb

@@ -1,3 +1,5 @@
+require 'active_sorting/model'
+
 module ActiveSorting
   class Engine < Rails::Engine # :nodoc:
     ActiveSupport.on_load(:active_record) do

data/lib/active_sorting/model.rb

@@ -20,6 +20,7 @@ module ActiveSorting
         active_sorting_options[:name] = name
         active_sorting_check_options
         validates active_sorting_options[:name], presence: true
+        default_scope { active_sorting_default_scope }
         before_validation :active_sorting_callback_before_validation
       end
 
@@ -37,11 +38,20 @@ module ActiveSorting
         # TODO: columns_hash breaks when database has no tables
         # field_type = columns_hash[active_sorting_field.to_s].type
         # unless field_type == :integer
-        #   raise ArgumentError, "Sortable field should be of type Integer, #{field_type} given"
+        #   raise ArgumentError, "Sortable field should be of type Integer, #{field_type} where given"
         # end
         unless active_sorting_step.is_a?(Fixnum)
-          raise ArgumentError, 'Sortable step should be of type Fixnum'
+          raise ArgumentError, "Sortable step should be of type Fixnum, #{active_sorting_step.class.name} where given"
         end
+        unless active_sorting_scope.respond_to?(:each)
+          raise ArgumentError, "Sortable step should be of type Enumerable, #{active_sorting_scope.class.name} where given"
+        end
+      end
+
+      def active_sorting_default_scope
+        conditions = {}
+        conditions[active_sorting_field] = active_sorting_order
+        order(conditions)
       end
 
       # Calculate the least possible changes required to
@@ -51,7 +61,7 @@ module ActiveSorting
       def active_sorting_changes_required(old_list, new_list)
         changes = []
         if old_list.count != new_list.count
-          raise ArgumentError, "Size mismatch between new (#{new_list.count}) and old (#{old_list.count}) array of items"
+          raise ArgumentError, "Sortable new and old lists should be of the same length"
         end
         proposal1 = active_sorting_calculate_changes(old_list.dup, new_list.dup)
         if proposal1.count >= (new_list.count / 4)
@@ -115,6 +125,10 @@ module ActiveSorting
       def active_sorting_order
         active_sorting_options[:order]
       end
+
+      def active_sorting_scope
+        active_sorting_options[:scope]
+      end
     end
 
     def active_sorting_value
@@ -125,7 +139,7 @@ module ActiveSorting
       send("#{self.class.active_sorting_field}=", new_value)
     end
 
-    # Centers an item between the given two positions
+    # Centers an item between the where given two positions
     def active_sorting_center_item(n1, n2)
       delta = (n1 - n2).abs
       smaller = [n1, n2].min
@@ -141,9 +155,15 @@ module ActiveSorting
 
     # Generate the next stepping
     def active_sorting_next_step
+      conditions = {}
+      self.class.active_sorting_scope.each do |s|
+        conditions[s] = send(s)
+      end
       # Get the maximum value for the sortable field name
-      # TODO: scopes
-      max = self.class.unscoped.maximum(self.class.active_sorting_field)
+      max = self.class
+                .unscoped
+                .where(conditions)
+                .maximum(self.class.active_sorting_field)
       # First value will always be 0
       return 0 if max.nil?
       # Increment by the step value configured
@@ -151,7 +171,7 @@ module ActiveSorting
     end
 
     ## Callbacks
-    # Generates a new code based on given options
+    # Generates a new code based on where given options
     def active_sorting_callback_before_validation
       field_name = self.class.active_sorting_field
       send("#{field_name}=", active_sorting_next_step) if send(field_name).nil?

data/lib/active_sorting/version.rb

@@ -1,3 +1,3 @@
 module ActiveSorting
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/lib/active_sorting.rb

@@ -1,5 +1,4 @@
 require 'rails/engine'
 require 'active_record'
 require 'active_sorting/version'
-require 'active_sorting/model'
 require 'active_sorting/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesorting
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Omar Abdel-Wahab
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement