has_hierarchy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296f6af57a4b4997d4f63b1ad555c9723da8701b
-  data.tar.gz: 83c399372635843bbeac74f6aa632d2eaeea0b05
+  metadata.gz: 86d673f21a344bfee6de33caa82e9d3828766b4c
+  data.tar.gz: bfd3039a2107c54291497898345bad43024413aa
 SHA512:
-  metadata.gz: 14a6ad138900fa59c5e174e26497ede7184c8e33137f8fc724045b1fb4d2c4befc89f82ed1071f82b5507bac917f517994e592f5cefd83928579d5f6a47e4549
-  data.tar.gz: 3df4da8267691965a285f537ab10e994596de77e3fda143223a9f00f6bb180eba0fc73368a8ef1dcac56d45092b464892dea7b5997daedcf575a8c1aff1d30f4
+  metadata.gz: 324bc0f6c38e8f8ca92c1f350ec204a8925c4820b8b6dbe402f65b28e5d36176e9c9b45f9663a424c51d46be9c2755f80a54d5c8fab6e01d0e494f9a0711beae
+  data.tar.gz: 7e1fc5c1b53e078bec6e1bc752775fd0cfd0aa6f1a0dc118f2cc9f25540c28402b9c942939f972806b465d8ad9d4d8e9ec282ecf36972d6ba3441e8b03881b1b

data/README.md

@@ -90,8 +90,10 @@ Item.ordered.tree
 #   }
 # }
 
-Item.find_by_path('bar/qux/quux')
+quux = Item.find_by_path('bar/qux/quux')
 # => quux
+quux.full_path
+# => 'bar/qux/quux'
 ```
 
 Operations on nodes:
@@ -118,8 +120,8 @@ bar.descendants         # => [ qux, quux, baz ]
 
 Ordering (see [has_order](https://github.com/kolesnikovde/has_order)):
 ```ruby
-bar.previous_siblings  # => [ foo, quux ]
-foo.next_siblings      # => [ quux, bar ]
+bar.previous_siblings  # => [ foo ]
+foo.next_siblings      # => [ bar ]
 
 foo.move_after(quux)
 Item.ordered.tree

data/has_hierarchy.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
 
   spec.authors       = ['Kolesnikov Danil']
   spec.email         = ['kolesnikovde@gmail.com']
-  spec.description   = 'Provides tree behavior to active_record models.'
-  spec.summary       = 'Provides tree behavior to active_record models.'
+  spec.description   = 'Tree behavior for ActiveRecord models and Mongoid documents.'
+  spec.summary       = 'Tree behavior for ActiveRecord models and Mongoid documents.'
   spec.homepage      = 'https://github.com/kolesnikovde/has_hierarchy'
   spec.license       = 'MIT'
 

data/lib/has_hierarchy/counter_cache.rb

@@ -7,6 +7,10 @@ module HasHierarchy
       after_destroy :decrement_children_counter, if: :parent_id?
     end
 
+    def leaf?
+      self[children_count_column] == 0
+    end
+
     protected
 
     def update_children_counter

data/lib/has_hierarchy/path.rb

@@ -3,8 +3,7 @@ module HasHierarchy
     extend ActiveSupport::Concern
 
     included do
-      before_create :populate_path
-      before_update :rebuild_subtree, if: :need_to_rebuild_subtree?
+      before_save :rebuild_subtree, if: :need_to_rebuild_subtree?
     end
 
     module ClassMethods
@@ -71,15 +70,16 @@ module HasHierarchy
     end
 
     def populate_path(path = nil)
-      self.path = root? ? '' : (path || parent.path_for_children)
     end
 
     def rebuild_subtree(path = nil)
-      populate_path(path)
+      self.path = root? ? '' : (path || parent.path_for_children)
 
-      children.each do |child|
-        child.rebuild_subtree(path_for_children)
-        child.save!
+      unless new_record?
+        children.each do |child|
+          child.rebuild_subtree(path_for_children)
+          child.save!
+        end
       end
     end
 

data/lib/has_hierarchy/version.rb

@@ -1,3 +1,3 @@
 module HasHierarchy
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/has_hierarchy.rb

@@ -94,11 +94,7 @@ module HasHierarchy
 
   module InstanceMethods
     def leaf?
-      if counter_cache = has_hierarchy_options[:counter_cache]
-        self[counter_cache] == 0
-      else
-        children.empty?
-      end
+      children.count == 0
     end
 
     def root?

data/spec/tree.rb

@@ -225,8 +225,8 @@ shared_examples 'materialized path' do
     let(:new_ancestors) { [ foo ] }
 
     before do
-      baz.parent = new_parent
-      baz.save!
+      qux.parent = new_parent
+      qux.save!
       reload_items
     end
 
@@ -241,16 +241,12 @@ shared_examples 'materialized path' do
     end
 
     it 'changes ancestors' do
-      expect(baz.ancestors).to match_array(new_ancestors)
+      expect(qux.ancestors).to match_array(new_ancestors)
     end
 
     it 'applies to all descendants' do
-      baz.children.each do |child|
+      qux.children.each do |child|
         expect(child).to be_descendant_of(new_parent)
-
-        child.children.each do |subchild|
-          expect(subchild).to be_descendant_of(new_parent)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kolesnikov Danil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: Provides tree behavior to active_record models.
+description: Tree behavior for ActiveRecord models and Mongoid documents.
 email:
 - kolesnikovde@gmail.com
 executables: []
@@ -192,7 +192,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Provides tree behavior to active_record models.
+summary: Tree behavior for ActiveRecord models and Mongoid documents.
 test_files:
 - spec/has_hierarchy_spec.rb
 - spec/spec_helper.rb