glebtv-mongoid_nested_set 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1e7293361d84a09bef083837a25965156e79ea
-  data.tar.gz: 0f88693f2a679bf73cbd4b4960afbd6ff6c78aff
+  metadata.gz: 318065a4aa31f41caf097a9315ad0ef0a7d15af8
+  data.tar.gz: 665e6056dfbe4e764ca76f72f113784a2b0813cb
 SHA512:
-  metadata.gz: 986372406b76254d3f874b7f1c0ba3c8a13002049d4c4b2d19858c8c6afc7d99c7d7c1fb0db303263b55b8fecc12e9064e2d1f441fc3c7a584cc00a32c569445
-  data.tar.gz: bb7b734fdabd023dd5fd1339813b5d55004476068040ef94fbb1c78d8421db9195d92418a29fdc9147300c41d416abdbf416d5cf7b49276003ab5f5c3d31b50e
+  metadata.gz: d136b219b6ecdd8dd23f4a594210f7efe7b646288bb1a2ca27ffcc6a77548bc743d31e5e0205d95948a94349249c9dd402ea6e6feeb19af4cd80ffaa6c81ef9a
+  data.tar.gz: a6a94a0ba07c7361dda1f2eabaa29fed82962fa3b25a96b7116a464f3495c269c0f7f817203f828146c96e7acbe3115d8a46af61a9b2de01f1cebdcde867018a

data/Gemfile

@@ -3,6 +3,14 @@ source "http://rubygems.org"
 #gem "activemodel", "~> 4.1.0.beta1"
 #gem "mongoid", "~> 4.0.0.beta1"
 
+#gem 'database_cleaner', github: 'glebtv/database_cleaner'
+gem 'database_cleaner', path: '/data/database_cleaner'
+
+gem 'mongo', github: 'mongodb/mongo-ruby-driver'
+#gem 'mongoid', '~> 5.0.0.beta', github: 'mongodb/mongoid'
+gem 'mongoid', '~> 5.0.0.beta', github: 'glebtv/mongoid'
+#gem 'mongoid', '~> 5.0.0.beta', path: '/data/mongoid'
+
 # Specify your gem's dependencies in glebtv-mongoid_nested_set.gemspec
 gemspec
 

data/glebtv-mongoid_nested_set.gemspec

@@ -19,16 +19,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'mongoid', [">= 3.1.0", "< 4.1"]
+  s.add_runtime_dependency 'mongoid', [">= 5.0.0.beta", "< 6.0"]
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov'
+  s.add_development_dependency 'mongoid-rspec', '2.3.0.beta'
 
-  s.add_development_dependency 'rspec-expectations', "~> 2.0"
-  s.add_development_dependency 'rr'
-  s.add_development_dependency 'remarkable_mongoid'
+  s.add_development_dependency 'rspec-expectations', "~> 3.3"
 end
 

data/lib/mongoid_nested_set/rebuild.rb

@@ -22,9 +22,8 @@ module Mongoid::Acts::NestedSet
         # set right
         right = (indices[scope.call(node)] += 1)
 
-        node.class.collection.find(:_id => node.id).update(
+        node.class.collection.find(:_id => node.id).update_one(
           {"$set" => {left_field_name => left, right_field_name => right}},
-          {:safe => true}
         )
       end
 

data/lib/mongoid_nested_set/update.rb

@@ -125,33 +125,32 @@ module Mongoid::Acts::NestedSet
           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
+        client = scope_class.mongo_client
+        collection = client[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_many("$inc" => { left_field_name => width })
+
+        collection.find(
+          scope.gte(right_field_name => bound).selector
+        ).update_many("$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_many("$inc" => { left_field_name => distance, right_field_name => distance })
+
+        # remove the hole
+        collection.find(
+          scope.gt(left_field_name => right).selector
+        ).update_many("$inc" => { left_field_name => -width })
+
+        collection.find(
+          scope.gt(right_field_name => right).selector
+        ).update_many("$inc" => { right_field_name => -width })
 
         self.mongoid_set(parent_field_name, new_parent)
         self.reload_nested_set
@@ -188,7 +187,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.with(:safe => true).mongoid_set(:depth, level) unless node.depth == level
+          node.mongoid_set(:depth, level) unless node.depth == level
         end
         self.reload
       end
@@ -214,12 +213,12 @@ module Mongoid::Acts::NestedSet
       # update lefts and rights for remaining nodes
       diff = right - left + 1
 
-      c = scope_class.with(:safe => true).where(
+      c = scope_class.where(
         nested_set_scope.where(left_field_name.to_sym.gt => right).selector
       )
       mongoid_inc(c, left_field_name, -diff)
 
-      c = scope_class.with(:safe => true).where(
+      c = scope_class.where(
         nested_set_scope.where(right_field_name.to_sym.gt => right).selector
       )
       mongoid_inc(c, right_field_name, -diff)

data/lib/mongoid_nested_set/version.rb

@@ -1,3 +1,3 @@
 module MongoidNestedSet
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/spec/mongoid.yml

@@ -0,0 +1,7 @@
+test:
+  clients:
+    default:
+      database: mongoid_nested_set_test
+      hosts:
+        - localhost:27017
+

data/spec/mongoid_nested_set_spec.rb

@@ -482,11 +482,7 @@ describe "A Mongoid::Document" do
       end
 
       it "cannot move a node to a non-existent target" do
-        if defined?(Moped::BSON)
-          @nodes[:mens].parent_id = Moped::BSON::ObjectId.new
-        else
-          @nodes[:mens].parent_id = BSON::ObjectId.new
-        end
+        @nodes[:mens].parent_id = BSON::ObjectId.new
         expect {
           @nodes[:mens].save
         }.to raise_error(Mongoid::Errors::MongoidError, /possible.*(exist|found)/)

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'rr'
+require 'database_cleaner'
 require 'active_support'
 require 'active_support/deprecation'
 require 'mongoid'
+require 'mongoid-rspec'
 require 'mongoid_nested_set'
-require 'remarkable/mongoid'
 
 if ENV['COVERAGE'] == 'yes'
   require 'simplecov'
@@ -23,23 +23,26 @@ if ENV['COVERAGE'] == 'yes'
   SimpleCov.start 
 end
 
-module Mongoid::Acts::NestedSet::Matchers
-end
-
-#Mongoid.logger = Logger.new($stdout)
-#Moped.logger = Logger.new($stdout)
-#Moped.logger.level = Logger::DEBUG
-
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 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("mongoid_nested_set_test")
-end
+#Mongo::Logger.logger.level = ::Logger::FATAL
+
+Mongoid.load!("#{File.dirname(__FILE__)}/mongoid.yml", :test)
 
 RSpec.configure do |config|
-  #config.mock_with :rr
+  config.include Mongoid::Matchers, type: :model
+
+  config.before(:suite) do
+    DatabaseCleaner[:mongoid, {client: :default }]
+    DatabaseCleaner[:mongoid].strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.clean
+  end
+
   config.include(Mongoid::Acts::NestedSet::Matchers)
 
   config.after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-mongoid_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - GlebTV
@@ -9,140 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
+        version: 5.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
+        version: 5.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.0.beta
 - !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: remarkable_mongoid
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 description: Fully featured tree implementation for Mongoid using the nested set model
 email:
 - bt@brandonturner.net
@@ -150,12 +136,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -186,6 +172,7 @@ files:
 - spec/models/square_node.rb
 - spec/models/test_document.rb
 - spec/models/unscoped_node.rb
+- spec/mongoid.yml
 - spec/mongoid_nested_set_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/glebtv/mongoid_nested_set
@@ -198,17 +185,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mongoid_nested_set
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Nested set based tree implementation for Mongoid
@@ -223,5 +210,6 @@ test_files:
 - spec/models/square_node.rb
 - spec/models/test_document.rb
 - spec/models/unscoped_node.rb
+- spec/mongoid.yml
 - spec/mongoid_nested_set_spec.rb
 - spec/spec_helper.rb