awesome_nested_set 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03913da2bc68032de674546a99f3650d3f4bab01
-  data.tar.gz: 163efbd91c3037f8b30320be60a597c598764da9
+  metadata.gz: 8f8c65ecba7e654a2e914de64f646e5e43416e47
+  data.tar.gz: c9d4bda2db60143062026f576080982698fa73ff
 SHA512:
-  metadata.gz: 3ded8c47fca3edb7ef59fe7198e11ab661291aa0b4813a357bf6c17ac890ea6cbc4a44520e52c1622d6988867a9d75cd75a9a7d48ae7034181c3881a1636aae3
-  data.tar.gz: a4cf617782266c5b0c29170813ed1f612d704a5d5bb3fd13c7e0f4686625d91017a3cafc3200bf4277982aedbbcff804d591cfbf20d58d6db7877466a9e605ec
+  metadata.gz: 98ecf4b03fd84f510f84092fe197c73b8a6612dfd80444d9c4dd79d49bdfb3f0ebb4f47966f6ce5e02aadb9006682f1d5fc5cb9c6654682fff286d0585ec1dc1
+  data.tar.gz: efc4897f020894d3798c6c00782baa3de7409d14f02890608da4f8245f4dfc59708ac6771efe2f1667b8b9f324c78fb3705ddee1b7df3b8d403bbdb13298f6ba

data/CHANGELOG

@@ -1,9 +1,21 @@
+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]
+* Corrected nested_set_scope usage. [Finbarr Taylor] [#292](https://github.com/collectiveidea/awesome_nested_set/pull/292)
+* Fix bug: when model with default_scope make #lft and #rgt wrong [eddie](https://github.com/afunction) [#281](https://github.com/collectiveidea/awesome_nested_set/pull/281)
+* [Compare to 3.0.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.0.1...v3.0.2)
+
+3.0.1
+* Fixed `dependent: :destroy` when called from associated object. #162 [Kuldeep Aggarwal]
+* [Compare to 3.0.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.0.0...v3.0.1)
+
 3.0.0
 * 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]
-* Fixed `dependent: :destroy` when called from associated object. #162 [Kuldeep Aggarwal]
+* Fix `dependent: :restrict_with_exception` not allowing a delete to occur. [Brendan Kilfoil]
+* [Compare to v2.1.6](https://github.com/collectiveidea/awesome_nested_set/compare/v2.1.6...v3.0.0)
 
 2.1.6
 * Fixed rebuild! when there is a default_scope with order [Adrian Serafin]

data/README.md

@@ -23,19 +23,22 @@ gem 'awesome_nested_set'
 
 ## Usage
 
-To make use of `awesome_nested_set`, your model needs to have 3 fields:
+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`. These fields are configurable.
 
 ```ruby
 class CreateCategories < ActiveRecord::Migration
   def self.up
     create_table :categories do |t|
       t.string :name
-      t.integer :parent_id
-      t.integer :lft
-      t.integer :rgt
-      t.integer :depth # this is optional.
+      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
     end
   end
 

data/lib/awesome_nested_set/model.rb

@@ -145,7 +145,18 @@ module CollectiveIdea #:nodoc:
             end
           end
 
-          self.class.base_class.nested_set_scope options
+          self.class.base_class.unscoped.nested_set_scope options
+        end
+
+        # Separate an other `nested_set_scope` for unscoped model
+        # because normal query still need activerecord `default_scope`
+        # Only activerecord callbacks need unscoped model to handle the nested set records
+        # And class level `nested_set_scope` seems just for query `root` `child` .. etc
+        # I think we don't have to provide unscoped `nested_set_scope` in class level.
+        def nested_set_scope_without_default_scope(*args)
+          self.class.unscoped do
+            nested_set_scope(*args)
+          end
         end
 
         def to_text
@@ -171,7 +182,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def right_most_node
-          @right_most_node ||= self.class.base_class.unscoped.nested_set_scope(
+          @right_most_node ||= nested_set_scope(
             :order => "#{quoted_right_column_full_name} desc"
           ).first
         end

data/lib/awesome_nested_set/model/prunable.rb

@@ -43,6 +43,7 @@ module CollectiveIdea #:nodoc:
               end
             elsif acts_as_nested_set_options[:dependent] == :restrict_with_exception
               raise ActiveRecord::DeleteRestrictionError.new(:children) unless leaf?
+              return true
             elsif acts_as_nested_set_options[:dependent] == :restrict_with_error
               unless leaf?
                 record = self.class.human_attribute_name(:children).downcase

data/lib/awesome_nested_set/move.rb

@@ -24,7 +24,7 @@ module CollectiveIdea #:nodoc:
 
           lock_nodes_between! a, d
 
-          nested_set_scope.where(where_statement(a, d)).update_all(
+          nested_set_scope_without_default_scope.where(where_statement(a, d)).update_all(
             conditions(a, b, c, d)
           )
         end
@@ -33,7 +33,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,
+                 :quoted_parent_column_name, :parent_column_name, :nested_set_scope_without_default_scope,
                  :primary_column_name, :quoted_primary_column_name, :primary_id,
                  :to => :instance
 
@@ -121,7 +121,7 @@ module CollectiveIdea #:nodoc:
           when :child then right(target)
           when :left  then left(target)
           when :right then right(target) + 1
-          when :root  then nested_set_scope.pluck(right_column_name).max + 1
+          when :root  then nested_set_scope_without_default_scope.pluck(right_column_name).max + 1
           else raise ActiveRecord::ActiveRecordError, "Position should be :child, :left, :right or :root ('#{position}' received)."
           end
         end

data/lib/awesome_nested_set/set_validator.rb

@@ -29,7 +29,7 @@ module CollectiveIdea #:nodoc:
 
         def join_scope
           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)
+          self.scope = scope.joins(join_arel.join_sources)
         end
 
         def filter_scope

data/lib/awesome_nested_set/version.rb

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