closure_tree 4.5.0 → 4.6.0

data/spec/parallel_spec.rb

@@ -1,85 +1,99 @@
 require 'spec_helper'
+require 'securerandom'
 
-
-class DbThread
-  def initialize(&block)
+class WorkerBase
+  def initialize(target, run_at, name)
+    @target = target
     @thread = Thread.new do
-      ActiveRecord::Base.connection_pool.with_connection(&block)
+      ActiveRecord::Base.connection_pool.with_connection do
+        before_work
+        sleep((run_at - Time.now).to_f)
+        do_work(name)
+      end
     end
   end
 
+  def before_work
+  end
+
+  def work(name)
+    raise
+  end
+
   def join
     @thread.join
   end
 end
 
-describe "threadhot", concurrency: true  do
-
-  before :each do
-    @parent = nil
-    @iterations = 3
-    @workers = 10
-    @min_sleep_time = 0.3
-    @lock = Mutex.new
-    @wake_times = []
-    DatabaseCleaner.clean
+class FindOrCreateWorker < WorkerBase
+  def do_work(name)
+    (@target || Tag).find_or_create_by_path([name.to_s, :a, :b, :c])
   end
+end
 
-  after :each do
-    DatabaseCleaner.clean
-  end
+describe 'Concurrent creation', if: support_concurrency do
 
-  def find_or_create_at_same_time(name)
-    @lock.synchronize { @wake_times << Time.now.to_f + @min_sleep_time }
-    while @wake_times.size < @workers
-      sleep(0.1)
-    end
-    max_wait_time = @lock.synchronize { @wake_times.max }
-    sleep_time = max_wait_time - Time.now.to_f
-    sleep(sleep_time)
-    (@parent || Tag).find_or_create_by_path([name.to_s, :a, :b, :c])
+  before :each do
+    @target = nil
+    @iterations = 5
+    @threads = 10
   end
 
-  def run_workers
-    @names = []
-    @iterations.times.each do |iter|
-      name = "iteration ##{iter}"
-      @names << name
-      threads = @workers.times.map do
-        DbThread.new { find_or_create_at_same_time(name) }
+  def run_workers(worker_class = FindOrCreateWorker)
+    all_workers = []
+    @names = @iterations.times.map { |iter| "iteration ##{iter}" }
+    @names.each do |name|
+      wake_time = 1.second.from_now
+      workers = @threads.times.map do
+        worker_class.new(@target, wake_time, name)
       end
-      threads.each { |ea| ea.join }
-      @wake_times.clear
+      workers.each(&:join)
+      all_workers += workers
+      puts name
     end
+    # Ensure we're still connected:
+    ActiveRecord::Base.connection_pool.connection
+    all_workers
   end
 
-  it "class method will not create dupes" do
+  it 'will not create dupes from class methods' do
     run_workers
     Tag.roots.collect { |ea| ea.name }.should =~ @names
     # No dupe children:
     %w(a b c).each do |ea|
-      Tag.where(:name => ea).size.should == @iterations
+      Tag.where(name: ea).size.should == @iterations
     end
   end
 
-  it "instance method will not create dupes" do
-    @parent = Tag.create!(:name => "root")
+  it 'will not create dupes from instance methods' do
+    @target = Tag.create!(name: 'root')
     run_workers
-    @parent.reload.children.collect { |ea| ea.name }.should =~ @names
-    Tag.where(:name => @names).size.should == @iterations
+    @target.reload.children.collect { |ea| ea.name }.should =~ @names
+    Tag.where(name: @names).size.should == @iterations
     %w(a b c).each do |ea|
-      Tag.where(:name => ea).size.should == @iterations
+      Tag.where(name: ea).size.should == @iterations
     end
   end
 
-  it "creates dupe roots without advisory locks" do
+  it 'creates dupe roots without advisory locks' do
     # disable with_advisory_lock:
-    Tag.stub(:with_advisory_lock).and_return { |lock_name, &block| block.call }
+    Tag.stub(:with_advisory_lock).and_return { |_lock_name, &block| block.call }
     run_workers
-    Tag.where(:name => @names).size.should > @iterations
+    Tag.where(name: @names).size.should > @iterations
   end
 
-  it 'fails to deadlock from parallel sibling churn' do
+  class SiblingPrependerWorker < WorkerBase
+    def before_work
+      @target.reload
+      @sibling = Label.new(name: SecureRandom.hex(10))
+    end
+
+    def do_work(name)
+      @target.prepend_sibling @sibling
+    end
+  end
+
+  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}" }
@@ -106,7 +120,7 @@ describe "threadhot", concurrency: true  do
           victim_name = children_to_delete.shift
           if victim_name
             Tag.transaction do
-              victim = target.children.where(:name => victim_name).first
+              victim = target.children.where(name: victim_name).first
               victim.destroy
               deleted_children << victim_name
             end
@@ -123,14 +137,14 @@ describe "threadhot", concurrency: true  do
     deleted_children.should =~ expected_children
   end
 
-  it "fails to deadlock while simultaneously deleting items from the same hierarchy" do
+  xit '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 })
     to_delete = target.self_and_ancestors.to_a.shuffle.map(&:email)
     destroyer_threads = @workers.times.map do
       DbThread.new do
         until to_delete.empty?
           email = to_delete.shift
-          User.transaction { User.where(:email => email).first.destroy } if email
+          User.transaction { User.where(email: email).first.destroy } if email
         end
       end
     end
@@ -138,4 +152,26 @@ describe "threadhot", concurrency: true  do
     User.all.should be_empty
   end
 
+  class SiblingPrependerWorker < WorkerBase
+    def before_work
+      @target.reload
+      @sibling = Label.new(name: SecureRandom.hex(10))
+    end
+
+    def do_work(name)
+      @target.prepend_sibling @sibling
+    end
+  end
+
+  it 'fails to deadlock from prepending siblings' do
+    @target = Label.find_or_create_by_path %w(root parent)
+    run_workers(SiblingPrependerWorker)
+    children = Label.roots
+    uniq_sort_orders = children.collect { |ea| ea.sort_order }.uniq
+    children.size.should == uniq_sort_orders.size
+
+    # The only non-root node should be "root":
+    Label.all.select { |ea| ea.root? }.should == [@target.parent]
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,110 +1,20 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-plugin_test_dir = File.dirname(__FILE__)
-
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 require 'rspec'
 require 'active_record'
 require 'foreigner'
 require 'database_cleaner'
 require 'closure_tree'
+require 'closure_tree/test/matcher'
 require 'tmpdir'
-
-if ENV['STDOUT_LOGGING']
-  log = Logger.new(STDOUT)
-  log.sev_threshold = Logger::DEBUG
-  ActiveRecord::Base.logger = log
-end
-
-
-ENV["DB"] ||= "mysql"
-ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s
-ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s
-
-if ENV['ATTR_ACCESSIBLE'] == '1'
-  # turn on whitelisted attributes:
-  ActiveRecord::Base.send(:include, ActiveModel::MassAssignmentSecurity)
-end
-
-ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read(plugin_test_dir + "/db/database.yml")).result)
-
-def recreate_db
-  db_name = ActiveRecord::Base.configurations[ENV["DB"]]["database"]
-  case ENV['DB']
-    when 'sqlite'
-    when 'postgresql'
-      `psql -c 'DROP DATABASE #{db_name}' -U postgres`
-      `psql -c 'CREATE DATABASE #{db_name}' -U postgres`
-    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"].to_sym)
-
-ActiveRecord::Migration.verbose = false
-if ENV['NONUKES']
-  puts 'skipping database creation'
-else
-  Foreigner.load
-  recreate_db
-  require 'db/schema'
-end
-require 'support/models'
-
-class Hash
-  def render_from_yield(&block)
-    inject({}) do |h, entry|
-      k, v = entry
-      h[block.call(k)] = if v.is_a?(Hash) then
-        v.render_from_yield(&block)
-      else
-        block.call(v)
-      end
-      h
-    end
-  end
-end
-
-DB_QUERIES = []
-
-ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-  def log_with_query_append(query, *args, &block)
-    DB_QUERIES << query
-    log_without_query_append(query, *args, &block)
-  end
-
-  alias_method_chain :log, :query_append
-end
+require 'timecop'
 
 Thread.abort_on_exception = true
 
-DatabaseCleaner.strategy = :truncation
-
-
-def support_concurrency
-  # SQLite doesn't support parallel writes
-  !(ENV['DB'] =~ /sqlite/)
-end
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-  config.after(:each) do
-    DatabaseCleaner.clean
-    DB_QUERIES.clear
-  end
-  config.before(:all) do
-    ENV['FLOCK_DIR'] = Dir.mktmpdir
-  end
-  config.after(:all) do
-    FileUtils.remove_entry_secure ENV['FLOCK_DIR']
-  end
-  config.filter_run_excluding :concurrency => !support_concurrency
+  config.include ClosureTree::Test::Matcher
 end
-
-

data/spec/support/database.rb

@@ -0,0 +1,49 @@
+database_folder = "#{File.dirname(__FILE__)}/../db"
+database_adapter = ENV['DB'] ||= 'mysql'
+
+if ENV['STDOUT_LOGGING']
+  log = Logger.new(STDOUT)
+  log.sev_threshold = Logger::DEBUG
+  ActiveRecord::Base.logger = log
+end
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s
+ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s
+ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read("#{database_folder}/database.yml")).result)
+
+config = ActiveRecord::Base.configurations[database_adapter]
+
+unless config['database'] == ':memory:'
+  # Postgresql or Mysql
+  config['database'].concat ENV['TRAVIS_JOB_NUMBER'].to_s.gsub(/\W/, '_')
+end
+
+begin
+  case database_adapter
+  when 'sqlite'
+    ActiveRecord::Base.establish_connection(database_adapter.to_sym)
+  when 'mysql'
+    ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+    ActiveRecord::Base.connection.recreate_database(config['database'], {charset: 'utf8', collation: 'utf8_unicode_ci'})
+  when 'postgresql'
+    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+    ActiveRecord::Base.connection.recreate_database(config['database'], config.merge('encoding' => 'utf8'))
+  end
+end unless ENV['NONUKES']
+
+ActiveRecord::Base.establish_connection(config)
+Foreigner.load
+
+require "#{database_folder}/schema"
+require "#{database_folder}/models"
+
+# See http://stackoverflow.com/a/22388177/1268016
+def count_queries(&block)
+  count = 0
+  counter_fn = ->(name, started, finished, unique_id, payload) do
+    count += 1 unless payload[:name].in? %w[ CACHE SCHEMA ]
+  end
+  ActiveSupport::Notifications.subscribed(counter_fn, "sql.active_record", &block)
+  count
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,14 @@
+RSpec.configure do |config|
+
+  DatabaseCleaner.strategy = :truncation
+
+  config.before(:each) do
+    ActiveRecord::Base.connection_pool.connection
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    ActiveRecord::Base.connection_pool.connection
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/deprecated/attr_accessible.rb

@@ -0,0 +1,5 @@
+# Delete this file when support for 3.2 is dropped
+if ENV['ATTR_ACCESSIBLE'] == '1'
+  # turn on whitelisted attributes:
+  ActiveRecord::Base.send(:include, ActiveModel::MassAssignmentSecurity)
+end

data/spec/support/hash_monkey_patch.rb

@@ -0,0 +1,13 @@
+class Hash
+  def render_from_yield(&block)
+    reduce({}) do |h, entry|
+      k, v = entry
+      h[block.call(k)] = if v.is_a?(Hash) then
+        v.render_from_yield(&block)
+      else
+        block.call(v)
+      end
+      h
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,8 @@
+def sqlite?
+  ENV['DB'] =~ /sqlite/
+end
+
+def support_concurrency
+  # SQLite doesn't support parallel writes
+  !sqlite?
+end

data/spec/support/sqlite3_with_advisory_lock.rb

@@ -0,0 +1,10 @@
+if sqlite?
+  RSpec.configure do |config|
+    config.before(:suite) do
+      ENV['FLOCK_DIR'] = Dir.mktmpdir
+    end
+    config.after(:suite) do
+      FileUtils.remove_entry_secure ENV['FLOCK_DIR']
+    end
+  end
+end

data/tests.sh

@@ -2,7 +2,12 @@
 
 appraisal install
 
-for db in sqlite mysql postgresql
+for RMI in 1.9.3-p429 2.1.2
 do
-  DB=$db WITH_ADVISORY_LOCK_PREFIX=$(date +%s) appraisal rake all_spec_flavors
+  rbenv local $RMI
+  for db in postgresql mysql sqlite
+  do
+    bundle install --quiet
+    DB=$db WITH_ADVISORY_LOCK_PREFIX=$(date +%s) appraisal rake all_spec_flavors
+  done
 done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
@@ -109,35 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  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: 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: sqlite3
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -200,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
@@ -228,21 +201,29 @@ files:
 - lib/closure_tree/support.rb
 - lib/closure_tree/support_attributes.rb
 - lib/closure_tree/support_flags.rb
+- lib/closure_tree/test/matcher.rb
 - lib/closure_tree/version.rb
 - mktree.rb
+- spec/cache_invalidation_spec.rb
 - spec/cuisine_type_spec.rb
 - spec/db/database.yml
+- spec/db/models.rb
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
 - spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
+- spec/matcher_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
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/support/database.rb
+- spec/support/database_cleaner.rb
+- spec/support/deprecated/attr_accessible.rb
+- spec/support/hash_monkey_patch.rb
+- spec/support/helpers.rb
+- spec/support/sqlite3_with_advisory_lock.rb
 - spec/support_spec.rb
 - spec/tag_examples.rb
 - spec/tag_spec.rb
@@ -261,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -274,19 +255,26 @@ signing_key:
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
 test_files:
+- spec/cache_invalidation_spec.rb
 - spec/cuisine_type_spec.rb
 - spec/db/database.yml
+- spec/db/models.rb
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
 - spec/hierarchy_maintenance_spec.rb
 - spec/label_spec.rb
+- spec/matcher_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
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/support/database.rb
+- spec/support/database_cleaner.rb
+- spec/support/deprecated/attr_accessible.rb
+- spec/support/hash_monkey_patch.rb
+- spec/support/helpers.rb
+- spec/support/sqlite3_with_advisory_lock.rb
 - spec/support_spec.rb
 - spec/tag_examples.rb
 - spec/tag_spec.rb

data/spec/parallel_prepend_sibling_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-require 'securerandom'
-
-describe "threadhot", concurrency: true do
-
-  before :each do
-    @iterations = 5
-    @workers = 8
-  end
-
-  def prepend_sibling_at_even_second(run_at)
-    ActiveRecord::Base.connection.reconnect!
-    sibling = Label.new(:name => SecureRandom.hex(10))
-    target = Label.find(@target.id)
-    sleep(run_at - Time.now.to_f)
-    target.prepend_sibling sibling
-  end
-
-  def run_workers
-    start_time = Time.now.to_i + 2
-    @times = @iterations.times.collect { |ea| start_time + (ea * 2) }
-    @names = @times.collect { |ea| ea.to_s }
-    @threads = @workers.times.collect do
-      Thread.new do
-        @times.each { |ea| prepend_sibling_at_even_second(ea) }
-      end
-    end
-    @threads.each { |ea| ea.join }
-  end
-
-  it "prepend_sibling on a non-root node doesn't cause deadlocks" do
-    @target = Label.find_or_create_by_path %w(root parent)
-    run_workers
-    children = Label.roots
-    uniq_sort_orders = children.collect { |ea| ea.sort_order }.uniq
-    children.size.should == uniq_sort_orders.size
-
-    # The only non-root node should be "root":
-    Label.all.select { |ea| ea.root? }.should == [@target.parent]
-  end
-
-end