mongoid-ordering 0.1.3 → 0.1.4

data/lib/mongoid/ordering.rb

@@ -205,6 +205,16 @@ module Mongoid
     private  
 
       def move_lower_siblings_up
+        return if self.ordering_scopes.any? do |scope|
+          scope_metadata = self.reflect_on_association(scope)
+          next if scope_metadata.nil?
+
+          relation = send(scope_metadata.name)
+          next if relation.nil?
+
+          relation.flagged_for_destroy? && scope_metadata.inverse_metadata(relation).destructive?
+        end
+
         self.lower_siblings.each { |s| s.inc(:position, -1) }
       end
 

data/spec/mongoid/ordering_spec.rb

@@ -277,15 +277,27 @@ describe Mongoid::Ordering do
   
   describe "destroying a document" do
   
-    let!(:sibling1) { DummyParentDocument.create }  
-    let!(:sibling2) { DummyParentDocument.create }  
-    let!(:sibling3) { DummyParentDocument.create }
+    let!(:parent1)        { DummyParentDocument.create }  
+    let!(:parent2)        { DummyParentDocument.create }
+    let!(:parent3)        { DummyParentDocument.create }
+    let!(:parent3_child1) { DummyChildDocument.create(parent: parent3) }
+    let!(:parent3_child2) { DummyChildDocument.create(parent: parent3) }
+    let!(:parent3_child3) { DummyChildDocument.create(parent: parent3) }
     
     it "moves lower siblings up" do
-      sibling2.destroy
+      parent2.destroy
       
-      sibling1.reload.position.should eq(0)
-      sibling3.reload.position.should eq(1)
+      parent1.reload.position.should eq(0)
+      parent3.reload.position.should eq(1)
+    end
+
+    context "when deletion is cascaded to the document's children" do
+
+      it "doesn't move lower siblings of those children up" do
+        DummyChildDocument.any_instance.should_not_receive(:inc)
+
+        parent3.destroy
+      end
     end
   end
 end

data/spec/support/models.rb

@@ -5,7 +5,8 @@ class DummyParentDocument
   ordered scope: nil
   
   has_many :children, class_name: "DummyChildDocument",
-                      inverse_of: :parent
+                      inverse_of: :parent,
+                      dependent:  :destroy
 end
 
 class DummyChildDocument
@@ -14,6 +15,6 @@ class DummyChildDocument
   
   ordered scope: :parent
   
-  belongs_to :parent, class_name: DummyParentDocument.to_s,
+  belongs_to :parent, class_name: "DummyParentDocument",
                       inverse_of: :children
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-ordering
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70334092153860 !ruby/object:Gem::Requirement
+  requirement: &70141127517200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334092153860
+  version_requirements: *70141127517200
 - !ruby/object:Gem::Dependency
   name: mongoid-siblings
-  requirement: &70334092153340 !ruby/object:Gem::Requirement
+  requirement: &70141127516720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334092153340
+  version_requirements: *70141127516720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70334092152920 !ruby/object:Gem::Requirement
+  requirement: &70141127516340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334092152920
+  version_requirements: *70141127516340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334092152400 !ruby/object:Gem::Requirement
+  requirement: &70141127515880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334092152400
+  version_requirements: *70141127515880
 description: mongoid-ordering makes it easy to keep your Mongoid documents in order.
 email: douwe@selenight.nl
 executables: []
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3787459196807544671
+      hash: -1977126769264338189
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3787459196807544671
+      hash: -1977126769264338189
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6