closure_tree 4.3.0 → 4.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I0ZTRhYzcwYzQ4YmM1MmIxMjUxZTdkZDdlMzY4NzkxNGEwMzM5OA==
+    YWJiMWRmNzcwODAzNGYyNTdkZDRmMDc0YjU2NjI0YjVmMTIzYWQzMQ==
   data.tar.gz: !binary |-
-    MDQ3YzAyNjA4NzI4YjgwM2JkYzgzYzlhYThhYTRkNmMxNjdhZDYxYg==
+    ODAyOWI2MGYzOWM5N2Y0ZGU0ZTQ4OTQyNjYwYTAyYzFkNzhhYjdlYw==
 SHA512:
   metadata.gz: !binary |-
-    OTVlZGNkNzlhN2Q3ODkxYzJjMTQ2YzNkZjA1MGI4ZDhhNDM4NTU2ZTRlZDEw
-    NjYxOWZjMDViNmJlNTE4NjM3ZDQ2MTM5Yjg1ZTkxNjAyNTBhMTU2N2FmNzRi
-    ZTQ5NmRlNjZlYzRjZGViYzU2OTBiZGY5YzQ4MTYxNmZkMTEwYmE=
+    OGZkN2RlN2Y2NTQxN2E0ZDRkM2IxMTM4MDhlYjMxYWUwOGE3ODlmZTc2ZDEx
+    YjhlN2IyNTA4YzE1N2MwZTMxNDEyNDhlYjQwOWNiYTU1ZDVlZTE0ODg2NWY1
+    NzUzN2ZmMjkwYTdmMjM0MmRkNmQ5YWQ2NTRkZWM5M2I0YzRmNTk=
   data.tar.gz: !binary |-
-    MmQ3OTBkNDZhNDkyZjZmY2E2NDRiZWRmYzc4YzA4Y2FjMTRmNTQwZTFmZjBl
-    Y2UwNGRiNDk2MTVhMGY5ZGNmNjZkMGY1MGI5NGYzNmNkYjRjMjJjZGM0NWNj
-    YmEyN2FkYjlkZDAxNWU3MWM4NGY0ZTk4MTQ1ZmFiM2UzNjVhNjE=
+    NzdmMmIzNDMxMjc3OTA3MjMwODM2ZmE2NzhiNzgzNzAwMmU3NGY5MzEyMTNk
+    Njk1ZjA2MjBjMTQxOTRlYmIxZDAzMzMxNmRkZTBjNTZkNTMzNjgyNzEwZTRi
+    NTdiOTliYTU4NmM3YzdkMmVhOWI4ODJiNTMxYjc0NDI3MjI1Yzc=

data/README.md

@@ -25,8 +25,8 @@ closure_tree has some great features:
 * __Best-in-class mutation performance__:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
-* __Support for Rails 3.0, 3.1, 3.2, and 4.0__
-* Support for reparenting children (and all their progeny)
+* __Support for Rails 3.1, 3.2, 4.0, and 4.1__
+* Support for reparenting children (and all their descendants)
 * Support for [concurrency](#concurrency) (using [with_advisory_lock](https://github.com/mceachen/with_advisory_lock))
 * Support for polymorphism [STI](#sti) within the hierarchy
 * ```find_or_create_by_path``` for [building out hierarchies quickly and conveniently](#find_or_create_by_path)
@@ -279,12 +279,14 @@ When you include ```acts_as_tree``` in your model, you can provide a hash to ove
 * ```tag.ancestors``` is a ordered scope of [ parent, grandparent, great grandparent, … ]. Note that the size of this array will always equal ```tag.depth```.
 * ```tag.ancestor_ids``` is an array of the IDs of the ancestors.
 * ```tag.self_and_ancestors``` returns a scope containing self, parent, grandparent, great grandparent, etc.
+* ```tag.self_and_ancestors_ids``` returns IDs containing self, parent, grandparent, great grandparent, etc.
 * ```tag.siblings``` returns a scope containing all nodes with the same parent as ```tag```, excluding self.
 * ```tag.sibling_ids``` returns an array of the IDs of the siblings.
 * ```tag.self_and_siblings``` returns a scope containing all nodes with the same parent as ```tag```, including self.
 * ```tag.descendants``` returns a scope of all children, childrens' children, etc., excluding self ordered by depth.
 * ```tag.descendant_ids``` returns an array of the IDs of the descendants.
-* ```tag.self_and_descendants``` returns a scope of all children, childrens' children, etc., including self, ordered by depth.
+* ```tag.self_and_descendants``` returns a scope of self, all children, childrens' children, etc., ordered by depth.
+* ```tag.self_and_descendant_ids``` returns IDs of self, all children, childrens' children, etc., ordered by depth.
 * ```tag.hash_tree``` returns an [ordered, nested hash](#nested-hashes) that can be depth-limited.
 * ```tag.find_by_path(path)``` returns the node whose name path *from ```tag```* is ```path```. See (#find_or_create_by_path).
 * ```tag.find_or_create_by_path(path)``` returns the node whose name path *from ```tag```* is ```path```, and will create the node if it doesn't exist already.See (#find_or_create_by_path).
@@ -478,21 +480,18 @@ after do
 end
 ```
 
-
 ## Testing
 
 Closure tree is [tested under every valid combination](http://travis-ci.org/#!/mceachen/closure_tree) of
 
 * Ruby 1.9.3 and Ruby 2.0.0
-* The latest Rails 3.0, 3.1, 3.2, and 4.0 branches, and
+* The latest Rails 3.1, 3.2, 4.0, and 4.1 branches, and
 * MySQL and PostgreSQL. SQLite works in a single-threaded environment.
 
 Assuming you're using [rbenv](https://github.com/sstephenson/rbenv), you can use ```tests.sh``` to
 run the test matrix locally.
 
-Parallelism is not tested with Rails 3.0.x nor 3.1.x due to this
-[known issue](https://github.com/rails/rails/issues/7538).
-
+Parallelism is not tested with Rails 3.1.x due to this [known issue](https://github.com/rails/rails/issues/7538).
 
 ## Change log
 

data/Rakefile

@@ -18,11 +18,11 @@ task :default => :spec
 
 task :all_spec_flavors do
   [["", ""], ["db_prefix_", ""], ["", "_db_suffix"], ["abc_", "_123"]].each do |prefix, suffix|
-    fail unless system("rake spec DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}")
+    fail unless system("bundle exec rake spec DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}")
   end
   require 'active_record/version'
   if ActiveRecord::VERSION::MAJOR == 3
-    system("rake spec ATTR_ACCESSIBLE=1")
+    fail unless system("rake spec ATTR_ACCESSIBLE=1")
   end
 end
 

data/lib/closure_tree/model.rb

@@ -86,6 +86,10 @@ module ClosureTree
       _ct.ids_from(ancestors)
     end
 
+    def self_and_ancestors_ids
+      _ct.ids_from(self_and_ancestors)
+    end
+
     # Returns an array, root first, of self_and_ancestors' values of the +to_s_column+, which defaults
     # to the +name_column+.
     # (so child.ancestry_path == +%w{grandparent parent child}+
@@ -101,6 +105,10 @@ module ClosureTree
       without_self(self_and_descendants)
     end
 
+    def self_and_descendant_ids
+      _ct.ids_from(self_and_descendants)
+    end
+
     def descendant_ids
       _ct.ids_from(descendants)
     end

data/lib/closure_tree/support.rb

@@ -94,9 +94,12 @@ module ClosureTree
     end
 
     def remove_prefix_and_suffix(table_name)
-      prefix = Regexp.escape(ActiveRecord::Base.table_name_prefix)
-      suffix = Regexp.escape(ActiveRecord::Base.table_name_suffix)
-      table_name.gsub(/^#{prefix}(.+)#{suffix}$/, "\\1")
+      pre, suff = ActiveRecord::Base.table_name_prefix, ActiveRecord::Base.table_name_suffix
+      if table_name.start_with?(pre) && table_name.end_with?(suff)
+        table_name[pre.size..-(suff.size + 1)]
+      else
+        table_name
+      end
     end
 
     def ids_from(scope)

data/lib/closure_tree/version.rb

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

data/spec/db/database.yml

@@ -1,5 +1,5 @@
 common: &common
-  database: closure_tree_test
+  database: closure_tree_test<%= ENV['TRAVIS_JOB_NUMBER'].to_s.gsub(/\W/, '_') %>
   host: localhost
   pool: 50
   timeout: 5000

data/spec/parallel_spec.rb

@@ -42,7 +42,6 @@ describe "threadhot" do
     end
     max_wait_time = @lock.synchronize { @wake_times.max }
     sleep_time = max_wait_time - Time.now.to_f
-    $stderr.puts "sleeping for #{sleep_time}"
     sleep(sleep_time)
     (@parent || Tag).find_or_create_by_path([name.to_s, :a, :b, :c])
   end

data/spec/support_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe ClosureTree::Support do
+  let(:sut) { Tag._ct }
+  it 'passes through table names without prefix and suffix' do
+    expected = 'some_random_table_name'
+    sut.remove_prefix_and_suffix(expected).should == expected
+  end
+  it 'extracts through table name with prefix and suffix' do
+    expected = 'some_random_table_name'
+    tn = ActiveRecord::Base.table_name_prefix + expected + ActiveRecord::Base.table_name_suffix
+    sut.remove_prefix_and_suffix(tn).should == expected
+  end
+end

data/spec/user_spec.rb

@@ -38,6 +38,14 @@ describe "empty db" do
       User.all.to_a.should =~ [@root, @mid, @leaf]
     end
 
+    it 'orders self_and_ancestor_ids nearest generation first' do
+      @leaf.self_and_ancestor_ids.should == [@leaf.id, @mid.id, @root.id]
+    end
+
+    it 'orders self_and_descendant_ids nearest generation first' do
+      @root.self_and_descendant_ids.should == [@root.id, @mid.id, @leaf.id]
+    end
+
     it "should have children" do
       @root.children.to_a.should == [@mid]
       @mid.children.to_a.should == [@leaf]
@@ -84,8 +92,10 @@ describe "empty db" do
     u = User.find_or_create_by_path(%w(a@t.co b@t.co c@t.co))
     u.descendant_ids.should == []
     u.ancestor_ids.should == [u.parent.id, u.root.id]
+    u.self_and_ancestor_ids.should == [u.id, u.parent.id, u.root.id]
     u.root.descendant_ids.should == [u.parent.id, u.id]
     u.root.ancestor_ids.should == []
+    u.root.self_and_ancestor_ids.should == [u.root.id]
     c1 = u.contracts.create!
     c2 = u.parent.contracts.create!
     u.root.indirect_contracts.to_a.should =~ [c1, c2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -178,20 +178,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: foreigner
-  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
@@ -213,6 +199,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/closure_tree.rb
 - lib/closure_tree/acts_as_tree.rb
 - lib/closure_tree/deterministic_ordering.rb
 - lib/closure_tree/digraphs.rb
@@ -226,10 +216,6 @@ files:
 - lib/closure_tree/support_attributes.rb
 - lib/closure_tree/support_flags.rb
 - lib/closure_tree/version.rb
-- lib/closure_tree.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 - spec/cuisine_type_spec.rb
 - spec/db/database.yml
 - spec/db/schema.rb
@@ -241,6 +227,7 @@ files:
 - spec/parallel_spec.rb
 - spec/spec_helper.rb
 - spec/support/models.rb
+- spec/support_spec.rb
 - spec/tag_examples.rb
 - spec/tag_spec.rb
 - spec/user_spec.rb
@@ -265,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -281,6 +268,7 @@ test_files:
 - spec/parallel_spec.rb
 - spec/spec_helper.rb
 - spec/support/models.rb
+- spec/support_spec.rb
 - spec/tag_examples.rb
 - spec/tag_spec.rb
 - spec/user_spec.rb