awesome_nested_set 3.0.0.rc.3 → 3.0.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb0aa9b299be85ac9ebc3494b827cb6b3afa971
-  data.tar.gz: f20762bfeacacd7f8f511696113ee55425a6939f
+  metadata.gz: b906a0322b3f2d297483d2ba0b15ff50388291a6
+  data.tar.gz: 350093eb665d7ae7c23de6338d0f1793c11d8e8a
 SHA512:
-  metadata.gz: 1144392749d797cbb0800004e3b21aac3080e6a6af9e6a25afbf598c7343ee2a7806f99ae4b5abbd1ce93b7e63e90b5c968098080eb99070d01ec54843d97dae
-  data.tar.gz: 3c75b37d2f71c763668ef7f76ad9406339494ac6b6d62223231dc9319b21462fd8b91b3bc06d99741e81d4e99febd8c123b06a1464c89ee1a73b07177c85ca11
+  metadata.gz: 6e90aeca23cb8729cccbf9b87f47176363fc009797eb0ec929823093ebdcd2a4c7dfd590bb2aee131defb15b0de8780a32d5ade6ad0e8de6c2897a7522c5ae84
+  data.tar.gz: c09e4c671b3c45e7092ccde2c5c9f0e865fc6748cc85433350f342b3e5f83cf0737459ff6f15cabc989afb78df53198a5beba908c4cf5a9afd7672e75e76491a

data/CHANGELOG

@@ -1,3 +1,5 @@
+* Support Rails 4.1 [Micah Geisel]
+* Support dependent: restrict_with_error [Tiago Moraes]
 * Added information to the README regarding indexes to be added for performance [bdarfler]
 * Modified associate_parents to add child objects to the parent#children collection [Tiago Moraes]
 

data/README.md

@@ -1,5 +1,9 @@
 # AwesomeNestedSet
 
+[![Build Status][Build Status Image]][Build Status]
+[Build Status Image]: https://travis-ci.org/collectiveidea/awesome_nested_set.png?branch=master
+[Build Status]: https://travis-ci.org/collectiveidea/awesome_nested_set
+
 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.
 
@@ -53,6 +57,21 @@ end
 
 Run `rake rdoc` to generate the API docs and see [CollectiveIdea::Acts::NestedSet](lib/awesome_nested_set/awesome_nested_set.rb) for more information.
 
+## Options
+
+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)
+* `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.
+* `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`
+
+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
+
 ## Indexes
 
 It is highly recommended that you add an index to the `rgt` column on your models. Every insertion requires finding the next `rgt` value to use and this can be slow for large tables without an index. It is probably best to index the other fields as well (`parent_id`, `lft`, `depth`).

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -24,6 +24,7 @@ module CollectiveIdea #:nodoc:
       # Configuration options are:
       #
       # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
+      # * +:primary_column+ - specifies the column name to use as the inverse of the parent column (default: id)
       # * +:left_column+ - column name for left boundry data, default "lft"
       # * +:right_column+ - column name for right boundry data, default "rgt"
       # * +:depth_column+ - column name for the depth data, default "depth"
@@ -75,6 +76,7 @@ module CollectiveIdea #:nodoc:
         has_many_children_options = {
           :class_name => self.base_class.to_s,
           :foreign_key => parent_column_name,
+          :primary_key => primary_column_name,
           :inverse_of => (:parent unless acts_as_nested_set_options[:polymorphic]),
         }
 
@@ -92,20 +94,24 @@ module CollectiveIdea #:nodoc:
       def acts_as_nested_set_relate_parent!
         belongs_to :parent, :class_name => self.base_class.to_s,
                             :foreign_key => parent_column_name,
+                            :primary_key => primary_column_name,
                             :counter_cache => acts_as_nested_set_options[:counter_cache],
                             :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
-                            :polymorphic => acts_as_nested_set_options[:polymorphic]
+                            :polymorphic => acts_as_nested_set_options[:polymorphic],
+                            :touch => acts_as_nested_set_options[:touch]
       end
 
       def acts_as_nested_set_default_options
         {
           :parent_column => 'parent_id',
+          :primary_column => 'id',
           :left_column => 'lft',
           :right_column => 'rgt',
           :depth_column => 'depth',
           :dependent => :delete_all, # or :destroy
           :polymorphic => false,
-          :counter_cache => false
+          :counter_cache => false,
+          :touch => false
         }.freeze
       end
 

data/lib/awesome_nested_set/columns.rb

@@ -19,6 +19,10 @@ module CollectiveIdea #:nodoc:
           acts_as_nested_set_options[:parent_column]
         end
 
+        def primary_column_name
+          acts_as_nested_set_options[:primary_column]
+        end
+
         def order_column
           acts_as_nested_set_options[:order_column] || left_column_name
         end
@@ -39,6 +43,10 @@ module CollectiveIdea #:nodoc:
           ActiveRecord::Base.connection.quote_column_name(depth_column_name)
         end
 
+        def quoted_primary_column_name
+          ActiveRecord::Base.connection.quote_column_name(primary_column_name)
+        end
+
         def quoted_parent_column_name
           ActiveRecord::Base.connection.quote_column_name(parent_column_name)
         end
@@ -52,7 +60,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def quoted_primary_key_column_full_name
-          "#{quoted_table_name}.#{ActiveRecord::Base.connection.quote_column_name('id')}"
+          "#{quoted_table_name}.#{quoted_primary_column_name}"
         end
 
         def quoted_left_column_full_name

data/lib/awesome_nested_set/helper.rb

@@ -25,14 +25,14 @@ module CollectiveIdea #:nodoc:
           if class_or_item.is_a? Array
             items = class_or_item.reject { |e| !e.root? }
           else
-            class_or_item = class_or_item.roots if class_or_item.respond_to?(:scoped)
+            class_or_item = class_or_item.roots if class_or_item.respond_to?(:scope)
             items = Array(class_or_item)
           end
           result = []
           items.each do |root|
             result += root.class.associate_parents(root.self_and_descendants).map do |i|
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
-                [yield(i), i.id]
+                [yield(i), i.primary_id]
               end
             end.compact
           end

data/lib/awesome_nested_set/model.rb

@@ -27,7 +27,7 @@ module CollectiveIdea #:nodoc:
           def associate_parents(objects)
             return objects unless objects.all? {|o| o.respond_to?(:association)}
 
-            id_indexed = objects.index_by(&:id)
+            id_indexed = objects.index_by(&primary_column_name.to_sym)
             objects.each do |object|
               association = object.association(:parent)
               parent = id_indexed[object.parent_id]
@@ -85,7 +85,7 @@ module CollectiveIdea #:nodoc:
           end
 
           def primary_key_scope(id)
-            where arel_table[primary_key].eq(id)
+            where arel_table[primary_column_name].eq(id)
           end
 
           def root
@@ -106,6 +106,10 @@ module CollectiveIdea #:nodoc:
           target[parent_column_name]
         end
 
+        def primary_id(target = self)
+          target[primary_column_name]
+        end
+
         # Value of the left column
         def left(target = self)
           target[left_column_name]
@@ -146,7 +150,7 @@ module CollectiveIdea #:nodoc:
 
         def to_text
           self_and_descendants.map do |node|
-            "#{'*'*(node.level+1)} #{node.id} #{node.to_s} (#{node.parent_id}, #{node.left}, #{node.right})"
+            "#{'*'*(node.level+1)} #{node.primary_id} #{node.to_s} (#{node.parent_id}, #{node.left}, #{node.right})"
           end.join("\n")
         end
 
@@ -154,7 +158,7 @@ module CollectiveIdea #:nodoc:
 
         def without_self(scope)
           return scope if new_record?
-          scope.where(["#{self.class.quoted_table_name}.#{self.class.primary_key} != ?", self])
+          scope.where(["#{self.class.quoted_table_name}.#{self.class.quoted_primary_column_name} != ?", self.primary_id])
         end
 
         def store_new_parent
@@ -186,7 +190,7 @@ module CollectiveIdea #:nodoc:
 
           in_tenacious_transaction do
             reload
-            nested_set_scope.primary_key_scope(id).
+            nested_set_scope.primary_key_scope(primary_id).
               update_all(["#{quoted_depth_column_name} = ?", level])
           end
           self[depth_column_name] = self.level
@@ -210,7 +214,7 @@ module CollectiveIdea #:nodoc:
           if target.is_a? self.class.base_class
             target.reload
           elsif position != :root
-            nested_set_scope.find(target)
+            nested_set_scope.where(primary_column_name => target).first!
           end
         end
       end

data/lib/awesome_nested_set/model/prunable.rb

@@ -12,9 +12,9 @@ module CollectiveIdea #:nodoc:
             in_tenacious_transaction do
               reload_nested_set
               # select the rows in the model that extend past the deletion point and apply a lock
-              nested_set_scope.right_of(left).select(id).lock(true)
+              nested_set_scope.right_of(left).select(primary_id).lock(true)
 
-              destroy_or_delete_descendants
+              return false unless destroy_or_delete_descendants
 
               # update lefts and rights for remaining nodes
               update_siblings_for_remaining_nodes
@@ -32,6 +32,13 @@ module CollectiveIdea #:nodoc:
               end
             elsif acts_as_nested_set_options[:dependent] == :restrict_with_exception
               raise ActiveRecord::DeleteRestrictionError.new(:children) unless leaf?
+            elsif acts_as_nested_set_options[:dependent] == :restrict_with_error
+              unless leaf?
+                record = self.class.human_attribute_name(:children).downcase
+                errors.add(:base, :"restrict_dependent_destroy.many", record: record)
+                return false
+              end
+              return true
             else
               descendants.delete_all
             end

data/lib/awesome_nested_set/model/rebuildable.rb

@@ -22,7 +22,9 @@ module CollectiveIdea
             if acts_as_nested_set_options[:scope]
               scope = proc {|node|
                 scope_column_names.inject("") {|str, column_name|
-                  str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name))} "
+                  column_value = node.send(column_name)
+                  cond = column_value.nil? ? "IS NULL" : "= #{connection.quote(column_value)}"
+                  str << "AND #{connection.quote_column_name(column_name)} #{cond} "
                 }
               }
             end

data/lib/awesome_nested_set/model/relatable.rb

@@ -86,7 +86,7 @@ module CollectiveIdea
           def root
             return self_and_ancestors.children_of(nil).first if persisted?
 
-            if parent_id && current_parent = nested_set_scope.find(parent_id)
+            if parent_id && current_parent = nested_set_scope.where(primary_column_name => parent_id).first!
               current_parent.root
             else
               self

data/lib/awesome_nested_set/model/validatable.rb

@@ -20,6 +20,7 @@ module CollectiveIdea
               select("#{scope_string}#{column}, COUNT(#{column})").
                 group("#{scope_string}#{column}", quoted_primary_key_column_full_name).
                 having("COUNT(#{column}) > 1").
+                order(quoted_primary_key_column_full_name).
                 first.nil?
             end
           end

data/lib/awesome_nested_set/move.rb

@@ -24,8 +24,9 @@ module CollectiveIdea #:nodoc:
 
           lock_nodes_between! a, d
 
-          nested_set_scope.where(where_statement(a, d)).
-                           update_all(conditions(a, b, c, d))
+          nested_set_scope.where(where_statement(a, d)).update_all(
+            conditions(a, b, c, d)
+          )
         end
 
         private
@@ -33,6 +34,7 @@ module CollectiveIdea #:nodoc:
         delegate :left, :right, :left_column_name, :right_column_name,
                  :quoted_left_column_name, :quoted_right_column_name,
                  :quoted_parent_column_name, :parent_column_name, :nested_set_scope,
+                 :primary_column_name, :quoted_primary_column_name, :primary_id,
                  :to => :instance
 
         delegate :arel_table, :class, :to => :instance, :prefix => true
@@ -44,11 +46,23 @@ module CollectiveIdea #:nodoc:
         end
 
         def conditions(a, b, c, d)
+          _conditions = case_condition_for_direction(:quoted_left_column_name) +
+                        case_condition_for_direction(:quoted_right_column_name) +
+                        case_condition_for_parent
+
+          # We want the record to be 'touched' if it timestamps.
+          if @instance.respond_to?(:updated_at)
+            _conditions << ", updated_at = :timestamp"
+          end
+
           [
-           case_condition_for_direction(:quoted_left_column_name) +
-           case_condition_for_direction(:quoted_right_column_name) +
-           case_condition_for_parent,
-           {:a => a, :b => b, :c => c, :d => d, :id => instance.id, :new_parent => new_parent}
+            _conditions,
+            {
+              :a => a, :b => b, :c => c, :d => d,
+              :primary_id => instance.primary_id,
+              :new_parent_id => new_parent_id,
+              :timestamp => Time.now.utc
+            }
           ]
         end
 
@@ -64,23 +78,23 @@ module CollectiveIdea #:nodoc:
 
         def case_condition_for_parent
           "#{quoted_parent_column_name} = CASE " +
-            "WHEN #{instance_base_class.primary_key} = :id THEN :new_parent " +
+            "WHEN #{quoted_primary_column_name} = :primary_id THEN :new_parent_id " +
             "ELSE #{quoted_parent_column_name} END"
         end
 
         def lock_nodes_between!(left_bound, right_bound)
           # select the rows in the model between a and d, and apply a lock
           instance_base_class.right_of(left_bound).left_of_right_side(right_bound).
-                              select(:id).lock(true)
+                              select(primary_column_name).lock(true)
         end
 
         def root
           position == :root
         end
 
-        def new_parent
+        def new_parent_id
           case position
-          when :child then target.id
+          when :child then target.primary_id
           when :root  then nil
           else target[parent_column_name]
           end

data/lib/awesome_nested_set/set_validator.rb

@@ -18,8 +18,8 @@ module CollectiveIdea #:nodoc:
         attr_reader :model, :parent
         attr_accessor :scope
 
-        delegate :parent_column_name, :primary_key, :left_column_name, :right_column_name, :arel_table,
-          :quoted_table_name, :quoted_parent_column_full_name, :quoted_left_column_full_name, :quoted_right_column_full_name, :quoted_left_column_name, :quoted_right_column_name,
+        delegate :parent_column_name, :primary_column_name, :primary_key, :left_column_name, :right_column_name, :arel_table,
+          :quoted_table_name, :quoted_parent_column_full_name, :quoted_left_column_full_name, :quoted_right_column_full_name, :quoted_left_column_name, :quoted_right_column_name, :quoted_primary_column_name,
         :to => :model
 
         def query
@@ -28,7 +28,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def join_scope
-          join_arel = arel_table.join(parent, Arel::Nodes::OuterJoin).on(parent[primary_key].eq(arel_table[parent_column_name]))
+          join_arel = arel_table.join(parent, Arel::Nodes::OuterJoin).on(parent[primary_column_name].eq(arel_table[parent_column_name]))
           self.scope = scope.joins(join_arel.join_sql)
         end
 

data/lib/awesome_nested_set/tree.rb

@@ -42,7 +42,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def node_children(node)
-          model.where(["#{quoted_parent_column_full_name} = ? #{scope_for_rebuild.call(node)}", node]).
+          model.where(["#{quoted_parent_column_full_name} = ? #{scope_for_rebuild.call(node)}", node.primary_id]).
                 order(order_for_rebuild)
         end
 

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.0.rc.3' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.0.rc.4' 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.3
+  version: 3.0.0.rc.4
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,82 +10,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An awesome nested set implementation for Active Record
@@ -95,50 +95,50 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG
+- MIT-LICENSE
+- README.md
+- lib/awesome_nested_set.rb
 - lib/awesome_nested_set/awesome_nested_set.rb
 - lib/awesome_nested_set/columns.rb
 - lib/awesome_nested_set/helper.rb
 - lib/awesome_nested_set/iterator.rb
+- lib/awesome_nested_set/model.rb
 - lib/awesome_nested_set/model/movable.rb
 - lib/awesome_nested_set/model/prunable.rb
 - lib/awesome_nested_set/model/rebuildable.rb
 - lib/awesome_nested_set/model/relatable.rb
 - lib/awesome_nested_set/model/transactable.rb
 - lib/awesome_nested_set/model/validatable.rb
-- lib/awesome_nested_set/model.rb
 - lib/awesome_nested_set/move.rb
 - lib/awesome_nested_set/set_validator.rb
 - lib/awesome_nested_set/tree.rb
 - lib/awesome_nested_set/version.rb
-- lib/awesome_nested_set.rb
-- MIT-LICENSE
-- README.md
-- CHANGELOG
 homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --inline-source
-- --line-numbers
+- "--inline-source"
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record