awesome_nested_set 3.0.0.rc.5 → 3.0.0.rc.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af145388371e47258be0fb9ed3c46ea172a6c3b
-  data.tar.gz: 4273003fd7e7fc00b0a5758001f1cc92af41ffeb
+  metadata.gz: ebe27a6d3e69be31c797a0d3c663f3677d68b302
+  data.tar.gz: e9f0144d3430f05b4b5af855f8f58a9cd3cd174d
 SHA512:
-  metadata.gz: 035d190dd06666e3fe5d01a36c70223b5150b27d21df6d3bcec5e5923180bde66090eee1f41263747b662f5d6b690aa55d509d8a14209e1dc0831d8424a8ff62
-  data.tar.gz: 99c75707c323da2add1d619c652fae8357396c75c3034a4c9dca92a359a24ed278e0501adf775b007d14e63a3d1c1c4155e1ed3b94f8ce84b756ed2c7a29507a
+  metadata.gz: bd9ddf03673994b9ff5cdb2a7c855f507aab5c69c1bf8eb21a367d1601634709932482d690e17baf34e5713b1f08cfabf47e50d4a9b1b76e400d9d4ed85d1971
+  data.tar.gz: be3ee9c75fbc3179ed6c75776edb9b65fde98ad2a7b415023d922748f5bd4b288785485e23109bf69bac45b21484f75ea9127999a942fe04ef59fc61e9e02a01

data/README.md

@@ -7,7 +7,7 @@
 Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models.
 It is a replacement for acts_as_nested_set and BetterNestedSet, but more awesome.
 
-Version 2 supports Rails 3. Gem versions prior to 2.0 support Rails 2.
+Version 2 supports Rails 3 and Rails 4. Gem versions prior to 2.0 support Rails 2.
 
 ## What makes this so awesome?
 
@@ -151,6 +151,50 @@ class Category < ActiveRecord::Base
 end
 ```
 
+
+## Add to your existing project
+
+To make use of `awesome_nested_set`, your model needs to have 3 fields:
+`lft`, `rgt`, and `parent_id`. The names of these fields are configurable.
+You can also have an optional field, `depth`.
+
+Create a migration to add fields:
+
+```ruby
+class AddNestedToCategories < ActiveRecord::Migration
+
+  def self.up
+    add_column :categories, :parent_id, :integer # Comment this line if your project already has this column
+    # Category.where(parent_id: 0).update_all(parent_id: nil) # Uncomment this line if your project already has :parent_id
+    add_column :categories, :lft      , :integer
+    add_column :categories, :rgt      , :integer
+    add_column :categories, :depth    , :integer  # this is optional.
+
+    # This is necessary to update :lft and :rgt columns
+    Category.rebuild!
+  end
+
+  def self.down
+    remove_column :categories, :parent_id
+    remove_column :categories, :lft
+    remove_column :categories, :rgt
+    remove_column :categories, :depth  # this is optional.
+  end
+
+end
+```
+
+Enable the nested set functionality by declaring `acts_as_nested_set` on your model
+
+```ruby
+class Category < ActiveRecord::Base
+  acts_as_nested_set
+end
+```
+
+Your project is now ready to run with the `awesome_nested_set` gem!
+
+
 ## Conversion from other trees
 
 Coming from acts_as_tree or another system where you only have a parent_id? No problem. Simply add the lft & rgt fields as above, and then run:

data/lib/awesome_nested_set/columns.rb

@@ -63,6 +63,10 @@ module CollectiveIdea #:nodoc:
           "#{quoted_table_name}.#{quoted_primary_column_name}"
         end
 
+        def quoted_order_column_full_name
+          "#{quoted_table_name}.#{quoted_order_column_name}"
+        end
+
         def quoted_left_column_full_name
           "#{quoted_table_name}.#{quoted_left_column_name}"
         end

data/lib/awesome_nested_set/model.rb

@@ -79,7 +79,7 @@ module CollectiveIdea #:nodoc:
           end
 
           def nested_set_scope(options = {})
-            options = {:order => quoted_order_column_name}.merge(options)
+            options = {:order => quoted_order_column_full_name}.merge(options)
 
             where(options[:conditions]).order(options.delete(:order))
           end

data/lib/awesome_nested_set/model/movable.rb

@@ -29,7 +29,7 @@ module CollectiveIdea #:nodoc:
             move_to node, :left
           end
 
-          # Move the node to the left of another node
+          # Move the node to the right of another node
           def move_to_right_of(node)
             move_to node, :right
           end
@@ -46,7 +46,17 @@ module CollectiveIdea #:nodoc:
             elsif node.children.count == index
               move_to_right_of(node.children.last)
             else
-              move_to_left_of(node.children[index])
+              my_position = node.children.index(self)
+              if my_position && my_position < index
+                # e.g. if self is at position 0 and we want to move self to position 1 then self
+                # needs to move to the *right* of the node at position 1. That's because the node
+                # that is currently at position 1 will be at position 0 after the move completes.
+                move_to_right_of(node.children[index])
+              elsif my_position && my_position == index
+                # do nothing. already there.
+              else
+                move_to_left_of(node.children[index])
+              end
             end
           end
 

data/lib/awesome_nested_set/model/prunable.rb

@@ -19,6 +19,9 @@ module CollectiveIdea #:nodoc:
               # update lefts and rights for remaining nodes
               update_siblings_for_remaining_nodes
 
+              # Reload is needed because children may have updated their parent (self) during deletion.
+              reload
+
               # Don't allow multiple calls to destroy to corrupt the set
               self.skip_before_destroy = true
             end

data/lib/awesome_nested_set/model/transactable.rb

@@ -10,8 +10,8 @@ module CollectiveIdea #:nodoc:
             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 self.class.connection.open_transactions.zero?
+              raise unless error.message =~ /[Dd]eadlock|Lock wait timeout exceeded/
               raise unless retry_count < 10
               retry_count += 1
               logger.info "Deadlock detected on retry #{retry_count}, restarting transaction"

data/lib/awesome_nested_set/model/validatable.rb

@@ -17,7 +17,7 @@ module CollectiveIdea
           def no_duplicates_for_columns?
             [quoted_left_column_full_name, quoted_right_column_full_name].all? do |column|
               # No duplicates
-              select("#{scope_string}#{column}, COUNT(#{column})").
+              select("#{scope_string}#{column}, COUNT(#{column}) as _count").
                 group("#{scope_string}#{column}", quoted_primary_key_column_full_name).
                 having("COUNT(#{column}) > 1").
                 order(quoted_primary_key_column_full_name).

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.0.rc.5' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.0.rc.6' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.5
+  version: 3.0.0.rc.6
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord