collectiveidea-awesome_nested_set 1.3.0 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/awesome_nested_set.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awesome_nested_set}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Daniel Morrison"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-09-03}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [

data/lib/awesome_nested_set.rb

@@ -15,24 +15,11 @@ module CollectiveIdea #:nodoc:
       #
       # == API
       #
-      # Methods names are aligned with acts_as_tree as much as possible, to make replacment from one
-      # by another easier, except for the creation:
+      # Methods names are aligned with acts_as_tree as much as possible to make replacment from one
+      # by another easier.
       #
-      # in acts_as_tree:
       #   item.children.create(:name => "child1")
       #
-      # in acts_as_nested_set:
-      #   # adds a new item at the "end" of the tree, i.e. with child.left = max(tree.right)+1
-      #   child = MyClass.new(:name => "child1")
-      #   child.save
-      #   # now move the item to its right place
-      #   child.move_to_child_of my_item
-      #
-      # You can pass an id or an object to:
-      # * <tt>#move_to_child_of</tt>
-      # * <tt>#move_to_right_of</tt>
-      # * <tt>#move_to_left_of</tt>
-      #
       module SingletonMethods
         # Configuration options are:
         #
@@ -75,6 +62,8 @@ module CollectiveIdea #:nodoc:
             
             belongs_to :parent, :class_name => self.base_class.class_name,
               :foreign_key => parent_column_name
+            has_many :children, :class_name => self.base_class.class_name,
+              :foreign_key => parent_column_name
 
             attr_accessor :skip_before_destroy
           
@@ -261,7 +250,7 @@ module CollectiveIdea #:nodoc:
         end
         
         def leaf?
-          right - left == 1
+          !new_record? && right - left == 1
         end
 
         # Returns true is this is a child node
@@ -332,11 +321,6 @@ module CollectiveIdea #:nodoc:
           without_self self_and_descendants
         end
 
-        # Returns a set of only this entry's immediate children
-        def children
-          nested_set_scope.scoped :conditions => {parent_column_name => self}
-        end
-
         def is_descendant_of?(other)
           other.left < self.left && self.left < other.right && same_scope?(other)
         end

data/test/awesome_nested_set_test.rb

@@ -3,18 +3,17 @@ require 'test_helper'
 class Note < ActiveRecord::Base
   acts_as_nested_set :scope => [:notable_id, :notable_type]
 end
+class Default < ActiveRecord::Base
+  acts_as_nested_set
+  set_table_name 'categories'
+end
+class ScopedCategory < ActiveRecord::Base
+  acts_as_nested_set :scope => :organization
+  set_table_name 'categories'
+end
 
 class AwesomeNestedSetTest < TestCaseClass
 
-  class Default < ActiveRecord::Base
-    acts_as_nested_set
-    set_table_name 'categories'
-  end
-  class Scoped < ActiveRecord::Base
-    acts_as_nested_set :scope => :organization
-    set_table_name 'categories'
-  end
-
   def test_left_column_default
     assert_equal 'lft', Default.acts_as_nested_set_options[:left_column]
   end
@@ -73,7 +72,7 @@ class AwesomeNestedSetTest < TestCaseClass
   end
   
   def test_scoped_appends_id
-    assert_equal :organization_id, Scoped.acts_as_nested_set_options[:scope]
+    assert_equal :organization_id, ScopedCategory.acts_as_nested_set_options[:scope]
   end
   
   def test_roots_class_method
@@ -110,7 +109,9 @@ class AwesomeNestedSetTest < TestCaseClass
     
     assert !categories(:top_level).leaf?
     assert !categories(:child_2).leaf?
+    assert !Category.new.leaf?
   end
+  
     
   def test_parent
     assert_equal categories(:child_2), categories(:child_2_1).parent
@@ -213,7 +214,7 @@ class AwesomeNestedSetTest < TestCaseClass
   end
 
   def test_is_or_is_ancestor_of_with_scope
-    root = Scoped.root
+    root = ScopedCategory.root
     child = root.children.first
     assert root.is_or_is_ancestor_of?(child)
     child.update_attribute :organization_id, 'different'
@@ -239,7 +240,7 @@ class AwesomeNestedSetTest < TestCaseClass
   end
   
   def test_is_or_is_descendant_of_with_scope
-    root = Scoped.root
+    root = ScopedCategory.root
     child = root.children.first
     assert child.is_or_is_descendant_of?(root)
     child.update_attribute :organization_id, 'different'
@@ -247,7 +248,7 @@ class AwesomeNestedSetTest < TestCaseClass
   end
   
   def test_same_scope?
-    root = Scoped.root
+    root = ScopedCategory.root
     child = root.children.first
     assert child.same_scope?(root)
     child.update_attribute :organization_id, 'different'
@@ -668,4 +669,13 @@ class AwesomeNestedSetTest < TestCaseClass
     assert Category.valid?
   end
 
+  def test_creating_child_from_parent
+    category = categories(:child_2).children.create!(:name => "Child")
+    assert_equal categories(:child_2), category.parent
+    assert_equal categories(:child_2).id, category.parent_id
+    assert_not_nil category.left
+    assert_not_nil category.right
+    assert Category.valid?
+  end
+
 end

data/test/test_helper.rb

@@ -20,7 +20,6 @@ load(File.join(plugin_test_dir, "db", "schema.rb"))
 
 Dir["#{plugin_test_dir}/fixtures/*.rb"].each {|file| require file }
 
-
 class TestCaseClass #:nodoc:
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
   self.use_transactional_fixtures = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: collectiveidea-awesome_nested_set
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,6 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/collectiveidea/awesome_nested_set
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -79,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record