closure_tree 3.10.1 → 3.10.2

data/README.md

@@ -444,6 +444,16 @@ Parallelism is not tested with Rails 3.0.x nor 3.1.x due to this
 
 ## Change log
 
+### 3.10.2
+
+* Prevent faulty SQL statement when ```#siblings``` is called on an unsaved records.
+  Resolves [issue 52](https://github.com/mceachen/closure_tree/pull/52). Perfect pull
+  request by [Gary Greyling](https://github.com/garygreyling).
+
+* The ```.roots``` class method now correctly respects the ```:order``` option.
+  Resolves [issue 53](https://github.com/mceachen/closure_tree/issues/53).
+  Thanks for finding this, [Brendon Muir](https://github.com/brendon)!
+
 ### 3.10.1
 
 * Multipart constant names like "Admin::PageHierarchy" are now supported.

data/lib/closure_tree/columns.rb

@@ -74,6 +74,10 @@ module ClosureTree
       order_option ? options.merge(:order => order_option) : options
     end
 
+    def scope_with_order(scope)
+      order_option ? scope.order(order_option) : scope
+    end
+
     def append_order(order_by)
       order_option ? "#{order_by}, #{order_option}" : order_by
     end

data/lib/closure_tree/model.rb

@@ -244,6 +244,7 @@ module ClosureTree
     end
 
     def without_self(scope)
+      return scope if self.new_record?
       scope.where(["#{quoted_table_name}.#{ct_base_class.primary_key} != ?", self])
     end
 
@@ -260,7 +261,7 @@ module ClosureTree
 
     module ClassMethods
       def roots
-        where(parent_column_name => nil)
+        scope_with_order(where(parent_column_name => nil))
       end
 
       # Returns an arbitrary node that has no parents.

data/lib/closure_tree/version.rb

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

data/spec/label_spec.rb

@@ -38,10 +38,10 @@ def create_preorder_tree(suffix = "")
     root.self_and_descendants.each do |ea|
       ea.children.to_a.sort_by(&:name).each_with_index do |ea, idx|
         ea.order_value = idx
-      ea.save!
+        ea.save!
+      end
     end
   end
-  end
 end
 
 describe Label do
@@ -58,6 +58,22 @@ describe Label do
     end
   end
 
+  context "roots" do
+    before :each do
+      delete_all_labels
+    end
+    it "sorts alphabetically" do
+      expected = (0..10).to_a
+      expected.shuffle.each do |ea|
+        Label.create! do |l|
+          l.name = "root #{ea}"
+          l.sort_order = ea
+        end
+      end
+      Label.roots.collect { |ea| ea.sort_order }.should == expected
+    end
+  end
+
   context "Base Label class" do
     it "should find or create by path" do
       # class method:
@@ -346,6 +362,11 @@ describe Label do
       expected = ('a'..'r').to_a
       a.self_and_descendants_preordered.collect { |ea| ea.name }.should == expected
       Label.roots_and_descendants_preordered.collect { |ea| ea.name }.should == expected
+      # Let's create the second root by hand so we can explicitly set the sort order
+      Label.create! do |l|
+        l.name = "a1"
+        l.sort_order = a.sort_order + 1
+      end
       create_preorder_tree("1")
       # Should be no change:
       a.reload.self_and_descendants_preordered.collect { |ea| ea.name }.should == expected

data/spec/tag_spec.rb

@@ -162,79 +162,86 @@ shared_examples_for "Tag (1)" do
       h.ancestry_path.should == %w(a b c d e f g h)
     end
 
-  end
-
-  context "paths" do
-    before :each do
-      @child = Tag.find_or_create_by_path(%w(grandparent parent child))
-      @child.title = "Kid"
-      @parent = @child.parent
-      @parent.title = "Mom"
-      @grandparent = @parent.parent
-      @grandparent.title = "Nonnie"
-      [@child, @parent, @grandparent].each { |ea| ea.save! }
+    context "roots" do
+      it "sorts alphabetically" do
+        expected = ("a".."z").to_a
+        expected.shuffle.each { |ea| Tag.create!(:name => ea) }
+        Tag.roots.collect { |ea| ea.name }.should == expected
+      end
     end
 
-    it "should build ancestry path" do
-      @child.ancestry_path.should == %w{grandparent parent child}
-      @child.ancestry_path(:name).should == %w{grandparent parent child}
-      @child.ancestry_path(:title).should == %w{Nonnie Mom Kid}
-    end
+    context "paths" do
+      before :each do
+        @child = Tag.find_or_create_by_path(%w(grandparent parent child))
+        @child.title = "Kid"
+        @parent = @child.parent
+        @parent.title = "Mom"
+        @grandparent = @parent.parent
+        @grandparent.title = "Nonnie"
+        [@child, @parent, @grandparent].each { |ea| ea.save! }
+      end
 
-    it "should find by path" do
-      # class method:
-      Tag.find_by_path(%w{grandparent parent child}).should == @child
-      # instance method:
-      @parent.find_by_path(%w{child}).should == @child
-      @grandparent.find_by_path(%w{parent child}).should == @child
-      @parent.find_by_path(%w{child larvae}).should be_nil
-    end
+      it "should build ancestry path" do
+        @child.ancestry_path.should == %w{grandparent parent child}
+        @child.ancestry_path(:name).should == %w{grandparent parent child}
+        @child.ancestry_path(:title).should == %w{Nonnie Mom Kid}
+      end
 
-    it "finds correctly rooted paths" do
-      decoy = Tag.find_or_create_by_path %w(a b c d)
-      b_d = Tag.find_or_create_by_path %w(b c d)
-      Tag.find_by_path(%w(b c d)).should == b_d
-      Tag.find_by_path(%w(c d)).should be_nil
-    end
+      it "should find by path" do
+        # class method:
+        Tag.find_by_path(%w{grandparent parent child}).should == @child
+        # instance method:
+        @parent.find_by_path(%w{child}).should == @child
+        @grandparent.find_by_path(%w{parent child}).should == @child
+        @parent.find_by_path(%w{child larvae}).should be_nil
+      end
 
-    it "find_by_path for 1 node" do
-      b = Tag.find_or_create_by_path %w(a b)
-      b2 = b.root.find_by_path(%w(b))
-      b2.should == b
-    end
+      it "finds correctly rooted paths" do
+        decoy = Tag.find_or_create_by_path %w(a b c d)
+        b_d = Tag.find_or_create_by_path %w(b c d)
+        Tag.find_by_path(%w(b c d)).should == b_d
+        Tag.find_by_path(%w(c d)).should be_nil
+      end
 
-    it "find_by_path for 2 nodes" do
-      c = Tag.find_or_create_by_path %w(a b c)
-      c.root.find_by_path(%w(b c)).should == c
-      c.root.find_by_path(%w(a c)).should be_nil
-      c.root.find_by_path(%w(c)).should be_nil
-    end
+      it "find_by_path for 1 node" do
+        b = Tag.find_or_create_by_path %w(a b)
+        b2 = b.root.find_by_path(%w(b))
+        b2.should == b
+      end
 
-    it "find_by_path for 3 nodes" do
-      d = Tag.find_or_create_by_path %w(a b c d)
-      d.root.find_by_path(%w(b c d)).should == d
-      Tag.find_by_path(%w(a b c d)).should == d
-      Tag.find_by_path(%w(d)).should be_nil
-    end
+      it "find_by_path for 2 nodes" do
+        c = Tag.find_or_create_by_path %w(a b c)
+        c.root.find_by_path(%w(b c)).should == c
+        c.root.find_by_path(%w(a c)).should be_nil
+        c.root.find_by_path(%w(c)).should be_nil
+      end
 
-    it "should return nil for missing nodes" do
-      Tag.find_by_path(%w{missing}).should be_nil
-      Tag.find_by_path(%w{grandparent missing}).should be_nil
-      Tag.find_by_path(%w{grandparent parent missing}).should be_nil
-      Tag.find_by_path(%w{grandparent parent missing child}).should be_nil
-    end
+      it "find_by_path for 3 nodes" do
+        d = Tag.find_or_create_by_path %w(a b c d)
+        d.root.find_by_path(%w(b c d)).should == d
+        Tag.find_by_path(%w(a b c d)).should == d
+        Tag.find_by_path(%w(d)).should be_nil
+      end
+
+      it "should return nil for missing nodes" do
+        Tag.find_by_path(%w{missing}).should be_nil
+        Tag.find_by_path(%w{grandparent missing}).should be_nil
+        Tag.find_by_path(%w{grandparent parent missing}).should be_nil
+        Tag.find_by_path(%w{grandparent parent missing child}).should be_nil
+      end
 
-    it "should find or create by path" do
-      # class method:
-      grandparent = Tag.find_or_create_by_path(%w{grandparent})
-      grandparent.should == @grandparent
-      child = Tag.find_or_create_by_path(%w{grandparent parent child})
-      child.should == @child
-      Tag.find_or_create_by_path(%w{events anniversary}).ancestry_path.should == %w{events anniversary}
-      a = Tag.find_or_create_by_path(%w{a})
-      a.ancestry_path.should == %w{a}
-      # instance method:
-      a.find_or_create_by_path(%w{b c}).ancestry_path.should == %w{a b c}
+      it "should find or create by path" do
+        # class method:
+        grandparent = Tag.find_or_create_by_path(%w{grandparent})
+        grandparent.should == @grandparent
+        child = Tag.find_or_create_by_path(%w{grandparent parent child})
+        child.should == @child
+        Tag.find_or_create_by_path(%w{events anniversary}).ancestry_path.should == %w{events anniversary}
+        a = Tag.find_or_create_by_path(%w{a})
+        a.ancestry_path.should == %w{a}
+        # instance method:
+        a.find_or_create_by_path(%w{b c}).ancestry_path.should == %w{a b c}
+      end
     end
   end
 end
@@ -408,7 +415,6 @@ shared_examples_for "Tag (2)" do
       end
     end
 
-
     def validate_city_tag city
       tags(:california).children.include?(city).should_not be_nil
       city.ancestors.should == [tags(:california), tags(:united_states), tags(:places)]

data/spec/user_spec.rb

@@ -31,7 +31,6 @@ describe "empty db" do
     end
   end
 
-
   context "3 User collection.create db" do
     before :each do
       @root = User.create! :email => "poppy@t.co"
@@ -126,6 +125,18 @@ describe "empty db" do
     b1.siblings.should =~ [b2, b3]
   end
 
+  context "when a user is not yet saved" do
+    it "supports siblings" do
+      User.order_option.should be_nil
+      a = User.create(:email => "a")
+      b1 = a.children.new(:email => "b1")
+      b2 = a.children.create(:email => "b2")
+      b3 = a.children.create(:email => "b3")
+      a.siblings.should be_empty
+      b1.siblings.should =~ [b2, b3]
+    end
+  end
+
   it "properly nullifies descendents" do
     c = User.find_or_create_by_path %w(a b c)
     b = c.parent
@@ -133,4 +144,16 @@ describe "empty db" do
     b.reload.should be_root
     b.child_ids.should == [c.id]
   end
+
+  context "roots" do
+    it "works on models without ordering" do
+      expected = ("a".."z").to_a
+      expected.shuffle.each do |ea|
+        User.create! do |u|
+          u.email = ea
+        end
+      end
+      User.roots.collect { |ea| ea.email }.sort.should == expected
+    end
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: closure_tree
 version: !ruby/object:Gem::Version 
-  version: 3.10.1
+  hash: 43
+  prerelease: 
+  segments: 
+  - 3
+  - 10
+  - 2
+  version: 3.10.2
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -9,110 +15,180 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-23 00:00:00 Z
+date: 2013-04-16 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
+  type: :runtime
+  name: activerecord
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: with_advisory_lock
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 0
+        - 6
         version: 0.0.6
+  type: :runtime
+  name: with_advisory_lock
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id004 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  type: :development
+  name: rake
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: yard
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: yard
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: rspec
   version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: rails
   version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rails
-  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: rspec-rails
   version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: mysql2
   version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: mysql2
-  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: pg
   version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: pg
-  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: sqlite3
   version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
-  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: uuidtools
   version_requirements: *id011
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
-  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - *id004
-  version_requirements: *id012
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  name: strong_parameters
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
-  version_requirements: *id013
+  name: strong_parameters
+  version_requirements: *id012
   prerelease: false
 description: Easily and efficiently make your ActiveRecord model support hierarchies
 email: 
@@ -149,28 +225,39 @@ files:
 - spec/support/models.rb
 - spec/tag_spec.rb
 - spec/user_spec.rb
+has_rdoc: true
 homepage: http://matthew.mceachen.us/closure_tree
 licenses: []
 
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
 test_files: 
 - spec/cuisine_type_spec.rb
@@ -187,4 +274,3 @@ test_files:
 - spec/support/models.rb
 - spec/tag_spec.rb
 - spec/user_spec.rb
-has_rdoc: 

checksums.yaml

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