acts_as_list_mongoid 0.2.0 → 0.2.1

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gem 'mongoid',                  '>= 2.0.0.beta.14'
+gem "mongoid_embedded_helper",  '>= 0.2.5'

data/README.markdown

@@ -7,7 +7,7 @@ If you do not specify custom position +column+ in the options, a key named +pos+
 
 ## Installation
 
-<code>gem install acts_a_list_mongoid</code>
+<code>gem install acts_as_list_mongoid</code>
 
 ## Usage
 

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.email       = "kmandrup@gmail.com"
     gem.homepage    = "http://github.com/rails/acts_as_list"
     gem.authors     = ["Kristian Mandrup"]
-    gem.add_dependency "mongoid", ">= 2.0.0.beta7"
-    gem.add_dependency "mongoid_embedded_helper", ">= 0.2.3"
+    gem.add_dependency "mongoid", ">= 2.0.0.beta.14"
+    gem.add_dependency "mongoid_embedded_helper", ">= 0.2.5"
     # gem.add_development_dependency "yard"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/acts_as_list_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_list_mongoid}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-08-08}
   s.description = %q{Make your Mongoid model acts as a list. This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list.
       The instances that take part in the list should have a +position+ field of type Integer.}
   s.email = %q{kmandrup@gmail.com}
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".DS_Store",
      ".gitignore",
+     ".rspec",
+     "Gemfile",
      "README.markdown",
      "Rakefile",
      "VERSION",
@@ -30,9 +32,10 @@ Gem::Specification.new do |s|
      "lib/init.rb",
      "lib/mongoid/acts_as_list.rb",
      "model/embedded_item.rb",
+     "model/referenced_category.rb",
      "spec/.rspec",
      "spec/acts_as_list/embedded_item_spec.rb",
-     "spec/spec.opts",
+     "spec/acts_as_list/referenced_category_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/rails/acts_as_list}
@@ -42,6 +45,7 @@ Gem::Specification.new do |s|
   s.summary = %q{acts_as_list for Mongoid}
   s.test_files = [
     "spec/acts_as_list/embedded_item_spec.rb",
+     "spec/acts_as_list/referenced_category_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -50,15 +54,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta7"])
-      s.add_runtime_dependency(%q<mongoid_embedded_helper>, [">= 0.2.3"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_runtime_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta7"])
-      s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.3"])
+      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta7"])
-    s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.3"])
+    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+    s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
   end
 end
 

data/lib/mongoid/acts_as_list.rb

@@ -1,5 +1,6 @@
 require "mongoid"  
 require 'mongoid_embedded_helper'
+require 'mongoid_adjust'
 
 module ActsAsList
 	module Mongoid
@@ -99,7 +100,7 @@ module ActsAsList
         sub_collection = if embedded?
           sub_collection.sort { |x,y| x.my_position <=> y.my_position }
         else
-          sub_collection.order_by([position_key, :desc])
+          sub_collection.order_by(position_key.to_sym.asc)
         end
 
         if !extras.empty?        
@@ -145,12 +146,12 @@ module ActsAsList
       end
 
       def move_below(object)
-        new_pos = ( (self == object) or (object.my_position < self.my_position) ) ? self.my_position : object.my_position
+        new_pos = (self == object) ? self.my_position : ((object.my_position > self.my_position) ? object.my_position : object.my_position + 1)
         move_to(new_pos)
       end
 
       def move_above(object)    
-        new_pos = ( self == object or (object.my_position < self.my_position) ) ? self.my_position : object.my_position - 1
+        new_pos = ( self == object ) ? self.my_position : ((object.my_position > self.my_position) ? object.my_position - 1 : object.my_position)
         move_to(new_pos)
       end
 
@@ -340,7 +341,7 @@ module ActsAsList
       end
 
       def adjust_all! collection, number
-        collection.adjust! position_key => number
+        collection.adjust!(position_key => number).each{|doc| doc.save}
       end
 
       def increase_all! collection        
@@ -406,7 +407,7 @@ module ActsAsList
 			def []=(key, value)
         if set_allowed?(key)
           @attributes[key.to_s] = value 
-        elsif write_allowed?(key)
+        else
           self.send("#{key}=", value) 
         end 
 				save!
@@ -414,7 +415,7 @@ module ActsAsList
 
 			def ==(other)
 				return true if other.equal?(self)
-				return true if other.instance_of?(self.class) and other._id == self._id
+				return true if other.instance_of?(self.class) and other.respond_to?('_id') and other._id == self._id
 				false
 			end
 
@@ -429,4 +430,4 @@ class Array
   def init_list!
     each {|i| i.init_list_item! }
   end
-end  
+end  

data/model/referenced_category.rb

@@ -0,0 +1,17 @@
+class Category
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include ActsAsList::Mongoid
+
+  field :number, :type => Integer
+
+  field :pos, :type => Integer
+  acts_as_list :column => :pos
+
+  references_many :categories
+  referenced_in :category
+
+  def scope_condition
+    {:category_id => category.id, :pos.ne => nil}
+  end
+end

data/spec/acts_as_list/embedded_item_spec.rb

@@ -134,6 +134,18 @@ describe 'ActsAsList for Mongoid' do
         get_positions(@list).should == [2, 1, 3, 4]          
       end
 
+      it "items[3].move_below(item[1]) should move item 3 to position 2" do           
+        item1 = @list.items.where(:number => 1).first
+        @list.items.where(:number => 3).first.move_below(item1)
+        get_positions(@list).should == [1, 3, 2, 4]          
+      end
+
+      it "items[3].move_above(item[2]) should move item 3 to position 2" do           
+        item2 = @list.items.where(:number => 2).first
+        @list.items.where(:number => 3).first.move_above(item2)
+        get_positions(@list).should == [1, 3, 2, 4]          
+      end
+
       it "items[1].move_above(item[3]) should move item 1 to position 2" do           
         item3 = @list.items.where(:number => 3).first
         @list.items.where(:number => 1).first.move_above(item3)
@@ -162,4 +174,4 @@ describe 'ActsAsList for Mongoid' do
       end
     end            
   end
-end
+end

data/spec/acts_as_list/referenced_category_spec.rb

@@ -0,0 +1,177 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'acts_as_list_mongoid'
+require 'referenced_category'
+
+describe 'ActsAsList for Mongoid' do
+  
+  before :each do
+    @category = Category.create!
+    @category.categories = []
+    (1..4).each do |counter|
+      @category.categories << Category.new(:number => counter)
+    end
+    @category.save!
+    
+    @category.categories.init_list!
+  end
+  
+  after :each do
+    Mongoid.database.collections.each do |coll|
+      coll.remove
+    end
+  end
+
+  def get_positions category
+    category.reload.categories.sort { |x,y| x.my_position <=> y.my_position }.map(&:number)
+  end
+  
+  context "4 category categories (1,2,3,4) that have parent_id pointing to first category container" do
+    describe '# initial configuration' do
+      it "should category categories 1 to 4 in order" do
+        positions = get_positions @category
+        positions.should == [1, 2, 3, 4]
+      end
+    end
+    
+    describe '#reordering' do
+      it "should move item 2 to position 3" do
+        @category.categories[1].increment_position
+        @category.categories[2].decrement_position
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+      
+      
+      it "should move item 2 to position 3 directly" do
+        Category.where(:number => 2).first.move_lower
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "move :down should move item 2 to position 3" do
+        Category.where(:number => 2).first.move(:down)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "move :lower should move item 2 to position 3" do
+        Category.where(:number => 2).first.move(:lower)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+      
+      it "should move item 2 to position 1" do
+        Category.where(:number => 2).first.move_higher
+        get_positions(@category).should == [2, 1, 3, 4]
+      end
+
+      it "move :up should move item 2 to position 1" do
+        Category.where(:number => 2).first.move(:up)
+        get_positions(@category).should == [2, 1, 3, 4]
+      end
+
+      it "move :higher should move item 2 to position 1" do
+        Category.where(:number => 2).first.move(:higher)
+        get_positions(@category).should == [2, 1, 3, 4]
+      end
+        
+      it "should move item 1 to bottom" do
+        Category.where(:number => 1).first.move_to_bottom
+        get_positions(@category).should == [2, 3, 4, 1]
+      end
+
+      it "move :lowest should move item 1 to bottom" do
+        Category.where(:number => 1).first.move(:lowest)
+        get_positions(@category).should == [2, 3, 4, 1]
+      end
+      
+      it "should move item 1 to top" do
+        Category.where(:number => 1).first.move_to_top
+        get_positions(@category).should == [1, 2, 3, 4]
+      end
+
+      it "move :highest should move item 1 to top" do
+        Category.where(:number => 1).first.move(:highest)
+        get_positions(@category).should == [1, 2, 3, 4]
+      end
+
+      it "move :unknown should cause argument error" do
+        lambda {Category.where(:number => 1).first.move(:unknown)}.should raise_error
+      end
+
+      
+      it "should move item 2 to bottom" do
+        Category.where(:number => 2).first.move_to_bottom
+        get_positions(@category).should == [1, 3, 4, 2]
+      end
+      
+      it "should move item 4 to top" do
+        Category.where(:number => 4).first.move_to_top
+        get_positions(@category).should == [4, 1, 2, 3]
+      end
+    
+      it "should move item 3 to bottom" do
+        Category.where(:number => 3).first.move_to_bottom
+        get_positions(@category).should == [1, 2, 4, 3]
+        
+      end
+
+      it "categories[2].move_to(4) should move item 2 to position 4" do
+        Category.where(:number => 2).first.move_to(4)
+        get_positions(@category).should == [1, 3, 4, 2]
+      end
+
+      it "categories[2].insert_at(3) should move item 2 to position 3" do
+        Category.where(:number => 2).first.insert_at(3)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "categories[2].move(:to => 3) should move item 2 to position 3" do
+        Category.where(:number => 2).first.move(:to => 3)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "categories[1].move_below(item[2]) should move item 1 to position 2" do
+        item2 = Category.where(:number => 2).first
+        Category.where(:number => 1).first.move_below(item2)
+        get_positions(@category).should == [2, 1, 3, 4]
+      end
+
+      it "categories[3].move_below(item[1]) should move item 3 to position 2" do
+        item1 = Category.where(:number => 1).first
+        Category.where(:number => 3).first.move_below(item1)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "categories[3].move_above(item[2]) should move item 3 to position 2" do
+        item2 = Category.where(:number => 2).first
+        Category.where(:number => 3).first.move_above(item2)
+        get_positions(@category).should == [1, 3, 2, 4]
+      end
+
+      it "categories[1].move_above(item[3]) should move item 1 to position 2" do
+        item3 = Category.where(:number => 3).first
+        Category.where(:number => 1).first.move_above(item3)
+        get_positions(@category).should == [2, 1, 3, 4]
+      end
+
+    end
+    
+    describe 'relative position queries' do
+      it "should find item 2 to be lower item of item 1" do
+        expected = Category.where(:pos => 2).first
+        Category.where(:pos => 1).first.lower_item.should == expected
+      end
+    
+      it "should not find any item higher than nr 1" do
+        Category.where(:pos => 1).first.higher_item.should == nil
+      end
+    
+      it "should find item 3 to be higher item of item 4" do
+        expected = Category.where(:pos => 3).first
+        Category.where(:pos => 4).first.higher_item.should == expected
+      end
+    
+      it "should not find item lower than item 4" do
+        Category.where(:pos => 4).first.lower_item.should == nil
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rspec'
 require 'rspec/autorun'
 require 'mongoid'
 require 'mongoid_embedded_helper'
+require 'mongoid_adjust'
 
 $:.unshift "#{File.dirname(__FILE__)}/../model/"
                  

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,9 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta7
-        version: 2.0.0.beta7
+        - beta
+        - 14
+        version: 2.0.0.beta.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,8 +45,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id002
 description: |-
@@ -61,6 +62,8 @@ extra_rdoc_files:
 files: 
 - .DS_Store
 - .gitignore
+- .rspec
+- Gemfile
 - README.markdown
 - Rakefile
 - VERSION
@@ -72,9 +75,10 @@ files:
 - lib/init.rb
 - lib/mongoid/acts_as_list.rb
 - model/embedded_item.rb
+- model/referenced_category.rb
 - spec/.rspec
 - spec/acts_as_list/embedded_item_spec.rb
-- spec/spec.opts
+- spec/acts_as_list/referenced_category_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/rails/acts_as_list
@@ -110,4 +114,5 @@ specification_version: 3
 summary: acts_as_list for Mongoid
 test_files: 
 - spec/acts_as_list/embedded_item_spec.rb
+- spec/acts_as_list/referenced_category_spec.rb
 - spec/spec_helper.rb