closure_tree 4.6.1 → 4.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTllNmI0MTA3YzE0NTZkNTk2Yzg4NWNiZWE2MDljN2NhYjAwZDc5NQ==
-  data.tar.gz: !binary |-
-    MjVkZDM0ZmMyNGE1OTk3NWNkYzQ3NmMxYzAyMzI1OTViYjZiMzhjOQ==
+SHA1:
+  metadata.gz: 9b06ce0d66fc54bc2e578c562b1ba81d645ae667
+  data.tar.gz: 2034f11a0b935071f164d059d8f061ba30f8ce69
 SHA512:
-  metadata.gz: !binary |-
-    MjIwMzM4YjBlYTQ5N2M0ZGYzNWIwYzc3NGFiMGE5NzM3YTA0ZTI1MjlkMzhj
-    NmZkODBkOGRlYTQwN2UzZGQ1NTU4ZDBjMzg4NmE3NjBkZDBmMjAzMDU1OWVk
-    Y2RlZGVkYTJlYWMzYWNlMzBjYzA0NDkzNzQ2ZjA5MzE4ZGI1YWE=
-  data.tar.gz: !binary |-
-    MWJlNTQ0NDdiNDE4NWNlYjdmNTkyZmUyM2U2OTA5YjFlNGM5NjczY2VlNzg3
-    OTk0NDQ3M2VjMGQ4MGI3N2MzOWEzZjAyNzZkOGMyYjFlNWU2YzUwNzAzZWI4
-    ZWViMTQyZDM2NTFhNWQ3MWVhMGY4NDYzZDEwY2E0Y2NlMTJkNGQ=
+  metadata.gz: 9871e9018bc6260939462cdbd59e0d93016843cd3b7ae918d7d41d46dd038157337c32050d4049b44b52dc2a6286a903dd566b09d6a9f14afcd6d7b720de1393
+  data.tar.gz: 899d7917cb840077174a91f0d984c0904b89f0a72e946744ac33c8c298857032acc496ac20f4bbcc7a4b710c6b9e9df4611ae3a5fa4083d1dcd4bbbd5dfa05ef

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 4.6.2
+ * Pull in [106](https://github.com/mceachen/closure_tree/pull/106) which fixed a bug introduced
+   in 4.6.0 which broke if the numeric ordering column wasn't named 'sort_order'. Tests have been
+   added. Thanks for the fix, [Fission Xuiptz](https://github.com/fissionxuiptz)!
+
 ### 4.6.1
 
  * Address [issue 60](https://github.com/mceachen/closure_tree/issues/60) (use `.empty?` rather 

data/lib/closure_tree/numeric_deterministic_ordering.rb

@@ -117,12 +117,12 @@ module ClosureTree
         _ct_reorder_siblings(reorder_from_value)
 
         # The sort order should be correct now except for self and sibling, which may need to flip:
-        sibling_is_after = self.reload.sort_order < sibling.reload.sort_order
+        sibling_is_after = self.reload.order_value < sibling.reload.order_value
         if add_after != sibling_is_after
           # We need to flip the sort orders:
-          self_so, sib_so = self.sort_order, sibling.sort_order
-          update_order_value(sib_so)
-          sibling.update_order_value(self_so)
+          self_ov, sib_ov = self.order_value, sibling.order_value
+          update_order_value(sib_ov)
+          sibling.update_order_value(self_ov)
         end
 
         if prior_sibling_parent != self.parent

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('4.6.1') unless defined?(::ClosureTree::VERSION)
+  VERSION = Gem::Version.new('4.6.2') unless defined?(::ClosureTree::VERSION)
 end

data/spec/db/models.rb

@@ -65,7 +65,7 @@ end
 
 class Label < ActiveRecord::Base
   # make sure order doesn't matter
-  acts_as_tree :order => :sort_order, # <- LOOK IT IS A SYMBOL OMG
+  acts_as_tree :order => :column_whereby_ordering_is_inferred, # <- symbol, and not "sort_order"
     :parent_column_name => "mother_id",
     :dependent => :destroy
 

data/spec/db/schema.rb

@@ -70,7 +70,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table "labels" do |t|
     t.string "name"
     t.string "type"
-    t.integer "sort_order"
+    t.integer "column_whereby_ordering_is_inferred"
     t.integer "mother_id"
   end
 

data/spec/label_spec.rb

@@ -11,7 +11,7 @@ def create_label_tree
   @c3 = @d3.parent
   @b2 = @c3.parent
   @a2 = @b2.parent
-  Label.update_all("sort_order = id")
+  Label.update_all("#{Label._ct.order_column} = id")
 end
 
 def create_preorder_tree(suffix = "", &block)
@@ -83,10 +83,10 @@ describe Label do
       expected.shuffle.each do |ea|
         Label.create! do |l|
           l.name = "root #{ea}"
-          l.sort_order = ea
+          l.order_value = ea
         end
       end
-      Label.roots.collect { |ea| ea.sort_order }.should == expected
+      Label.roots.collect { |ea| ea.order_value }.should == expected
     end
   end
 
@@ -139,7 +139,7 @@ describe Label do
       before do
         classes = [Label, DateLabel, DirectoryLabel, EventLabel]
         create_preorder_tree do |ea|
-          ea.type = classes[ea.sort_order % 4].to_s
+          ea.type = classes[ea.order_value % 4].to_s
         end
       end
       it "finds roots with specific classes" do
@@ -250,7 +250,7 @@ describe Label do
     end
 
     def name_and_order(enum)
-      enum.map { |ea| [ea.name, ea.sort_order] }
+      enum.map { |ea| [ea.name, ea.order_value] }
     end
 
     def children_name_and_order
@@ -261,7 +261,7 @@ describe Label do
       name_and_order(Label.roots)
     end
 
-    it 'sort_orders properly' do
+    it 'order_values properly' do
       children_name_and_order.should == [['a', 0], ['b', 1], ['c', 2], ['d', 3]]
     end
 
@@ -300,27 +300,27 @@ describe Label do
     a.append_sibling(b)
     a.self_and_siblings.collect(&:name).should == %w(a b)
     root.reload.children.collect(&:name).should == %w(a b)
-    root.children.collect(&:sort_order).should == [0, 1]
+    root.children.collect(&:order_value).should == [0, 1]
 
     a.prepend_sibling(b)
     a.self_and_siblings.collect(&:name).should == %w(b a)
     root.reload.children.collect(&:name).should == %w(b a)
-    root.children.collect(&:sort_order).should == [0, 1]
+    root.children.collect(&:order_value).should == [0, 1]
 
     a.append_sibling(c)
     a.self_and_siblings.collect(&:name).should == %w(b a c)
     root.reload.children.collect(&:name).should == %w(b a c)
-    root.children.collect(&:sort_order).should == [0, 1, 2]
+    root.children.collect(&:order_value).should == [0, 1, 2]
 
     # We need to reload b because it was updated by a.append_sibling(c)
     b.reload.append_sibling(c)
     root.reload.children.collect(&:name).should == %w(b c a)
-    root.children.collect(&:sort_order).should == [0, 1, 2]
+    root.children.collect(&:order_value).should == [0, 1, 2]
 
     # We need to reload a because it was updated by b.append_sibling(c)
     d = a.reload.append_sibling(Label.new(:name => "d"))
     d.self_and_siblings.collect(&:name).should == %w(b c a d)
-    d.self_and_siblings.collect(&:sort_order).should == [0, 1, 2, 3]
+    d.self_and_siblings.collect(&:order_value).should == [0, 1, 2, 3]
   end
 
   # https://github.com/mceachen/closure_tree/issues/84
@@ -328,27 +328,27 @@ describe Label do
     root = Label.create(:name => "root")
     a = Label.create(:name => "a", :parent => root)
     b = Label.create(:name => "b", :parent => root)
-    a.sort_order.should == 0
-    b.sort_order.should == 1
+    a.order_value.should == 0
+    b.order_value.should == 1
     #c = Label.create(:name => "c")
 
-    # should the sort_order for roots be set?
-    root.sort_order.should_not be_nil
-    root.sort_order.should == 0
+    # should the order_value for roots be set?
+    root.order_value.should_not be_nil
+    root.order_value.should == 0
 
-    # sort_order should never be nil on a child.
-    a.sort_order.should_not be_nil
-    a.sort_order.should == 0
+    # order_value should never be nil on a child.
+    a.order_value.should_not be_nil
+    a.order_value.should == 0
     # Add a child to root at end of children.
     root.children << b
     b.parent.should == root
     a.self_and_siblings.collect(&:name).should == %w(a b)
     root.reload.children.collect(&:name).should == %w(a b)
-    root.children.collect(&:sort_order).should == [0, 1]
+    root.children.collect(&:order_value).should == [0, 1]
   end
 
   context "#add_sibling" do
-    it "should move a node before another node which has an uninitialized sort_order" do
+    it "should move a node before another node which has an uninitialized order_value" do
       f = Label.find_or_create_by_path %w(a b c d e fa)
       f0 = f.prepend_sibling(Label.new(:name => "fb")) # < not alpha sort, so name shouldn't matter
       f0.ancestry_path.should == %w(a b c d e fb)
@@ -374,42 +374,42 @@ describe Label do
       f3 = f2.prepend_sibling(Label.new(:name => "f3"))
       f4 = f2.append_sibling(Label.new(:name => "f4"))
       f1.add_sibling(f2)
-      f1.self_and_siblings.collect(&:sort_order).should == [0, 1]
-      f3.self_and_siblings.collect(&:sort_order).should == [0, 1]
+      f1.self_and_siblings.collect(&:order_value).should == [0, 1]
+      f3.self_and_siblings.collect(&:order_value).should == [0, 1]
       f1.self_and_siblings.collect(&:name).should == %w(f1 f2)
       f3.self_and_siblings.collect(&:name).should == %w(f3 f4)
     end
   end
 
-  context "sort_order must be set" do
+  context "order_value must be set" do
 
     before do
       @root = Label.create(name: 'root')
       @a, @b, @c = %w(a b c).map { |n| @root.children.create(name: n) }
     end
 
-    it 'should set sort_order on roots' do
-      @root.sort_order.should == 0
+    it 'should set order_value on roots' do
+      @root.order_value.should == 0
     end
 
-    it 'should set sort_order with siblings' do
-      @a.sort_order.should == 0
-      @b.sort_order.should == 1
-      @c.sort_order.should == 2
+    it 'should set order_value with siblings' do
+      @a.order_value.should == 0
+      @b.order_value.should == 1
+      @c.order_value.should == 2
     end
 
-    it 'should reset sort_order when a node is moved to another location' do
+    it 'should reset order_value when a node is moved to another location' do
       root2 = Label.create(name: 'root2')
       root2.add_child @b
-      @a.sort_order.should == 0
-      @b.sort_order.should == 0
-      @c.reload.sort_order.should == 1
+      @a.order_value.should == 0
+      @b.order_value.should == 0
+      @c.reload.order_value.should == 1
     end
   end
 
   context "destructive reordering" do
     before :each do
-      # to make sure sort_order isn't affected by additional nodes:
+      # to make sure order_value isn't affected by additional nodes:
       create_preorder_tree
       @root = Label.create(:name => 'root')
       @a = @root.children.create!(:name => 'a')
@@ -420,17 +420,17 @@ describe Label do
       it 'from head' do
         @a.destroy
         @root.reload.children.should == [@b, @c]
-        @root.children.map { |ea| ea.sort_order }.should == [0, 1]
+        @root.children.map { |ea| ea.order_value }.should == [0, 1]
       end
       it 'from mid' do
         @b.destroy
         @root.reload.children.should == [@a, @c]
-        @root.children.map { |ea| ea.sort_order }.should == [0, 1]
+        @root.children.map { |ea| ea.order_value }.should == [0, 1]
       end
       it 'from tail' do
         @c.destroy
         @root.reload.children.should == [@a, @b]
-        @root.children.map { |ea| ea.sort_order }.should == [0, 1]
+        @root.children.map { |ea| ea.order_value }.should == [0, 1]
       end
     end
 
@@ -502,7 +502,7 @@ describe Label do
       # 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
+        l.order_value = a.order_value + 1
       end
       create_preorder_tree('1')
       # Should be no change:

data/spec/parallel_spec.rb

@@ -167,8 +167,8 @@ describe 'Concurrent creation', if: support_concurrency do
     @target = Label.find_or_create_by_path %w(root parent)
     run_workers(SiblingPrependerWorker)
     children = Label.roots
-    uniq_sort_orders = children.collect { |ea| ea.sort_order }.uniq
-    children.size.should == uniq_sort_orders.size
+    uniq_order_values = children.collect { |ea| ea.order_value }.uniq
+    children.size.should == uniq_order_values.size
 
     # The only non-root node should be "root":
     Label.all.select { |ea| ea.root? }.should == [@target.parent]

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.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: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.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: 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: 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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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: appraisal
   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: timecop
   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
@@ -171,10 +171,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -240,17 +240,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies