awesome_nested_set 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.0.2
+* Fixed deprecation warning under Rails 3.1 [Philip Arndt]
+* Converted Test::Unit matchers to RSpec. [Uģis Ozols]
+* Added inverse_of to associations to improve performance rendering trees. [Sergio Cambra]
+* Added row locking and fixed some race conditions. [Markus J. Q. Roberts]
+
+2.0.1
+* Fixed a bug with move_to not using nested_set_scope [Andreas Sekine]
+
 2.0.0.pre
 * Expect Rails 3
 * Changed how callbacks work. Returning false in a before_move action does not block save operations. Use a validation or exception in the callback if you need that.

data/README.rdoc

@@ -39,7 +39,7 @@ Enable the nested set functionality by declaring acts_as_nested_set on your mode
     acts_as_nested_set
   end
 
-Run `rake rdoc` to generate the API docs and see CollectiveIdea::Acts::NestedSet::Model::SingletonMethods for more info.
+Run `rake rdoc` to generate the API docs and see CollectiveIdea::Acts::NestedSet for more info.
 
 == Conversion from other trees
 

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -51,8 +51,8 @@ module CollectiveIdea #:nodoc:
           options[:scope] = "#{options[:scope]}_id".intern
         end
 
-        write_inheritable_attribute :acts_as_nested_set_options, options
-        class_inheritable_reader :acts_as_nested_set_options
+        class_attribute :acts_as_nested_set_options
+        self.acts_as_nested_set_options = options
 
         include CollectiveIdea::Acts::NestedSet::Model
         include Columns
@@ -60,9 +60,11 @@ module CollectiveIdea #:nodoc:
 
         belongs_to :parent, :class_name => self.base_class.to_s,
           :foreign_key => parent_column_name,
-          :counter_cache => options[:counter_cache]
+          :counter_cache => options[:counter_cache],
+          :inverse_of => :children
         has_many :children, :class_name => self.base_class.to_s,
-          :foreign_key => parent_column_name, :order => quoted_left_column_name
+          :foreign_key => parent_column_name, :order => quoted_left_column_name,
+          :inverse_of => :parent
 
         attr_accessor :skip_before_destroy
 
@@ -88,7 +90,7 @@ module CollectiveIdea #:nodoc:
         scope :roots, where(parent_column_name => nil).order(quoted_left_column_name)
         scope :leaves, where("#{quoted_right_column_name} - #{quoted_left_column_name} = 1").order(quoted_left_column_name)
 
-        define_callbacks :move, :terminator => "result == false"
+        define_model_callbacks :move
       end
 
       module Model
@@ -382,8 +384,8 @@ module CollectiveIdea #:nodoc:
           # All nested set queries should use this nested_set_scope, which performs finds on
           # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
           # declaration.
-          def nested_set_scope
-            options = {:order => quoted_left_column_name}
+          def nested_set_scope(options = {})
+            options = {:order => quoted_left_column_name}.merge(options)
             scopes = Array(acts_as_nested_set_options[:scope])
             options[:conditions] = scopes.inject({}) do |conditions,attr|
               conditions.merge attr => self[attr]
@@ -406,7 +408,8 @@ module CollectiveIdea #:nodoc:
 
           # on creation, set automatically lft and rgt to the end of the tree
           def set_default_left_and_right
-            maxright = nested_set_scope.maximum(right_column_name) || 0
+            highest_right_row = nested_set_scope(:order => "#{quoted_right_column_name} desc").find(:first, :limit => 1,:lock => true )
+            maxright = highest_right_row ? highest_right_row[right_column_name] : 0
             # adds the new node to the right of all existing nodes
             self[left_column_name] = maxright + 1
             self[right_column_name] = maxright + 2
@@ -490,6 +493,11 @@ module CollectiveIdea #:nodoc:
                 # so sorting puts both the intervals and their boundaries in order
                 a, b, c, d = [self[left_column_name], self[right_column_name], bound, other_bound].sort
 
+                # select the rows in the model between a and d, and apply a lock
+                self.class.base_class.select('id').lock(true).where(
+                  ["#{quoted_left_column_name} >= :a and #{quoted_right_column_name} <= :d", {:a => a, :d => d}]
+                )
+
                 new_parent = case position
                   when :child;  target.id
                   when :root;   nil
@@ -561,4 +569,4 @@ module CollectiveIdea #:nodoc:
 
     end
   end
-end
+end

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '2.0.1' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '2.0.2' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,18 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: awesome_nested_set
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
-  version: 2.0.1
+  segments: 
+  - 2
+  - 0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Brandon Keepers
 - Daniel Morrison
+- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -04:00
-default_executable: 
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -22,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -41,7 +51,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - CHANGELOG
-has_rdoc: true
 homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses: []
 
@@ -58,17 +67,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record