noodall-core 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/noodall/node.rb

@@ -76,29 +76,29 @@ module Noodall
     end
 
     def last?
-      position == self.class.count(:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field])
+      position == search_class.count(:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field])
     end
     def move_lower
-      sibling = self.class.first(:position => {"$gt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position ASC')
+      sibling = search_class.first(:position => {"$gt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position ASC')
 
       tmp = sibling.position
       sibling.position = self.position
       self.position = tmp
 
-      self.class.collection.update({:_id => self._id}, self.to_mongo)
-      self.class.collection.update({:_id => sibling._id}, sibling.to_mongo)
+      search_class.collection.update({:_id => self._id}, self.to_mongo)
+      search_class.collection.update({:_id => sibling._id}, sibling.to_mongo)
 
       global_updated!
     end
     def move_higher
-      sibling = self.class.first(:position => {"$lt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position DESC')
+      sibling = search_class.first(:position => {"$lt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position DESC')
 
       tmp = sibling.position
       sibling.position = self.position
       self.position = tmp
 
-      self.class.collection.update({:_id => self._id}, self.to_mongo)
-      self.class.collection.update({:_id => sibling._id}, sibling.to_mongo)
+      search_class.collection.update({:_id => self._id}, self.to_mongo)
+      search_class.collection.update({:_id => sibling._id}, sibling.to_mongo)
 
       global_updated!
     end
@@ -149,16 +149,16 @@ module Noodall
     end
 
     def siblings
-      self.class.where(:_id => {:$ne => self._id}, parent_id_field => self[parent_id_field]).order(tree_order)
+      search_class.where(:_id => {:$ne => self._id}, parent_id_field => self[parent_id_field]).order(tree_order)
     end
 
     def self_and_siblings
-      self.class.where(parent_id_field => self[parent_id_field]).order(tree_order)
+      search_class.where(parent_id_field => self[parent_id_field]).order(tree_order)
 
     end
 
     def children
-      self.class.where(parent_id_field => self._id).order(tree_order)
+      search_class.where(parent_id_field => self._id).order(tree_order)
     end
 
   private
@@ -225,11 +225,11 @@ module Noodall
     after_save :order_siblings
     def order_siblings
       if position_changed?
-        self.class.collection.update({:_id => {"$ne" => self._id}, :position => {"$gte" => self.position}, parent_id_field => self[parent_id_field]}, { "$inc" => { :position => 1 }}, { :multi => true })
+        search_class.collection.update({:_id => {"$ne" => self._id}, :position => {"$gte" => self.position}, parent_id_field => self[parent_id_field]}, { "$inc" => { :position => 1 }}, { :multi => true })
         self_and_siblings.each_with_index do |sibling, index|
           unless sibling.position == index
             sibling.position = index
-            self.class.collection.save(sibling.to_mongo, :safe => true)
+            search_class.collection.save(sibling.to_mongo, :safe => true)
           end
         end
       end

data/noodall-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]

data/spec/node_spec.rb

@@ -60,7 +60,11 @@ describe Noodall::Node do
 
   describe "within a tree" do
     before(:each) do
-      @root = Page.create!(:title => "Root")
+      class LandingPage < Noodall::Node
+        root_template!
+      end
+
+      @root = LandingPage.create!(:title => "Root")
 
       @child = Page.create!(:title => "Ickle Kid", :parent => @root)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Steve England