closure_tree 2.0.0.beta1 → 2.0.0

data/README.md

@@ -10,13 +10,13 @@ for a description of different tree storage algorithms.
 
 ## Setup
 
-Note that closure_tree is being developed for Rails 3.1.0.rc1
+Note that closure_tree is being developed for Rails 3.1.x
 
 1.  Add this to your Gemfile: ```gem 'closure_tree'```
 
 2.  Run ```bundle install```
 
-3.  Add ```acts_as_tree``` to your hierarchical model(s) (see the <a href="#options">available options</a>).
+3.  Add ```acts_as_tree``` to your hierarchical model(s) (see the <em>Available options</em> section below for details).
 
 4.  Add a migration to add a ```parent_id``` column to the model you want to act_as_tree.
 
@@ -67,23 +67,29 @@ Note that closure_tree is being developed for Rails 3.1.0.rc1
 Create a root node:
 
   ```ruby
-  grandparent = Tag.create!(:name => 'Grandparent')
+  grandparent = Tag.create(:name => 'Grandparent')
   ```
 
-There are two equivalent ways to add children. Either use the ```add_child``` method:
+Child nodes are created by appending to the children collection:
 
   ```ruby
-  parent = Tag.create!(:name => 'Parent')
-  grandparent.add_child parent
+  child = parent.children.create(:name => 'Child')
   ```
 
-Or append to the ```children``` collection:
+You can also append to the children collection:
 
   ```ruby
-  child = Tag.create!(:name => 'Child')
+  child = Tag.create(:name => 'Child')
   parent.children << child
   ```
-  
+
+Or call the "add_child" method:
+
+  ```ruby
+  parent = Tag.create(:name => 'Parent')
+  grandparent.add_child parent
+  ```
+
 Then:
 
   ```ruby
@@ -99,7 +105,7 @@ Then:
 We can do all the node creation and add_child calls from the prior section with one method call:
 
   ```ruby
-  child = Tag.find_or_create_by_path "grandparent", "parent", "child"
+  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 column is ```name```, which can be changed with the :name_column option provided to ```acts_as_tree```.
@@ -111,13 +117,13 @@ Note that the other columns will be null if nodes are created, other than auto-g
 
 When you include ```acts_as_tree``` in your model, you can provide a hash to override the following defaults:
 
-* ```:parent_column_name``` to override the column name of the parent foreign key in the model's table
+* ```:parent_column_name``` to override the column name of the parent foreign key in the model's table. This defaults to "parent_id".
 * ```:hierarchy_table_name``` to override the hierarchy table name. This defaults to the singular name of the model + "_hierarchies".
-* ```:name_column``` used by #```find_or_create_by_path```, #```find_by_path```, and ```ancestry_path``` instance methods. This is primarily useful if the model only has one required field (like a "tag").
 * ```:dependent``` determines what happens when a node is destroyed. Defaults to ```nil```.
-    * ```nil``` will simply set the parent column to null. Each child node will be considered a "root" node
+    * ```:nullify``` will simply set the parent column to null. Each child node will be considered a "root" node. This is the default.
     * ```:delete_all``` will delete all descendant nodes (which circumvents the destroy hooks)
     * ```:destroy``` will destroy all descendant nodes (which runs the destroy hooks on each child node)
+* ```:name_column``` used by #```find_or_create_by_path```, #```find_by_path```, and ```ancestry_path``` instance methods. This is primarily useful if the model only has one required field (like a "tag").
 
 ## Accessing Data
 
@@ -143,8 +149,7 @@ When you include ```acts_as_tree``` in your model, you can provide a hash to ove
 * ``` tag.self_and_siblings``` returns an array of brothers and sisters (all at that level), including self.
 * ``` tag.descendants``` returns an array of all children, childrens' children, etc., excluding self.
 * ``` tag.self_and_descendants``` returns an array of all children, childrens' children, etc., including self.
-* ``` tag.reparent``` lets you move a node (and all it's children) to a new parent.
-* ``` tag.destroy``` will destroy a node as well as possibly all of its children. See the ```:dependent``` option passed to ```acts_as_tree```.
+* ``` tag.destroy``` will destroy a node and do <em>something</em> to its children, which is determined by the ```:dependent``` option passed to ```acts_as_tree```.
 
 ## Changelog
 
@@ -152,7 +157,6 @@ When you include ```acts_as_tree``` in your model, you can provide a hash to ove
 
 * Had to increment the major version, as rebuild! will need to be called by prior consumers to support the new ```leaves``` class and instance methods.
 * Tag deletion is supported now along with ```:dependent => :destroy``` and ```:dependent => :delete_all```
-* Added new instance method ```reparent```
 * Switched from default rails plugin directory structure to rspec
 
 ## Thanks to

data/Rakefile

@@ -15,3 +15,6 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+# Run the specs using all the different database engines:
+# for DB in sqlite3 mysql postgresql ; do rake ; done

data/lib/closure_tree/acts_as_tree.rb

@@ -242,22 +242,6 @@ module ClosureTree
         root = roots.send("find_or_create_by_#{name_column}", path.shift)
         root.find_or_create_by_path(*path)
       end
-
-      # From https://github.com/collectiveidea/awesome_nested_set:
-      def in_tenacious_transaction(&block)
-        retry_count = 0
-        begin
-          transaction(&block)
-        rescue ActiveRecord::StatementInvalid => error
-          raise unless connection.open_transactions.zero?
-          raise unless error.message =~ /Deadlock found when trying to get lock|Lock wait timeout exceeded/
-          raise unless retry_count < 10
-          retry_count += 1
-          logger.info "Deadlock detected on retry #{retry_count}, restarting transaction"
-          sleep(rand(retry_count)*0.2) # Aloha protocol
-          retry
-        end
-      end
     end
   end
 

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "2.0.0.beta1" unless defined?(::ClosureTree::VERSION)
+  VERSION = "2.0.0" unless defined?(::ClosureTree::VERSION)
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: closure_tree
 version: !ruby/object:Gem::Version 
-  hash: 62196449
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - beta
-  - 1
-  version: 2.0.0.beta1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -79,14 +77,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: