mongoid-tree 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5137d0df514633dff660618929df94658352c576
-  data.tar.gz: cc8bc0884e0d028b762d364ede0fca32b07e1e53
+  metadata.gz: b077e8bfb9c59a23025951349cc64293d496ff2b
+  data.tar.gz: a16ee9fa51743425d25de01fb489ac1f193752b6
 SHA512:
-  metadata.gz: 6533082d31a625ccb70529cdd4391ce9f0a934239efe3c45c1299a9e2762db2d4af26933a2b48bc3852b982b1f9a63174e486dedd714fba872a58e46f4f60699
-  data.tar.gz: cd4b110278a8b0cf46be05a721eafc9428e0a3260e7434b72668ceea2a4f2327051967df4739c78f678a60fb19cc8b76f8c6223e73591b6f49faf5b3222bffd8
+  metadata.gz: b53ef6fb2bd5055dc441d43af840617806e48550328266d033b124f5d978c4e118627d3a1d95815d8e014c2eab6cd29f11936d6a605a292757163c931b85cacf
+  data.tar.gz: db8180d46265765c981e249ffd904f5d2d8b4414effda1e37402e3066512339ea9e820ed52ed6d58609bf5992163fc9a87372eb632aa1560ff1f1e5cce06109c

data/Gemfile

@@ -4,4 +4,9 @@ gemspec
 
 gem 'guard-rspec', '>= 0.6.0'
 gem 'ruby_gntp',   '>= 0.3.4'
-gem 'rb-fsevent' if RUBY_PLATFORM =~ /darwin/
+gem 'rb-fsevent' if RUBY_PLATFORM =~ /darwin/
+gem 'mongoid', :github => 'mongoid/mongoid'
+
+platforms :rbx do
+  gem 'rubysl-rake', '~> 2.0'
+end

data/README.md

@@ -4,9 +4,10 @@ A tree structure for Mongoid documents using the materialized path pattern
 
 ## Requirements
 
-* mongoid (~> 3.0)
+* mongoid (~> 4.0)
 
-For a mongoid 2.x compatible version, please use mongoid-tree 0.7.x!
+For a mongoid 3.x compatible version, please use mongoid-tree 1.0.x,
+for a mongoid 2.x compatible version, please use mongoid-tree 0.7.x.
 
 
 ## Install
@@ -17,15 +18,15 @@ To install mongoid_tree, simply add it to your Gemfile:
 
 In order to get the latest development version of mongoid-tree:
 
-    gem 'mongoid-tree', :git => 'git://github.com/benedikt/mongoid-tree', :require => 'mongoid/tree'
+    gem 'mongoid-tree', :git => 'git://github.com/benedikt/mongoid-tree'
 
-You might want to remove the `:require => 'mongoid/tree'` option and explicitly `require 'mongoid/tree'` where needed and finally run
+You might want to add `:require => nil` option and explicitly `require 'mongoid/tree'` where needed and finally run
 
     bundle install
 
-### Upgrade from mongoid-tree 1.0.x
+### Upgrade from mongoid-tree 1.x
 
-To fix issues with the ordering of ancestors, mongoid-tree 1.1 introduces a new depth field to the documents that include the Mongoid::Tree module. In case your project uses its own depth field, you can now rely on mongoid-tree to handle this.
+To fix issues with the ordering of ancestors, mongoid-tree 2.0 introduces a new `depth` field to the documents that include the `Mongoid::Tree` module. In case your project uses its own `depth` field, you can now rely on mongoid-tree to handle this.
 
 ## Usage
 

data/lib/mongoid/tree.rb

@@ -277,7 +277,7 @@ module Mongoid
     #
     # @return [Mongoid::Criteria] Mongoid criteria to retrieve the documents ancestors
     def ancestors
-      base_class.where(:_id.in => parent_ids).asc(:depth)
+      base_class.where(:_id.in => parent_ids).order(:depth => :asc)
     end
 
     ##

data/lib/mongoid/tree/ordering.rb

@@ -35,7 +35,7 @@ module Mongoid
       included do
         field :position, :type => Integer
 
-        default_scope asc(:position)
+        default_scope ->{ asc(:position) }
 
         before_save :assign_default_position, :if => :assign_default_position?
         before_save :reposition_former_siblings, :if => :sibling_reposition_required?
@@ -157,11 +157,11 @@ module Mongoid
 
         if position > other.position
           new_position = other.position
-          self.siblings_between(other).inc(:position, 1)
-          other.inc(:position, 1)
+          self.siblings_between(other).inc(:position => 1)
+          other.inc(:position => 1)
         else
           new_position = other.position - 1
-          self.siblings_between(other).inc(:position, -1)
+          self.siblings_between(other).inc(:position => -1)
         end
 
         self.position = new_position
@@ -181,11 +181,11 @@ module Mongoid
 
         if position > other.position
           new_position = other.position + 1
-          self.siblings_between(other).inc(:position, 1)
+          self.siblings_between(other).inc(:position => 1)
         else
           new_position = other.position
-          self.siblings_between(other).inc(:position, -1)
-          other.inc(:position, -1)
+          self.siblings_between(other).inc(:position => -1)
+          other.inc(:position => -1)
         end
 
         self.position = new_position
@@ -195,8 +195,8 @@ module Mongoid
     private
 
       def switch_with_sibling_at_offset(offset)
-        siblings.where(:position => self.position + offset).first.inc(:position, -offset)
-        inc(:position, offset)
+        siblings.where(:position => self.position + offset).first.inc(:position => -offset)
+        inc(:position => offset)
       end
 
       def ensure_to_be_sibling_of(other)
@@ -206,14 +206,14 @@ module Mongoid
       end
 
       def move_lower_siblings_up
-        lower_siblings.inc(:position, -1)
+        lower_siblings.inc(:position => -1)
       end
 
       def reposition_former_siblings
         former_siblings = base_class.where(:parent_id => attribute_was('parent_id')).
                                      and(:position.gt => (attribute_was('position') || 0)).
                                      excludes(:id => self.id)
-        former_siblings.inc(:position,  -1)
+        former_siblings.inc(:position => -1)
       end
 
       def sibling_reposition_required?

data/spec/mongoid/tree/traversal_spec.rb

@@ -141,7 +141,7 @@ describe Mongoid::Tree::Traversal do
       @root1 = node(:root1)
       @root2 = node(:root2)
 
-      Node.stub(:roots).and_return [@root1, @root2]
+      allow(Node).to receive(:roots).and_return [@root1, @root2]
     end
 
     it 'should grab each root' do

data/spec/mongoid/tree_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Tree do
     expect(a.macro).to eq(:has_many)
     expect(a.class_name).to eq('Node')
     expect(a.foreign_key).to eq('parent_id')
-    expect(Node.index_options).to have_key(:parent_id => 1)
+    expect(Node.index_specification(:parent_id => 1)).to be
   end
 
   it "should be referenced in one parent as inverse of children" do
@@ -26,14 +26,14 @@ describe Mongoid::Tree do
     expect(f).to be
     expect(f.options[:type]).to eq(Array)
     expect(f.options[:default]).to eq([])
-    expect(Node.index_options).to have_key(:parent_ids => 1)
+    expect(Node.index_specification(:parent_ids => 1)).to be
   end
 
   it "should store the depth as Integer with index" do
     f = Node.fields['depth']
     expect(f).to be
     expect(f.options[:type]).to eq(Integer)
-    expect(Node.index_options).to have_key(:depth => 1)
+    expect(Node.index_specification(:depth => 1)).to be
   end
 
   describe 'when new' do
@@ -263,11 +263,8 @@ describe Mongoid::Tree do
       end
 
       it "should be updated when the nodes ancestors change" do
-        node(:child).update_attributes!(:parent => nil)
-
-        puts node(:child).inspect
-
-        expect(node(:child).reload.depth).to eq(0)
+        node(:child).update_attributes(:parent => nil)
+        expect(node(:child).depth).to eq(0)
         expect(node(:subchild).depth).to eq(1)
       end
     end

data/spec/support/macros/tree_macros.rb

@@ -21,15 +21,16 @@ module Mongoid::Tree::TreeMacros
   end
 
 private
+
   def create_tree(object)
     case object
-      when String then return create_node(object)
-      when Array then object.each { |tree| create_tree(tree) }
-      when Hash then
-        name, children = object.first
-        node = create_node(name)
-        children.each { |c| node.children << create_tree(c) }
-        return node
+    when String then return create_node(object)
+    when Array then object.each { |tree| create_tree(tree) }
+    when Hash then
+      name, children = object.first
+      node = create_node(name)
+      children.each { |c| node.children << create_tree(c) }
+      return node
     end
   end
 

data/spec/support/models/node.rb

@@ -4,8 +4,6 @@ class Node
   include Mongoid::Tree::Traversal
 
   field :name
-
-  attr_accessible :name, :parent
 end
 
 class SubclassedNode < Node
@@ -23,8 +21,6 @@ class OrderedNode
   include Mongoid::Tree::Ordering
 
   field :name
-
-  attr_accessible :name
 end
 
 class NodeWithEmbeddedDocument < Node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tree
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Benedikt Deicke
@@ -14,22 +14,22 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - <=
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement