acts_as_restful_list 0.4.0 → 0.5.0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== Version 0.5.0 / 2011-02-08
+
+* enhancements
+  * Support moving items between lists.  Thanks jamiemill!
+
 === Version 0.4.0 / 2010-11-15
 
 * enhancements

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/acts_as_restful_list.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_restful_list}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["'Trey Bean'"]
-  s.date = %q{2010-11-15}
+  s.date = %q{2011-02-08}
   s.description = %q{Just like acts_as_list, but allows updating through standard restful methods.}
   s.email = %q{trey@12spokes.com}
   s.extra_rdoc_files = [

data/lib/acts_as_restful_list.rb

@@ -36,6 +36,19 @@ module ActsAsRestfulList
         end
       end
       
+      define_method 'scope_condition_was' do
+        if configuration[:scope].nil?
+          nil
+        else
+          scopes = Array(configuration[:scope]).collect do |scope|
+            column = self.class.column_names.include?(scope.to_s) ? scope.to_s : "#{scope}_id"
+            value = self.send("#{column}_was")
+            value.nil? ? "#{column} IS NULL" : "#{column} = #{value.is_a?(String) ? "'#{value}'" : value}"
+          end
+          scopes.join(' AND ')
+        end
+      end
+      
       define_method 'optimistic_locking_update' do
         self.class.column_names.include?("lock_version") ? ", lock_version = (lock_version + 1)" : ""
       end
@@ -49,7 +62,10 @@ module ActsAsRestfulList
     end
     
     def reset_order_after_update
-      if self.send( "#{position_column}_changed?" )
+      if scope_condition != scope_condition_was
+        self.class.update_all("#{position_column} = (#{position_column} - 1) #{optimistic_locking_update}", [scope_condition_was, "#{position_column} > #{self.send( "#{position_column}_was" )}", "id != #{id}"].compact.join(' AND '))
+        self.class.update_all("#{position_column} = (#{position_column} + 1) #{optimistic_locking_update}", [scope_condition, "#{position_column} >= #{self.send( position_column )}", "id != #{id}"].compact.join(' AND '))
+      elsif self.send( "#{position_column}_changed?" )
         if self.send( "#{position_column}_was" ) > self.send( position_column )
           self.class.update_all("#{position_column} = (#{position_column} + 1) #{optimistic_locking_update}", [scope_condition, "#{position_column} >= #{self.send( position_column )}", "id != #{id}", "#{position_column} < #{self.send( "#{position_column}_was" )}"].compact.join(' AND '))
         else

data/spec/acts_as_restful_list_spec.rb

@@ -333,6 +333,25 @@ describe "ActsAsRestfulList" do
         Mixin.all(:conditions => { :parent_id => 1 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
         Mixin.all(:conditions => { :parent_id => 2 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4,5,6]
       end
+      
+      it 'should report the old and new scope correctly' do
+        second_mixin = Mixin.first( :conditions => { :position => 2, :parent_id => 1  } )
+        second_mixin.parent_id = 2
+        second_mixin.position = 4
+        second_mixin.scope_condition_was.should == 'parent_id = 1'
+        second_mixin.scope_condition.should == 'parent_id = 2'
+      end
+      
+      it 'should automatically reorder both lists if a record is moved between them' do
+        second_mixin = Mixin.first( :conditions => { :position => 2, :parent_id => 1  } )
+        second_mixin.parent_id = 2
+        second_mixin.position = 4
+        second_mixin.save!
+        second_mixin.reload.parent_id.should == 2
+        second_mixin.reload.position.should == 4
+        Mixin.all(:conditions => { :parent_id => 1 }, :order => 'position ASC').collect(&:position).should == [1,2,3]
+        Mixin.all(:conditions => { :parent_id => 2 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4,5,6,7]
+      end
     end
     
     it 'should automatically reorder the list scoped by parent if the record is deleted' do

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
-gem 'activerecord', '>= 1.15.4.7794'
+gem 'activerecord', '>= 3'
 require 'active_record'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'acts_as_restful_list'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_restful_list
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "'Trey Bean'"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -07:00
+date: 2011-02-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency