mongoid-list 0.1.5 → 0.1.6

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@mongoid-list
+rvm 1.9.3@mongoid-list

data/lib/mongoid/list.rb

@@ -1,7 +1,7 @@
 module Mongoid
 
-
   module List
+
     extend ActiveSupport::Concern
 
     autoload :Collection, 'mongoid/list/collection'
@@ -12,8 +12,6 @@ module Mongoid
 
       validates :position, numericality: true, on: :update
 
-      index [ include?(Mongoid::Paranoia) ? [ :deleted_at, 1 ] : nil, [ :position, -1 ] ].compact # TODO: MONGOID: Apply a patch
-
       before_create  :set_initial_position_in_list
       before_update  :mark_for_update_processing_of_list, if: :position_changed?
       after_update   :update_positions_in_list!, if: :_process_list_change

data/lib/mongoid/list/embedded.rb

@@ -32,7 +32,7 @@ module Mongoid
           next unless should_operate_on_item?(item)
           criteria  = item.atomic_selector
           updates   = { '$inc' => { "#{item.atomic_path}.$.position" => changes[:by] } }
-          item._parent.class.collection.update(criteria, updates)
+          item._root.class.collection.update(criteria, updates)
         end
       end
 

data/lib/mongoid/list/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module List
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/mongoid-list.gemspec

@@ -13,16 +13,16 @@ Gem::Specification.new do |s|
   s.summary       = 'Simple list behavior for Mongoid'
   s.homepage      = 'https://github.com/davekrupinski/mongoid-list'
 
-  s.add_dependency('mongoid', [ '>= 2.0.0' ])
+  s.add_dependency('mongoid', [ '>= 2.4.0' ])
 
   s.add_development_dependency('bson_ext')
-  s.add_development_dependency('minitest', [ '>= 2.7.0' ])
+  s.add_development_dependency('minitest', [ '>= 2.11.0' ])
   s.add_development_dependency('mini_shoulda', [ '>= 0.4.0' ])
-  s.add_development_dependency('spork', [ '>= 0.9.0.rc' ])
-  s.add_development_dependency('spork-testunit', [ '>= 0.0.6' ])
-  s.add_development_dependency('guard-minitest', [ '>= 0.4.0' ])
-  s.add_development_dependency('guard-spork', [ '>= 0.3.1' ])
-  s.add_development_dependency('turn', [ '>= 0.8.3' ])
+  s.add_development_dependency('spork', [ '>= 1.0.0.rc' ])
+  s.add_development_dependency('spork-testunit', [ '>= 0.0.8' ])
+  s.add_development_dependency('guard-minitest', [ '>= 0.5.0' ])
+  s.add_development_dependency('guard-spork', [ '>= 0.5.2' ])
+  s.add_development_dependency('turn', [ '>= 0.9.4' ])
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/mongoid/list_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 
 describe Mongoid::List do
 
-
   context "Setting Initial Position" do
     setup do
       @list1 = Simple.create
@@ -49,6 +48,7 @@ describe Mongoid::List do
 
 
   context "Updating List Position" do
+
     setup do
       @list1 = Simple.create
       @list2 = Simple.create
@@ -64,6 +64,7 @@ describe Mongoid::List do
     end
 
     context "for @list2 going to position of 1" do
+
       setup do
         @list2.update_attributes(:position => 1)
         @list1.reload; @list2.reload; @list3.reload; @list4.reload
@@ -78,6 +79,7 @@ describe Mongoid::List do
     end
 
     context "for @list3 going to position of 1" do
+
       setup do
         @list3.update_attributes(:position => 1)
         @list1.reload; @list2.reload; @list3.reload; @list4.reload
@@ -89,9 +91,11 @@ describe Mongoid::List do
         assert_equal 1, @list3.position
         assert_equal 4, @list4.position
       end
+
     end
 
     context "for @list1 going to position of 2" do
+
       setup do
         @list1.update_attributes(:position => 2)
         @list1.reload; @list2.reload; @list3.reload; @list4.reload
@@ -103,9 +107,11 @@ describe Mongoid::List do
         assert_equal 3, @list3.position
         assert_equal 4, @list4.position
       end
+
     end
 
     context "for @list1 going to position of 3" do
+
       setup do
         @list1.update_attributes(:position => 3)
         @list1.reload; @list2.reload; @list3.reload; @list4.reload
@@ -117,12 +123,15 @@ describe Mongoid::List do
         assert_equal 2, @list3.position
         assert_equal 4, @list4.position
       end
+
     end
+
   end
 
 
 
   context "Updating List Position in Embedded Collection" do
+
     setup do
       @container = Container.create
       @list1 = @container.items.create
@@ -139,6 +148,7 @@ describe Mongoid::List do
     end
 
     context "for @list2 going to position of 1" do
+
       setup do
         @list2.update_attributes(:position => 1)
         @container.reload
@@ -150,9 +160,11 @@ describe Mongoid::List do
         assert_equal 3, @container.items.find(@list3.id).position
         assert_equal 4, @container.items.find(@list4.id).position
       end
+
     end
 
     context "for @list3 going to position of 1" do
+
       setup do
         @list3.update_attributes(:position => 1)
         @container.reload
@@ -164,9 +176,11 @@ describe Mongoid::List do
         assert_equal 1, @container.items.find(@list3.id).position
         assert_equal 4, @container.items.find(@list4.id).position
       end
+
     end
 
     context "for @list1 going to position of 2" do
+
       setup do
         @list1.update_attributes(:position => 2)
         @container.reload
@@ -178,9 +192,11 @@ describe Mongoid::List do
         assert_equal 3, @container.items.find(@list3.id).position
         assert_equal 4, @container.items.find(@list4.id).position
       end
+
     end
 
     context "for @list1 going to position of 3" do
+
       setup do
         @list1.update_attributes(:position => 3)
         @container.reload
@@ -192,12 +208,15 @@ describe Mongoid::List do
         assert_equal 2, @container.items.find(@list3.id).position
         assert_equal 4, @container.items.find(@list4.id).position
       end
+
     end
+
   end
 
 
 
-  context "Removing an Item from a List" do
+  context "#destroy" do
+
     setup do
       @list1 = Simple.create
       @list2 = Simple.create
@@ -232,9 +251,11 @@ describe Mongoid::List do
         assert_equal 2, @list3.position
         assert_equal 3, @list4.position
       end
+
     end
 
     context "removing from the 4th and last position" do
+
       setup do
         @list4.destroy
         @list1.reload; @list2.reload; @list3.reload
@@ -245,12 +266,14 @@ describe Mongoid::List do
         assert_equal 2, @list2.position
         assert_equal 3, @list3.position
       end
+
     end
   end
 
 
 
-  context "Removing an Item from an Embedded List" do
+  context "#destroy Item from an Embedded List" do
+
     setup do
       @container = Container.create
       @list1 = @container.items.create
@@ -260,6 +283,7 @@ describe Mongoid::List do
     end
 
     context "from the first position" do
+
       setup do
         @list1.destroy
         @container.reload
@@ -270,9 +294,11 @@ describe Mongoid::List do
         assert_equal 2, @container.items.find(@list3.id).position
         assert_equal 3, @container.items.find(@list4.id).position
       end
+
     end
 
     context "removing from the 2nd position" do
+
       setup do
         @list2.destroy
         @container.reload
@@ -293,6 +319,7 @@ describe Mongoid::List do
     end
 
     context "removing from the 4th and last position" do
+
       setup do
         @list4.destroy
         @container.reload
@@ -303,10 +330,52 @@ describe Mongoid::List do
         assert_equal 2, @container.items.find(@list2.id).position
         assert_equal 3, @container.items.find(@list3.id).position
       end
+
     end
+
   end
 
 
+  context "#destroy Item from Deeply Embedded List" do
+
+    setup do
+      @container = Container.create
+      @list  = @container.items.create
+      @item1 = @list.items.create
+      @item2 = @list.items.create
+      @item3 = @list.items.create
+    end
+
+    context "from 1st position" do
+
+      setup do
+        @item1.destroy
+        @container.reload
+      end
+
+      should "have moved all other items up" do
+        assert_equal 1, @container.items.first.items.find(@item2.id).position
+        assert_equal 2, @container.items.first.items.find(@item3.id).position
+      end
+
+    end
+
+    context "from middle position" do
+
+      setup do
+        @item2.destroy
+        @container.reload
+      end
+
+      should "have moved last items up" do
+        assert_equal 1, @container.items.first.items.find(@item1.id).position
+        assert_equal 2, @container.items.first.items.find(@item3.id).position
+      end
+
+    end
+
+  end
+
 
   context "#list_scoped?" do
 
@@ -797,5 +866,4 @@ describe Mongoid::List do
 
   end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-list
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153462200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153462200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153461780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153461780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153461200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *2153461200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: mini_shoulda
-  requirement: &2153460680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,62 +69,92 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153460680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2153460200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc
+        version: 1.0.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2153460200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: spork-testunit
-  requirement: &2153459720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *2153459720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2153459240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153459240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2153458760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *2153458760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2153458280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *2153458280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 description: 
 email: dave@davekrupinski.com
 executables: []
@@ -161,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple list behavior for Mongoid