mongoid_nested_set 0.1.3 → 0.2.0

data/Gemfile

@@ -1,13 +1,14 @@
 source "http://rubygems.org"
 
-gem "mongoid", ">= 2.1.0"
+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 "rcov", ">= 0"
+  gem "simplecov"
+  gem "simplecov-rcov"
   gem 'rspec-core', "~> 2.0"
   gem 'rdoc'
 end
@@ -16,5 +17,4 @@ group :test do
   gem 'rspec-expectations', "~> 2.0"
   gem 'rr'
   gem 'remarkable_mongoid'
-  gem 'database_cleaner'
 end

data/Gemfile.lock

@@ -1,30 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.10)
-    bson (1.3.1)
-    builder (2.1.2)
-    database_cleaner (0.6.7)
-    diff-lcs (1.1.2)
+    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.5.0)
-    jeweler (1.6.4)
+    i18n (0.6.0)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.1.9)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+      rdoc
+    json (1.7.3)
+    mongoid (3.0.1)
+      activemodel (~> 3.1)
+      moped (~> 1.1.1)
+      origin (~> 1.0.3)
       tzinfo (~> 0.3.22)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rdoc (3.9.4)
+    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)
@@ -32,28 +35,34 @@ GEM
       rspec (>= 2.0.0.alpha11)
     remarkable_mongoid (0.6.0)
       remarkable_activemodel (~> 4.0.0.alpha4)
-    rr (1.0.3)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    tzinfo (0.3.29)
+    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)
-  database_cleaner
   jeweler (~> 1.5)
-  mongoid (>= 2.1.0)
-  rcov
+  mongoid (>= 3.0.0)
   rdoc
   remarkable_mongoid
   rr
   rspec-core (~> 2.0)
   rspec-expectations (~> 2.0)
+  simplecov
+  simplecov-rcov

data/Rakefile

@@ -27,9 +27,9 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+task :rcov do
+  ENV['COVERAGE'] = 'yes'
+  Rake::Task["spec"].execute
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/mongoid_nested_set/base.rb

@@ -48,8 +48,8 @@ module Mongoid::Acts::NestedSet
         field outline_number_field_name, :type => String if outline_number_field_name
         field :depth, :type => Integer
 
-        references_many :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => criteria.asc(left_field_name)
-        referenced_in   :parent,   :class_name => self.name, :foreign_key => parent_field_name
+        has_many   :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => left_field_name.to_sym.asc
+        belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name
 
         attr_accessor :skip_before_destroy
 

data/lib/mongoid_nested_set/rebuild.rb

@@ -10,7 +10,7 @@ module Mongoid::Acts::NestedSet
 
       scope = lambda{ |node| {} }
       if acts_as_nested_set_options[:scope]
-        scope = lambda { |node| node.nested_set_scope.scoped }
+        scope = lambda { |node| node.nested_set_scope.options.merge(node.nested_set_scope.selector) }
       end
       indices = {}
 
@@ -22,8 +22,7 @@ module Mongoid::Acts::NestedSet
         # set right
         right = (indices[scope.call(node)] += 1)
 
-        node.class.collection.update(
-          {:_id => node.id},
+        node.class.collection.find(:_id => node.id).update(
           {"$set" => {left_field_name => left, right_field_name => right}},
           {:safe => true}
         )

data/lib/mongoid_nested_set/remove_order_by.rb

@@ -1,11 +1,15 @@
 module Mongoid
   module Criterion
-    module Optional
+    module Ordering
       def remove_order_by
         @options[:sort] = nil
         self
       end
     end
   end
+
+  class Criteria
+    include Criterion::Ordering
+  end
 end
 

data/lib/mongoid_nested_set/update.rb

@@ -126,31 +126,13 @@ module Mongoid::Acts::NestedSet
                      else         target[parent_field_name]
                      end
 
-        # TODO: Worst case O(n) queries, improve?
-        # MongoDB 1.9 may allow javascript in updates: http://jira.mongodb.org/browse/SERVER-458
-        nested_set_scope.only(left_field_name, right_field_name, parent_field_name).remove_order_by.each do |node|
-          updates = {}
-          if (a..b).include? node.left
-            updates[left_field_name] = node.left + d - b
-          elsif (c..d).include? node.left
-            updates[left_field_name] = node.left + a - c
-          end
-
-          if (a..b).include? node.right
-            updates[right_field_name] = node.right + d - b
-          elsif (c..d).include? node.right
-            updates[right_field_name] = node.right + a - c
-          end
-
-          updates[parent_field_name] = new_parent if self.id == node.id
-
-          node.class.collection.update(
-            {:_id => node.id },
-            {"$set" => updates},
-            {:safe => true}
-          ) unless updates.empty?
-        end
+        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)
 
+        self.set(parent_field_name, new_parent)
         self.reload_nested_set
         self.update_self_and_descendants_depth
 
@@ -175,7 +157,7 @@ module Mongoid::Acts::NestedSet
     # Update cached level attribute
     def update_depth
       if depth?
-        self.update_attributes(:depth => level)
+        self.update_attribute(:depth, level)
       end
       self
     end
@@ -185,11 +167,7 @@ module Mongoid::Acts::NestedSet
     def update_self_and_descendants_depth
       if depth?
         scope_class.each_with_level(self_and_descendants) do |node, level|
-          node.class.collection.update(
-            {:_id => node.id},
-            {"$set" => {:depth => level}},
-            {:safe => true}
-          ) unless node.depth == level
+          node.with(:safe => true).set(:depth, level) unless node.depth == level
         end
         self.reload
       end
@@ -208,22 +186,20 @@ module Mongoid::Acts::NestedSet
           model.destroy
         end
       else
-        c = nested_set_scope.fuse(:where => {left_field_name => {"$gt" => left}, right_field_name => {"$lt" => right}})
-        scope_class.delete_all(:conditions => c.selector)
+        c = nested_set_scope.where(left_field_name.to_sym.gt => left, right_field_name.to_sym.lt => right)
+        scope_class.where(c.selector).delete_all
       end
 
       # update lefts and rights for remaining nodes
       diff = right - left + 1
-      scope_class.collection.update(
-        nested_set_scope.fuse(:where => {left_field_name => {"$gt" => right}}).selector,
-        {"$inc" => { left_field_name => -diff }},
-        {:safe => true, :multi => true}
-      )
-      scope_class.collection.update(
-        nested_set_scope.fuse(:where => {right_field_name => {"$gt" => right}}).selector,
-        {"$inc" => { right_field_name => -diff }},
-        {:safe => true, :multi => true}
-      )
+
+      scope_class.with(:safe => true).where(
+        nested_set_scope.where(left_field_name.to_sym.gt => right).selector
+      ).inc(left_field_name, -diff)
+
+      scope_class.with(:safe => true).where(
+        nested_set_scope.where(right_field_name.to_sym.gt => right).selector
+      ).inc(right_field_name, -diff)
 
       # Don't allow multiple calls to destroy to corrupt the set
       self.skip_before_destroy = true

data/lib/mongoid_nested_set/validation.rb

@@ -27,7 +27,7 @@ module Mongoid::Acts::NestedSet
     def no_duplicates_for_fields?
       roots.group_by{|record| scope_field_names.collect{|field| record.send(field.to_sym)}}.all? do |scope, grouped_roots|
         [left_field_name, right_field_name].all? do |field|
-          grouped_roots.first.nested_set_scope.only(field).aggregate.all? {|c| c['count'] == 1}
+          grouped_roots.first.nested_set_scope.only(field).group_by {|doc| doc.send(field)}.all? {|k, v| v.size == 1}
         end
       end
     end

data/mongoid_nested_set.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mongoid_nested_set}
-  s.version = "0.1.3"
+  s.name = "mongoid_nested_set"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Brandon Turner}]
-  s.date = %q{2011-08-26}
-  s.description = %q{Fully featured tree implementation for Mongoid using the nested set model}
-  s.email = %q{bturner@bltweb.net}
+  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"
@@ -49,35 +49,38 @@ Gem::Specification.new do |s|
     "spec/mongoid_nested_set_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/thinkwell/mongoid_nested_set}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Nested set based tree implementation for Mongoid}
+  s.homepage = "http://github.com/thinkwell/mongoid_nested_set"
+  s.licenses = ["MIT"]
+  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
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.1.0"])
+      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<rcov>, [">= 0"])
+      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>, [">= 2.1.0"])
+      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<rcov>, [">= 0"])
+      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>, [">= 2.1.0"])
+    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<rcov>, [">= 0"])
+    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

data/spec/models/test_document.rb

@@ -25,7 +25,7 @@ module Mongoid::Acts::NestedSet
           if Mongoid.allow_dynamic_fields ||
               fields.keys.any? { |k| k.to_s == key } ||
               associations.any? { |a| a[0].to_s == key || a[1].foreign_key.to_s == key }
-            @attributes[key] = self.typed_value_for(key, val)
+            @attributes[key] = fields[key].mongoize(val)
           end
         end
         self

data/spec/mongoid_nested_set_spec.rb

@@ -51,11 +51,11 @@ describe "A Mongoid::Document" do
   def persist_nodes(nodes, collection_name=nil)
     nodes = {:first => nodes} unless nodes.is_a? Hash
     collection_name = nodes.values.first.class.collection_name if collection_name.nil?
-    coll = Mongoid.master[collection_name]
 
     nodes.each_value do |node|
-      # Bypass the ORM (and the nested set callbacks) and save directly with the underlying driver
-      coll.update({:_id => node.id}, node.attributes, {:upsert => true})
+      # As soon as there is no upsert callbacks set
+      # this is effectively identical to the straight driver call
+      node.with(:conllection => collection_name).upsert
       node.new_record = false
     end
     nodes
@@ -456,7 +456,7 @@ describe "A Mongoid::Document" do
       end
 
       it "cannot move a node to a non-existent target" do
-        @nodes[:mens].parent_id = BSON::ObjectId.new
+        @nodes[:mens].parent_id = Moped::BSON::ObjectId.new
         expect {
           @nodes[:mens].save
         }.to raise_error(Mongoid::Errors::MongoidError, /possible.*(exist|found)/)

data/spec/spec_helper.rb

@@ -5,7 +5,21 @@ require 'rr'
 require 'mongoid'
 require 'mongoid_nested_set'
 require 'remarkable/mongoid'
-require 'database_cleaner'
+
+if ENV['COVERAGE'] == 'yes'
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+      SimpleCov::Formatter::HTMLFormatter.new.format(result)
+      SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+  SimpleCov.start 
+end
 
 module Mongoid::Acts::NestedSet::Matchers
 end
@@ -15,30 +29,15 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file }
 Dir["#{File.dirname(__FILE__)}/matchers/*.rb"].each {|file| require file }
 
 Mongoid.configure do |config|
-  name = "mongoid_nested_set_test"
-  host = "localhost"
+  config.connect_to("dmongoid_nested_set_test")
   config.allow_dynamic_fields = false
-  #config.master = Mongo::Connection.new(host, nil, :logger => Logger.new($stdout)).db(name)
-  config.master = Mongo::Connection.new.db(name)
-  # config.slaves = [
-    # Mongo::Connection.new(host, 27018, :slave_ok => true).db(name)
-  # ]
 end
 
 RSpec.configure do |config|
   config.mock_with :rr
   config.include(Mongoid::Acts::NestedSet::Matchers)
 
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
-    DatabaseCleaner.orm = "mongoid"
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
   config.after(:each) do
-    DatabaseCleaner.clean
+    Mongoid::Config.purge!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &25185020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *25185020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25184540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *25184540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25184060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,31 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *25184060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &25183200 !ruby/object:Gem::Requirement
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25183200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &25182460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +101,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *25182460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25070500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25070500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fully featured tree implementation for Mongoid using the nested set model
 email: bturner@bltweb.net
 executables: []
@@ -131,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -922553073555053444
+      hash: -1942426900078281337
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Nested set based tree implementation for Mongoid