mongoid_nested_set 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1,44 @@
+Gemfile.lock
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp
+.rvmrc

data/Gemfile

@@ -1,17 +1,7 @@
 source "http://rubygems.org"
 
-gem "mongoid", ">= 3.0.0"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.5"
-  gem "simplecov"
-  gem "simplecov-rcov"
-  gem 'rspec-core', "~> 2.0"
-  gem 'rdoc'
-end
+# Specify your gem's dependencies in mongoid_nested_set.gemspec
+gemspec
 
 group :test do
   gem 'rspec-expectations', "~> 2.0"

data/Rakefile

@@ -1,45 +1 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mongoid_nested_set"
-  gem.homepage = "http://github.com/thinkwell/mongoid_nested_set"
-  gem.license = "MIT"
-  gem.summary = %Q{Nested set based tree implementation for Mongoid}
-  gem.description = %Q{Fully featured tree implementation for Mongoid using the nested set model}
-  gem.email = "bturner@bltweb.net"
-  gem.authors = ["Brandon Turner"]
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :rcov do
-  ENV['COVERAGE'] = 'yes'
-  Rake::Task["spec"].execute
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid_nested_set #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'

data/lib/mongoid_nested_set/update.rb

@@ -105,32 +105,53 @@ module Mongoid::Acts::NestedSet
                 else raise Mongoid::Errors::MongoidError, "Position should be :child, :left, :right or :root ('#{position}' received)."
                 end
 
-        if bound > self[right_field_name]
-          bound = bound - 1
-          other_bound = self[right_field_name] + 1
-        else
-          other_bound = self[left_field_name] - 1
-        end
-
-        # there would be no change
-        return self if bound == self[right_field_name] || bound == self[left_field_name]
-
-        # we have defined the boundaries of two non-overlapping intervals,
-        # so sorting puts both the intervals and their boundaries in order
-        a, b, c, d = [self[left_field_name], self[right_field_name], bound, other_bound].sort
-
         old_parent = self[parent_field_name]
         new_parent = case position
                      when :child; target.id
                      when :root;  nil
                      else         target[parent_field_name]
                      end
+        
+        left, right     = [self[left_field_name], self[right_field_name]]
+        width, distance = [right - left + 1, bound - left]
+        edge            = bound > right ? bound - 1 : bound
+
+        # there would be no change
+        return self if left == edge || right == edge
 
-        nested_set_scope.remove_order_by.or(left_field_name => a..b).or(right_field_name => a..b).set(:depth, -1)
-        nested_set_scope.remove_order_by.between(left_field_name => c..d).inc(left_field_name, a - c)
-        nested_set_scope.remove_order_by.between(right_field_name => c..d).inc(right_field_name, a - c)
-        nested_set_scope.remove_order_by.where(:depth => -1).between(left_field_name => a..b).inc(left_field_name, d - b)
-        nested_set_scope.remove_order_by.where(:depth => -1).between(right_field_name => a..b).inc(right_field_name, d - b)
+        # moving backwards
+        if distance < 0
+          distance -= width
+          left += width
+        end
+
+        scope_class.mongo_session.with(:safe => true) do |session|
+          collection = session[scope_class.collection_name]
+          scope = nested_set_scope.remove_order_by
+
+          # allocate space for new move
+          collection.find(
+            scope.gte(left_field_name => bound).selector
+          ).update_all("$inc" => { left_field_name => width })
+
+          collection.find(
+            scope.gte(right_field_name => bound).selector
+          ).update_all("$inc" => { right_field_name => width })
+
+          # move the nodes
+          collection.find(
+            scope.and(left_field_name => {"$gte" => left}, right_field_name => {"$lt" => left + width}).selector
+          ).update_all("$inc" => { left_field_name => distance, right_field_name => distance })
+
+          # remove the hole
+          collection.find(
+            scope.gt(left_field_name => right).selector
+          ).update_all("$inc" => { left_field_name => -width })
+
+          collection.find(
+            scope.gt(right_field_name => right).selector
+          ).update_all("$inc" => { right_field_name => -width })
+        end
 
         self.set(parent_field_name, new_parent)
         self.reload_nested_set

data/lib/mongoid_nested_set/version.rb

@@ -0,0 +1,3 @@
+module MongoidNestedSet
+  VERSION = "0.2.1"
+end

data/mongoid_nested_set.gemspec

@@ -1,88 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "mongoid_nested_set/version"
 
 Gem::Specification.new do |s|
-  s.name = "mongoid_nested_set"
-  s.version = "0.2.0"
+  s.name        = "mongoid_nested_set"
+  s.version     = MongoidNestedSet::VERSION
+  s.authors     = ["Brandon Turner"]
+  s.email       = ["bt@brandonturner.net"]
+  s.homepage    = "http://github.com/thinkwell/mongoid_nested_set"
+  s.summary     = %q{Nested set based tree implementation for Mongoid}
+  s.description = %q{Fully featured tree implementation for Mongoid using the nested set model}
+  s.licenses    = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Turner"]
-  s.date = "2012-07-15"
-  s.description = "Fully featured tree implementation for Mongoid using the nested set model"
-  s.email = "bturner@bltweb.net"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "lib/mongoid_nested_set.rb",
-    "lib/mongoid_nested_set/base.rb",
-    "lib/mongoid_nested_set/document.rb",
-    "lib/mongoid_nested_set/fields.rb",
-    "lib/mongoid_nested_set/outline_number.rb",
-    "lib/mongoid_nested_set/rebuild.rb",
-    "lib/mongoid_nested_set/relations.rb",
-    "lib/mongoid_nested_set/remove_order_by.rb",
-    "lib/mongoid_nested_set/update.rb",
-    "lib/mongoid_nested_set/validation.rb",
-    "mongoid_nested_set.gemspec",
-    "spec/matchers/nestedset_pos.rb",
-    "spec/models/circle_node.rb",
-    "spec/models/node.rb",
-    "spec/models/node_without_nested_set.rb",
-    "spec/models/numbering_node.rb",
-    "spec/models/renamed_fields.rb",
-    "spec/models/shape_node.rb",
-    "spec/models/square_node.rb",
-    "spec/models/test_document.rb",
-    "spec/models/unscoped_node.rb",
-    "spec/mongoid_nested_set_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/thinkwell/mongoid_nested_set"
-  s.licenses = ["MIT"]
+  s.rubyforge_project = "mongoid_nested_set"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "Nested set based tree implementation for Mongoid"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  # specifiy any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  s.add_runtime_dependency(%q<mongoid>, [">= 3.0.0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 3.0.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec-core>, ["~> 2.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<mongoid>, [">= 3.0.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
-      s.add_dependency(%q<rspec-core>, ["~> 2.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, [">= 3.0.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
-    s.add_dependency(%q<rspec-core>, ["~> 2.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-  end
+  s.add_development_dependency(%q<rspec>, [">= 2.7.0"])
+  s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
+  s.add_development_dependency(%q<simplecov>)
+  s.add_development_dependency(%q<simplecov-rcov>)
 end
 

data/spec/mongoid_nested_set_spec.rb

@@ -273,6 +273,7 @@ describe "A Mongoid::Document" do
         child.parent_id.should == root.id
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
       end
 
       it "can create a child node via children<<" do
@@ -283,6 +284,23 @@ describe "A Mongoid::Document" do
         child.should have_nestedset_pos(2, 3)
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
+      end
+
+      it "can create 2 level child nodes via children<<" do
+        root = Node.create(:name => 'Root Category', :root_id => 10)
+        child = Node.create(:name => 'Child Category', :root_id => 10)
+        grandchild = Node.create(:name => 'Grandchild Category', :root_id => 10)
+        root.children << child
+        child.children << grandchild
+        grandchild.parent_id.should == child.id
+        grandchild.reload.should have_nestedset_pos(3, 4)
+        grandchild.depth.should == 2
+        child.parent_id.should == root.id
+        child.reload.should have_nestedset_pos(2, 5)
+        child.depth.should == 1
+        root.reload.should have_nestedset_pos(1, 6)
+        root.depth.should == 0
       end
 
       it "can create a child node with parent pre-assigned" do
@@ -292,6 +310,7 @@ describe "A Mongoid::Document" do
         child.parent_id.should == root.id
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
       end
 
       it "can create a child node with parent id pre-assigned" do
@@ -301,6 +320,7 @@ describe "A Mongoid::Document" do
         child.parent_id.should == root.id
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
       end
 
       it "can change a new node's parent before saving" do
@@ -312,6 +332,7 @@ describe "A Mongoid::Document" do
         child.parent_id.should == root.id
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
       end
 
       it "can change a new node's parent id before saving" do
@@ -323,6 +344,7 @@ describe "A Mongoid::Document" do
         child.parent_id.should == root.id
         child.depth.should == 1
         root.reload.should have_nestedset_pos(1, 4)
+        root.depth.should == 0
       end
 
     end
@@ -476,6 +498,8 @@ describe "A Mongoid::Document" do
         @nodes[:slacks].reload.should have_nestedset_pos( 6,  7)
         @nodes[:suits] .reload.should have_nestedset_pos( 3,  8)
         @nodes[:jackets].depth.should == 3
+        @nodes[:slacks].depth.should == 3
+        @nodes[:suits].depth.should == 2
       end
 
       it "can move right" do
@@ -484,6 +508,8 @@ describe "A Mongoid::Document" do
         @nodes[:jackets].reload.should have_nestedset_pos( 4,  5)
         @nodes[:suits]  .reload.should have_nestedset_pos( 3,  8)
         @nodes[:slacks].depth.should == 3
+        @nodes[:jackets].depth.should == 3
+        @nodes[:suits].depth.should == 2
       end
 
       it "can move left of another node" do

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file }
 Dir["#{File.dirname(__FILE__)}/matchers/*.rb"].each {|file| require file }
 
 Mongoid.configure do |config|
-  config.connect_to("dmongoid_nested_set_test")
+  config.connect_to("mongoid_nested_set_test")
   config.allow_dynamic_fields = false
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -28,45 +28,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +58,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.21
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,23 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,21 +92,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Fully featured tree implementation for Mongoid using the nested set model
-email: bturner@bltweb.net
+email:
+- bt@brandonturner.net
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.markdown
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - lib/mongoid_nested_set.rb
 - lib/mongoid_nested_set/base.rb
 - lib/mongoid_nested_set/document.rb
@@ -149,6 +115,7 @@ files:
 - lib/mongoid_nested_set/remove_order_by.rb
 - lib/mongoid_nested_set/update.rb
 - lib/mongoid_nested_set/validation.rb
+- lib/mongoid_nested_set/version.rb
 - mongoid_nested_set.gemspec
 - spec/matchers/nestedset_pos.rb
 - spec/models/circle_node.rb
@@ -175,9 +142,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1942426900078281337
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,9 +149,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: mongoid_nested_set
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Nested set based tree implementation for Mongoid
-test_files: []
+test_files:
+- spec/matchers/nestedset_pos.rb
+- spec/models/circle_node.rb
+- spec/models/node.rb
+- spec/models/node_without_nested_set.rb
+- spec/models/numbering_node.rb
+- spec/models/renamed_fields.rb
+- spec/models/shape_node.rb
+- spec/models/square_node.rb
+- spec/models/test_document.rb
+- spec/models/unscoped_node.rb
+- spec/mongoid_nested_set_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,68 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    mongoid (3.0.1)
-      activemodel (~> 3.1)
-      moped (~> 1.1.1)
-      origin (~> 1.0.3)
-      tzinfo (~> 0.3.22)
-    moped (1.1.1)
-    multi_json (1.3.6)
-    origin (1.0.4)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    remarkable (4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_activemodel (4.0.0.alpha4)
-      remarkable (~> 4.0.0.alpha4)
-      rspec (>= 2.0.0.alpha11)
-    remarkable_mongoid (0.6.0)
-      remarkable_activemodel (~> 4.0.0.alpha4)
-    rr (1.0.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 1.5)
-  mongoid (>= 3.0.0)
-  rdoc
-  remarkable_mongoid
-  rr
-  rspec-core (~> 2.0)
-  rspec-expectations (~> 2.0)
-  simplecov
-  simplecov-rcov

data/VERSION

@@ -1 +0,0 @@
-0.2.0