closure_tree 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: e94fc2a743703667fdfdc150ad5d24ea7799956355191476d15856f81213154f4f2cc8a0981ca978ad80278ccc1201b38ccd9143e1ec00e1ffa243a238ad1d8a
-  data.tar.gz: b5c221f82dbf36750c90a834632b550baa0b2e7d82bc3d9f41621716958e0ed26eb29be8ab480800ff5509b0dafd207dfef558f2079189a5b4f1be8b9eea6809
 SHA1: 
-  metadata.gz: 6f2021ccd1462a82b2735a5b28219c4d870a69a3
-  data.tar.gz: e8559d6b2aeed3aa0dffb07998b3655972ad9b8b
+  metadata.gz: 50404d7f26719cd30625a177d0c7fbc9c4396843
+  data.tar.gz: 38ae281b5a8f92005839a0c2f08a4e4774881001
+SHA512: 
+  metadata.gz: c862247bb1c73a3e98bd531a51a49274d7478453ee77777927fdad9a88502aa5f733183690c538e49a37d307bbb868d726239189671eac6782ac0b618966a0dc
+  data.tar.gz: 6b533b01ff64e084af4c41e669d0847dc98f8464634b78e365ab2cc6d4245e7f4a0991b65701ca869ff67e4e3151ba30283b85d6f99553bbff9bfd345439cc5c

data/README.md

@@ -444,6 +444,17 @@ Parallelism is not tested with Rails 3.0.x nor 3.1.x due to this
 
 ## Change log
 
+### 3.10.1
+
+* Multipart constant names like "Admin::PageHierarchy" are now supported.
+  Resolves [issue 47](https://github.com/mceachen/closure_tree/issues/47).
+  Thanks for the perfect pull request, [Simon Menke](https://github.com/fd)!
+
+* Committing transactions involving large numbers of hierarchy model classes was very slow due
+  to hash collisions in the hierarchy class. A better hash implementation addressed
+  [issue 48](https://github.com/mceachen/closure_tree/issues/48).
+  Thanks, [Joel Turkel](https://github.com/jturkel)!
+
 ### 3.10.0
 
 * Added ```#roots_and_descendants_preordered```.

data/lib/closure_tree/acts_as_tree.rb

@@ -29,17 +29,19 @@ module ClosureTree
       # Auto-inject the hierarchy table
       # See https://github.com/patshaughnessy/class_factory/blob/master/lib/class_factory/class_factory.rb
       class_attribute :hierarchy_class
-      self.hierarchy_class = Object.const_set hierarchy_class_name, Class.new(ActiveRecord::Base)
+      self.hierarchy_class = ct_class.parent.const_set short_hierarchy_class_name, Class.new(ActiveRecord::Base)
 
       self.hierarchy_class.class_eval <<-RUBY
         belongs_to :ancestor, :class_name => "#{ct_class.to_s}"
         belongs_to :descendant, :class_name => "#{ct_class.to_s}"
         attr_accessible :ancestor, :descendant, :generations
-        def ==(comparison_object)
-          comparison_object.instance_of?(self.class) &&
-          self.attributes == comparison_object.attributes
+        def ==(other)
+          self.class == other.class && ancestor == other.ancestor && descendant == other.descendant
         end
         alias :eql? :==
+        def hash
+          ancestor_id.hash << 31 ^ descendant_id.hash
+        end
       RUBY
 
       self.hierarchy_class.table_name = hierarchy_table_name
@@ -51,4 +53,4 @@ module ClosureTree
       end
     end
   end
-end
+end

data/lib/closure_tree/columns.rb

@@ -37,6 +37,19 @@ module ClosureTree
       closure_tree_options[:hierarchy_class_name] || ct_class.to_s + "Hierarchy"
     end
 
+
+    #
+    # Returns the constant name of the hierarchy_class
+    #
+    # @return [String] the constant name
+    #
+    # @example
+    #   Namespace::Model.hierarchy_class_name # => "Namespace::ModelHierarchy"
+    #   Namespace::Model.short_hierarchy_class_name # => "ModelHierarchy"
+    def short_hierarchy_class_name
+      hierarchy_class_name.split('::').last
+    end
+
     def quoted_hierarchy_table_name
       connection.quote_table_name hierarchy_table_name
     end

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.10.0" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.10.1" unless defined?(::ClosureTree::VERSION)
 end

data/spec/db/schema.rb

@@ -95,4 +95,15 @@ ActiveRecord::Schema.define(:version => 0) do
     t.integer "descendant_id", :null => false
     t.integer "generations", :null => false
   end
+
+  create_table "namespace_types", :force => true do |t|
+    t.string "name"
+    t.integer "parent_id"
+  end
+
+  create_table "namespace_type_hierarchies", :id => false, :force => true do |t|
+    t.integer "ancestor_id", :null => false
+    t.integer "descendant_id", :null => false
+    t.integer "generations", :null => false
+  end
 end

data/spec/namespace_type_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Namespace::Type do
+
+  context "class injection" do
+    it "should build hierarchy classname correctly" do
+      Namespace::Type.hierarchy_class.to_s.should == "Namespace::TypeHierarchy"
+      Namespace::Type.hierarchy_class_name.should == "Namespace::TypeHierarchy"
+      Namespace::Type.short_hierarchy_class_name.should == "TypeHierarchy"
+    end
+  end
+
+end

data/spec/parallel_prepend_sibling_spec.rb

@@ -42,4 +42,4 @@ describe "threadhot" do
   end
 
 # SQLite doesn't like parallelism, and Rails 3.0 and 3.1 have known threading issues. SKIP.
-end if ((ENV["DB"] != "sqlite3") && (ActiveRecord::VERSION::STRING =~ /^3.2/))
+end if ((ENV["DB"] != "sqlite") && (ActiveRecord::VERSION::STRING =~ /^3.2/))

data/spec/support/models.rb

@@ -65,3 +65,10 @@ end
 class CuisineType < ActiveRecord::Base
   acts_as_tree
 end
+
+module Namespace
+  class Type < ActiveRecord::Base
+    acts_as_tree :dependent => :destroy
+    attr_accessible :name
+  end
+end

data/spec/tag_spec.rb

@@ -130,6 +130,15 @@ shared_examples_for "Tag (1)" do
         TagHierarchy.find_all_by_ancestor_id(@root.id).should == root_hiers
         TagHierarchy.find_all_by_descendant_id(@root.id).should == root_hiers
       end
+
+      it "should have different hash codes for each hierarchy model" do
+        hashes = TagHierarchy.all.map(&:hash)
+        hashes.should =~ hashes.uniq
+      end
+
+      it "should return the same hash code for equal hierarchy models" do
+        TagHierarchy.first.hash.should == TagHierarchy.first.hash
+      end
     end
 
     it "performs as the readme says it does" do
@@ -244,6 +253,7 @@ shared_examples_for "Tag (2)" do
       it "should build hierarchy classname correctly" do
         Tag.hierarchy_class.to_s.should == "TagHierarchy"
         Tag.hierarchy_class_name.should == "TagHierarchy"
+        Tag.short_hierarchy_class_name.should == "TagHierarchy"
       end
 
       it "should have a correct parent column name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: closure_tree
 version: !ruby/object:Gem::Version 
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-13 00:00:00 Z
+date: 2013-03-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -142,6 +142,7 @@ files:
 - spec/fixtures/tags.yml
 - spec/hash_tree_spec.rb
 - spec/label_spec.rb
+- spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb
 - spec/spec_helper.rb
@@ -179,6 +180,7 @@ test_files:
 - spec/fixtures/tags.yml
 - spec/hash_tree_spec.rb
 - spec/label_spec.rb
+- spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb
 - spec/spec_helper.rb