tiny_cms 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/tiny_cms/node.rb

@@ -29,6 +29,10 @@ module TinyCMS
       
       model.named_scope :roots,   :conditions => {:parent_id => nil}, :order => 'position'
       
+      model.named_scope :by_parent_id, lambda { |parent_id|
+        {:conditions => {:parent_id => parent_id}}
+      }
+      
       model.belongs_to :parent,   :class_name => model.to_s, :foreign_key => 'parent_id'
       model.has_many   :children, :class_name => model.to_s, :foreign_key => 'parent_id', :order => 'position', :dependent => :destroy
       
@@ -48,12 +52,7 @@ module TinyCMS
       end
       model.alias_method_chain :children=, :position
     end
-  
-    def siblings
-      return [] unless parent_id
-      self.class.include_tree(1).find(:first, :conditions => "id = #{parent_id}").children.find(:all, :conditions => "id != #{id}")
-    end
-    
+   
     def parameterize_permalink
       text = permalink.blank? ? title : permalink
       self.permalink = text.parameterize if text
@@ -67,6 +66,14 @@ module TinyCMS
       {:attributes => {'data-node-id' => id, 'data-permalink' => permalink, 'data-path' => path}, :data => title, :children => children.map{ |c| c.to_hash } }
     end
     
+    def siblings
+      section.find :all, :conditions => "id != #{id}"
+    end
+    
+    def section
+      self.class.by_parent_id parent_id
+    end
+    
     def to_json opts = {}
       self.to_hash.to_json
     end

data/test/test_node.rb

@@ -94,12 +94,16 @@ class PageTest < Test::Unit::TestCase
     end
     
     should 'getting siblings for root' do
-      assert_equal [], @roots.first.siblings
+      assert_equal @roots[1..-1], @roots.first.siblings
     end
 
     should 'getting ordered root' do
       assert_equal @roots.map(&:id), Page.roots.map(&:id)
     end
+    
+    should 'getting section' do
+      assert_equal @children, @children.first.section
+    end
   end
 
   context 'json generation' do
@@ -206,11 +210,6 @@ class PageTest < Test::Unit::TestCase
       @page = Factory :page, :title => 'This is teh title', :permalink => nil
       assert_equal 'this-is-teh-title', @page.permalink
     end
-
-    # should 'convert to blank if permalink == index' do
-    #   @page = Factory :page, :permalink => 'index'
-    #   assert_equal '', @page.permalink
-    # end
   end
 
   context 'validation' do
@@ -234,14 +233,6 @@ class PageTest < Test::Unit::TestCase
         assert_equal false, @page2.errors.on(:permalink).blank?
       end
 
-      # should 'allow duplicate if path is the same but one is not page' do
-      #   @page1.update_attribute
-      #   assert_equal @page1.path,      @page2.path
-      #   assert_equal @page1.permalink, @page2.permalink
-      #   @page1.save!
-      #   assert_equal true, @page2.valid?
-      # end
-
       should 'allow duplicate if paths are diferent and both are pages' do
         @page2.parent = @page3
         @page1.save(false)
@@ -253,12 +244,6 @@ class PageTest < Test::Unit::TestCase
         assert_equal @page1.permalink, @page2.permalink
         assert_equal true, @page2.valid?
       end
-
-      # should 'validate presence of permalink if is not page' do
-      #   page = Factory.build :page, :permalink => ''
-      #   assert_equal false, page.valid?
-      #   assert_equal false, page.errors.on(:permalink).blank?
-      # end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Macario