closure_tree 4.4.0 → 4.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWJiMWRmNzcwODAzNGYyNTdkZDRmMDc0YjU2NjI0YjVmMTIzYWQzMQ==
-  data.tar.gz: !binary |-
-    ODAyOWI2MGYzOWM5N2Y0ZGU0ZTQ4OTQyNjYwYTAyYzFkNzhhYjdlYw==
+SHA1:
+  metadata.gz: ceda99255848a84a4d3370654ecfad42dc2b7711
+  data.tar.gz: 71096e3755bb3dda8039eb49e3f301930ef7cc0d
 SHA512:
-  metadata.gz: !binary |-
-    OGZkN2RlN2Y2NTQxN2E0ZDRkM2IxMTM4MDhlYjMxYWUwOGE3ODlmZTc2ZDEx
-    YjhlN2IyNTA4YzE1N2MwZTMxNDEyNDhlYjQwOWNiYTU1ZDVlZTE0ODg2NWY1
-    NzUzN2ZmMjkwYTdmMjM0MmRkNmQ5YWQ2NTRkZWM5M2I0YzRmNTk=
-  data.tar.gz: !binary |-
-    NzdmMmIzNDMxMjc3OTA3MjMwODM2ZmE2NzhiNzgzNzAwMmU3NGY5MzEyMTNk
-    Njk1ZjA2MjBjMTQxOTRlYmIxZDAzMzMxNmRkZTBjNTZkNTMzNjgyNzEwZTRi
-    NTdiOTliYTU4NmM3YzdkMmVhOWI4ODJiNTMxYjc0NDI3MjI1Yzc=
+  metadata.gz: f40621b5ddc3cbc1c0de1959f2720b7f1e21e209ed7952878720cbcff981993037330a9c6f1e6f4f287e862b2af82e14b99109dde5a2330c6cb5e3256a0f7acb
+  data.tar.gz: ecd521d391c33e3afb162c25f8760c734dd58acec6c3a875d523ec7ec5dcfb50ccbbd7601f79d2fd68e2a1e592095174381508a8e45708dd91bcf1bd658cf0a7

data/.gitignore

@@ -0,0 +1,12 @@
+.bundle/
+.idea/
+pkg/
+rdoc/
+doc/
+*.sqlite3.db
+*.log
+tmp/
+.DS_Store
+.yardoc/
+.rvmrc
+*.lock

data/.travis.yml

@@ -0,0 +1,32 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.2
+  - ruby-head
+#  - rbx-2
+
+gemfile:
+  - gemfiles/activerecord_3.2.gemfile
+  - gemfiles/activerecord_4.0.gemfile
+  - gemfiles/activerecord_4.1.gemfile
+  - gemfiles/activerecord_edge.gemfile
+
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgresql
+
+script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace all_spec_flavors
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - gemfile: gemfiles/activerecord_edge.gemfile
+    - rvm: ruby-head
+  exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/activerecord_3.2.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/activerecord_4.0.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/activerecord_4.1.gemfile

data/.yardopts

@@ -0,0 +1,3 @@
+--readme README.md
+--charset utf-8
+'lib/**/*.rb'

data/Appraisals

@@ -0,0 +1,17 @@
+appraise "activerecord-3.2" do
+  gem 'activerecord', '~> 3.2'
+  gem 'strong_parameters'
+end
+
+appraise "activerecord-4.0" do
+  gem "activerecord", "~> 4.0"
+end
+
+appraise "activerecord-4.1" do
+  gem "activerecord", "~> 4.1"
+end
+
+appraise "activerecord-edge" do
+  gem "activerecord", github: "rails/rails"
+  gem 'arel', github: 'rails/arel'
+end

data/CHANGELOG.md

@@ -0,0 +1,317 @@
+# Changelog
+
+### 4.5.0
+
+* Merged a bunch of great changes from [Abdelkader Boudih](https://github.com/seuros), 
+  including a change to use [appraisal](https://github.com/thoughtbot/appraisal)
+* Added Travis builds for Rails 4.1.1 and Ruby 2.1.2
+* Dropped support for Rails 3.1, as it is no longer receiving security patches.
+  See http://rubyonrails.org/security/ for more information.
+
+### 4.4.0
+
+* Added ```.self_and_descendant_ids``` and ```.self_and_ancestors_ids``` from [PR92](https://github.com/mceachen/closure_tree/pull/92).
+  Thanks, [Kir Shatrov](https://github.com/kirs)!
+
+* Dropped support for Rails 3.0.
+
+### 4.3.0
+
+* Use [foreigner](https://github.com/matthuhiggins/foreigner) to prove that
+  things are inserted and deleted without violating foreign key constraints
+
+* Added Rails 4.1.0.rc2 as a Travis CI build target
+
+### 4.2.9
+
+* Support for Heroku's cray assets:precompile hack for Rails 4.
+  Addresses [issue 78](https://github.com/mceachen/closure_tree/issues/78).
+  Thanks for the assist, [Alex Bowman](https://github.com/axlekb).
+
+### 4.2.8
+
+* More massaging for Rails 4 and ```attr_accessible``` support
+
+### 4.2.7
+
+* ```self_and_ancestors``` and ```ancestry_hierarchy``` are reloaded
+  when nodes are reparented. Addresses [issue 68](https://github.com/mceachen/closure_tree/issues/68).
+  Thanks for the assist, [Ivan Stana](https://github.com/istana).
+
+### 4.2.6
+
+* Explicitly added MIT licensing to the gemspec.
+
+### 4.2.5
+
+* Fix for potential deadlock from ```delete_hierarchy_references``` not being called within an
+  advisory lock. Thanks, [Armando Guereca](https://github.com/aguereca), for finding that!
+
+* Sped up find_or_create_by_path to skip cycle detection validation.
+  A node whose ancestry was 200-deep took 20 seconds to create (!!), and now takes < 1 second.
+
+* Fixed issue with MySQL that prevented nodes > 60 levels deep from being created
+
+### 4.2.4
+
+* Support for ```root?```, ```child?```, and proper parent-child associations
+  when both the parent and the child are not persisted. Addresses [issue 64](https://github.com/mceachen/closure_tree/issues/64).
+  Thanks for the help, [Gabriel Mazetto](https://github.com/brodock)!
+
+### 4.2.3
+
+* Fixed ```attr_accessible?``` error introduced in 4.2.2 ([issue 66](https://github.com/mceachen/closure_tree/issues/66)).
+* Switched to use new WithAdvisoryLock::DatabaseAdapterSupport (in v0.0.9) to add Postgis support
+
+### 4.2.2
+
+* Support attr_accessible and strong_attributes even if you're on Rails 4
+
+### 4.2.1
+
+* Deleting from NumericDeterministicOrdering doesn't create sort order gaps anymore.
+
+### 4.2.0
+
+* Added ```with_ancestor(*ancestors)```. Thanks for the idea, [Matt](https://github.com/mgornick)!
+* Applied [Leonel Galan](https://github.com/leonelgalan)'s fix for Strong Attribute support
+* ```find_or_create_by``` now uses passed-in attributes as both selection and creation criteria.
+  Thanks for the help, [Judd Blair](https://github.com/juddblair)!
+  **Please note that this changes prior behavior—test your code with this new version!**
+* ```ct_advisory_lock``` was moved into the ```_ct``` support class, to reduce model method pollution
+* Moved a bunch of code into more focused piles of module mixins
+
+### 4.1.0
+
+* Added support for Rails 4.0.0.rc1 and Ruby 2.0.0 (while maintaining backward compatibility with Rails 3, BOOYA)
+* Added ```#to_dot_digraph```, suitable for Graphviz rendering
+
+### 4.0.1
+
+* Numeric, deterministically ordered siblings will always be [0..#{self_and_siblings.count}]
+  (previously, the sort order might use negative values, which broke the preordering).
+  Resolves [issue 49](https://github.com/mceachen/closure_tree/issues/49). Thanks for the help,
+  [Leonel Galan](https://github.com/leonelgalan), [Juan Hoyos](https://github.com/elhoyos), and
+  [Michael Elfassy](https://github.com/elfassy)!
+
+* The ```order``` option can be a symbol now. Resolves [issue 46](https://github.com/mceachen/closure_tree/issues/46).
+
+### 4.0.0
+
+* Moved all of closure_tree's implementation-detail methods into a ```ClosureTree::Support```
+  instance, which removes almost all of the namespace pollution in your models that wasn't
+  for normal consumption. If you were using any of these methods, they're now available through
+  the "_ct" class and instance member.
+
+  *This change may break consumers*, so I incremented the major version number, even though no new
+  functionality was released.
+
+### 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.
+  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```.
+  Thanks for the suggestion, [Leonel Galan](https://github.com/leonelgalan)!
+
+### 3.9.0
+
+* Added ```.child_ids```.
+* Removed ```dependent => destroy``` on the descendant_hierarchy and ancestor_hierarchy collections
+  (they were a mistake).
+* Clarified documentation for creation and child associations.
+  Because ```Tag.create!(:parent => ...)``` requires a ```.reload```, I removed it as an example.
+
+All three of these improvements were suggested by Andrew Bromwich. Thanks!
+
+### 3.8.2
+
+* find_by_path uses 1 SELECT now. BOOM.
+
+### 3.8.1
+
+* Double-check locking for find_or_create_by_path
+
+### 3.8.0
+
+* Support for preordered descendants. This requires a numeric sort order column.
+  Resolves [feature request 38](https://github.com/mceachen/closure_tree/issues/38).
+* Moved modules from ```acts_as_tree``` into separate files
+
+### 3.7.3
+
+Due to MySQL's inability to lock rows properly, I've switched to advisory_locks for
+all write paths. This will prevent deadlocks, addressing
+[issue 41](https://github.com/mceachen/closure_tree/issues/41).
+
+### 3.7.2
+
+* Support for UUID primary keys. Addresses
+  [issue 40](https://github.com/mceachen/closure_tree/issues/40). Thanks for the pull request,
+  [Julien](https://github.com/calexicoz)!
+
+### 3.7.1
+
+* Moved requires into ActiveSupport.on_load
+* Added ```require 'with_advisory_lock'```
+
+### 3.7.0
+
+**Thread safety!**
+* [Advisory locks](https://github.com/mceachen/with_advisory_lock) were
+  integrated with the class-level ```find_or_create_by_path``` and ```rebuild!```.
+* Pessimistic locking is used by the instance-level ```find_or_create_by_path```.
+
+### 3.6.9
+
+* [Don Morrison](https://github.com/elskwid) massaged the [#hash_tree](#nested-hashes) query to
+be more efficient, and found a bug in ```hash_tree```'s query that resulted in duplicate rows,
+wasting time on the ruby side.
+
+### 3.6.7
+
+* Added workaround for ActiveRecord::Observer usage pre-db-creation. Addresses
+  [issue 32](https://github.com/mceachen/closure_tree/issues/32).
+  Thanks, [Don Morrison](https://github.com/elskwid)!
+
+### 3.6.6
+
+* Added support for Rails 4's [strong parameter](https://github.com/rails/strong_parameters).
+Thanks, [James Miller](https://github.com/bensie)!
+
+### 3.6.5
+
+* Use ```quote_table_name``` instead of ```quote_column_name```. Addresses
+ [issue 29](https://github.com/mceachen/closure_tree/issues/29). Thanks,
+ [Marcello Barnaba](https://github.com/vjt)!
+
+### 3.6.4
+
+* Use ```.pluck``` when available for ```.ids_from```. Addresses
+ [issue 26](https://github.com/mceachen/closure_tree/issues/26). Thanks,
+ [Chris Sturgill](https://github.com/sturgill)!
+
+### 3.6.3
+
+* Fixed [issue 24](https://github.com/mceachen/closure_tree/issues/24), which optimized ```#hash_tree```
+  for roots. Thanks, [Saverio Trioni](https://github.com/rewritten)!
+
+### 3.6.2
+
+* Fixed [issue 23](https://github.com/mceachen/closure_tree/issues/23), which added support for ```#siblings```
+  when sort_order wasn't specified. Thanks, [Gary Greyling](https://github.com/garygreyling)!
+
+### 3.6.1
+
+* Fixed [issue 20](https://github.com/mceachen/closure_tree/issues/20), which affected
+  deterministic ordering when siblings where different STI classes. Thanks, [edwinramirez](https://github.com/edwinramirez)!
+
+### 3.6.0
+
+Added support for:
+* ```:hierarchy_class_name``` as an option
+* ActiveRecord::Base.table_name_prefix
+* ActiveRecord::Base.table_name_suffix
+
+This addresses [issue 21](https://github.com/mceachen/closure_tree/issues/21). Thanks, [Judd Blair](https://github.com/juddblair)!
+
+### 3.5.2
+
+* Added ```find_all_by_generation```
+  for [feature request 17](https://github.com/mceachen/closure_tree/issues/17).
+
+### 3.4.2
+
+* Fixed [issue 18](https://github.com/mceachen/closure_tree/issues/18), which affected
+  append_node/prepend_node ordering when the first node didn't have an explicit order_by value
+
+### 3.4.1
+
+* Reverted .gemspec mistake that changed add_development_dependency to add_runtime_dependency
+
+### 3.4.0
+
+Fixed [issue 15](https://github.com/mceachen/closure_tree/issues/15):
+* "parent" is now attr_accessible, which adds support for constructor-provided parents.
+* updated readme accordingly
+
+### 3.3.2
+
+* Merged calebphillips' patch for a more efficient leaves query
+
+### 3.3.1
+
+* Added support for partially-unsaved hierarchies [issue 13](https://github.com/mceachen/closure_tree/issues/13):
+```
+a = Tag.new(name: "a")
+b = Tag.new(name: "b")
+a.children << b
+a.save
+```
+
+### 3.3.0
+
+* Added [```hash_tree```](#nested-hashes).
+
+### 3.2.1
+
+* Added ```ancestor_ids```, ```descendant_ids```, and ```sibling_ids```
+* Added example spec to solve [issue 9](https://github.com/mceachen/closure_tree/issues/9)
+
+### 3.2.0
+
+* Added support for deterministic ordering of nodes.
+
+### 3.1.0
+
+* Switched to using ```has_many :though``` rather than ```has_and_belongs_to_many```
+
+### 3.0.4
+
+* Merged [pull request](https://github.com/mceachen/closure_tree/pull/8) to fix ```.siblings``` and ```.self_and_siblings```
+  (Thanks, [eljojo](https://github.com/eljojo)!)
+
+### 3.0.3
+
+* Added support for ActiveRecord's whitelist_attributes
+  (Make sure you read [the Rails Security Guide](http://guides.rubyonrails.org/security.html), and
+  enable ```config.active_record.whitelist_attributes``` in your ```config/application.rb``` ASAP!)
+
+### 3.0.2
+
+* Fix for ancestry-loop detection (performed by a validation, not through raising an exception in before_save)
+
+### 3.0.1
+
+* Support 3.2.0's fickle deprecation of InstanceMethods (Thanks, [jheiss](https://github.com/mceachen/closure_tree/pull/5))!
+
+### 3.0.0
+
+* Support for polymorphic trees
+* ```find_by_path``` and ```find_or_create_by_path``` signatures changed to support constructor attributes
+* tested against Rails 3.1.3
+
+### 2.0.0
+
+* Had to increment the major version, as rebuild! will need to be called by prior consumers to support the new ```leaves``` class and instance methods.
+* Tag deletion is supported now along with ```:dependent => :destroy``` and ```:dependent => :delete_all```
+* Switched from default rails plugin directory structure to rspec
+* Support for running specs under different database engines: ```export DB ; for DB in sqlite3 mysql postgresql ; do rake ; done```

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'foreigner', :git => 'https://github.com/mceachen/foreigner.git'
+gemspec

data/README.md

@@ -25,7 +25,7 @@ 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.1, 3.2, 4.0, and 4.1__
+* __Support for Rails 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
@@ -53,7 +53,7 @@ for a description of different tree storage algorithms.
 
 ## Installation
 
-Note that closure_tree only supports Rails 3.0 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
+Note that closure_tree only supports Rails 3.2 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
 
 1.  Add this to your Gemfile: ```gem 'closure_tree'```
 
@@ -243,7 +243,7 @@ Just for kicks, this is the test tree I used for proving that preordered tree tr
 When you include ```acts_as_tree``` in your model, you can provide a hash to override the following defaults:
 
 * ```:parent_column_name``` to override the column name of the parent foreign key in the model's table. This defaults to "parent_id".
-* ```:hierarchy_table_name``` to override the hierarchy class name. This defaults to the singular name of the model + "Hierarchy", like ```TagHierarchy```.
+* ```:hierarchy_class_name``` to override the hierarchy class name. This defaults to the singular name of the model + "Hierarchy", like ```TagHierarchy```.
 * ```:hierarchy_table_name``` to override the hierarchy table name. This defaults to the singular name of the model + "_hierarchies", like ```tag_hierarchies```.
 * ```:dependent``` determines what happens when a node is destroyed. Defaults to ```nullify```.
     * ```:nullify``` will simply set the parent column to null. Each child node will be considered a "root" node. This is the default.
@@ -437,6 +437,10 @@ database with multiple threads, and don't provide an alternative mutex.
 
 ## FAQ
 
+### Does this work well with ```#default_scope```?
+
+No. Please see [issue 86](https://github.com/mceachen/closure_tree/issues/86) for details.
+
 ### Does this gem support multiple parents?
 
 No. This gem's API is based on the assumption that each node has either 0 or 1 parent.
@@ -484,15 +488,14 @@ end
 
 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.1, 3.2, 4.0, and 4.1 branches, and
-* MySQL and PostgreSQL. SQLite works in a single-threaded environment.
+* Ruby 1.9.3 , 2.0.0 and 2.1.2
+* Rubinius 2.2.6
+* The latest Rails 3.2, 4.0, 4.1 and master branches
+* Concurrency tests for 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.1.x due to this [known issue](https://github.com/rails/rails/issues/7538).
-
 ## Change log
 
 See https://github.com/mceachen/closure_tree/blob/master/CHANGELOG.md

data/closure_tree.gemspec

@@ -0,0 +1,35 @@
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'closure_tree/version'
+
+Gem::Specification.new do |gem|
+  gem.name        = 'closure_tree'
+  gem.version     = ::ClosureTree::VERSION
+  gem.authors     = ['Matthew McEachen']
+  gem.email       = ['matthew-github@mceachen.org']
+  gem.homepage    = 'http://mceachen.github.io/closure_tree/'
+
+  gem.summary = %q(Easily and efficiently make your ActiveRecord model support hierarchies)
+  gem.description = gem.summary
+  gem.license = 'MIT'
+
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.test_files    = gem.files.grep(%r{^spec/})
+
+  gem.add_runtime_dependency 'activerecord', '>= 3.2.0'
+  gem.add_runtime_dependency 'with_advisory_lock', '>= 0.0.9' # <- to prevent duplicate roots
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-instafail'
+  gem.add_development_dependency 'rspec-rails' # FIXME: for rspec-rails and rspec fixture support
+  gem.add_development_dependency 'mysql2'
+  gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'uuidtools'
+  gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'appraisal'
+
+  # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.
+  # TODO: gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+end

data/gemfiles/activerecord_3.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "activerecord", "~> 3.2"
+gem "strong_parameters"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "activerecord", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "activerecord", "~> 4.1"
+
+gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "activerecord", :github => "rails/rails"
+gem "arel", :github => "rails/arel"
+
+gemspec :path => "../"

data/lib/closure_tree.rb

@@ -1,8 +1,6 @@
 require 'active_support'
-require 'active_record'
 
 ActiveSupport.on_load :active_record do
   require 'closure_tree/acts_as_tree'
-
   ActiveRecord::Base.send :extend, ClosureTree::ActsAsTree
 end

data/lib/closure_tree/acts_as_tree.rb

@@ -11,6 +11,18 @@ require 'closure_tree/numeric_deterministic_ordering'
 module ClosureTree
   module ActsAsTree
     def acts_as_tree(options = {})
+      options.assert_valid_keys(
+        :base_class,
+        :dependent,
+        :hierarchy_class_name,
+        :hierarchy_table_name,
+        :name,
+        :name_column,
+        :order,
+        :parent_column_name,
+        :with_advisory_lock
+      )
+
       class_attribute :_ct
       self._ct = ClosureTree::Support.new(self, options)
 

data/lib/closure_tree/digraphs.rb

@@ -14,11 +14,11 @@ module ClosureTree
     module ClassMethods
       # Renders the given scope as a DOT digraph, suitable for rendering by Graphviz
       def to_dot_digraph(tree_scope)
-        id_to_instance = tree_scope.inject({}) { |h, ea| h[ea.id] = ea; h }
+        id_to_instance = tree_scope.reduce({}) { |h, ea| h[ea.id] = ea; h }
         output = StringIO.new
         output << "digraph G {\n"
         tree_scope.each do |ea|
-          if id_to_instance.has_key? ea._ct_parent_id
+          if id_to_instance.key? ea._ct_parent_id
             output << "  #{ea._ct_parent_id} -> #{ea._ct_id}\n"
           end
           output << "  #{ea._ct_id} [label=\"#{ea.to_digraph_label}\"]\n"

data/lib/closure_tree/model.rb

@@ -6,39 +6,40 @@ module ClosureTree
 
     included do
       belongs_to :parent,
-        :class_name => _ct.model_class.to_s,
-        :foreign_key => _ct.parent_column_name,
-        :inverse_of => :children
+                 class_name: _ct.model_class.to_s,
+                 foreign_key: _ct.parent_column_name,
+                 inverse_of: :children
 
+      # TODO, remove when activerecord 3.2 support is dropped
       attr_accessible :parent if _ct.use_attr_accessible?
 
       order_by_generations = "#{_ct.quoted_hierarchy_table_name}.generations asc"
 
       has_many :children, *_ct.has_many_with_order_option(
-        :class_name => _ct.model_class.to_s,
-        :foreign_key => _ct.parent_column_name,
-        :dependent => _ct.options[:dependent],
-        :inverse_of => :parent)
+        class_name: _ct.model_class.to_s,
+        foreign_key: _ct.parent_column_name,
+        dependent: _ct.options[:dependent],
+        inverse_of: :parent)
 
       has_many :ancestor_hierarchies, *_ct.has_many_without_order_option(
-        :class_name => _ct.hierarchy_class_name,
-        :foreign_key => "descendant_id",
-        :order => order_by_generations)
+        class_name: _ct.hierarchy_class_name,
+        foreign_key: 'descendant_id',
+        order: order_by_generations)
 
       has_many :self_and_ancestors, *_ct.has_many_without_order_option(
-        :through => :ancestor_hierarchies,
-        :source => :ancestor,
-        :order => order_by_generations)
+        through: :ancestor_hierarchies,
+        source: :ancestor,
+        order: order_by_generations)
 
       has_many :descendant_hierarchies, *_ct.has_many_without_order_option(
-        :class_name => _ct.hierarchy_class_name,
-        :foreign_key => "ancestor_id",
-        :order => order_by_generations)
+        class_name: _ct.hierarchy_class_name,
+        foreign_key: 'ancestor_id',
+        order: order_by_generations)
 
       has_many :self_and_descendants, *_ct.has_many_with_order_option(
-        :through => :descendant_hierarchies,
-        :source => :descendant,
-        :order => order_by_generations)
+        through: :descendant_hierarchies,
+        source: :descendant,
+        order: order_by_generations)
     end
 
     # Delegate to the Support instance on the class:
@@ -76,7 +77,7 @@ module ClosureTree
       ancestors.size
     end
 
-    alias :level :depth
+    alias_method :level, :depth
 
     def ancestors
       without_self(self_and_ancestors)
@@ -94,7 +95,7 @@ module ClosureTree
     # to the +name_column+.
     # (so child.ancestry_path == +%w{grandparent parent child}+
     def ancestry_path(to_s_column = _ct.name_column)
-      self_and_ancestors.reverse.collect { |n| n.send to_s_column.to_sym }
+      self_and_ancestors.reverse.map { |n| n.send to_s_column.to_sym }
     end
 
     def child_ids

data/lib/closure_tree/support.rb

@@ -103,11 +103,7 @@ module ClosureTree
     end
 
     def ids_from(scope)
-      if scope.respond_to? :pluck
-        scope.pluck(model_class.primary_key)
-      else
-        scope.select(model_class.primary_key).map { |ea| ea._ct_id }
-      end
+      scope.pluck(model_class.primary_key)
     end
 
     def with_advisory_lock(&block)

data/lib/closure_tree/version.rb

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

data/mktree.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env bundle exec ruby -I lib:spec
+
+# Simple benchmark utility to create a closure tree based on the topology of the current filesystem
+
+#ENV['NONUKES'] = '1'
+require 'spec_helper'
+require 'findler'
+require 'pathname'
+
+# Returns the current path, split into an array.
+# Pathname.new("/a/b/c").path_array = ["a", "b", "c"]
+class Pathname
+  def path_array
+    a = []
+    each_filename { |ea| a << ea }
+    a
+  end
+end
+
+cnt = 0
+f = Findler.new '/'
+iter = f.iterator
+Tag.with_advisory_lock('closure_tree') do
+  while (nxt = iter.next_file) && ((cnt += 1) < 1000)
+    t = Tag.find_or_create_by_path(nxt.path_array)
+    puts "created #{nxt.to_s}"
+  end
+end
+
+puts "Tag.all.size: #{Tag.all.size}"
+puts "TagHierarchy.all.size: #{TagHierarchy.all.size}"
+
+puts 'Tag.roots performance:'
+puts Benchmark.measure { Tag.roots.size }
+
+puts 'Tag.leaves performance:'
+puts Benchmark.measure { Tag.leaves.size }
+

data/spec/db/database.yml

@@ -8,7 +8,7 @@ common: &common
 
 sqlite:
   adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
-  database: spec/sqlite3.db
+  database: ':memory:'
 
 postgresql:
   <<: *common

data/spec/hierarchy_maintenance_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ClosureTree::HierarchyMaintenance do
+  describe '.rebuild!' do
+    it 'rebuild tree' do
+      20.times do |counter|
+        Metal.create(:value => "Nitro-#{counter}", parent: Metal.all.sample)
+      end
+      hierarchy_count = MetalHierarchy.count
+      MetalHierarchy.delete_all
+      Metal.rebuild!
+      expect(MetalHierarchy.count).to eq(hierarchy_count)
+    end
+  end
+end

data/spec/label_spec.rb

@@ -49,9 +49,7 @@ describe Label do
       b = c.parent
       a = c.root
       a.destroy
-      Label.exists?(a).should be_false
-      Label.exists?(b).should be_false
-      Label.exists?(c).should be_false
+      Label.exists?(id: [a.id,b.id,c.id]).should be_false
     end
   end
 
@@ -346,6 +344,28 @@ describe Label do
     end
   end
 
+  context "descendent destruction" do
+    it "properly destroys descendents created with add_child" do
+      a = Label.create(name: 'a')
+      b = Label.new(name: 'b')
+      a.add_child b
+      c = Label.new(name: 'c')
+      b.add_child c
+      a.destroy
+      Label.exists?(id: [a.id,b.id,c.id]).should be_false
+    end
+
+    it "properly destroys descendents created with <<" do
+      a = Label.create(name: 'a')
+      b = Label.new(name: 'b')
+      a.children << b
+      c = Label.new(name: 'c')
+      b.children << c
+      a.destroy
+      Label.exists?(id: [a.id,b.id,c.id]).should be_false
+    end
+  end
+
   context "preorder" do
     it "returns descendants in proper order" do
       create_preorder_tree

data/spec/model_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe ClosureTree::Model do
+  describe '#_ct' do
+    it 'should delegate to the Support instance on the class' do
+      expect(Tag.new._ct).to eq(Tag._ct)
+    end
+  end
+end

data/spec/parallel_prepend_sibling_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'securerandom'
 
-describe "threadhot" do
+describe "threadhot", concurrency: true do
 
   before :each do
     @iterations = 5
@@ -39,5 +39,4 @@ describe "threadhot" do
     Label.all.select { |ea| ea.root? }.should == [@target.parent]
   end
 
-# SQLite doesn't like parallelism, and Rails 3.0 and 3.1 have known threading issues. SKIP.
-end if ((ENV["DB"] != "sqlite") && (ActiveRecord::VERSION::STRING =~ /^3.2/))
+end

data/spec/parallel_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-parallelism_is_broken = begin
-  # Rails < 3.2 has known bugs with parallelism
-  (ActiveRecord::VERSION::MAJOR <= 3 && ActiveRecord::VERSION::MINOR < 2) ||
-    # SQLite doesn't support parallel writes
-    ENV["DB"] =~ /sqlite/
-end
 
 class DbThread
   def initialize(&block)
@@ -19,7 +13,7 @@ class DbThread
   end
 end
 
-describe "threadhot" do
+describe "threadhot", concurrency: true  do
 
   before :each do
     @parent = nil
@@ -144,4 +138,4 @@ describe "threadhot" do
     User.all.should be_empty
   end
 
-end unless parallelism_is_broken
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 plugin_test_dir = File.dirname(__FILE__)
 
-require 'rubygems'
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 require 'rspec'
@@ -17,8 +17,7 @@ if ENV['STDOUT_LOGGING']
   ActiveRecord::Base.logger = log
 end
 
-require 'yaml'
-require 'erb'
+
 ENV["DB"] ||= "mysql"
 ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s
 ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s
@@ -32,20 +31,19 @@ ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir +
 
 def recreate_db
   db_name = ActiveRecord::Base.configurations[ENV["DB"]]["database"]
-  case ENV['DB'] || 'mysql'
+  case ENV['DB']
     when 'sqlite'
-      File.delete 'spec/sqlite3.db' if File.exist? 'spec/sqlite3.db'
     when 'postgresql'
       `psql -c 'DROP DATABASE #{db_name}' -U postgres`
       `psql -c 'CREATE DATABASE #{db_name}' -U postgres`
-    when 'mysql'
+    else
       `mysql -e 'DROP DATABASE IF EXISTS #{db_name}'`
       `mysql -e 'CREATE DATABASE #{db_name}'`
   end
   ActiveRecord::Base.connection.reconnect!
 end
 
-ActiveRecord::Base.establish_connection(ENV["DB"])
+ActiveRecord::Base.establish_connection(ENV["DB"].to_sym)
 
 ActiveRecord::Migration.verbose = false
 if ENV['NONUKES']
@@ -86,6 +84,12 @@ Thread.abort_on_exception = true
 
 DatabaseCleaner.strategy = :truncation
 
+
+def support_concurrency
+  # SQLite doesn't support parallel writes
+  !(ENV['DB'] =~ /sqlite/)
+end
+
 RSpec.configure do |config|
   config.before(:each) do
     DatabaseCleaner.start
@@ -100,4 +104,7 @@ RSpec.configure do |config|
   config.after(:all) do
     FileUtils.remove_entry_secure ENV['FLOCK_DIR']
   end
+  config.filter_run_excluding :concurrency => !support_concurrency
 end
+
+

data/spec/uuid_tag_spec.rb

@@ -3,4 +3,4 @@ require 'tag_examples'
 
 describe UUIDTag do
   it_behaves_like Tag
-end unless ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
+end

data/tests.sh

@@ -0,0 +1,8 @@
+#!/bin/sh -ex
+
+appraisal install
+
+for db in sqlite mysql postgresql
+do
+  DB=$db WITH_ADVISORY_LOCK_PREFIX=$(date +%s) appraisal rake all_spec_flavors
+done

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-05-18 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
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        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: '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
+  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: rspec-rails
+  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: mysql2
+  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: pg
+  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: sqlite3
+  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: uuidtools
+  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: database_cleaner
+  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'
 description: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -199,9 +199,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
+- Appraisals
+- CHANGELOG.md
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
+- closure_tree.gemspec
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.1.gemfile
+- gemfiles/activerecord_edge.gemfile
+- img/example.png
+- img/preorder.png
 - lib/closure_tree.rb
 - lib/closure_tree/acts_as_tree.rb
 - lib/closure_tree/deterministic_ordering.rb
@@ -216,12 +229,15 @@ files:
 - lib/closure_tree/support_attributes.rb
 - lib/closure_tree/support_flags.rb
 - lib/closure_tree/version.rb
+- mktree.rb
 - spec/cuisine_type_spec.rb
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
+- spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
 - spec/metal_spec.rb
+- spec/model_spec.rb
 - spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb
@@ -232,6 +248,7 @@ files:
 - spec/tag_spec.rb
 - spec/user_spec.rb
 - spec/uuid_tag_spec.rb
+- tests.sh
 homepage: http://mceachen.github.io/closure_tree/
 licenses:
 - MIT
@@ -242,17 +259,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.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -261,8 +278,10 @@ test_files:
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
+- spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
 - spec/metal_spec.rb
+- spec/model_spec.rb
 - spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb