acts_as_list 0.1.8 → 0.1.9

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

@@ -75,6 +75,14 @@ module ActiveRecord
 
             #{scope_condition_method}
 
+            # only add to attr_accessible
+            # if the class has some mass_assignment_protection
+
+            unless accessible_attributes.blank?
+              attr_accessible :#{configuration[:column]}
+            end
+
+            before_destroy :reload_position
             after_destroy :decrement_positions_on_lower_items
             before_create :add_to_list_#{configuration[:add_new_at]}
             after_update :update_positions
@@ -136,20 +144,20 @@ module ActiveRecord
         def remove_from_list
           if in_list?
             decrement_positions_on_lower_items
-            update_attributes! position_column => nil
+            set_list_position(nil)
           end
         end
 
         # Increase the position of this item without adjusting the rest of the list.
         def increment_position
           return unless in_list?
-          update_attributes! position_column => self.send(position_column).to_i + 1
+          set_list_position(self.send(position_column).to_i + 1)
         end
 
         # Decrease the position of this item without adjusting the rest of the list.
         def decrement_position
           return unless in_list?
-          update_attributes! position_column => self.send(position_column).to_i - 1
+          set_list_position(self.send(position_column).to_i - 1)
         end
 
         # Return +true+ if this object is the first in the list.
@@ -168,7 +176,8 @@ module ActiveRecord
         def higher_item
           return nil unless in_list?
           acts_as_list_class.unscoped.find(:first, :conditions =>
-            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
+            "#{scope_condition} AND #{position_column} < #{(send(position_column).to_i).to_s}",
+            :order => "#{acts_as_list_class.table_name}.#{position_column} DESC"
           )
         end
 
@@ -176,7 +185,8 @@ module ActiveRecord
         def lower_item
           return nil unless in_list?
           acts_as_list_class.unscoped.find(:first, :conditions =>
-            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
+            "#{scope_condition} AND #{position_column} > #{(send(position_column).to_i).to_s}",
+            :order => "#{acts_as_list_class.table_name}.#{position_column} ASC"
           )
         end
 
@@ -197,6 +207,12 @@ module ActiveRecord
           default_position == send(position_column)
         end
 
+        # Sets the new position and saves it
+        def set_list_position(new_position)
+          send("#{position_column}=", new_position)
+          save!
+        end
+
         private
           def add_to_list_top
             increment_positions_on_all_items
@@ -230,12 +246,12 @@ module ActiveRecord
 
           # Forces item to assume the bottom position in the list.
           def assume_bottom_position
-            update_attributes!(position_column => bottom_position_in_list(self).to_i + 1)
+            set_list_position(bottom_position_in_list(self).to_i + 1)
           end
 
           # Forces item to assume the top position in the list.
           def assume_top_position
-            update_attributes!(position_column => acts_as_list_top)
+            set_list_position(acts_as_list_top)
           end
 
           # This has the effect of moving all the higher items up one.
@@ -307,14 +323,14 @@ module ActiveRecord
             else
               increment_positions_on_lower_items(position)
             end
-            self.update_attributes!(position_column => position)
+            set_list_position(position)
           end
 
           # used by insert_at_position instead of remove_from_list, as postgresql raises error if position_column has non-null constraint
           def store_at_0
             if in_list?
               old_position = send(position_column).to_i
-              update_attributes!(position_column => 0)
+              set_list_position(0)
               decrement_positions_on_lower_items(old_position)
             end
           end
@@ -325,6 +341,10 @@ module ActiveRecord
             return unless acts_as_list_class.unscoped.where("#{scope_condition} AND #{position_column} = #{new_position}").count > 1
             shuffle_positions_on_intermediate_items old_position, new_position, id
           end
+
+          def reload_position
+            self.reload
+          end
       end
     end
   end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = "0.1.8"
+      VERSION = "0.1.9"
     end
   end
 end

data/test/shared_list.rb

@@ -1,7 +1,11 @@
 module Shared
   module List
     def setup
-      (1..4).each { |counter| ListMixin.create! :pos => counter, :parent_id => 5 }
+      (1..4).each do |counter|
+        node = ListMixin.new :parent_id => 5
+        node.pos = counter
+        node.save!
+      end
     end
 
     def test_reordering
@@ -204,14 +208,18 @@ module Shared
     def test_before_create_callback_adds_to_given_position
       assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
 
-      new = ListMixin.create(:pos => 1, :parent_id => 5)
+      new = ListMixin.new(:parent_id => 5)
+      new.pos = 1
+      new.save!
       assert_equal 1, new.pos
       assert new.first?
       assert !new.last?
 
       assert_equal [5, 1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
 
-      new = ListMixin.create(:pos => 3, :parent_id => 5)
+      new = ListMixin.new(:parent_id => 5)
+      new.pos = 3
+      new.save!
       assert_equal 3, new.pos
       assert !new.first?
       assert !new.last?

data/test/shared_list_sub.rb

@@ -1,7 +1,11 @@
 module Shared
   module ListSub
     def setup
-      (1..4).each { |i| ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2).create! :pos => i, :parent_id => 5000 }
+      (1..4).each do |i|
+        node = ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2).new :parent_id => 5000
+        node.pos = i
+        node.save!
+      end
     end
 
     def test_reordering

data/test/test_list.rb

@@ -36,8 +36,27 @@ end
 
 class Mixin < ActiveRecord::Base
   self.table_name = 'mixins'
+  attr_accessible :active, :parent_id, :parent_type
 end
 
+class ProtectedMixin < ActiveRecord::Base
+  self.table_name = 'mixins'
+  attr_protected :active
+end
+
+class ProtectedListMixin < ProtectedMixin
+  acts_as_list :column => "pos"
+end
+
+class UnProtectedMixin < ActiveRecord::Base
+  self.table_name = 'mixins'
+end
+
+class UnProtectedListMixin < UnProtectedMixin
+  acts_as_list :column => "pos"
+end
+
+
 class ListMixin < Mixin
   acts_as_list :column => "pos", :scope => :parent
 end
@@ -164,7 +183,7 @@ end
 class DefaultScopedTest < ActsAsListTestCase
   def setup
     setup_db
-    (1..4).each { |counter| DefaultScopedMixin.create! :pos => counter }
+    (1..4).each { |counter| DefaultScopedMixin.create!({:pos => counter}) }
   end
 
   def test_insert
@@ -243,13 +262,13 @@ class DefaultScopedTest < ActsAsListTestCase
 
   def test_update_position
     assert_equal [1, 2, 3, 4], DefaultScopedMixin.find(:all).map(&:id)
-    DefaultScopedMixin.find(2).update_attributes!(:pos => 4)
+    DefaultScopedMixin.find(2).set_list_position(4)
     assert_equal [1, 3, 4, 2], DefaultScopedMixin.find(:all).map(&:id)
-    DefaultScopedMixin.find(2).update_attributes!(:pos => 2)
+    DefaultScopedMixin.find(2).set_list_position(2)
     assert_equal [1, 2, 3, 4], DefaultScopedMixin.find(:all).map(&:id)
-    DefaultScopedMixin.find(1).update_attributes!(:pos => 4)
+    DefaultScopedMixin.find(1).set_list_position(4)
     assert_equal [2, 3, 4, 1], DefaultScopedMixin.find(:all).map(&:id)
-    DefaultScopedMixin.find(1).update_attributes!(:pos => 1)
+    DefaultScopedMixin.find(1).set_list_position(1)
     assert_equal [1, 2, 3, 4], DefaultScopedMixin.find(:all).map(&:id)
   end
 
@@ -337,18 +356,63 @@ class DefaultScopedWhereTest < ActsAsListTestCase
 
   def test_update_position
     assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(:active => false).find(:all).map(&:id)
-    DefaultScopedWhereMixin.where(:active => false).find(2).update_attributes!(:pos => 4)
+    DefaultScopedWhereMixin.where(:active => false).find(2).set_list_position(4)
     assert_equal [1, 3, 4, 2], DefaultScopedWhereMixin.where(:active => false).find(:all).map(&:id)
-    DefaultScopedWhereMixin.where(:active => false).find(2).update_attributes!(:pos => 2)
+    DefaultScopedWhereMixin.where(:active => false).find(2).set_list_position(2)
     assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(:active => false).find(:all).map(&:id)
-    DefaultScopedWhereMixin.where(:active => false).find(1).update_attributes!(:pos => 4)
+    DefaultScopedWhereMixin.where(:active => false).find(1).set_list_position(4)
     assert_equal [2, 3, 4, 1], DefaultScopedWhereMixin.where(:active => false).find(:all).map(&:id)
-    DefaultScopedWhereMixin.where(:active => false).find(1).update_attributes!(:pos => 1)
+    DefaultScopedWhereMixin.where(:active => false).find(1).set_list_position(1)
     assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(:active => false).find(:all).map(&:id)
   end
 
 end
 
+class MultiDestroyTest < ActsAsListTestCase
+
+  def setup
+    setup_db
+  end
+
+  # example:
+  #
+  #   class TodoList < ActiveRecord::Base
+  #     has_many :todo_items, :order => "position"
+  #     accepts_nested_attributes_for :todo_items, :allow_destroy => true
+  #   end
+  #
+  #   class TodoItem < ActiveRecord::Base
+  #     belongs_to :todo_list
+  #     acts_as_list :scope => :todo_list
+  #   end
+  #
+  # Assume that there are three items.
+  # The user mark two items as deleted, click save button, form will be post:
+  #
+  # todo_list.todo_items_attributes = [
+  #   {id: 1, _destroy: true},
+  #   {id: 2, _destroy: true}
+  # ]
+  #
+  # Save toto_list, the position of item #3 should eql 1.
+  #
+  def test_destroy
+    new1 = DefaultScopedMixin.create
+    assert_equal 1, new1.pos
+
+    new2 = DefaultScopedMixin.create
+    assert_equal 2, new2.pos
+
+    new3 = DefaultScopedMixin.create
+    assert_equal 3, new3.pos
+
+    new1.destroy
+    new2.destroy
+    new3.reload
+    assert_equal 1, new3.pos
+  end
+end
+
 #class TopAdditionMixin < Mixin
 
 class TopAdditionTest < ActsAsListTestCase
@@ -360,6 +424,7 @@ class TopAdditionTest < ActsAsListTestCase
   end
 end
 
+
 class TopAdditionTestWithDefault < ActsAsListTestCase
   include Shared::TopAddition
 
@@ -368,3 +433,44 @@ class TopAdditionTestWithDefault < ActsAsListTestCase
     super
   end
 end
+
+class RespectMixinProtection < ActsAsListTestCase
+  def setup
+    setup_db_with_default
+    super
+  end
+
+  # if an attribute is set attr_protected
+  # it should be unchanged by update_attributes
+  def test_unmodified_protection
+    a = ProtectedMixin.new
+    a.update_attributes({:active => false})
+    assert_equal true, a.active
+  end
+
+  # even after the acts_as_list mixin is joined
+  # that protection should continue to exist
+  def test_still_protected
+    b = ProtectedListMixin.new
+    b.update_attributes({:active => false})
+    assert_equal true, b.active
+  end
+
+  # similarly, if a class lacks mass_assignment protection
+  # it should be able to be changed
+  def test_unprotected
+    a = UnProtectedMixin.new
+    a.update_attributes({:active => false})
+    assert_equal false, a.active
+  end
+
+  # and it should continue to be mutable by mass_assignment
+  # even after the acts_as_list plugin has been joined
+  def test_still_unprotected_mixin
+    b = UnProtectedListMixin.new
+    b.assign_attributes({:active => false})
+    # p UnProtectedListMixin.accessible_attributes.length
+    assert_equal false, b.active
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152115680 !ruby/object:Gem::Requirement
+  requirement: &2155911360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152115680
+  version_requirements: *2155911360
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152115040 !ruby/object:Gem::Requirement
+  requirement: &2155910780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.15.4.7794
   type: :development
   prerelease: false
-  version_requirements: *2152115040
+  version_requirements: *2155910780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152114620 !ruby/object:Gem::Requirement
+  requirement: &2155910340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152114620
+  version_requirements: *2155910340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152114020 !ruby/object:Gem::Requirement
+  requirement: &2155909700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152114020
+  version_requirements: *2155909700
 description: This "acts_as" extension provides the capabilities for sorting and reordering
   a number of objects in a list. The class that has this specified needs to have a
   "position" column defined as an integer on the mapped database table.