closure_tree 3.3.2 → 3.4.0

data/README.md

@@ -88,25 +88,31 @@ Child nodes are created by appending to the children collection:
 parent = grandparent.children.create(:name => 'Parent')
 ```
 
-You can also append to the children collection:
+Or by giving the parent to the constructor:
 
 ```ruby
-child1 = Tag.create(:name => 'First Child')
-parent.children << child1
+child1 = Tag.create(:name => 'First Child', :parent => parent)
 ```
 
-Or call the "add_child" method:
+Or by appending to the children collection:
 
 ```ruby
-child2 = Tag.create(:name => 'Second Child')
-parent.add_child child2
+child2 = Tag.new(:name => 'Second Child')
+parent.children << child2
+```
+
+Or by calling the "add_child" method:
+
+```ruby
+child3 = Tag.new(:name => 'Third Child')
+parent.add_child child3
 ```
 
 Then:
 
 ```ruby
 grandparent.self_and_descendants.collect(&:name)
-=> ["Grandparent", "Parent", "First Child", "Second Child"]
+=> ["Grandparent", "Parent", "First Child", "Second Child", "Third Child"]
 
 child1.ancestry_path
 => ["Grandparent", "Parent", "First Child"]
@@ -116,9 +122,9 @@ child1.ancestry_path
 
 We can do all the node creation and add_child calls with one method call:
 
-  ```ruby
-  child = Tag.find_or_create_by_path(["grandparent", "parent", "child"])
-  ```
+```ruby
+child = Tag.find_or_create_by_path(["grandparent", "parent", "child"])
+```
 
 You can ```find``` as well as ```find_or_create``` by "ancestry paths".
 Ancestry paths may be built using any column in your model. The default
@@ -317,6 +323,12 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
+### 3.4.0
+
+Fixed [issue 15](https://github.com/mceachen/closure_tree/issues/15):
+* "parent" is now attr_accessible, which adds support for constructor-provided parents.
+* updated readme accordingly
+
 ### 3.3.2
 
 * Merged calebphillips' patch for a more efficient leaves query

data/lib/closure_tree/acts_as_tree.rb

@@ -47,6 +47,8 @@ module ClosureTree
         :class_name => ct_class.to_s,
         :foreign_key => parent_column_name
 
+      attr_accessible :parent
+
       has_many :children, with_order_option(
         :class_name => ct_class.to_s,
           :foreign_key => parent_column_name,

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.3.2" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.4.0" unless defined?(::ClosureTree::VERSION)
 end

data/spec/cuisine_type_spec.rb

@@ -1,18 +1,27 @@
 require 'spec_helper'
 
+def assert_lineage(e, m)
+  m.parent.should == e
+  m.self_and_ancestors.should == [m, e]
+
+  # make sure reloading doesn't affect the self_and_ancestors:
+  m.reload
+  m.self_and_ancestors.should == [m, e]
+end
+
 describe CuisineType do
-  it "finds self and parents properly" do
+  it "finds self and parents when children << is used" do
     e = CuisineType.new(:name => "e")
     m = CuisineType.new(:name => "m")
     e.children << m
     e.save
+    assert_lineage(e, m)
+  end
 
-    m.parent.should == e
-    m.self_and_ancestors.should == [m, e]
-
-    # make sure reloading doesn't affect the self_and_ancestors:
-    m.reload
-    m.self_and_ancestors.should == [m, e]
+  it "finds self and parents properly if the constructor is used" do
+    e = CuisineType.create(:name => "e")
+    m = CuisineType.create(:name => "m", :parent => e)
+    assert_lineage(e, m)
   end
 
   it "sets the table_name of the hierarchy class properly" do

data/spec/support/models.rb

@@ -40,8 +40,8 @@ class Contract < ActiveRecord::Base
 end
 
 class Label < ActiveRecord::Base
+  attr_accessible :name # < - make sure order doesn't matter
   acts_as_tree :order => "sort_order"
-  attr_accessible :name
 
   def to_s
     "#{self.class}: #{name}"

data/spec/tag_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 shared_examples_for Tag do
+
+  it "has correct accessible_attributes" do
+    Tag.accessible_attributes.to_a.should =~ %w(parent name)
+  end
+
   describe "empty db" do
 
     def nuke_db
@@ -140,9 +145,31 @@ shared_examples_for Tag do
       b.hash_tree(:limit_depth => 3).should == b_tree
       b.hash_tree.should == b_tree
     end
+
+    it "performs as the readme says it does" do
+      grandparent = Tag.create(:name => 'Grandparent')
+      parent = grandparent.children.create(:name => 'Parent')
+      child1 = Tag.create(:name => 'First Child', :parent => parent)
+      child2 = Tag.new(:name => 'Second Child')
+      parent.children << child2
+      child3 = Tag.new(:name => 'Third Child')
+      parent.add_child child3
+      grandparent.self_and_descendants.collect(&:name).should ==
+        ["Grandparent", "Parent", "First Child", "Second Child", "Third Child"]
+      child1.ancestry_path.should ==
+        ["Grandparent", "Parent", "First Child"]
+      child3.ancestry_path.should ==
+        ["Grandparent", "Parent", "Third Child"]
+      d = Tag.find_or_create_by_path %w(a b c d)
+      h = Tag.find_or_create_by_path %w(e f g h)
+      e = h.root
+      d.add_child(e) # "d.children << e" would work too, of course
+      h.ancestry_path.should == %w(a b c d e f g h)
+    end
+
   end
 
-  describe Tag do
+  describe "Tag with fixtures" do
 
     fixtures :tags
 
@@ -353,24 +380,6 @@ shared_examples_for Tag do
       city.self_and_ancestors.should == [city, tags(:california), tags(:united_states), tags(:places)]
     end
 
-    it "performs as the readme says it does" do
-      grandparent = Tag.create(:name => 'Grandparent')
-      parent = grandparent.children.create(:name => 'Parent')
-      child1 = Tag.create(:name => 'First Child')
-      parent.children << child1
-      child2 = Tag.create(:name => 'Second Child')
-      parent.add_child child2
-      grandparent.self_and_descendants.collect(&:name).should ==
-        ["Grandparent", "Parent", "First Child", "Second Child"]
-      child1.ancestry_path.should ==
-        ["Grandparent", "Parent", "First Child"]
-      d = Tag.find_or_create_by_path %w(a b c d)
-      h = Tag.find_or_create_by_path %w(e f g h)
-      e = h.root
-      d.add_child(e) # "d.children << e" would work too, of course
-      h.ancestry_path.should == %w(a b c d e f g h)
-    end
-
   end
 end
 
@@ -386,3 +395,4 @@ describe "Tag with AR whitelisted attributes enabled" do
   it_behaves_like Tag
 end
 
+

data/spec/user_spec.rb

@@ -113,7 +113,7 @@ describe "empty db" do
 
     a.save
     User.roots.should == [a]
-    User.leaves.should == [b1, c1, d]
+    User.leaves.should =~ [b1, c1, d]
     d.ancestry_path.should == %w(a b2 c2 d)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -35,7 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -51,7 +51,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -67,7 +67,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -83,7 +83,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -99,7 +99,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -115,7 +115,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -131,7 +131,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -147,7 +147,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -155,9 +155,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    A mostly-API-compatible replacement for the acts_as_tree and awesome_nested_set
-  gems,\n    but with much better mutation performance thanks to the Closure Tree
-  storage algorithm\n"
+description: Easily and efficiently make your ActiveRecord model support hierarchies
 email:
 - matthew-github@mceachen.org
 executables: []
@@ -194,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2505204839193156816
+      hash: 1501864790180733571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,13 +201,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2505204839193156816
+      hash: 1501864790180733571
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Hierarchies for ActiveRecord models using a Closure Tree storage algorithm
+summary: Easily and efficiently make your ActiveRecord model support hierarchies
 test_files:
 - spec/cuisine_type_spec.rb
 - spec/db/database.yml