glebtv-mongoid_nested_set 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3ae4fb0473cf7cef052ee941ef62e4d0f642ef
-  data.tar.gz: ed8aef4a4d36c0936bbd8e0397fba3c84fb2907c
+  metadata.gz: e4bbc837da8191ec439a50dac4aada31c25a3108
+  data.tar.gz: 2b8bcbccc169e543ddd1c9bd4bb6534a05f0cdf2
 SHA512:
-  metadata.gz: a9f0a5179fb255f08f64f78be3dc517e80acc04200e61b63b01372a9efd488817df9c8bfa1b458b18f12a2308e3d603fa4074328a98ff1595f5ed811ce079be9
-  data.tar.gz: 20079c928fae0fbf0633c73f8d4d7ddff0b81b92125658be59fee61627fbaf68ebd279d7a4ab96cc45a35570904039be3cbc3815701f01137348049ead99c631
+  metadata.gz: 594c32953884950e05426f8ddf4aa1abd6095259303a9a5a7be9119992f602181579f92d922e52befb84b60aed92224b8ece7d10644c6d06f0c830cb0f5a6a85
+  data.tar.gz: ae0ae8f2280e304b43e9bba7333a6e754b519597abac0c296eba52a0f4dac6f39ef15c4dc55aacea69192cd55a03c272c6e6f8cf272133c30984595c55775318

data/gemfiles/mongoid-4.0.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0.beta1"
+gem "mongoid", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile.lock

@@ -0,0 +1,84 @@
+PATH
+  remote: ../
+  specs:
+    glebtv-mongoid_nested_set (0.5.2)
+      mongoid (>= 4.0.0, < 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    bson (3.2.6)
+    builder (3.2.2)
+    connection_pool (2.2.0)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.9.0)
+    mongoid (4.0.2)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-rspec (2.2.0)
+      mongoid (~> 4.0.0)
+      rake
+      rspec (~> 3.1)
+    moped (2.0.7)
+      bson (~> 3.0)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    optionable (0.2.0)
+    origin (2.2.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  database_cleaner
+  glebtv-mongoid_nested_set!
+  mongoid (~> 4.0.0)
+  mongoid-rspec
+  rake
+  rspec
+  rspec-expectations
+  simplecov
+  simplecov-rcov
+
+BUNDLED WITH
+   1.12.5

data/glebtv-mongoid_nested_set.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov-rcov'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'rspec-expectations'
-  s.add_development_dependency 'mongoid-rspec', '3.0.0'
+  s.add_development_dependency 'mongoid-rspec'
 end

data/lib/mongoid_nested_set/rebuild.rb

@@ -22,9 +22,13 @@ module Mongoid::Acts::NestedSet
         # set right
         right = (indices[scope.call(node)] += 1)
 
-        node.class.collection.find(:_id => node.id).update_one(
-          {"$set" => {left_field_name => left, right_field_name => right}},
-        )
+        q = node.class.collection.find(:_id => node.id)
+        set = {"$set" => {left_field_name => left, right_field_name => right}}
+        if q.respond_to?(:update_one)
+          q.update_one(set)
+        else
+          q.update(set)
+        end
       end
 
       # scope rebuild for specified node

data/lib/mongoid_nested_set/update.rb

@@ -129,27 +129,27 @@ module Mongoid::Acts::NestedSet
         scope = nested_set_scope.remove_order_by
 
         # allocate space for new move
-        collection.find(
+        update_many(collection.find(
           scope.gte(left_field_name => bound).selector
-        ).update_many("$inc" => { left_field_name => width })
+        ), "$inc" => { left_field_name => width })
 
-        collection.find(
+        update_many(collection.find(
           scope.gte(right_field_name => bound).selector
-        ).update_many("$inc" => { right_field_name => width })
+        ), "$inc" => { right_field_name => width })
 
         # move the nodes
-        collection.find(
+        update_many(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 })
+        ), "$inc" => { left_field_name => distance, right_field_name => distance })
 
         # remove the hole
-        collection.find(
+        update_many(collection.find(
           scope.gt(left_field_name => right).selector
-        ).update_many("$inc" => { left_field_name => -width })
+        ), "$inc" => { left_field_name => -width })
 
-        collection.find(
+        update_many(collection.find(
           scope.gt(right_field_name => right).selector
-        ).update_many("$inc" => { right_field_name => -width })
+        ), "$inc" => { right_field_name => -width })
 
         self.mongoid_set(parent_field_name, new_parent)
         self.reload_nested_set
@@ -172,6 +172,13 @@ module Mongoid::Acts::NestedSet
       self
     end
 
+    def update_many(q, set)
+      if q.respond_to?(:update_all)
+        q.update_all(set)
+      else
+        q.update_many(set)
+      end
+    end
 
     # Update cached level attribute
     def update_depth

data/lib/mongoid_nested_set/version.rb

@@ -1,3 +1,3 @@
 module MongoidNestedSet
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-mongoid_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - GlebTV
@@ -133,16 +133,16 @@ dependencies:
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 description: Fully featured tree implementation for Mongoid using the nested set model
 email:
 - bt@brandonturner.net
@@ -163,6 +163,7 @@ files:
 - gemfiles/am-4.1.gemfile
 - gemfiles/mongoid-3.1.gemfile
 - gemfiles/mongoid-4.0.gemfile
+- gemfiles/mongoid-4.0.gemfile.lock
 - glebtv-mongoid_nested_set.gemspec
 - lib/glebtv-mongoid_nested_set.rb
 - lib/mongoid_nested_set.rb