mongoid-list 0.1.4 → 0.1.5

data/lib/mongoid/list/collection.rb

@@ -7,18 +7,9 @@ module Mongoid
       class << self
 
         def update_positions!(klass, elements)
-          load_list_elements(klass, elements).each_with_index do |element, idx|
-            klass.collection.update({ _id: element.id }, { '$set' => { position: (idx + 1) } })
-          end
-          # return false if elements.size < klass.count
-        end
-
-      private
-
-        def load_list_elements(klass, elements)
-          elements.collect do |element|
+          elements.each_with_index do |element, idx|
             id = element.kind_of?(Hash) ? element['id'] : element
-            klass.find(id)
+            klass.collection.update({ _id: id }, { '$set' => { position: (idx + 1) } })
           end
         end
 

data/lib/mongoid/list/embedded.rb

@@ -8,9 +8,9 @@ module Mongoid
 
         def update_positions!(binding, elements)
           load_list_elements(binding, elements).each_with_index do |element, idx|
-            binding.base.collection.update(
-              { "#{binding.metadata.key}._id" => element.id },
-              { "$set" => { "#{binding.metadata.key}.$.position" => (idx+1) } }
+            (binding.base._parent || binding.base).collection.update(
+              element.atomic_selector,
+              { "$set" => { "#{element.atomic_path}.$.position" => (idx+1) } }
             )
           end
         end
@@ -30,9 +30,9 @@ module Mongoid
       def update_positions!
         items.each do |item|
           next unless should_operate_on_item?(item)
-          criteria  = { "#{relation_name}._id" => item.id }
-          updates   = { '$inc' => { "#{relation_name}.$.position" => changes[:by] } }
-          container.class.collection.update(criteria, updates)
+          criteria  = item.atomic_selector
+          updates   = { '$inc' => { "#{item.atomic_path}.$.position" => changes[:by] } }
+          item._parent.class.collection.update(criteria, updates)
         end
       end
 

data/lib/mongoid/list/version.rb

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

data/test/mongoid/list_test.rb

@@ -282,10 +282,14 @@ describe Mongoid::List do
         assert_equal 1, @container.items.find(@list1.id).position
       end
 
-      should "have moved lower items up" do
+      should "have moved @list3 up to :position 2" do
         assert_equal 2, @container.items.find(@list3.id).position
+      end
+
+      should "have moved @list4 up to :position 3" do
         assert_equal 3, @container.items.find(@list4.id).position
       end
+
     end
 
     context "removing from the 4th and last position" do
@@ -734,8 +738,64 @@ describe Mongoid::List do
         assert_equal 2, @obj1.reload.position
       end
 
+      should "change @obj2 from :position of 2 to 1" do
+        assert_equal 2, @obj2.position
+        assert_equal 1, @obj2.reload.position
+      end
+
+      should "change @obj3 from :position of 3 to 4" do
+        assert_equal 3, @obj3.position
+        assert_equal 4, @obj3.reload.position
+      end
+
+      should "change @obj4 from :position of 4 to 3" do
+        assert_equal 4, @obj4.position
+        assert_equal 3, @obj4.reload.position
+      end
+
+    end
+
+    context "on a Deeply Embedded Collection" do
+
+      let :root do
+        Container.create!
+      end
+
+      let :embedded do
+        root.items.create!
+      end
+
+      setup do
+        @obj1 = embedded.items.create!
+        @obj2 = embedded.items.create!
+        @obj3 = embedded.items.create!
+        @obj4 = embedded.items.create!
+        embedded.items.update_positions_in_list!([ @obj3.id, @obj4.id, @obj1.id, @obj2.id ])
+      end
+
+      should "change @obj1 from :position of 1 to 3" do
+        assert_equal 1, @obj1.position
+        assert_equal 3, @obj1.reload.position
+      end
+
+      should "change @obj2 from :position of 2 to 4" do
+        assert_equal 2, @obj2.position
+        assert_equal 4, @obj2.reload.position
+      end
+
+      should "change @obj3 from :position of 3 to 1" do
+        assert_equal 3, @obj3.position
+        assert_equal 1, @obj3.reload.position
+      end
+
+      should "change @obj4 from :position of 4 to 2" do
+        assert_equal 4, @obj4.position
+        assert_equal 2, @obj4.reload.position
+      end
+
     end
 
   end
 
+
 end

data/test/support/models/embedded.rb

@@ -2,7 +2,8 @@ class Embedded
 
   include Mongoid::Document
   include Mongoid::List
-  
+
   embedded_in :container
+  embeds_many :items, class_name: 'EmbeddedDeeply'
 
 end

data/test/support/models/embedded_deeply.rb

@@ -0,0 +1,8 @@
+class EmbeddedDeeply
+
+  include Mongoid::Document
+  include Mongoid::List
+
+  embedded_in :embedded
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-list
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153443220 !ruby/object:Gem::Requirement
+  requirement: &2153462200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153443220
+  version_requirements: *2153462200
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153442720 !ruby/object:Gem::Requirement
+  requirement: &2153461780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153442720
+  version_requirements: *2153461780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153441880 !ruby/object:Gem::Requirement
+  requirement: &2153461200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153441880
+  version_requirements: *2153461200
 - !ruby/object:Gem::Dependency
   name: mini_shoulda
-  requirement: &2153440960 !ruby/object:Gem::Requirement
+  requirement: &2153460680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153440960
+  version_requirements: *2153460680
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2153440480 !ruby/object:Gem::Requirement
+  requirement: &2153460200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2153440480
+  version_requirements: *2153460200
 - !ruby/object:Gem::Dependency
   name: spork-testunit
-  requirement: &2153431480 !ruby/object:Gem::Requirement
+  requirement: &2153459720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153431480
+  version_requirements: *2153459720
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2153431000 !ruby/object:Gem::Requirement
+  requirement: &2153459240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153431000
+  version_requirements: *2153459240
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2153430500 !ruby/object:Gem::Requirement
+  requirement: &2153458760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2153430500
+  version_requirements: *2153458760
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2153430020 !ruby/object:Gem::Requirement
+  requirement: &2153458280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2153430020
+  version_requirements: *2153458280
 description: 
 email: dave@davekrupinski.com
 executables: []
@@ -136,6 +136,7 @@ files:
 - test/mongoid/list_test.rb
 - test/support/models/container.rb
 - test/support/models/embedded.rb
+- test/support/models/embedded_deeply.rb
 - test/support/models/scoped.rb
 - test/support/models/scoped_embedded.rb
 - test/support/models/simple.rb
@@ -170,6 +171,7 @@ test_files:
 - test/mongoid/list_test.rb
 - test/support/models/container.rb
 - test/support/models/embedded.rb
+- test/support/models/embedded_deeply.rb
 - test/support/models/scoped.rb
 - test/support/models/scoped_embedded.rb
 - test/support/models/simple.rb