acts_as_list 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cbf688ac985c43f61b4c0669030f5b6f6c6caa
-  data.tar.gz: aef8fc0d40ed0ee55bf73ff2b7989e14e9c6572e
+  metadata.gz: 0cf6c26261c5ef1690443023c346ddf8de5f5a95
+  data.tar.gz: 419d7210f9a06bd54a113da0b8e8c929f716f4b6
 SHA512:
-  metadata.gz: de7f8dd3123cb1bf1fd5837517c221d8a6682207c3a75ac99a7457782b5ebf6d3fa995ee12664674cc7dfacaca6bd7e5ffaa484407502856aa8e9932ff066746
-  data.tar.gz: 20d069cc6a4420dd3dd6073f12ab8940cf2bb3c1003bd71faca489ddefe780349159696cd12ef37e65578ac796c0d4686af3c231cff832f3eb2b2a3306f2da62
+  metadata.gz: 07d0a625d3d0ea4344b4fea41be748b0191a0495edd5255e679c3c543b3101e70711f47595f5f6009f2490f01cf7c8e5683370254a65d654bed00ec7e6eb5265
+  data.tar.gz: aaea3b5d86259b0564ea278a7dc936b2826b82a66d6c25e8abc33cb9124d434fb4a57de70c01751176ef285d8d36a25f8b62b9b60e18a6dcf198713fbe5cd2d6

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx
+  - rbx-2
 gemfile:
  - gemfiles/rails3/Gemfile
  - gemfiles/rails4/Gemfile

data/Gemfile

@@ -12,4 +12,8 @@ end
 # Specify your gem's dependencies in acts_as_list-rails3.gemspec
 gemspec
 
-gem 'rake'
+gem 'rake'
+
+group :test do
+	gem 'minitest', '~> 5'
+end

data/README.md

@@ -76,6 +76,15 @@ All `position` queries (select, update, etc.) inside gem methods are executed wi
 
 The `position` column is set after validations are called, so you should not put a `presence` validation on the `position` column.
 
+
+If you need a scope by a non-association field you should pass an array, containing field name, to a scope:
+```ruby
+class TodoItem < ActiveRecord::Base
+  # `kind` is a plain text field (e.g. 'work', 'shopping', 'meeting'), not an association
+  acts_as_list scope: [:kind]
+end
+```
+
 ## Versions
 All versions `0.1.5` onwards require Rails 3.0.x and higher.
 

data/gemfiles/rails3/Gemfile

@@ -15,3 +15,7 @@ gem 'activerecord', '>= 3.0', '< 4'
 gemspec :path => File.join('..', '..')
 
 gem 'rake'
+
+group :test do
+	gem 'minitest', '~> 5'
+end

data/gemfiles/rails4/Gemfile

@@ -9,10 +9,13 @@ platforms :rbx do
   gem 'rubysl-test-unit'
 end
 
-
 gem 'activerecord', '>= 4.0.0', '< 5'
 
 # Specify your gem's dependencies in acts_as_list.gemspec
 gemspec :path => File.join('..', '..')
 
 gem 'rake'
+
+group :test do
+	gem 'minitest', '~> 5'
+end

data/init.rb

@@ -1,4 +1,2 @@
 $:.unshift "#{File.dirname(__FILE__)}/lib"
 require 'acts_as_list'
-
-ActsAsList::Railtie.insert

data/lib/acts_as_list.rb

@@ -1,24 +1,17 @@
 require 'acts_as_list/active_record/acts/list'
 
 module ActsAsList
-  if defined? Rails::Railtie
+  begin
     require 'rails'
+
     class Railtie < Rails::Railtie
       initializer 'acts_as_list.insert_into_active_record' do
         ActiveSupport.on_load :active_record do
-          ActsAsList::Railtie.insert
+          ActiveRecord::Base.send(:include, ActiveRecord::Acts::List)
         end
       end
     end
-  end
-
-  class Railtie
-    def self.insert
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.send(:include, ActiveRecord::Acts::List)
-      end
-    end
+  rescue LoadError
+    ActiveRecord::Base.send(:include, ActiveRecord::Acts::List) if defined?(ActiveRecord)
   end
 end
-
-ActsAsList::Railtie.insert

data/lib/acts_as_list/active_record/acts/list.rb

@@ -99,6 +99,11 @@ module ActiveRecord
               '#{configuration[:add_new_at]}'
             end
 
+            def #{configuration[:column]}=(position)
+              write_attribute(:#{configuration[:column]}, position)
+              @position_changed = true
+            end
+
             #{scope_methods}
 
             # only add to attr_accessible
@@ -182,7 +187,8 @@ module ActiveRecord
           end
         end
 
-        # Move the item within scope
+        # Move the item within scope. If a position within the new scope isn't supplied, the item will
+        # be appended to the end of the list.
         def move_within_scope(scope_id)
           send("#{scope_name}=", scope_id)
           save!
@@ -215,9 +221,10 @@ module ActiveRecord
         # Return the next higher item in the list.
         def higher_item
           return nil unless in_list?
-          acts_as_list_class.unscoped.
-            where("#{scope_condition} AND #{position_column} < #{(send(position_column).to_i).to_s}").
+          acts_as_list_class.unscoped do
+            acts_as_list_class.where("#{scope_condition} AND #{position_column} < #{(send(position_column).to_i).to_s}").
             order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
+          end
         end
 
         # Return the next n higher items in the list
@@ -235,9 +242,10 @@ module ActiveRecord
         # Return the next lower item in the list.
         def lower_item
           return nil unless in_list?
-          acts_as_list_class.unscoped.
-            where("#{scope_condition} AND #{position_column} > #{(send(position_column).to_i).to_s}").
+          acts_as_list_class.unscoped do
+            acts_as_list_class.where("#{scope_condition} AND #{position_column} > #{(send(position_column).to_i).to_s}").
             order("#{acts_as_list_class.table_name}.#{position_column} ASC").first
+          end
         end
 
         # Return the next n lower items in the list
@@ -266,19 +274,20 @@ module ActiveRecord
         end
 
         def default_position?
-          default_position == send(position_column)
+          default_position && default_position.to_i == send(position_column)
         end
 
         # Sets the new position and saves it
         def set_list_position(new_position)
-          send("#{position_column}=", new_position)
-          save!
+          write_attribute position_column, new_position
+          save(validate: false)
         end
 
         private
           def acts_as_list_list
-            acts_as_list_class.unscoped.
-              where(scope_condition)
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(scope_condition)
+            end
           end
 
           def add_to_list_top
@@ -287,10 +296,10 @@ module ActiveRecord
           end
 
           def add_to_list_bottom
-            if not_in_list? || default_position?
+            if not_in_list? || scope_changed? && !@position_changed || default_position?
               self[position_column] = bottom_position_in_list.to_i + 1
             else
-              increment_positions_on_lower_items(self[position_column])
+              increment_positions_on_lower_items(self[position_column], id)
             end
           end
 
@@ -307,8 +316,10 @@ module ActiveRecord
           # Returns the bottom item
           def bottom_item(except = nil)
             conditions = scope_condition
-            conditions = "#{conditions} AND #{self.class.primary_key} != '#{except.id}'" if except
-            acts_as_list_class.unscoped.in_list.where(conditions).order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
+            conditions = "#{conditions} AND #{self.class.primary_key} != #{self.class.connection.quote(except.id)}" if except
+            acts_as_list_class.unscoped do
+              acts_as_list_class.in_list.where(conditions).order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
+            end
           end
 
           # Forces item to assume the bottom position in the list.
@@ -323,76 +334,93 @@ module ActiveRecord
 
           # This has the effect of moving all the higher items up one.
           def decrement_positions_on_higher_items(position)
-            acts_as_list_class.unscoped.where(
-              "#{scope_condition} AND #{position_column} <= #{position}"
-            ).update_all(
-              "#{position_column} = (#{position_column} - 1)"
-            )
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(
+                "#{scope_condition} AND #{position_column} <= #{position}"
+              ).update_all(
+                "#{position_column} = (#{position_column} - 1)"
+              )
+            end
           end
 
           # This has the effect of moving all the lower items up one.
           def decrement_positions_on_lower_items(position=nil)
             return unless in_list?
             position ||= send(position_column).to_i
-            acts_as_list_class.unscoped.where(
-              "#{scope_condition} AND #{position_column} > #{position}"
-            ).update_all(
-              "#{position_column} = (#{position_column} - 1)"
-            )
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(
+                "#{scope_condition} AND #{position_column} > #{position}"
+              ).update_all(
+                "#{position_column} = (#{position_column} - 1)"
+              )
+            end
           end
 
           # This has the effect of moving all the higher items down one.
           def increment_positions_on_higher_items
             return unless in_list?
-            acts_as_list_class.unscoped.where(
-              "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
-            ).update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(
+                "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
+              ).update_all(
+                "#{position_column} = (#{position_column} + 1)"
+              )
+            end
           end
 
           # This has the effect of moving all the lower items down one.
-          def increment_positions_on_lower_items(position)
-            acts_as_list_class.unscoped.where(
-              "#{scope_condition} AND #{position_column} >= #{position}"
-            ).update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+          def increment_positions_on_lower_items(position, avoid_id = nil)
+            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(
+                "#{scope_condition} AND #{position_column} >= #{position}#{avoid_id_condition}"
+              ).update_all(
+                "#{position_column} = (#{position_column} + 1)"
+              )
+            end
           end
 
           # Increments position (<tt>position_column</tt>) of all items in the list.
           def increment_positions_on_all_items
-            acts_as_list_class.unscoped.where(
-              "#{scope_condition}"
-            ).update_all(
-              "#{position_column} = (#{position_column} + 1)"
-            )
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(
+                "#{scope_condition}"
+              ).update_all(
+                "#{position_column} = (#{position_column} + 1)"
+              )
+            end
           end
 
           # Reorders intermediate items to support moving an item from old_position to new_position.
           def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id = nil)
             return if old_position == new_position
-            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != '#{avoid_id}'" : ''
+            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+
             if old_position < new_position
               # Decrement position of intermediate items
               #
               # e.g., if moving an item from 2 to 5,
               # move [3, 4, 5] to [2, 3, 4]
-              acts_as_list_class.unscoped.where(
-                "#{scope_condition} AND #{position_column} > #{old_position} AND #{position_column} <= #{new_position}#{avoid_id_condition}"
-              ).update_all(
-                "#{position_column} = (#{position_column} - 1)"
-              )
+              acts_as_list_class.unscoped do
+                acts_as_list_class.where(
+                  "#{scope_condition} AND #{position_column} > #{old_position} AND #{position_column} <= #{new_position}#{avoid_id_condition}"
+                ).update_all(
+                  "#{position_column} = (#{position_column} - 1)"
+                )
+              end
             else
               # Increment position of intermediate items
               #
               # e.g., if moving an item from 5 to 2,
               # move [2, 3, 4] to [3, 4, 5]
-              acts_as_list_class.unscoped.where(
-                "#{scope_condition} AND #{position_column} >= #{new_position} AND #{position_column} < #{old_position}#{avoid_id_condition}"
-              ).update_all(
-                "#{position_column} = (#{position_column} + 1)"
-              )
+              acts_as_list_class.unscoped do
+                acts_as_list_class.where(
+                  "#{scope_condition} AND #{position_column} >= #{new_position} AND #{position_column} < #{old_position}#{avoid_id_condition}"
+                ).update_all(
+                  "#{position_column} = (#{position_column} + 1)"
+                )
+              end
             end
           end
 
@@ -421,7 +449,9 @@ module ActiveRecord
             old_position = send("#{position_column}_was").to_i
             new_position = send(position_column).to_i
 
-            return unless acts_as_list_class.unscoped.where("#{scope_condition} AND #{position_column} = #{new_position}").count > 1
+            return unless acts_as_list_class.unscoped do
+              acts_as_list_class.where("#{scope_condition} AND #{position_column} = #{new_position}").count > 1
+            end
             shuffle_positions_on_intermediate_items old_position, new_position, id
           end
 
@@ -444,8 +474,10 @@ module ActiveRecord
             self.reload
           end
 
+          # This check is skipped if the position is currently the default position from the table
+          # as modifying the default position on creation is handled elsewhere
           def check_top_position
-            if send(position_column) && send(position_column) < acts_as_list_top
+            if send(position_column) && !default_position? && send(position_column) < acts_as_list_top
               self[position_column] = acts_as_list_top
             end
           end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.4.0'
+      VERSION = '0.5.0'
     end
   end
 end

data/test/shared_list.rb

@@ -137,12 +137,12 @@ module Shared
     def test_nil_scope
       new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create
       new2.move_higher
-      assert_equal [new2, new1, new3], ListMixin.where(parent_id: nil).order('pos')
+      assert_equal [new2, new1, new3].map(&:id), ListMixin.where(parent_id: nil).order('pos').map(&:id)
     end
 
     def test_update_position_when_scope_changes
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
-      parent = ListMixin.create(id: 6)
+      parent = ListMixin.create(parent_id: 6)
 
       ListMixin.where(id: 2).first.move_within_scope(6)
 
@@ -155,7 +155,7 @@ module Shared
       assert_equal 3, ListMixin.where(id: 4).first.pos
 
       ListMixin.where(id: 2).first.move_within_scope(5)
-      assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
+      assert_equal [1, 3, 4, 2], ListMixin.where(parent_id: 5).order('pos').map(&:id)
     end
 
     def test_remove_from_list_should_then_fail_in_list?

data/test/test_list.rb

@@ -6,16 +6,21 @@ ActiveRecord::Schema.verbose = false
 
 def setup_db(position_options = {})
   # AR caches columns options like defaults etc. Clear them!
+  ActiveRecord::Base.connection.create_table :mixins do |t|
+    t.column :pos, :integer, position_options
+    t.column :active, :boolean, default: true
+    t.column :parent_id, :integer
+    t.column :parent_type, :string
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
+  end
+  
   ActiveRecord::Base.connection.schema_cache.clear!
-  ActiveRecord::Schema.define(version: 1) do
-    create_table :mixins do |t|
-      t.column :pos, :integer, position_options
-      t.column :active, :boolean, default: true
-      t.column :parent_id, :integer
-      t.column :parent_type, :string
-      t.column :created_at, :datetime
-      t.column :updated_at, :datetime
-    end
+  [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
+    ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
+    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin ].each do |klass|
+    
+    klass.reset_column_information
   end
 end
 
@@ -87,8 +92,8 @@ class NoAdditionMixin < Mixin
   acts_as_list column: "pos", add_new_at: nil, scope: :parent_id
 end
 
-class ActsAsListTestCase < MiniTest::Unit::TestCase
-  # No default test required a this class is abstract.
+class ActsAsListTestCase < Minitest::Test
+  # No default test required as this class is abstract.
   # Need for test/unit.
   undef_method :default_test if method_defined?(:default_test)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acts_as_list
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A gem allowing a active_record model to act_as_list.