mongoid-list 0.1.3 → 0.1.4

data/lib/mongoid-list.rb

@@ -1 +1,2 @@
-require 'mongoid/list'
+require 'mongoid/list'
+require 'mongoid/relations/embedded/many_list_extension'

data/lib/mongoid/list.rb

@@ -26,12 +26,8 @@ module Mongoid
 
     module ClassMethods
 
-      def update_positions_in_list!(elements)
-        return false if elements.size < count
-        elements.each_with_index do |element, idx|
-          id = element.kind_of?(Hash) ? element['id'] : element
-          self.collection.update({ id: id }, { '$set' => { position: (idx + 1) } })
-        end
+      def update_positions_in_list!(elements, binding=nil)
+        embedded? ? Embedded.update_positions!(binding, elements) : Collection.update_positions!(self, elements)
       end
 
     end

data/lib/mongoid/list/collection.rb

@@ -4,6 +4,27 @@ module Mongoid
   module List
     class Collection < Abstract
 
+      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|
+            id = element.kind_of?(Hash) ? element['id'] : element
+            klass.find(id)
+          end
+        end
+
+      end
+
+
       def update_positions!
         obj.class.collection.update(
           criteria,

data/lib/mongoid/list/embedded.rb

@@ -4,6 +4,29 @@ module Mongoid
   module List
     class Embedded < Abstract
 
+      class << self
+
+        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) } }
+            )
+          end
+        end
+
+      private
+
+        def load_list_elements(binding, elements)
+          elements.collect do |element|
+            id = element.kind_of?(Hash) ? element['id'] : element
+            binding.base.send(binding.metadata.key).find(id)
+          end
+        end
+
+      end
+
+
       def update_positions!
         items.each do |item|
           next unless should_operate_on_item?(item)

data/lib/mongoid/list/version.rb

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

data/lib/mongoid/relations/embedded/many_list_extension.rb

@@ -0,0 +1,7 @@
+Mongoid::Relations::Embedded::Many.class_eval do
+
+  def update_positions_in_list!(elements)
+    klass.update_positions_in_list!(elements, binding)
+  end
+
+end

data/test/mongoid/list/collection_test.rb

@@ -75,4 +75,67 @@ describe Mongoid::List::Collection do
   end
 
 
+  describe "#update_positions_in_list!" do
+
+    context "unscoped" do
+
+      setup do
+        @obj1 = Simple.create
+        @obj2 = Simple.create
+        @obj3 = Simple.create
+        Simple.update_positions_in_list!([ @obj2.id, @obj1.id, @obj3.id ])
+      end
+
+      should "change @obj1 from :position of 1 to 2" do
+        assert_equal 1, @obj1.position
+        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 "not change @obj3 from :position of 3" do
+        assert_equal 3, @obj3.position
+        assert_equal 3, @obj3.reload.position
+      end
+
+    end
+
+    context "scoped" do
+
+      setup do
+        @obj1 = Scoped.create(group: "hell's angels")
+        @obj2 = Scoped.create(group: "hell's angels")
+        @obj3 = Scoped.create(group: "hell's angels")
+        @other = Scoped.create(group: "charlie's angels")
+
+        Scoped.update_positions_in_list!([ @obj3.id, @obj2.id, @obj1.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 "not change @obj2 from :position of 2" do
+        assert_equal 2, @obj2.position
+        assert_equal 2, @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 "not have touched @other scoped" do
+        assert_equal 1, @other.position
+        assert_equal 1, @other.reload.position
+      end
+
+    end
+
+  end
+
 end

data/test/mongoid/list/embedded_test.rb

@@ -104,4 +104,71 @@ describe Mongoid::List::Embedded do
   end
 
 
+  describe "#update_positions_in_list!" do
+
+    let :container do
+      Container.create!
+    end
+
+    context "unscoped" do
+
+      setup do
+        @obj1 = container.items.create!
+        @obj2 = container.items.create!
+        @obj3 = container.items.create!
+        container.items.update_positions_in_list!([ @obj2.id, @obj1.id, @obj3.id ])
+      end
+
+      should "change @obj1 from :position of 1 to 2" do
+        assert_equal 1, @obj1.position
+        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 "not change @obj3 from :position of 3" do
+        assert_equal 3, @obj3.position
+        assert_equal 3, @obj3.reload.position
+      end
+
+    end
+
+    context "scoped" do
+
+      setup do
+        @obj1 = container.scoped_items.create!(group: "hell's angels")
+        @obj2 = container.scoped_items.create!(group: "hell's angels")
+        @obj3 = container.scoped_items.create!(group: "hell's angels")
+        @other = container.scoped_items.create!(group: "charlie's angels")
+
+        container.scoped_items.update_positions_in_list!([ @obj3.id, @obj2.id, @obj1.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 "not change @obj2 from :position of 2" do
+        assert_equal 2, @obj2.position
+        assert_equal 2, @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 "not have touched @other scoped" do
+        assert_equal 1, @other.position
+        assert_equal 1, @other.reload.position
+      end
+
+    end
+
+  end
+
 end

data/test/mongoid/list_test.rb

@@ -683,6 +683,59 @@ describe Mongoid::List do
 
     end
 
+  end
+
+
+
+  describe "#update_positions_in_list!" do
+
+    context "on a Collection" do
+
+      setup do
+        @obj1 = Simple.create
+        @obj2 = Simple.create
+        @obj3 = Simple.create
+        Simple.update_positions_in_list!([ @obj2.id, @obj1.id, @obj3.id ])
+      end
+
+      should "change @obj1 from :position of 1 to 2" do
+        assert_equal 1, @obj1.position
+        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 "not change @obj3 from :position of 3" do
+        assert_equal 3, @obj3.position
+        assert_equal 3, @obj3.reload.position
+      end
+
+    end
+
+    context "on an Embedded Collection" do
+
+      let :container do
+        Container.create!
+      end
+
+      setup do
+        @obj1 = container.items.create!
+        @obj2 = container.items.create!
+        @obj3 = container.items.create!
+        @obj4 = container.items.create!
+        container.items.update_positions_in_list!([ @obj2.id, @obj1.id, @obj4.id, @obj3.id ])
+      end
+
+      should "change @obj1 from :position of 1 to 2" do
+        assert_equal 1, @obj1.position
+        assert_equal 2, @obj1.reload.position
+      end
+
+    end
 
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-list
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2164486340 !ruby/object:Gem::Requirement
+  requirement: &2153443220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164486340
+  version_requirements: *2153443220
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2164485920 !ruby/object:Gem::Requirement
+  requirement: &2153442720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164485920
+  version_requirements: *2153442720
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2164485360 !ruby/object:Gem::Requirement
+  requirement: &2153441880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2164485360
+  version_requirements: *2153441880
 - !ruby/object:Gem::Dependency
   name: mini_shoulda
-  requirement: &2164484820 !ruby/object:Gem::Requirement
+  requirement: &2153440960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2164484820
+  version_requirements: *2153440960
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2164484300 !ruby/object:Gem::Requirement
+  requirement: &2153440480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2164484300
+  version_requirements: *2153440480
 - !ruby/object:Gem::Dependency
   name: spork-testunit
-  requirement: &2164483660 !ruby/object:Gem::Requirement
+  requirement: &2153431480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *2164483660
+  version_requirements: *2153431480
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2164483040 !ruby/object:Gem::Requirement
+  requirement: &2153431000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2164483040
+  version_requirements: *2153431000
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2164482400 !ruby/object:Gem::Requirement
+  requirement: &2153430500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2164482400
+  version_requirements: *2153430500
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2164481620 !ruby/object:Gem::Requirement
+  requirement: &2153430020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2164481620
+  version_requirements: *2153430020
 description: 
 email: dave@davekrupinski.com
 executables: []
@@ -129,6 +129,7 @@ files:
 - lib/mongoid/list/collection.rb
 - lib/mongoid/list/embedded.rb
 - lib/mongoid/list/version.rb
+- lib/mongoid/relations/embedded/many_list_extension.rb
 - mongoid-list.gemspec
 - test/mongoid/list/collection_test.rb
 - test/mongoid/list/embedded_test.rb