acts_as_restful_list 0.1.0 → 0.2.0

data/README.rdoc

@@ -5,14 +5,23 @@ non-standard method calls like insert_at, acts_as_restful_list makes managing li
 simple.  You update the position attribute just like you would update anything else
 and the rest is taken care of for you.
 
-For example:
+== Installation
+  #environment.rb
+  config.gem 'acts_as_restful_list'
+  
+  # in Terminal
+  rake gems:install
+
+== Usage
+
+=== In your model:
 
   class Item < ActiveRecord::Base
     belongs_to :parent
     acts_as_restful_list :scope => :parent
   end
 
-Now, simply CRUD away:
+=== Now, simply CRUD away:
 
   item = Item.create
   item.position # 1
@@ -37,6 +46,8 @@ Now, simply CRUD away:
   
 And that's that.
 
+Report issues at http://github.com/12spokes/acts_as_restful_list/issues
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{Restful acts_as_list}
     gem.description = %Q{Just like acts_as_list, but allows updating through standard restful methods.}
     gem.email = "trey@12spokes.com"
-    gem.homepage = "http://github.com/treybean/acts_as_restful_list"
+    gem.homepage = "http://github.com/12spokes/acts_as_restful_list"
     gem.authors = ["'Trey Bean'"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/acts_as_restful_list.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{acts_as_restful_list}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["'Trey Bean'"]
+  s.date = %q{2010-02-19}
+  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 = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "History.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "Todo.rdoc",
+     "VERSION",
+     "acts_as_restful_list.gemspec",
+     "lib/acts_as_restful_list.rb",
+     "spec/acts_as_restful_list_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/12spokes/acts_as_restful_list}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Restful acts_as_list}
+  s.test_files = [
+    "spec/acts_as_restful_list_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/lib/acts_as_restful_list.rb

@@ -27,9 +27,12 @@ module ActsAsRestfulList
         if configuration[:scope].nil?
           nil
         else
-          column = configuration[:scope].to_s.match(/_id$/) ? configuration[:scope].to_s : "#{configuration[:scope]}_id"
-          value = self.send(column)
-          value.nil? ? "#{column} IS NULL" : "#{column} = #{value}"
+          scopes = Array(configuration[:scope]).collect do |scope|
+            column = scope.to_s.match(/_id$/) ? scope.to_s : "#{scope}_id"
+            value = self.send(column)
+            value.nil? ? "#{column} IS NULL" : "#{column} = #{value}"
+          end
+          scopes.join(' AND ')
         end
       end
     end

data/spec/acts_as_restful_list_spec.rb

@@ -85,7 +85,7 @@ describe "ActsAsRestfulList" do
         mixin.destroy
       end
       
-      it 'should automatically reorder the list if the record id deleted' do
+      it 'should automatically reorder the list if the record is deleted' do
         (1..4).each{ Mixin.create! }
         second_mixin = Mixin.first( :conditions => { :position => 2 } )
         second_mixin.destroy
@@ -178,7 +178,7 @@ describe "ActsAsRestfulList" do
         mixin.destroy
       end
       
-      it 'should automatically reorder the list if the record id deleted' do
+      it 'should automatically reorder the list if the record is deleted' do
         (1..4).each{ Mixin.create! }
         second_mixin = Mixin.first( :conditions => { :pos => 2 } )
         second_mixin.destroy
@@ -255,7 +255,7 @@ describe "ActsAsRestfulList" do
       end
     end
     
-    it 'should automatically reorder the list scoped by parent if the record id deleted' do
+    it 'should automatically reorder the list scoped by parent if the record is deleted' do
       (1..4).each{ Mixin.create!(:parent_id => 1) }
       (1..6).each{ Mixin.create!(:parent_id => 2) }
       second_mixin = Mixin.first( :conditions => { :position => 2, :parent_id => 1 } )
@@ -297,4 +297,95 @@ describe "ActsAsRestfulList" do
       Mixin.new(:parent_id => 3).scope_condition.should == "parent_id = 3"
     end
   end
+  
+  
+  describe 'declaring acts_as_restful_list and setting the scope to multiple columns' do
+    before(:all) do
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :mixins do |t|
+          t.column :position, :integer
+          t.column :user_id, :integer
+          t.column :parent_id, :integer
+          t.column :created_at, :datetime      
+          t.column :updated_at, :datetime
+        end
+      end
+      
+      class Mixin < ActiveRecord::Base
+        acts_as_restful_list :scope => [:parent, :user]
+      end
+    end
+    
+    after(:all) do
+      Object.send(:remove_const, :Mixin)
+      
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table(table)
+      end
+    end
+    
+    it 'should define scope_condition as an instance method' do
+      Mixin.new.should respond_to(:scope_condition)
+    end
+    
+    it 'should return a scope condition that limits based on the parent_id' do
+      Mixin.new(:user_id => 4, :parent_id => 3).scope_condition.should == "parent_id = 3 AND user_id = 4"
+    end
+    
+    describe 'reordering on update' do
+      before(:each) do
+        (1..4).each{ Mixin.create!(:parent_id => 1, :user_id => 5) }
+        (1..4).each{ Mixin.create!(:parent_id => 2, :user_id => 5) }
+        (1..4).each{ Mixin.create!(:parent_id => 1, :user_id => 7) }
+        (1..4).each{ Mixin.create!(:parent_id => 2, :user_id => 7) }
+      end
+      
+      it 'should automatically reorder the list if a record is updated with a lower position' do
+        user5_parent1_fourth_mixin = Mixin.first( :conditions => { :position => 4, :parent_id => 1, :user_id => 5 } )
+        user5_parent1_fourth_mixin.position = 2
+        user5_parent1_fourth_mixin.save!
+        user5_parent1_fourth_mixin.reload.position.should == 2
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [1,4,2,3]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [5,6,7,8]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [9,10,11,12]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [13,14,15,16]
+      end
+      
+      it 'should automatically reorder the list if a record is updated with a higher position' do
+        second_mixin = Mixin.first( :conditions => { :position => 2, :parent_id => 1, :user_id => 5  } )
+        second_mixin.position = 4
+        second_mixin.save!
+        second_mixin.reload.position.should == 4
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [1,3,4,2]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [5,6,7,8]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [9,10,11,12]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+        Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [13,14,15,16]
+      end
+    end
+    
+    it 'should automatically reorder if the record is deleted' do
+      (1..4).each{ Mixin.create!(:parent_id => 1, :user_id => 5) }
+      (1..4).each{ Mixin.create!(:parent_id => 2, :user_id => 5) }
+      (1..4).each{ Mixin.create!(:parent_id => 1, :user_id => 7) }
+      (1..4).each{ Mixin.create!(:parent_id => 2, :user_id => 7) }
+      second_mixin = Mixin.first( :conditions => { :position => 2, :parent_id => 1, :user_id => 5 } )
+      second_mixin.destroy
+      Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3]
+      Mixin.all(:conditions => { :parent_id => 1, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [1,3,4]
+      Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+      Mixin.all(:conditions => { :parent_id => 2, :user_id => 5 }, :order => 'position ASC').collect(&:id).should == [5,6,7,8]
+      Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+      Mixin.all(:conditions => { :parent_id => 1, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [9,10,11,12]
+      Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:position).should == [1,2,3,4]
+      Mixin.all(:conditions => { :parent_id => 2, :user_id => 7 }, :order => 'position ASC').collect(&:id).should == [13,14,15,16]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_restful_list
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "'Trey Bean'"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -07:00
+date: 2010-02-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,13 @@ files:
 - Rakefile
 - Todo.rdoc
 - VERSION
+- acts_as_restful_list.gemspec
 - lib/acts_as_restful_list.rb
 - spec/acts_as_restful_list_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/treybean/acts_as_restful_list
+homepage: http://github.com/12spokes/acts_as_restful_list
 licenses: []
 
 post_install_message: