closure_tree 4.2.6 → 4.2.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 668d9c504e247dafadea2b0ccbc1765514b3d0c1
-  data.tar.gz: 65aab985c3409f2a77c05853b63426366650ded9
-SHA512:
-  metadata.gz: 60550b7c9c0810ab5fc66e4d4f2fbbefa1a5bcde87db897b59292d08b11f6859789a35c89394b405c3ba6e6ea9b0edf1cafaf0de57c0d89ca4b3439d9d3401ef
-  data.tar.gz: 41d130014eca0daeb0848a8613604304f9c2f6887ebce70cfd77b2769686ff1b6cdf4c683d23120959b7c310db3b4918c96b92e007d98996d01fdce5e607333a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWUwYTFjNDQ4ZDI3ZDhkZTc0MWU1ZmY4MDZkZmMxZDdjZjY3MmFjMw==
+  data.tar.gz: !binary |-
+    YzdmYTU0ZDNkODUyOGNkNTMyZDE4YTQ4ZTg3MzY4ZTRhMzhjZTllZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDMxNjQxNjYxZGYyNDMxNjM5MDhmZGQ0MzMyYTI4ZDU3ZWUwZmIwYjk1NTBj
+    ZTQ0N2YwYTIwMWYzNGQ2MDAwYTQ1MjBiM2MyMmNjZTY3ZTNiNTJkNWI1NWE2
+    NzQ4MDMxODYzMGQ1YTkxN2VkNTE3YjU2NTI0ZDQ0ODZkOGNlODE=
+  data.tar.gz: !binary |-
+    MzBjNmRmYmVlYWUzZjEyYjBlNjViNDEwYWVmOWU0ZTBmZGQwMWI2YTIzNGE4
+    OWE3ZTcxNTBiMzk0OWYzZjliMzcxNzg0M2YxZWJiNzQ4OTYwYTFhN2ZjMjU3
+    M2M1ZmUzOWVmMmFhMzgyZmIzNmVlNjgyNjExMjUyMzBkNDhkYmM=

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -17,9 +17,10 @@ module ClosureTree
 
     def _ct_validate
       if !@_ct_skip_cycle_detection &&
-        changes[_ct.parent_column_name] &&
-        parent.present? &&
-        parent.self_and_ancestors.include?(self)
+        !new_record? && # don't validate for cycles if we're a new record
+        changes[_ct.parent_column_name] && # don't validate for cycles if we didn't change our parent
+        parent.present? && # don't validate if we're root
+        parent.self_and_ancestors.include?(self) # < this is expensive :\
         errors.add(_ct.parent_column_sym, "You cannot add an ancestor as a descendant")
       end
     end
@@ -30,7 +31,15 @@ module ClosureTree
     end
 
     def _ct_after_save
-      rebuild! if changes[_ct.parent_column_name] || @was_new_record
+      if changes[_ct.parent_column_name] || @was_new_record
+        rebuild!
+      end
+      if changes[_ct.parent_column_name] && !@was_new_record
+        # Resetting the ancestral collections addresses
+        # https://github.com/mceachen/closure_tree/issues/68
+        ancestor_hierarchies.reload
+        self_and_ancestors.reload
+      end
       @was_new_record = false # we aren't new anymore.
       true # don't cancel anything.
     end

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new("4.2.6") unless defined?(::ClosureTree::VERSION)
+  VERSION = Gem::Version.new("4.2.7") unless defined?(::ClosureTree::VERSION)
 end

data/spec/cuisine_type_spec.rb

@@ -27,4 +27,12 @@ describe CuisineType do
   it "sets the table_name of the hierarchy class properly" do
     CuisineTypeHierarchy.table_name.should == ActiveRecord::Base.table_name_prefix + "cuisine_type_hierarchies" + ActiveRecord::Base.table_name_suffix
   end
+
+  it 'fixes self_and_ancestors properly on reparenting' do
+    a = CuisineType.create! :name => 'a'
+    b = CuisineType.create! :name => 'b'
+    b.self_and_ancestors.to_a.should == [b]
+    a.children << b
+    b.self_and_ancestors.to_a.should == [b, a]
+  end
 end

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir +
 ActiveRecord::Base.establish_connection(ENV["DB"])
 ActiveRecord::Migration.verbose = false
 if ENV['NONUKES']
-  puts "skipping database creation"
+  puts 'skipping database creation'
 else
   require 'db/schema'
 end

data/spec/tag_examples.rb

@@ -97,6 +97,13 @@ shared_examples_for "Tag (without fixtures)" do
         tag_class.leaves.should be_empty
         DestroyedTag.all.map { |t| t.name }.should =~ %w{root mid leaf}
       end
+
+      it 'fix self_and_ancestors properly on reparenting' do
+        t = tag_class.create! :name => 'moar leaf'
+        t.self_and_ancestors.to_a.should == [t]
+        @mid.children << t
+        t.self_and_ancestors.to_a.should == [t, @mid, @root]
+      end
     end
 
     context "3 tag explicit_create db" do

metadata

@@ -1,167 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.7
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: with_advisory_lock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: yard
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  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'
 - !ruby/object:Gem::Dependency
   name: fuubar
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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'
 - !ruby/object:Gem::Dependency
   name: mysql2
   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'
 - !ruby/object:Gem::Dependency
   name: pg
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   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: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -213,17 +227,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies