closure_tree 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed9e9ee1d96298188863154501be9befbc2529d1
-  data.tar.gz: 9eab4fbf0b8b40dbaead055c5d18d4367d801489
+  metadata.gz: d4e2702f6eb10fd2f2b7c9c9347e1bfbff2b97ea
+  data.tar.gz: 472bf0e636274ee25de4c88b64a1684ea627fb0b
 SHA512:
-  metadata.gz: f0e90ba79f6900faa44bead080114a2c83b51fbc5c97ef5aea18dd8a563352e89ed2d49a9e8645a5957d6a5bd95cf219ebd5fd886400ecfc1ecde2a51b1e80d1
-  data.tar.gz: 66406674bbe8f32d8ce0c545dcc412d8bd2e50a2f61e4e8428cf0bbedbdb367e0faf0bb783a6e51e6634cd438344c0bae29e8bb9f39fb54c8443cb6e0845993e
+  metadata.gz: ec12064f1459d2f72e4d0b04af9392426dcf463b09abcf5053eaf598c54b917e0ed6e29509c04a9dbc04a574ace5ede33199527cbdbcde028f44a611d5d7a7c8
+  data.tar.gz: 1553a1b5bbf0bf4ffce3d3acae823d3e319b5ac9eab2edfff3e0555cec89de8d80927bbb51ab497f83856e81504437a76cd9c8e8d693a7cb6f8b80c660542d75

data/.gitignore

@@ -10,3 +10,4 @@ tmp/
 .yardoc/
 .rvmrc
 *.lock
+tmp/

data/.travis.yml

@@ -1,7 +1,9 @@
+cache: bundler
+sudo: false
 language: ruby
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1.5
   - rbx-2
   - jruby-19mode
 #  - ruby-head
@@ -12,6 +14,7 @@ gemfile:
   - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
+  - gemfiles/activerecord_4.2.gemfile
   - gemfiles/activerecord_edge.gemfile
 
 env:
@@ -22,7 +25,7 @@ env:
 addons:
   postgresql: "9.3"
 
-script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace all_spec_flavors
+script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
 
 matrix:
   allow_failures:

data/Appraisals

@@ -11,6 +11,10 @@ appraise 'activerecord-4.1' do
   gem 'activerecord', '~> 4.1.0'
 end
 
+appraise 'activerecord-4.2' do
+  gem 'activerecord', '~> 4.2.0'
+end
+
 appraise 'activerecord-edge' do
   gem 'activerecord', github: 'rails/rails'
   gem 'arel', github: 'rails/arel'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+### 5.2.0
+
+* [Eduardo Turiño](https://github.com/eturino) renamed `acts_as_tree` to `has_closure_tree`. We'll
+  keep both annotations around for the forseeable future, but I think not name-colliding by default is
+  strictly better. (Thanks for both the suggestion and PR!)
+* [Ryan Selk](https://github.com/rselk) made several enhancements to the migration generation (thanks!).
+* [ruok5](https://github.com/ruok5) updated the README to clarify a heirarchy maintenance usecase. Thanks!
+* Made migrations error with a helpful message if the target didn't have the `has_closure_tree` or
+  `acts_as_tree` annotation. This addresses [issue 131](https://github.com/mceachen/closure_tree/issues/131).
+
 ### 5.1.1
 
 * Fixed bug in `rails g closure_tree:migration` (introduced by me, not by seuros!) 

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'foreigner', :git => 'https://github.com/mceachen/foreigner.git'
+gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'
 
 platforms :ruby, :rbx do
   gem 'mysql2'

data/README.md

@@ -43,6 +43,7 @@ for a description of different tree storage algorithms.
 ## Table of Contents
 
 - [Installation](#installation)
+- [Warning](#warning)
 - [Usage](#usage)
 - [Accessing Data](#accessing-data)
 - [Polymorphic hierarchies with STI](#polymorphic-hierarchies-with-sti)
@@ -60,19 +61,26 @@ Note that closure_tree only supports Rails 3.2 and later, and has test coverage
 
 2.  Run `bundle install`
 
-3.  Add `acts_as_tree` to your hierarchical model:
+3.  Add `has_closure_tree` (or `acts_as_tree`, which is an alias of the same method) to your hierarchical model:
 
     ```ruby
     class Tag < ActiveRecord::Base
+      has_closure_tree
+    end
+
+    class AnotherTag < ActiveRecord::Base
       acts_as_tree
     end
     ```
 
-    Make sure you check out the [large number options](#available-options) that `acts_as_tree` accepts.
+    Make sure you check out the [large number options](#available-options) that `has_closure_tree` accepts.
     
-    Make sure you add `acts_as_tree` **after** `attr_accessible` and
+    Make sure you add `has_closure_tree` **after** `attr_accessible` and
     `self.table_name =` lines in your model.
 
+    If you're already using other hierarchical gems, like `ancestry` or `acts_as_tree`, please refer
+    to the [warning section](#warning)!
+
 4.  Add a migration to add a `parent_id` column to the hierarchical model.
     You may want to also [add a column for deterministic ordering of children](#sort_order), but that's optional.
 
@@ -90,7 +98,7 @@ Note that closure_tree only supports Rails 3.2 and later, and has test coverage
     to create the closure tree table for your model.
 
     By default the table name will be the model's table name, followed by
-    "_hierarchies". Note that by calling ```acts_as_tree```, a "virtual model" (in this case, ```TagHierarchy```)
+    "_hierarchies". Note that by calling ```has_closure_tree```, a "virtual model" (in this case, ```TagHierarchy```)
     will be created dynamically. You don't need to create it.
 
 6.  Run `rake db:migrate`
@@ -101,6 +109,12 @@ Note that closure_tree only supports Rails 3.2 and later, and has test coverage
 
     If you're starting from scratch you don't need to call `rebuild!`.
 
+## Warning
+
+As stated above, using multiple hierarchy gems (like `ancestry` or `nested set`) on the same model 
+will most likely result in pain, suffering, hair loss, tooth decay, heel-related ailments, and gingivitis.
+Assume things will break. 
+
 ## Usage
 
 ### Creation
@@ -146,7 +160,7 @@ child1.ancestry_path
 You can `find` as well as `find_or_create` by "ancestry paths".
 
 If you provide an array of strings to these methods, they reference the `name` column in your 
-model, which can be overridden with the `:name_column` option provided to `acts_as_tree`.
+model, which can be overridden with the `:name_column` option provided to `has_closure_tree`.
 
 ```ruby
 child = Tag.find_or_create_by_path(%w[grandparent parent child])
@@ -187,6 +201,17 @@ h.ancestry_path
 => ["a", "b", "c", "d", "e", "f", "g", "h"]
 ```
 
+When it is more convenient to simply change the `parent_id` of a node directly (for example, when dealing with a form `<select>`), closure_tree will handle the necessary changes automatically when the record is saved:
+
+```ruby
+j = Tag.find 102
+j.self_and_ancestor_ids
+=> [102, 87, 77]
+j.update parent_id: 96
+j.self_and_ancestor_ids
+=> [102, 96, 95, 78]
+```
+
 ### Nested hashes
 
 ```hash_tree``` provides a method for rendering a subtree as an
@@ -241,7 +266,7 @@ Just for kicks, this is the test tree I used for proving that preordered tree tr
 
 ### Available options
 
-When you include ```acts_as_tree``` in your model, you can provide a hash to override the following defaults:
+When you include ```has_closure_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_class_name``` to override the hierarchy class name. This defaults to the singular name of the model + "Hierarchy", like ```TagHierarchy```.
@@ -296,18 +321,18 @@ When you include ```acts_as_tree``` in your model, you can provide a hash to ove
     * ```tag.find_all_by_generation(0).to_a``` == ```[tag]```
     * ```tag.find_all_by_generation(1)``` == ```tag.children```
     * ```tag.find_all_by_generation(2)``` will return the tag's grandchildren, and so on.
-* ```tag.destroy``` will destroy a node and do <em>something</em> to its children, which is determined by the ```:dependent``` option passed to ```acts_as_tree```.
+* ```tag.destroy``` will destroy a node and do <em>something</em> to its children, which is determined by the ```:dependent``` option passed to ```has_closure_tree```.
 
 ## Polymorphic hierarchies with STI
 
 Polymorphic models using single table inheritance (STI) are supported:
 
 1. Create a db migration that adds a String ```type``` column to your model
-2. Subclass the model class. You only need to add ```acts_as_tree``` to your base class:
+2. Subclass the model class. You only need to add ```has_closure_tree``` to your base class:
 
 ```ruby
 class Tag < ActiveRecord::Base
-  acts_as_tree
+  has_closure_tree
 end
 class WhenTag < Tag ; end
 class WhereTag < Tag ; end
@@ -319,17 +344,17 @@ you use the ```:type``` attribute, so **this doesn't work**:
 
 ```ruby
 # BAD: ActiveRecord ignores the :type attribute:
-root.children.create(:name => "child", :type => "WhenTag")
+root.children.create(name: "child", type: "WhenTag")
 ```
 
 Instead, use either ```.add_child``` or ```children <<```:
 
 ```ruby
 # GOOD!
-a = Tag.create!(:name => "a")
-b = WhenTag.new(:name => "b")
+a = Tag.create!(name: "a")
+b = WhenTag.new(name: "b")
 a.children << b
-c = WhatTag.new(:name => "c")
+c = WhatTag.new(name: "c")
 b.add_child(c)
 ```
 
@@ -343,7 +368,7 @@ If you want to order children alphabetically, and your model has a ```name``` co
 
 ```ruby
 class Tag < ActiveRecord::Base
-  acts_as_tree :order => 'name'
+  has_closure_tree order: 'name'
 end
 ```
 
@@ -357,7 +382,7 @@ and in your model:
 
 ```ruby
 class OrderedTag < ActiveRecord::Base
-  acts_as_tree :order => 'sort_order'
+  has_closure_tree order: 'sort_order'
 end
 ```
 
@@ -434,11 +459,11 @@ for both MySQL and PostgreSQL, [with_advisory_lock](https://github.com/mceachen/
 is used automatically to ensure correctness.
 
 If you are already managing concurrency elsewhere in your application, and want to disable the use
-of with_advisory_lock, pass ```:with_advisory_lock => false``` in the options hash:
+of with_advisory_lock, pass ```with_advisory_lock: false``` in the options hash:
 
 ```ruby
 class Tag
-  acts_as_tree :with_advisory_lock => false
+  has_closure_tree with_advisory_lock: false
 end
 ```
 

data/Rakefile

@@ -12,19 +12,29 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = 'spec/*_spec.rb'
+end
 
 task :default => :spec
 
-task :all_spec_flavors do
-  [["", ""], ["db_prefix_", ""], ["", "_db_suffix"], ["abc_", "_123"]].each do |prefix, suffix|
-    fail unless system("bundle exec rake spec DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}")
+namespace :spec do
+  desc 'Run all spec variants'
+  task :all do
+    rake = 'bundle exec rake'
+    fail unless system("#{rake} spec:generators")
+    [['', ''], ['db_prefix_', ''], ['', '_db_suffix'], ['abc_', '_123']].each do |prefix, suffix|
+      env = "DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}"
+      fail unless system("#{rake} spec #{env}")
+    end
+    require 'active_record/version'
+    if ActiveRecord::VERSION::MAJOR == 3
+      fail unless system("#{rake} spec ATTR_ACCESSIBLE=1")
+    end
   end
-  require 'active_record/version'
-  if ActiveRecord::VERSION::MAJOR == 3
-    fail unless system("rake spec ATTR_ACCESSIBLE=1")
+
+  desc 'Run generator specs'
+  RSpec::Core::RakeTask.new(:generators) do |task|
+    task.pattern = 'spec/generators/*_spec.rb'
   end
 end
-
-# Run the specs using all the different database engines:
-# for DB in sqlite3 mysql postgresql ; do rake ; done

data/closure_tree.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'with_advisory_lock', '>= 3.0.0'
 
   gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'rspec', '>= 3.0'
   gem.add_development_dependency 'rspec-instafail'
-  # TODO: delete rspec-rails.
-  gem.add_development_dependency 'rspec-rails' # FIXME: for rspec-rails and rspec fixture support
+  gem.add_development_dependency 'rspec-rails', '>= 3.1'
   gem.add_development_dependency 'uuidtools'
   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'
+  # gem.add_development_dependency 'byebug'
   # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.
 end

data/gemfiles/activerecord_3.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
 gem "activerecord", "~> 3.2.0"
 gem "strong_parameters"
 

data/gemfiles/activerecord_4.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
 gem "activerecord", "~> 4.0.0"
 
 platforms :ruby, :rbx do

data/gemfiles/activerecord_4.1.gemfile

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

data/gemfiles/activerecord_4.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
+gem "activerecord", "~> 4.2.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_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "foreigner", :git => "https://github.com/mceachen/foreigner.git"
+gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
 gem "activerecord", :github => "rails/rails"
 gem "arel", :github => "rails/arel"
 

data/lib/closure_tree.rb

@@ -3,7 +3,7 @@ require 'active_support'
 module ClosureTree
   extend ActiveSupport::Autoload
 
-  autoload :ActsAsTree
+  autoload :HasClosureTree
   autoload :Support
   autoload :HierarchyMaintenance
   autoload :Model
@@ -15,5 +15,5 @@ module ClosureTree
 end
 
 ActiveSupport.on_load :active_record do
-  ActiveRecord::Base.send :extend, ClosureTree::ActsAsTree
+  ActiveRecord::Base.send :extend, ClosureTree::HasClosureTree
 end

data/lib/closure_tree/active_record_support.rb

@@ -0,0 +1,20 @@
+module ClosureTree
+  module ActiveRecordSupport
+    def ensure_fixed_table_name(table_name)
+      [
+        ActiveRecord::Base.table_name_prefix,
+        remove_prefix_and_suffix(table_name),
+        ActiveRecord::Base.table_name_suffix
+      ].compact.join
+    end
+
+    def remove_prefix_and_suffix(table_name)
+      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
+  end
+end

data/lib/closure_tree/{acts_as_tree.rb → has_closure_tree.rb}

@@ -1,8 +1,6 @@
-require 'with_advisory_lock'
-
 module ClosureTree
-  module ActsAsTree
-    def acts_as_tree(options = {})
+  module HasClosureTree
+    def has_closure_tree(options = {})
       options.assert_valid_keys(
         :parent_column_name,
         :dependent,
@@ -35,5 +33,7 @@ module ClosureTree
       # 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/') && ENV['RAILS_GROUPS'] == 'assets'
     end
+
+    alias_method :acts_as_tree, :has_closure_tree
   end
 end

data/lib/closure_tree/support.rb

@@ -1,12 +1,15 @@
 require 'closure_tree/support_flags'
 require 'closure_tree/support_attributes'
 require 'closure_tree/numeric_order_support'
+require 'closure_tree/active_record_support'
+require 'with_advisory_lock'
 
 # This class and mixins are an effort to reduce the namespace pollution to models that act_as_tree.
 module ClosureTree
   class Support
     include ClosureTree::SupportFlags
     include ClosureTree::SupportAttributes
+    include ClosureTree::ActiveRecordSupport
 
     attr_reader :model_class
     attr_reader :options
@@ -93,15 +96,6 @@ module ClosureTree
       end
     end
 
-    def remove_prefix_and_suffix(table_name)
-      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)
       scope.pluck(model_class.primary_key)
     end

data/lib/closure_tree/version.rb

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

data/lib/generators/closure_tree/migration_generator.rb

@@ -1,12 +1,13 @@
-require 'rails/generators/named_base'
-require 'rails/generators/active_record/migration'
+require 'closure_tree/active_record_support'
 require 'forwardable'
+require 'rails/generators/active_record'
+require 'rails/generators/named_base'
 
 module ClosureTree
   module Generators # :nodoc:
-    class MigrationGenerator < ::Rails::Generators::NamedBase # :nodoc:
-      include ActiveRecord::Generators::Migration
-
+    class MigrationGenerator < Rails::Generators::NamedBase # :nodoc:
+      include Rails::Generators::Migration
+      include ClosureTree::ActiveRecordSupport
       extend Forwardable
       def_delegators :ct, :hierarchy_table_name, :primary_key_type
 
@@ -15,15 +16,33 @@ module ClosureTree
       end
 
       def create_migration_file
-        migration_template 'create_hierarchies_table.rb.erb', "db/migrate/create_#{ct.hierarchy_table_name}.rb"
+        migration_template 'create_hierarchies_table.rb.erb', "db/migrate/create_#{migration_name}.rb"
+      end
+
+      private
+
+      def migration_name
+        remove_prefix_and_suffix(ct.hierarchy_table_name)
       end
 
       def migration_class_name
-        "Create#{ct.hierarchy_table_name.camelize}"
+        "Create#{migration_name.camelize}"
+      end
+
+      def target_class
+        @target_class ||= class_name.constantize
       end
 
       def ct
-        @ct ||= class_name.constantize._ct
+        @ct ||= if target_class.respond_to?(:_ct)
+          target_class._ct
+        else
+          fail "Please RTFM and add the `has_closure_tree` (or `acts_as_tree`) annotation to #{class_name} before creating the migration."
+        end
+      end
+
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
     end
   end

data/lib/generators/closure_tree/templates/create_hierarchies_table.rb.erb

@@ -1,16 +1,16 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
-    create_table :<%= hierarchy_table_name %>, id: false do |t|
+    create_table :<%= migration_name %>, id: false do |t|
       t.<%= primary_key_type %> :ancestor_id, null: false
       t.<%= primary_key_type %> :descendant_id, null: false
       t.integer :generations, null: false
     end
 
-    add_index :<%= hierarchy_table_name %>, [:ancestor_id, :descendant_id, :generations],
+    add_index :<%= migration_name %>, [:ancestor_id, :descendant_id, :generations],
       unique: true,
-      name: "anc_desc_idx"
+      name: "<%= file_name %>_anc_desc_idx"
 
-    add_index :<%= hierarchy_table_name -%>, [:descendant_id],
-      name: "desc_idx"
+    add_index :<%= migration_name -%>, [:descendant_id],
+      name: "<%= file_name %>_desc_idx"
   end
 end

data/spec/db/models.rb

@@ -1,7 +1,7 @@
 require 'uuidtools'
 
 class Tag < ActiveRecord::Base
-  acts_as_tree :dependent => :destroy, :order => :name
+  has_closure_tree :dependent => :destroy, :order => :name
   before_destroy :add_destroyed_tag
   attr_accessible :name, :title if _ct.use_attr_accessible?
 
@@ -18,7 +18,7 @@ end
 class UUIDTag < ActiveRecord::Base
   self.primary_key = :uuid
   before_create :set_uuid
-  acts_as_tree :dependent => :destroy, :order => 'name', :parent_column_name => 'parent_uuid'
+  has_closure_tree dependent: :destroy, order: 'name', parent_column_name: 'parent_uuid'
   before_destroy :add_destroyed_tag
   attr_accessible :name, :title if _ct.use_attr_accessible?
 
@@ -90,15 +90,18 @@ class CuisineType < ActiveRecord::Base
 end
 
 module Namespace
+  def self.table_name_prefix
+    'namespace_'
+  end
   class Type < ActiveRecord::Base
-    acts_as_tree :dependent => :destroy
+    has_closure_tree dependent: :destroy
     attr_accessible :name if _ct.use_attr_accessible?
   end
 end
 
 class Metal < ActiveRecord::Base
   self.table_name = "#{table_name_prefix}metal#{table_name_suffix}"
-  acts_as_tree order: 'sort_order', name_column: 'value'
+  has_closure_tree order: 'sort_order', name_column: 'value'
   self.inheritance_column = 'metal_type'
 end
 
@@ -109,5 +112,5 @@ class Unobtanium < Metal
 end
 
 class MenuItem < ActiveRecord::Base
-  acts_as_tree(touch: true, with_advisory_lock: false)
+  has_closure_tree touch: true, with_advisory_lock: false
 end

data/spec/generators/migration_generator_spec.rb

@@ -0,0 +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

data/spec/parallel_spec.rb

@@ -11,21 +11,26 @@ def max_threads
   5
 end
 
+
 class WorkerBase
   extend Forwardable
   attr_reader :name
   def_delegators :@thread, :join, :wakeup, :status, :to_s
 
+  def log(msg)
+    puts("#{Thread.current}: #{msg}") if ENV['VERBOSE']
+  end
+
   def initialize(target, name)
     @target = target
     @name = name
     @thread = Thread.new do
       ActiveRecord::Base.connection_pool.with_connection { before_work } if respond_to? :before_work
-      puts "#{Thread.current} going to sleep..."
+      log 'going to sleep...'
       sleep
-      puts "#{Thread.current} woke up..."
+      log 'woke up...'
       ActiveRecord::Base.connection_pool.with_connection { work }
-      puts "#{Thread.current} done..."
+      log 'done.'
     end
   end
 end
@@ -33,9 +38,9 @@ end
 class FindOrCreateWorker < WorkerBase
   def work
     path = [name, :a, :b, :c]
-    puts "#{Thread.current} making #{path}..."
+    log "making #{path}..."
     t = (@target || Tag).find_or_create_by_path(path)
-    puts "#{Thread.current} made #{t.id}, #{t.ancestry_path}"
+    log "made #{t.id}, #{t.ancestry_path}"
   end
 end
 
@@ -45,6 +50,10 @@ describe 'Concurrent creation' do
     @iterations = 5
   end
 
+  def log(msg)
+    puts(msg) if ENV['VERBOSE']
+  end
+
   def run_workers(worker_class = FindOrCreateWorker)
     @names = @iterations.times.map { |iter| "iteration ##{iter}" }
     @names.each do |name|
@@ -55,17 +64,17 @@ describe 'Concurrent creation' do
         if unready_workers.empty?
           break
         else
-          puts "Not ready to wakeup: #{unready_workers.map { |ea| [ea.to_s, ea.status] }}"
+          log "Not ready to wakeup: #{unready_workers.map { |ea| [ea.to_s, ea.status] }}"
           sleep(0.1)
         end
       end
       sleep(0.25)
       # OK, GO!
-      puts 'Calling .wakeup on all workers...'
+      log 'Calling .wakeup on all workers...'
       workers.each(&:wakeup)
       sleep(0.25)
       # Then wait for them to finish:
-      puts 'Calling .join on all workers...'
+      log 'Calling .join on all workers...'
       workers.each(&:join)
     end
     # Ensure we're still connected:
@@ -160,7 +169,7 @@ describe 'Concurrent creation' do
     Parallel.map(emails, :in_threads => max_threads) do |email|
       ActiveRecord::Base.connection_pool.with_connection do
         User.transaction do
-          puts "Destroying #{email}..."
+          log "Destroying #{email}..."
           User.where(email: email).destroy_all
         end
       end

data/tests.sh

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,20 @@ 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
@@ -185,14 +185,16 @@ files:
 - gemfiles/activerecord_3.2.gemfile
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
+- gemfiles/activerecord_4.2.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/active_record_support.rb
 - lib/closure_tree/deterministic_ordering.rb
 - lib/closure_tree/digraphs.rb
 - lib/closure_tree/finders.rb
+- lib/closure_tree/has_closure_tree.rb
 - lib/closure_tree/hash_tree.rb
 - lib/closure_tree/hierarchy_maintenance.rb
 - lib/closure_tree/model.rb
@@ -212,6 +214,7 @@ files:
 - spec/db/models.rb
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
+- spec/generators/migration_generator_spec.rb
 - spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
 - spec/matcher_spec.rb
@@ -251,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -262,6 +265,7 @@ test_files:
 - spec/db/models.rb
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
+- spec/generators/migration_generator_spec.rb
 - spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
 - spec/matcher_spec.rb