closure_tree 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61222be14d812607e9d4cefdcfc76c0579fb08dd
-  data.tar.gz: 81e89568a49834a426341cdd5f1595ccd7587c7c
+  metadata.gz: be5442160917053dfca50f710fa8276b2d2d937c
+  data.tar.gz: e6012dd4b630ace5fa36835de936bd395e41df20
 SHA512:
-  metadata.gz: 97e39637522b4a2d9ea04d0900c5da4fbd5e21ec2dacc3d6082ca7c77106bc612100ce1c61e8e82e238ef705e9bce4d7d22537a012e3abfff9a042d96256c3ca
-  data.tar.gz: fb6aa0360ae7642efc6c5d70ff44bc9d583c25a027ae07c3eaa1573fea8d99879a5f424a8641209b34a10ffc17c98edeff122bfebd282b71521010f8bb9c1153
+  metadata.gz: 43316c4fd1030f11ca90d59cf477f9a7d5300a16771152e3b81a779d5a25f665b9f9a288c42bc0c54183717d537cc95d704fc180166064079fbe6a9ee20d2bc5
+  data.tar.gz: 7f65c0281b3d878b2c333087f3e63a8e09c6aecbcabc98d798e2e1651853f50f7aefe50ece31b611bf12b17718fa3b023adc67cb39c747034a79aafae152dd93

data/.gitignore

@@ -11,4 +11,4 @@ tmp/
 .rvmrc
 *.lock
 tmp/
-.ruby-version
+.ruby-*

data/.travis.yml

@@ -2,12 +2,18 @@ cache: bundler
 sudo: false
 language: ruby
 rvm:
-  - 2.2.3
-  - jruby-head
+  - 2.3.1
+  - 2.2.5
+  - 2.0
+# these haven't been passing for a while:
+#  - jruby-head
+#  - rbx
 
 gemfile:
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
+  - gemfiles/activerecord_5.0_foreigner.gemfile
+  - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_edge.gemfile
 
 env:
@@ -15,16 +21,19 @@ env:
   - DB=mysql
   - DB=postgresql
 
-#addons:
-#  postgresql: "9.3"
-
 script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/activerecord_edge.gemfile
     - rvm: jruby-head
+    - rvm: rbx
 
+  # rails 5+ requires ruby >= 2.2:
   exclude:
-    - rvm: ruby-head
-      gemfile: gemfiles/activerecord_4.1.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/activerecord_5.0_foreigner.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/activerecord_5.0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/activerecord_edge.gemfile

data/Appraisals

@@ -1,6 +1,6 @@
 appraise 'activerecord-4.1' do
   gem 'activerecord', '~> 4.1.0'
-  gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'
+  gem 'foreigner'
   platforms :ruby, :rbx do
     gem 'mysql2', '~> 0.3.20'
   end
@@ -8,11 +8,21 @@ end
 
 appraise 'activerecord-4.2' do
   gem 'activerecord', '~> 4.2.0'
+
   platforms :ruby, :rbx do
     gem 'mysql2', '~> 0.3.20'
   end
 end
 
+appraise 'activerecord-5.0-foreigner' do
+  gem 'activerecord', '~> 5.0.0'
+  gem 'foreigner'
+end
+
+appraise 'activerecord-5.0' do
+  gem 'activerecord', '~> 5.0.0'
+end
+
 appraise 'activerecord-edge' do
   gem 'activerecord', github: 'rails/rails'
   gem 'arel', github: 'rails/arel'

data/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
+### 6.1.0
+
+* Added official support for ActiveRecord 5.0! Thanks to [Abdelkader Boudih](https://github.com/seuros),
+  [Jay Fredlund](https://github.com/jayfredlund), Veselin Stoyanov, and
+  [Aaron Russell](https://github.com/aaronrussell) for all the PRs.
+* Add `database_less` configuration to not raise an error during build step when
+  database is unavailable which is a common case in some PaaS like
+  (Heroku, Catalyze, ..., etc).
+
 ### 6.0.0
 
 * [Andrew Kumanyaev](https://github.com/zzet) *dramatically* improved mutation performance on large trees. 
   Thanks for the PR!
 * [Martin Schmidt](https://github.com/martin-schmidt) discovered and fixed build problems due to new versions 
   of mysql2 and ammeter which broke Travis builds. Thanks for the PR!
+* [Fabien MICHEL](https://github.com/fabien-michel) updated the README with another example. Thanks for the PR!
 
 ### 6.0.0.alpha,beta,gamma
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Matthew McEachen
+Copyright (c) 2012-2016 Matthew McEachen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,7 +2,7 @@
 
 ### Closure_tree lets your ActiveRecord models act as nodes in a [tree data structure](http://en.wikipedia.org/wiki/Tree_%28data_structure%29)
 
-Common applications include modeling hierarchical data, like tags, page graphs in CMSes,
+Common applications include modeling hierarchical data, like tags, threaded comments, page graphs in CMSes,
 and tracking user referrals.
 
 [![Build Status](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master)](http://travis-ci.org/mceachen/closure_tree)
@@ -26,8 +26,8 @@ closure_tree has some great features:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
 * __Support for [concurrency](#concurrency)__ (using [with_advisory_lock](https://github.com/mceachen/with_advisory_lock))
-* __Support for ActiveRecord 4.1, 4.2 and 5.0.alpha__
-* __Support for Ruby 2.2 and JRuby 9000__
+* __Support for ActiveRecord 4.1, 4.2 and 5.0__
+* __Support for Ruby 2.0, 2.1, 2.2, 2.3.1 and JRuby 9000__
 * Support for reparenting children (and all their descendants)
 * Support for [single-table inheritance (STI)](#sti) within the hierarchy
 * ```find_or_create_by_path``` for [building out heterogeneous hierarchies quickly and conveniently](#find_or_create_by_path)
@@ -109,6 +109,9 @@ Note that closure_tree only supports ActiveRecord 4.1 and later, and has test co
 
     If you're starting from scratch you don't need to call `rebuild!`.
 
+NOTE: Run `rails g closure_tree:config` to create an initializer with extra
+      configurations. (Optional)
+
 ## Warning
 
 As stated above, using multiple hierarchy gems (like `ancestry` or `nested set`) on the same model 
@@ -145,11 +148,17 @@ child3 = Tag.new(name: 'Third Child')
 parent.add_child child3
 ```
 
+Or by setting the parent on the child :
+
+```ruby
+Tag.create(name: 'Fourth Child', parent: parent)
+```
+
 Then:
 
 ```ruby
 grandparent.self_and_descendants.collect(&:name)
-=> ["Grandparent", "Parent", "First Child", "Second Child", "Third Child"]
+=> ["Grandparent", "Parent", "First Child", "Second Child", "Third Child", "Fourth Child"]
 
 child1.ancestry_path
 => ["Grandparent", "Parent", "First Child"]
@@ -275,6 +284,7 @@ When you include ```has_closure_tree``` in your model, you can provide a hash to
     * ```:nullify``` will simply set the parent column to null. Each child node will be considered a "root" node. This is the default.
     * ```:delete_all``` will delete all descendant nodes (which circumvents the destroy hooks)
     * ```:destroy``` will destroy all descendant nodes (which runs the destroy hooks on each child node)
+    * ```nil``` does nothing with descendant nodes
 * ```:name_column``` used by #```find_or_create_by_path```, #```find_by_path```, and ```ancestry_path``` instance methods. This is primarily useful if the model only has one required field (like a "tag").
 * ```:order``` used to set up [deterministic ordering](#deterministic-ordering)
 * ```:touch``` delegates to the `belongs_to` annotation for the parent, so `touch`ing cascades to all children (the performance of this for deep trees isn't currently optimal).
@@ -394,12 +404,12 @@ If your ```order``` column is an integer attribute, you'll also have these:
 * ```node1.prepend_sibling(node2)``` which will
   1. set ```node2``` to the same parent as ```node1```,
   2. set ```node2```'s order column to 1 less than ```node1```'s value, and
-  3. decrement the order_column of all children of node1's parents whose order_column is <>>= node2's new value by 1.
+  3. increment the order_column of all children of node1's parents whose order_column is > node2's new value by 1.
 
 * ```node1.append_sibling(node2)``` which will
   1. set ```node2``` to the same parent as ```node1```,
   2. set ```node2```'s order column to 1 more than ```node1```'s value, and
-  3. increment the order_column of all children of node1's parents whose order_column is >= node2's new value by 1.
+  3. increment the order_column of all children of node1's parents whose order_column is > node2's new value by 1.
 
 ```ruby
 
@@ -503,6 +513,22 @@ after do
 end
 ```
 
+### `bundle install` says `Gem::Ext::BuildError: ERROR: Failed to build gem native extension`
+
+When building from source, the `mysql2`, `pg`, and `sqlite` gems need their native client libraries
+installed on your system. Note that this error isn't specific to ClosureTree.
+
+On Ubuntu/Debian systems, run:
+
+```
+sudo apt-get install libpq-dev libsqlite3-dev libmysqlclient-dev
+bundle install
+```
+
+### Object destroy fails with MySQL 5.7+
+
+A bug was introduced in MySQL's query optimizer. [See the workaround here](https://github.com/mceachen/closure_tree/issues/206).
+
 ## Testing with Closure Tree
 
 Closure tree comes with some RSpec2/3 matchers which you may use for your tests:
@@ -538,10 +564,9 @@ end
 
 Closure tree is [tested under every valid combination](http://travis-ci.org/#!/mceachen/closure_tree) of
 
-* Ruby 2.2 (and sometimes head)
-* jRuby 9000 (and sometimes head)
-* The latest ActiveRecord 4.1, 4.2, and master branch
-* Concurrency tests for MySQL and PostgreSQL. SQLite is tested in a single-threaded environment.
+* Ruby 2.0, 2.2, 2.3.1
+* ActiveRecord 4.1, 4.2, and 5.0
+* PostgreSQL, MySQL, and SQLite. Concurrency tests are only run with MySQL and PostgreSQL.
 
 Assuming you're using [rbenv](https://github.com/sstephenson/rbenv), you can use ```tests.sh``` to
 run the test matrix locally.
@@ -552,7 +577,7 @@ See the [change log](https://github.com/mceachen/closure_tree/blob/master/CHANGE
 
 ## Thanks to
 
-* The more than 30 engineers around the world that have contributed their time and code to this gem
+* The 45+ engineers around the world that have contributed their time and code to this gem
   (see the [changelog](https://github.com/mceachen/closure_tree/blob/master/CHANGELOG.md)!)
 * https://github.com/collectiveidea/awesome_nested_set
 * https://github.com/patshaughnessy/class_factory

data/closure_tree.gemspec

@@ -14,18 +14,18 @@ Gem::Specification.new do |gem|
 
   gem.files       = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files  = gem.files.grep(%r{^spec/})
-  gem.required_ruby_version = '>= 2.1.0'
+  gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_runtime_dependency 'activerecord', '>= 4.1.0'
   gem.add_runtime_dependency 'with_advisory_lock', '>= 3.0.0'
 
   gem.add_development_dependency 'rspec-instafail'
-  gem.add_development_dependency 'rspec-rails', '~> 3.2.3'
+  gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'timecop'
   gem.add_development_dependency 'parallel'
-  gem.add_development_dependency 'ammeter', '1.1.2' # See https://github.com/mceachen/closure_tree/issues/181
+  # gem.add_development_dependency 'ammeter', '1.1.2' # See https://github.com/mceachen/closure_tree/issues/181
   # gem.add_development_dependency 'byebug'
   # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.
 end

data/gemfiles/activerecord_4.1.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
-gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
+gem "foreigner"
 
 platforms :ruby, :rbx do
   gem "mysql2", "~> 0.3.20"

data/gemfiles/activerecord_5.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+
+platforms :ruby, :rbx do
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+gemspec :path => "../"

data/gemfiles/activerecord_5.0_foreigner.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "foreigner"
+
+platforms :ruby, :rbx do
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+gemspec :path => "../"

data/lib/closure_tree.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'active_record'
 
 module ClosureTree
   extend ActiveSupport::Autoload
@@ -12,6 +12,15 @@ module ClosureTree
   autoload :Digraphs
   autoload :DeterministicOrdering
   autoload :NumericDeterministicOrdering
+  autoload :Configuration
+
+  def self.configure
+    yield configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
 end
 
 ActiveSupport.on_load :active_record do

data/lib/closure_tree/configuration.rb

@@ -0,0 +1,9 @@
+module ClosureTree
+  class Configuration # :nodoc:
+    attr_accessor :database_less
+
+    def initialize
+      @database_less = ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')
+    end
+  end
+end

data/lib/closure_tree/finders.rb

@@ -47,12 +47,12 @@ module ClosureTree
     end
 
     def without_self(scope)
-      scope.without(self)
+      scope.without_instance(self)
     end
 
     module ClassMethods
 
-      def without(instance)
+      def without_instance(instance)
         if instance.new_record?
           all
         else

data/lib/closure_tree/has_closure_tree.rb

@@ -30,8 +30,7 @@ module ClosureTree
       include ClosureTree::DeterministicOrdering if _ct.order_option?
       include ClosureTree::NumericDeterministicOrdering if _ct.order_is_numeric?
     rescue StandardError => e
-      # Support Heroku's database-less assets:precompile pre-deploy step:
-      raise e unless ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')
+      raise e unless ClosureTree.configuration.database_less
     end
 
     alias_method :acts_as_tree, :has_closure_tree

data/lib/closure_tree/hash_tree.rb

@@ -11,7 +11,7 @@ module ClosureTree
       # There is no default depth limit. This might be crazy-big, depending
       # on your tree shape. Hash huge trees at your own peril!
       def hash_tree(options = {})
-        _ct.hash_tree(nil, options[:limit_depth])
+        _ct.hash_tree(_ct.default_tree_scope(all, options[:limit_depth]))
       end
     end
   end

data/lib/closure_tree/hash_tree_support.rb

@@ -1,6 +1,6 @@
 module ClosureTree
   module HashTreeSupport
-    def default_tree_scope(limit_depth = nil)
+    def default_tree_scope(scope, limit_depth = nil)
         # Deepest generation, within limit, for each descendant
         # NOTE: Postgres requires HAVING clauses to always contains aggregate functions (!!)
         having_clause = limit_depth ? "HAVING MAX(generations) <= #{limit_depth - 1}" : ''
@@ -13,15 +13,11 @@ module ClosureTree
           ) AS generation_depth
             ON #{quoted_table_name}.#{model_class.primary_key} = generation_depth.descendant_id
         SQL
-        scope_with_order(model_class.joins(generation_depth), 'generation_depth.depth')
+        scope_with_order(scope.joins(generation_depth), 'generation_depth.depth')
       end
 
     def hash_tree(tree_scope, limit_depth = nil)
-      limited_scope = if tree_scope
-        limit_depth ? tree_scope.where("#{quoted_hierarchy_table_name}.generations <= #{limit_depth - 1}") : tree_scope
-      else
-        default_tree_scope(limit_depth)
-      end
+      limited_scope = limit_depth ? tree_scope.where("#{quoted_hierarchy_table_name}.generations <= #{limit_depth - 1}") : tree_scope
       build_hash_tree(limited_scope)
     end
 

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -36,7 +36,7 @@ module ClosureTree
 
     def _ct_after_save
       if changes[_ct.parent_column_name] || @was_new_record
-        rebuild! unless @_ct_skip_hierarchy_maintenance
+        rebuild!
       end
       if changes[_ct.parent_column_name] && !@was_new_record
         # Resetting the ancestral collections addresses

data/lib/closure_tree/model.rb

@@ -5,11 +5,13 @@ module ClosureTree
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :parent,
-                 class_name: _ct.model_class.to_s,
-                 foreign_key: _ct.parent_column_name,
-                 inverse_of: :children,
-                 touch: _ct.options[:touch]
+
+      belongs_to :parent, nil, *_ct.belongs_to_with_optional_option(
+        class_name: _ct.model_class.to_s,
+        foreign_key: _ct.parent_column_name,
+        inverse_of: :children,
+        touch: _ct.options[:touch],
+        optional: true)
 
       order_by_generations = "#{_ct.quoted_hierarchy_table_name}.generations asc"
 

data/lib/closure_tree/support.rb

@@ -76,6 +76,10 @@ module ClosureTree
       end
     end
 
+    def belongs_to_with_optional_option(opts)
+      [ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts]
+    end
+
     # lambda-ize the order, but don't apply the default order_option
     def has_many_without_order_option(opts)
         [lambda { order(opts[:order]) }, opts.except(:order)]

data/lib/closure_tree/test/matcher.rb

@@ -1,3 +1,5 @@
+require 'closure_tree'
+
 module ClosureTree
   module Test
     module Matcher

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('6.0.0')
+  VERSION = Gem::Version.new('6.1.0')
 end

data/lib/generators/closure_tree/config_generator.rb

@@ -0,0 +1,12 @@
+module ClosureTree
+  module Generators # :nodoc:
+    class ConfigGenerator < Rails::Generators::Base # :nodoc:
+      source_root File.expand_path('../templates', __FILE__)
+      desc 'Install closure tree config.'
+
+      def config
+        template 'config.rb', 'config/initializers/closure_tree_config.rb'
+      end
+    end
+  end
+end

data/lib/generators/closure_tree/templates/config.rb

@@ -0,0 +1,5 @@
+ClosureTree.configure do |config|
+  # Some PaaS like Heroku don't have available the db in some build steps like
+  # assets:precompile, this is skipped when this value is true, default = false
+  # config.database_less = true
+end

data/spec/generators/migration_generator_spec.rb

@@ -1,48 +1,48 @@
-require 'spec_helper'
-require 'ammeter/init'
-
-# Generators are not automatically loaded by Rails
-require 'generators/closure_tree/migration_generator'
-
-RSpec.describe ClosureTree::Generators::MigrationGenerator, type: :generator do
-  TMPDIR = Dir.mktmpdir
-  # Tell generator where to put its output
-  destination TMPDIR
-  before { prepare_destination }
-
-  describe 'generator output' do
-    before { run_generator %w(tag) }
-    subject { migration_file('db/migrate/create_tag_hierarchies.rb') }
-    it { is_expected.to be_a_migration }
-    it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
-    it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
-    it { is_expected.to contain(/t.integer :generations, null: false/) }
-    it { is_expected.to contain(/add_index :tag_hierarchies/) }
-  end
-
-  describe 'generator output with namespaced model' do
-    before { run_generator %w(Namespace::Type) }
-    subject { migration_file('db/migrate/create_namespace_type_hierarchies.rb') }
-    it { is_expected.to be_a_migration }
-    it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
-    it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
-    it { is_expected.to contain(/t.integer :generations, null: false/) }
-    it { is_expected.to contain(/add_index :namespace_type_hierarchies/) }
-  end
-
-  describe 'generator output with namespaced model with /' do
-    before { run_generator %w(namespace/type) }
-    subject { migration_file('db/migrate/create_namespace_type_hierarchies.rb') }
-    it { is_expected.to be_a_migration }
-    it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
-    it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
-    it { is_expected.to contain(/t.integer :generations, null: false/) }
-    it { is_expected.to contain(/add_index :namespace_type_hierarchies/) }
-  end
-
-  it 'should run all tasks in generator without errors' do
-    gen = generator %w(tag)
-    expect(gen).to receive :create_migration_file
-    capture(:stdout) { gen.invoke_all }
-  end
-end
+# require 'spec_helper'
+# require 'ammeter/init'
+#
+# # Generators are not automatically loaded by Rails
+# require 'generators/closure_tree/migration_generator'
+#
+# RSpec.describe ClosureTree::Generators::MigrationGenerator, type: :generator do
+#   TMPDIR = Dir.mktmpdir
+#   # Tell generator where to put its output
+#   destination TMPDIR
+#   before { prepare_destination }
+#
+#   describe 'generator output' do
+#     before { run_generator %w(tag) }
+#     subject { migration_file('db/migrate/create_tag_hierarchies.rb') }
+#     it { is_expected.to be_a_migration }
+#     it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :generations, null: false/) }
+#     it { is_expected.to contain(/add_index :tag_hierarchies/) }
+#   end
+#
+#   describe 'generator output with namespaced model' do
+#     before { run_generator %w(Namespace::Type) }
+#     subject { migration_file('db/migrate/create_namespace_type_hierarchies.rb') }
+#     it { is_expected.to be_a_migration }
+#     it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :generations, null: false/) }
+#     it { is_expected.to contain(/add_index :namespace_type_hierarchies/) }
+#   end
+#
+#   describe 'generator output with namespaced model with /' do
+#     before { run_generator %w(namespace/type) }
+#     subject { migration_file('db/migrate/create_namespace_type_hierarchies.rb') }
+#     it { is_expected.to be_a_migration }
+#     it { is_expected.to contain(/t.integer :ancestor_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :descendant_id, null: false/) }
+#     it { is_expected.to contain(/t.integer :generations, null: false/) }
+#     it { is_expected.to contain(/add_index :namespace_type_hierarchies/) }
+#   end
+#
+#   it 'should run all tasks in generator without errors' do
+#     gen = generator %w(tag)
+#     expect(gen).to receive :create_migration_file
+#     capture(:stdout) { gen.invoke_all }
+#   end
+# end

data/spec/label_spec.rb

@@ -252,7 +252,7 @@ describe Label do
     end
 
     def children_name_and_order
-      name_and_order(@parent.children(reload = true))
+      name_and_order(@parent.children.reload)
     end
 
     def roots_name_and_order
@@ -454,7 +454,7 @@ describe Label do
       it 'should retain sort orders of descendants when moving to a new parent' do
         expected_order = ('a'..'z').to_a.shuffle
         expected_order.map { |ea| first_root.add_child(Label.new(name: ea)) }
-        actual_order = first_root.children(reload = true).pluck(:name)
+        actual_order = first_root.children.reload.pluck(:name)
         expect(actual_order).to eq(expected_order)
         last_root.append_child(first_root)
         expect(last_root.self_and_descendants.pluck(:name)).to eq(%w(10 0) + expected_order)
@@ -465,13 +465,13 @@ describe Label do
         z = first_root.find_or_create_by_path(path)
         z_children_names = (100..150).to_a.shuffle.map { |ea| ea.to_s }
         z_children_names.reverse.each { |ea| z.prepend_child(Label.new(name: ea)) }
-        expect(z.children(reload = true).pluck(:name)).to eq(z_children_names)
+        expect(z.children.reload.pluck(:name)).to eq(z_children_names)
         a = first_root.find_by_path(['a'])
         # move b up to a's level:
         b = a.children.first
         a.add_sibling(b)
         expect(b.parent).to eq(first_root)
-        expect(z.children(reload = true).pluck(:name)).to eq(z_children_names)
+        expect(z.children.reload.pluck(:name)).to eq(z_children_names)
       end
     end
 
@@ -524,4 +524,31 @@ describe Label do
       expect(Label.roots_and_descendants_preordered.collect { |ea| ea.name }).to eq(expected)
     end
   end unless sqlite? # sqlite doesn't have a power function.
+
+  context 'hash_tree' do
+    before do
+      @a = EventLabel.create(name: 'a')
+      @b = DateLabel.create(name: 'b')
+      @c = DirectoryLabel.create(name: 'c')
+      (1..3).each { |i| DirectoryLabel.create!(name: "c#{ i }", mother_id: @c.id) }
+    end
+    it 'should return tree with correct scope when called on class' do
+      tree = DirectoryLabel.hash_tree
+      expect(tree.keys.size).to eq(1)
+      expect(tree.keys.first).to eq(@c)
+      expect(tree[@c].keys.size).to eq(3)
+    end
+    it 'should return tree with correct scope when called on all' do
+      tree = DirectoryLabel.all.hash_tree
+      expect(tree.keys.size).to eq(1)
+      expect(tree.keys.first).to eq(@c)
+      expect(tree[@c].keys.size).to eq(3)
+    end
+    it 'should return tree with correct scope when called on scope chain' do
+      tree = Label.where(name: 'b').hash_tree
+      expect(tree.keys.size).to eq(1)
+      expect(tree.keys.first).to eq(@b)
+      expect(tree[@b]).to eq({})
+    end
+  end
 end

data/spec/parallel_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 # We don't need to run the expensive parallel tests for every combination of prefix/suffix.
-# Those affect SQL generation, not parallelism
+# Those affect SQL generation, not parallelism.
+# SQLite doesn't support concurrency reliably, either.
 def run_parallel_tests?
-  ActiveRecord::Base.table_name_prefix.empty? &&
+  !sqlite? &&
+    ActiveRecord::Base.table_name_prefix.empty? &&
     ActiveRecord::Base.table_name_suffix.empty?
 end
 
@@ -11,7 +13,6 @@ def max_threads
   5
 end
 
-
 class WorkerBase
   extend Forwardable
   attr_reader :name
@@ -106,7 +107,7 @@ describe 'Concurrent creation' do
     run_workers
     # duplication from at least one iteration:
     expect(Tag.where(name: @names).size).to be > @iterations
-  end unless sqlite? # sqlite throws errors from concurrent access
+  end
 
   class SiblingPrependerWorker < WorkerBase
     def before_work
@@ -119,50 +120,6 @@ describe 'Concurrent creation' do
     end
   end
 
-  # TODO: this test should be rewritten to be proper producer-consumer code
-  xit 'fails to deadlock from parallel sibling churn' do
-    # target should be non-trivially long to maximize time spent in hierarchy maintenance
-    target = Tag.find_or_create_by_path(('a'..'z').to_a + ('A'..'Z').to_a)
-    expected_children = (1..100).to_a.map { |ea| "root ##{ea}" }
-    children_to_add = expected_children.dup
-    added_children = []
-    children_to_delete = []
-    deleted_children = []
-    creator_threads = @workers.times.map do
-      Thread.new do
-        while children_to_add.present?
-          name = children_to_add.shift
-          unless name.nil?
-            Tag.transaction { target.find_or_create_by_path(name) }
-            children_to_delete << name
-            added_children << name
-          end
-        end
-      end
-    end
-    run_destruction = true
-    destroyer_threads = @workers.times.map do
-      Thread.new do
-        begin
-          victim_name = children_to_delete.shift
-          if victim_name
-            Tag.transaction do
-              victim = target.children.where(name: victim_name).first
-              victim.destroy
-              deleted_children << victim_name
-            end
-          else
-            sleep rand # wait for more victims
-          end
-        end while run_destruction || !children_to_delete.empty?
-      end
-    end
-    creator_threads.each(&:join)
-    destroyer_threads.each(&:join)
-    expect(added_children).to match(expected_children)
-    expect(deleted_children).to match(expected_children)
-  end
-
   it 'fails to deadlock while simultaneously deleting items from the same hierarchy' do
     target = User.find_or_create_by_path((1..200).to_a.map { |ea| ea.to_s })
     emails = target.self_and_ancestors.to_a.map(&:email).shuffle
@@ -176,7 +133,7 @@ describe 'Concurrent creation' do
     end
     User.connection.reconnect!
     expect(User.all).to be_empty
-  end unless sqlite? # sqlite throws errors from concurrent access
+  end
 
   class SiblingPrependerWorker < WorkerBase
     def before_work
@@ -198,6 +155,5 @@ describe 'Concurrent creation' do
 
     # The only non-root node should be "root":
     expect(Label.all.select { |ea| ea.root? }).to eq([@target.parent])
-  end unless sqlite? # sqlite throws errors from concurrent access
-
+  end
 end if run_parallel_tests?

data/spec/spec_helper.rb

@@ -2,10 +2,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-require 'rspec'
-require 'active_record'
+
 require 'database_cleaner'
-require 'closure_tree'
 require 'closure_tree/test/matcher'
 require 'tmpdir'
 require 'timecop'

data/spec/support/database.rb

@@ -1,5 +1,5 @@
 database_folder = "#{File.dirname(__FILE__)}/../db"
-database_adapter = ENV['DB'] ||= 'mysql'
+database_adapter = ENV['DB'] ||= 'postgresql'
 
 def sqlite?
   ENV['DB'] == 'sqlite'

data/tests.sh

@@ -1,9 +1,10 @@
 #!/bin/sh -ex
 
-for RMI in 2.2.3 #jruby-1.6.13 :P
+for RMI in 2.3.1 #jruby-1.6.13 :P
 do
   rbenv local $RMI
-  for DB in postgresql mysql sqlite
+  appraisal bundle install
+  for DB in mysql sqlite postgresql
   do
     appraisal rake spec:all WITH_ADVISORY_LOCK_PREFIX=$(date +%s) DB=$DB
   done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,16 +56,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
 description: Easily and efficiently make your ActiveRecord model support hierarchies
 email:
 - matthew-github@mceachen.org
@@ -156,11 +142,14 @@ files:
 - closure_tree.gemspec
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_5.0.gemfile
+- gemfiles/activerecord_5.0_foreigner.gemfile
 - gemfiles/activerecord_edge.gemfile
 - img/example.png
 - img/preorder.png
 - lib/closure_tree.rb
 - lib/closure_tree/active_record_support.rb
+- lib/closure_tree/configuration.rb
 - lib/closure_tree/deterministic_ordering.rb
 - lib/closure_tree/digraphs.rb
 - lib/closure_tree/finders.rb
@@ -176,7 +165,9 @@ files:
 - lib/closure_tree/support_flags.rb
 - lib/closure_tree/test/matcher.rb
 - lib/closure_tree/version.rb
+- lib/generators/closure_tree/config_generator.rb
 - lib/generators/closure_tree/migration_generator.rb
+- lib/generators/closure_tree/templates/config.rb
 - lib/generators/closure_tree/templates/create_hierarchies_table.rb.erb
 - mktree.rb
 - spec/cache_invalidation_spec.rb
@@ -216,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -224,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies