awesome_nested_set 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8c65ecba7e654a2e914de64f646e5e43416e47
-  data.tar.gz: c9d4bda2db60143062026f576080982698fa73ff
+  metadata.gz: f5ab643ea1dfe98a3df89d5bf2c142fd22d8d96f
+  data.tar.gz: 3f6089e375d849c9cb600eb4c776c40323b3e67e
 SHA512:
-  metadata.gz: 98ecf4b03fd84f510f84092fe197c73b8a6612dfd80444d9c4dd79d49bdfb3f0ebb4f47966f6ce5e02aadb9006682f1d5fc5cb9c6654682fff286d0585ec1dc1
-  data.tar.gz: efc4897f020894d3798c6c00782baa3de7409d14f02890608da4f8245f4dfc59708ac6771efe2f1667b8b9f324c78fb3705ddee1b7df3b8d403bbdb13298f6ba
+  metadata.gz: 3afe6283157bd9937196de7ffe4239dac7be930417b505b306c92685cfdd703d9cf7463317994bc822490f4a426c0c88f3f3425501036cd00b00025a6f81dc8c
+  data.tar.gz: d96cf10ce68aa34ccee951f3b04beec6eebd960748c42502ba48016b3f559cf798c657b2b9b36d4238c38d1ba0dbca08f53dab5f39f3d3bb37044dcb4dafe902

data/CHANGELOG

@@ -1,3 +1,10 @@
+3.0.4
+* Reuse the current model's connection when available [Tim Bugai] [#322](https://github.com/collectiveidea/awesome_nested_set/pull/322)
+
+3.0.3
+* Add :nullify option to :dependent functionality to orphan children rather
+than destroy them.
+
 3.0.2
 * Fix `dependent: :restrict_with_exception` not allowing a delete to occur. [Brendan Kilfoil]
 * Replace `Arel::SelectManager#join_sql` with `Arel::SelectManager#join_sources` as `Arel::Node#joins` accepts AST as well. [Swanand Pagnis]

data/README.md

@@ -35,10 +35,10 @@ class CreateCategories < ActiveRecord::Migration
       t.integer :parent_id, :null => true, :index => true
       t.integer :lft, :null => false, :index => true
       t.integer :rgt, :null => false, :index => true
-      
+
       # optional fields
-      t.integer :depth, :null => false
-      t.integer :children_count, :null => false
+      t.integer :depth, :null => false, :default => 0
+      t.integer :children_count, :null => false, :default => 0
     end
   end
 
@@ -63,13 +63,14 @@ Run `rake rdoc` to generate the API docs and see [CollectiveIdea::Acts::NestedSe
 You can pass various options to `acts_as_nested_set` macro. Configuration options are:
 
 * `parent_column`: specifies the column name to use for keeping the position integer (default: parent_id)
-* `left_column`: column name for left boundry data (default: lft)
-* `right_column`: column name for right boundry data (default: rgt)
+* `left_column`: column name for left boundary data (default: lft)
+* `right_column`: column name for right boundary data (default: rgt)
 * `depth_column`: column name for the depth data default (default: depth)
 * `scope`: restricts what is to be considered a list. Given a symbol, it'll attach “_id” (if it hasn't been already) and use that as the foreign key restriction. You can also pass an array to scope by multiple attributes. Example: `acts_as_nested_set :scope => [:notable_id, :notable_type]`
-* `dependent`: behavior for cascading destroy. If set to :destroy, all the child objects are destroyed alongside this object by calling their destroy method. If set to :delete_all (default), all the child objects are deleted without calling their destroy method.
+* `dependent`: behavior for cascading destroy. If set to :destroy, all the child objects are destroyed alongside this object by calling their destroy method. If set to :delete_all (default), all the child objects are deleted without calling their destroy method. If set to :nullify, all child objects will become orphaned and become roots themselves.
 * `counter_cache`: adds a counter cache for the number of children. defaults to false. Example: `acts_as_nested_set :counter_cache => :children_count`
 * `order_column`: on which column to do sorting, by default it is the left_column_name. Example: `acts_as_nested_set :order_column => :position`
+* `touch`: If set to `true`, then the updated_at timestamp on the ancestors will be set to the current time whenever this object is saved or destroyed (default: false)
 
 See [CollectiveIdea::Acts::NestedSet::Model::ClassMethods](/lib/awesome_nested_set/model.rb#L26) for a list of class methods and [CollectiveIdea::Acts::NestedSet::Model](lib/awesome_nested_set/model.rb#L13) for a list of instance methods added to acts_as_nested_set models
 
@@ -157,7 +158,7 @@ end
 
 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`.
+You can also have optional fields, `depth` and `children_count`.
 
 Create a migration to add fields:
 
@@ -167,9 +168,12 @@ 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.
+    add_column :categories, :lft,       :integer
+    add_column :categories, :rgt,       :integer
+
+    # optional fields
+    add_column :categories, :depth,          :integer
+    add_column :categories, :children_count, :integer
 
     # This is necessary to update :lft and :rgt columns
     Category.rebuild!
@@ -179,7 +183,10 @@ class AddNestedToCategories < ActiveRecord::Migration
     remove_column :categories, :parent_id
     remove_column :categories, :lft
     remove_column :categories, :rgt
-    remove_column :categories, :depth  # this is optional.
+
+    # optional fields
+    remove_column :categories, :depth
+    remove_column :categories, :children_count
   end
 
 end
@@ -206,6 +213,8 @@ Category.rebuild!
 
 Your tree will be converted to a valid nested set. Awesome!
 
+Note: You can use `Category.rebuild!(false)` to skip model validations when performing the rebuild.
+
 ## View Helper
 
 The view helper is called #nested_set_options.

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -87,7 +87,7 @@ module CollectiveIdea #:nodoc:
           ) if acts_as_nested_set_options[ar_callback]
         end
 
-        has_many :children, -> { order(quoted_order_column_name) },
+        has_many :children, -> { order(quoted_order_column_full_name) },
                  has_many_children_options
       end
 

data/lib/awesome_nested_set/columns.rb

@@ -32,23 +32,23 @@ module CollectiveIdea #:nodoc:
         end
 
         def quoted_left_column_name
-          ActiveRecord::Base.connection.quote_column_name(left_column_name)
+          model_connection.quote_column_name(left_column_name)
         end
 
         def quoted_right_column_name
-          ActiveRecord::Base.connection.quote_column_name(right_column_name)
+          model_connection.quote_column_name(right_column_name)
         end
 
         def quoted_depth_column_name
-          ActiveRecord::Base.connection.quote_column_name(depth_column_name)
+          model_connection.quote_column_name(depth_column_name)
         end
 
         def quoted_primary_column_name
-          ActiveRecord::Base.connection.quote_column_name(primary_column_name)
+          model_connection.quote_column_name(primary_column_name)
         end
 
         def quoted_parent_column_name
-          ActiveRecord::Base.connection.quote_column_name(parent_column_name)
+          model_connection.quote_column_name(parent_column_name)
         end
 
         def quoted_scope_column_names
@@ -56,7 +56,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def quoted_order_column_name
-          ActiveRecord::Base.connection.quote_column_name(order_column)
+          model_connection.quote_column_name(order_column)
         end
 
         def quoted_primary_key_column_full_name
@@ -78,6 +78,10 @@ module CollectiveIdea #:nodoc:
         def quoted_parent_column_full_name
           "#{quoted_table_name}.#{quoted_parent_column_name}"
         end
+
+        def model_connection
+          self.is_a?(Class) ? self.connection : self.class.connection
+        end
       end
     end
   end

data/lib/awesome_nested_set/model/prunable.rb

@@ -51,7 +51,9 @@ module CollectiveIdea #:nodoc:
                 return false
               end
               return true
-            else
+             elsif acts_as_nested_set_options[:dependent] == :nullify
+               descendants.update_all(parent_id: nil)
+             else
               descendants.delete_all
             end
           end

data/lib/awesome_nested_set/model/transactable.rb

@@ -3,16 +3,23 @@ module CollectiveIdea #:nodoc:
     module NestedSet #:nodoc:
       module Model
         module Transactable
+          class OpenTransactionsIsNotZero < ActiveRecord::StatementInvalid
+          end
+
+          class DeadlockDetected < ActiveRecord::StatementInvalid
+          end
 
           protected
           def in_tenacious_transaction(&block)
             retry_count = 0
             begin
               transaction(&block)
+            rescue CollectiveIdea::Acts::NestedSet::Move::ImpossibleMove
+              raise
             rescue ActiveRecord::StatementInvalid => error
-              raise unless self.class.connection.open_transactions.zero?
+              raise OpenTransactionsIsNotZero.new(error.message) unless connection.open_transactions.zero?
               raise unless error.message =~ /[Dd]eadlock|Lock wait timeout exceeded/
-              raise unless retry_count < 10
+              raise DeadlockDetected.new(error.message) unless retry_count < 10
               retry_count += 1
               logger.info "Deadlock detected on retry #{retry_count}, restarting transaction"
               sleep(rand(retry_count)*0.1) # Aloha protocol

data/lib/awesome_nested_set/move.rb

@@ -110,9 +110,12 @@ module CollectiveIdea #:nodoc:
           [bound, other_bound]
         end
 
+        class ImpossibleMove < ActiveRecord::StatementInvalid
+        end
+
         def prevent_impossible_move
           if !root && !instance.move_possible?(target)
-            raise ActiveRecord::ActiveRecordError, "Impossible move, target node cannot be inside moved tree."
+            raise ImpossibleMove, "Impossible move, target node cannot be inside moved tree."
           end
         end
 

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.2' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.3' 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.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record
 test_files: []
-has_rdoc: