mm-referenced-tree 0.1.1 → 0.1.2

data/Rakefile

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "mm-referenced-tree"
-  s.version           = "0.1.1"
+  s.version           = "0.1.2"
   s.summary           = "Yet another tree plugin for MongoMapper, built with an array of reference numbers"
   s.author            = "Richard Livsey"
   s.email             = "richard@livsey.org"

data/lib/mm-referenced-tree.rb

@@ -235,11 +235,7 @@ module MongoMapper
         end
 
         def scoped_find
-          if referenced_tree_options[:scope]
-            self.class.sort(:reference.asc).where(referenced_tree_options[:scope] => self[referenced_tree_options[:scope]])
-          else
-            self.class.sort(:reference.asc)
-          end
+          self.class.sort(:reference.asc).where(apply_scope_to_query({}))
         end
 
         def assign_reference
@@ -280,17 +276,19 @@ module MongoMapper
         end
 
         def renumber_tree
-          scope = {}
+          self.class.renumber_tree(apply_scope_to_query({}))
+        end
+
+        def apply_scope_to_query(query={})
           if referenced_tree_options[:scope]
-            scope[referenced_tree_options[:scope]] = self[referenced_tree_options[:scope]]
+            query[referenced_tree_options[:scope]] = self[referenced_tree_options[:scope]]
           end
-
-          self.class.renumber_tree(scope)
+          query
         end
 
         def reposition_subsequent_nodes
           self.class.set(
-            query_for_reference(reference),
+            apply_scope_to_query(query_for_reference(reference)),
             {:"reference.#{depth-1}" => (reference[depth-1] + 1)}
           )
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm-referenced-tree
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Richard Livsey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +00:00
+date: 2011-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency