Bye bye rails 4.0

seuros · seuros · commit 246857bff19a · 2015-09-05T19:32:20.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,9 @@ sudo: false
 language: ruby
 rvm:
   - 2.2
-#  - rbx-2
-#  - ruby-head
-#  - rbx-head
   - jruby-head
 
 gemfile:
-  - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
   - gemfiles/activerecord_edge.gemfile
@@ -34,7 +30,5 @@ matrix:
     - rvm: jruby-head
 
   exclude:
-    - rvm: ruby-head
-      gemfile: gemfiles/activerecord_4.0.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/activerecord_4.1.gemfile
diff --git a/Appraisals b/Appraisals
@@ -1,14 +1,6 @@
-appraise 'activerecord-3.2' do
-  gem 'activerecord', '~> 3.2.0'
-  gem 'strong_parameters'
-end
-
-appraise 'activerecord-4.0' do
-  gem 'activerecord', '~> 4.0.0'
-end
-
 appraise 'activerecord-4.1' do
   gem 'activerecord', '~> 4.1.0'
+  gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'
 end
 
 appraise 'activerecord-4.2' do
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### 6.0.0.alpha
+* Drop support for unsupported version of Rails
+
 ### 5.2.0
 
 * [Eduardo Turiño](https://github.com/eturino) renamed `acts_as_tree` to `has_closure_tree`. We'll
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'
 
 platforms :ruby, :rbx do
   gem 'mysql2'
diff --git a/MIT-LICENSE b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Matthew McEachen
+Copyright (c) 2012-2015 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
diff --git a/README.md b/README.md
@@ -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 Rails 4.0, 4.1, and 4.2__
-* __Support for Ruby 2.2 and JRuby__
+* __Support for Rails 4.1, 4.2 and 5.0.alpha__
+* __Support for Ruby 2.2 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)
diff --git a/closure_tree.gemspec b/closure_tree.gemspec
@@ -14,21 +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 = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.2.0'
 
-  gem.add_runtime_dependency 'activerecord', '>= 3.2.0'
+  gem.add_runtime_dependency 'activerecord', '>= 4.1.0'
   gem.add_runtime_dependency 'with_advisory_lock', '>= 3.0.0'
 
-  gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rspec-instafail'
   gem.add_development_dependency 'rspec-rails', '~> 3.2.3'
-  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 'test-unit', '~> 3.0'
   # gem.add_development_dependency 'byebug'
   # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.
 end
diff --git a/gemfiles/activerecord_4.0.gemfile b/gemfiles/activerecord_4.0.gemfile
diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
 gem "activerecord", "~> 4.2.0"
 
 platforms :ruby, :rbx do
diff --git a/gemfiles/activerecord_edge.gemfile b/gemfiles/activerecord_edge.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
 gem "activerecord", :github => "rails/rails"
 gem "arel", :github => "rails/arel"
 
diff --git a/lib/closure_tree/has_closure_tree.rb b/lib/closure_tree/has_closure_tree.rb
@@ -31,7 +31,7 @@ def has_closure_tree(options = {})
       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/') && ENV['RAILS_GROUPS'] == 'assets'
+      raise e unless ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')
     end
 
     alias_method :acts_as_tree, :has_closure_tree
diff --git a/lib/closure_tree/model.rb b/lib/closure_tree/model.rb
@@ -11,9 +11,6 @@ module Model
                  inverse_of: :children,
                  touch: _ct.options[:touch]
 
-      # 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(
diff --git a/lib/closure_tree/version.rb b/lib/closure_tree/version.rb
@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('5.2.0') unless defined?(::ClosureTree::VERSION)
+  VERSION = Gem::Version.new('6.0.0.alpha')
 end
diff --git a/spec/db/models.rb b/spec/db/models.rb
@@ -1,9 +1,6 @@
-require 'uuidtools'
-
 class Tag < ActiveRecord::Base
   has_closure_tree :dependent => :destroy, :order => :name
   before_destroy :add_destroyed_tag
-  attr_accessible :name, :title if _ct.use_attr_accessible?
 
   def to_s
     name
@@ -20,10 +17,9 @@ class UUIDTag < ActiveRecord::Base
   before_create :set_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?
 
   def set_uuid
-    self.uuid = UUIDTools::UUID.timestamp_create.to_s
+    self.uuid = SecureRandom.uuid
   end
 
   def to_s
@@ -37,7 +33,6 @@ def add_destroyed_tag
 end
 
 class DestroyedTag < ActiveRecord::Base
-  attr_accessible :name if Tag._ct.use_attr_accessible?
 end
 
 class User < ActiveRecord::Base
@@ -52,8 +47,6 @@ def indirect_contracts
     Contract.where(:user_id => descendant_ids)
   end
 
-  attr_accessible :email, :referrer if _ct.use_attr_accessible?
-
   def to_s
     email
   end
@@ -69,8 +62,6 @@ class Label < ActiveRecord::Base
     :parent_column_name => "mother_id",
     :dependent => :destroy
 
-  attr_accessible :name if _ct.use_attr_accessible?
-
   def to_s
     "#{self.class}: #{name}"
   end
@@ -95,7 +86,6 @@ def self.table_name_prefix
   end
   class Type < ActiveRecord::Base
     has_closure_tree dependent: :destroy
-    attr_accessible :name if _ct.use_attr_accessible?
   end
 end
 
diff --git a/spec/support/deprecated/attr_accessible.rb b/spec/support/deprecated/attr_accessible.rb

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`source 'https://rubygems.org'`
`2`		`-gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'`
`3`	`2`
`4`	`3`	`platforms :ruby, :rbx do`
`5`	`4`	`gem 'mysql2'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2012-2014 Matthew McEachen`
	`1`	`+Copyright (c) 2012-2015 Matthew McEachen`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`