ruby 2.1.2 and no rails 3.0.

Author: mceachen

.travis.yml

@@ -1,39 +1,15 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.2
   - 1.9.3
-  # - jruby-19mode
-  # - rbx-19mode
 
 gemfile:
   - ci/Gemfile.rails-4.1.x
   - ci/Gemfile.rails-4.0.x
   - ci/Gemfile.rails-3.2.x
-  - ci/Gemfile.rails-3.1.x
 
 env:
   - DB=sqlite
   - DB=mysql
   - DB=postgresql
 script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace all_spec_flavors
-
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.1.x
-      env: DB=sqlite
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.1.x
-      env: DB=mysql
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.1.x
-      env: DB=postgresql
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.2.x
-      env: DB=sqlite
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.2.x
-      env: DB=mysql
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile.rails-3.2.x
-      env: DB=postgresql

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 4.5.0
+
+* Added Travis builds for Rails 4.1.1 and Ruby 2.1.2
+* Dropped support for Rails 3.1.
+* [PR94]
+
 ### 4.4.0
 
 * Added ```.self_and_descendant_ids``` and ```.self_and_ancestors_ids``` from [PR92](https://github.com/mceachen/closure_tree/pull/92).

README.md

@@ -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,13 @@ 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
+* Ruby 1.9.3 and Ruby 2.1.2
+* The latest Rails 3.2, 4.0, and 4.1 branches, and
 * MySQL and PostgreSQL. SQLite works in a single-threaded environment.
 
 Assuming you're using [rbenv](https://github.com/sstephenson/rbenv), you can use ```tests.sh``` to
 run the test matrix locally.
 
-Parallelism is not tested with Rails 3.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

ci/Gemfile.rails-3.1.x

@@ -23,13 +23,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-instafail'
   # gem.add_development_dependency 'rspec', '~> 2.13.0' # <- Rubymine can't handle 2.14.x
-  gem.add_development_dependency 'fuubar'
   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 'foreigner'
 
   # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.
   # TODO: gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby

closure_tree.gemspec

@@ -103,11 +103,7 @@ def remove_prefix_and_suffix(table_name)
     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)

lib/closure_tree/support.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

lib/closure_tree/version.rb

@@ -39,5 +39,4 @@ def run_workers
     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 unless parallelism_is_broken

spec/parallel_prepend_sibling_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)

spec/parallel_spec.rb

@@ -45,7 +45,7 @@ def recreate_db
   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']
@@ -101,3 +101,9 @@ def log_with_query_append(query, *args, &block)
     FileUtils.remove_entry_secure ENV['FLOCK_DIR']
   end
 end
+
+parallelism_is_broken = begin
+  # SQLite doesn't support parallel writes
+  ENV["DB"] =~ /sqlite/
+end
+