awesome_nested_set 3.0.0.rc.1 → 3.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559dfc3c4e84219413936644a4f9562bb5b99f7e
-  data.tar.gz: 94ab72b3cc301118a120e63a147dc002664c5ca3
+  metadata.gz: 5d1c0885abe0d301749e9c918588554824172ece
+  data.tar.gz: 6d2fb2d4d781491b9fc76812d822d973308f1a28
 SHA512:
-  metadata.gz: 75ca6ea8548d4099e7879832d4b66035dcd825adf027eb05f662ea3651bf63e32957f5e9a1aa5a98d47a1a889d697ed10c63ef0dc943bc0f8908c43279921da3
-  data.tar.gz: 3b678935e580e09010e66cc45114e01d103bb4b4aa726bef1885f969d1c54fd05d9bafc67b28db3af677f81e0749439de2dfa3b765d4785d453272045d3c10a3
+  metadata.gz: 994a05b6c6d17b97a7ab365cf1a3a77e3fbde00a1bdd10da1f00f3bf6d31f09f78de81ed56ca1891d92b8f27e7befc22865215a1a3c3fe239add0d5ef1c2f19d
+  data.tar.gz: d7c1929abfb91c0f5f78f1a02782c90b37da7c2c8172a891a83411e392255f6d778e1ab3f022c3fa8a5526d0beb0372186b7b377ca66dd24bae58b97ee17da26

data/CHANGELOG

@@ -1,3 +1,5 @@
+* Modified associate_parents to add child objects to the parent#children collection [Tiago Moraes]
+
 2.1.6
 * Fixed rebuild! when there is a default_scope with order [Adrian Serafin]
 * Testing with stable bundler, ruby 2.0, MySQL and PostgreSQL [Philip Arndt]

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -75,17 +75,18 @@ module CollectiveIdea #:nodoc:
         has_many_children_options = {
           :class_name => self.base_class.to_s,
           :foreign_key => parent_column_name,
-          :order => quoted_order_column_name,
           :inverse_of => (:parent unless acts_as_nested_set_options[:polymorphic]),
         }
 
         # Add callbacks, if they were supplied.. otherwise, we don't want them.
         [:before_add, :after_add, :before_remove, :after_remove].each do |ar_callback|
-          has_many_children_options.update(ar_callback => acts_as_nested_set_options[ar_callback]) if acts_as_nested_set_options[ar_callback]
+          has_many_children_options.update(
+            ar_callback => acts_as_nested_set_options[ar_callback]
+          ) if acts_as_nested_set_options[ar_callback]
         end
 
-        order_condition = has_many_children_options.delete(:order)
-        has_many :children, -> { order(order_condition) }, has_many_children_options
+        has_many :children, -> { order(quoted_order_column_name) },
+                 has_many_children_options
       end
 
       def acts_as_nested_set_relate_parent!

data/lib/awesome_nested_set/model.rb

@@ -34,11 +34,18 @@ module CollectiveIdea #:nodoc:
 
               if !association.loaded? && parent
                 association.target = parent
-                association.set_inverse_instance(parent)
+                add_to_inverse_association(association, parent)
               end
             end
           end
 
+          def add_to_inverse_association(association, record)
+            inverse_reflection = association.send(:inverse_reflection_for, record)
+            inverse = record.association(inverse_reflection.name)
+            inverse.target << association.owner
+            inverse.loaded!
+          end
+
           def children_of(parent_id)
             where arel_table[parent_column_name].eq(parent_id)
           end
@@ -134,7 +141,7 @@ module CollectiveIdea #:nodoc:
             end
           end
 
-          self.class.nested_set_scope options
+          self.class.base_class.nested_set_scope options
         end
 
         def to_text
@@ -199,10 +206,10 @@ module CollectiveIdea #:nodoc:
           )
         end
 
-        def reload_target(target)
+        def reload_target(target, position)
           if target.is_a? self.class.base_class
             target.reload
-          else
+          elsif position != :root
             nested_set_scope.find(target)
           end
         end

data/lib/awesome_nested_set/model/movable.rb

@@ -52,7 +52,7 @@ module CollectiveIdea #:nodoc:
 
           # Move the node to root nodes
           def move_to_root
-            move_to_right_of(root)
+            move_to self, :root
           end
 
           # Order children in a nested set by an attribute
@@ -91,7 +91,7 @@ module CollectiveIdea #:nodoc:
 
             run_callbacks :move do
               in_tenacious_transaction do
-                target = reload_target(target)
+                target = reload_target(target, position)
                 self.reload_nested_set
 
                 Move.new(target, position, self).move

data/lib/awesome_nested_set/model/prunable.rb

@@ -30,6 +30,8 @@ module CollectiveIdea #:nodoc:
                 model.skip_before_destroy = true
                 model.destroy
               end
+            elsif acts_as_nested_set_options[:dependent] == :restrict_with_exception
+              raise ActiveRecord::DeleteRestrictionError.new(:children) unless leaf?
             else
               descendants.delete_all
             end

data/lib/awesome_nested_set/move.rb

@@ -80,10 +80,9 @@ module CollectiveIdea #:nodoc:
 
         def new_parent
           case position
-          when :child
-            target.id
-          else
-            target[parent_column_name]
+          when :child then target.id
+          when :root  then nil
+          else target[parent_column_name]
           end
         end
 
@@ -105,9 +104,10 @@ module CollectiveIdea #:nodoc:
 
         def target_bound
           case position
-          when :child;  right(target)
-          when :left;   left(target)
-          when :right;  right(target) + 1
+          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
           else raise ActiveRecord::ActiveRecordError, "Position should be :child, :left, :right or :root ('#{position}' received)."
           end
         end

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.0.rc.1' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.0.rc.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.0.rc.1
+  version: 3.0.0.rc.2
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record