acts_as_tree 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd2799e03637580aeb10e75af1924473df069822
-  data.tar.gz: 495ff7f53a6386537161d2157c80e3fd7f5b8b73
+  metadata.gz: 3bdf6e214ed89182c6f2d9d1c67dc7eb98740bfd
+  data.tar.gz: 3e0b66ce3f15e89cc9200083887dce33f8924636
 SHA512:
-  metadata.gz: edf84e997d0163d04b8e8d46fc11a82f5700312062f7daef2d23b0e1a3cb537cb464f93921933f577c551868768c0ed8722e331309d978c705d5054e76d86d67
-  data.tar.gz: 0ae085569ca95ddf40c24086d75e5c4ccfee6c0c8f9f6ba722c33814959b0efbc3aae0bbea025ef856c9918dc8cc770d583d5f13adbe0728b6c47095db70079c
+  metadata.gz: 23d0e45f4a847b74b25e7832c046564c7c03a31faa2ab687332b555e00b6efd7f88cb034dd691ae6feba027ba0bcafb3ca2affa86f91825536d61bf57dcca344
+  data.tar.gz: 093917a7a3fcd2ad5a26c93016a47896c18fb1db175f57bbb511aabc00154fd4d42836521eb3669e11dc42d6ceb73d357a5579b7de4b161bf84ab1f78c7636af

data/.gitignore

@@ -3,3 +3,4 @@
 pkg/*
 .rvmrc
 Gemfile.lock
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,22 +1,52 @@
 language: ruby
+
+sudo: false
+cache: bundler
+
 rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
 
 gemfile:
   - gemfiles/rails-3.0.gemfile
   - gemfiles/rails-3.1.gemfile
   - gemfiles/rails-3.2.gemfile
   - gemfiles/rails-4.0.gemfile
+  - gemfiles/rails-4.1.gemfile
+  - gemfiles/rails-4.2.gemfile
+  - gemfiles/rails-5.0.gemfile
 
 matrix:
   exclude:
-    # rails 4.0 requries ruby 1.9.3 or newer
+    # rails 4.x requries ruby 1.9.3 or newer
     - rvm: 1.9.2
       gemfile: gemfiles/rails-4.0.gemfile
-    # rails < 3.2 is unsupported on ruby 2.0
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails-4.1.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails-4.2.gemfile
+    # rails < 3.2 is unsupported on ruby 2.0+
     - rvm: 2.0.0
       gemfile: gemfiles/rails-3.0.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails-3.1.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails-3.0.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails-3.1.gemfile
+    - rvm: 2.2.4
+      gemfile: gemfiles/rails-3.0.gemfile
+    - rvm: 2.2.4
+      gemfile: gemfiles/rails-3.1.gemfile
+    # rails 5.0 requires ruby 2.2.2+
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails-5.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails-5.0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails-5.0.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails-5.0.gemfile

data/README.md

@@ -74,6 +74,8 @@ We no longer support Ruby 1.8 or versions of Rails/ActiveRecord older than 3.0.
 Moving forward we will do our best to support the latest versions of ActiveRecord and Ruby.
 
 ## Change Log
+* 2.4.0 - January 12, 2016
+	* Added support for rails 5.0, see #46 -- klacointe
 * 2.3.0 - November 6, 2015
 	* Added touch option to acts\_as\_tree relation. See #40 -- mbenitezm
 	* Fix tests on rails 3.x with ruby 1.9.2. See #41 -- felixbuenemann

data/acts_as_tree.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   # Dependencies (installed via 'bundle install')...
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "minitest", "~> 4.7.5"
+  s.add_development_dependency "minitest", ">= 4.7.5"
 end

data/gemfiles/rails-3.0.gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3.0.0"
-gem "acts_as_tree", path: "../"
 gem "i18n", "< 0.7"
 
 gemspec path: "../"

data/gemfiles/rails-3.1.gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3.1.0"
-gem "acts_as_tree", path: "../"
 gem "i18n", "< 0.7"
 gem "rack-cache", "< 1.3"
 

data/gemfiles/rails-3.2.gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.0"
-gem "acts_as_tree", path: "../"
+gem "rails", "~> 3.2.22"
 gem "i18n", "< 0.7"
 gem "rack-cache", "< 1.3"
 

data/gemfiles/rails-4.0.gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
-gem "acts_as_tree", path: "../"
 
 gemspec path: "../"

data/gemfiles/rails-4.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+gemspec path: "../"

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0.beta1"
+
+gemspec path: "../"

data/lib/acts_as_tree.rb

@@ -76,11 +76,17 @@ module ActsAsTree
         configuration[:counter_cache] = :children_count
       end
 
-      belongs_to :parent, class_name:    name,
+      belongs_to_opts = {
+        class_name:    name,
         foreign_key:   configuration[:foreign_key],
         counter_cache: configuration[:counter_cache],
         touch:         configuration[:touch],
         inverse_of:    :children
+      }
+
+      belongs_to_opts[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
+
+      belongs_to :parent, belongs_to_opts
 
       if ActiveRecord::VERSION::MAJOR >= 4
         has_many :children, lambda { order configuration[:order] },

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/test/acts_as_tree_test.rb

@@ -3,7 +3,7 @@ require 'minitest/benchmark'
 require 'active_record'
 require 'acts_as_tree'
 
-class MiniTest::Unit::TestCase
+class ActsAsTreeTestCase < (defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase)
   def assert_queries(num = 1, &block)
     query_count, result = count_queries(&block)
     result
@@ -65,8 +65,11 @@ def setup_db(counter_cache = false)
 end
 
 def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
+  # Silence tables deprecation on rails 5.0
+  ActiveSupport::Deprecation.silence do
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
   end
 end
 
@@ -99,7 +102,7 @@ class TreeMixinWithTouch < Mixin
    acts_as_tree foreign_key: "parent_id", order: "id", touch: true
 end
 
-class TreeTest < MiniTest::Unit::TestCase
+class TreeTest < ActsAsTreeTestCase
 
   def setup
     setup_db
@@ -322,7 +325,7 @@ class TreeTest < MiniTest::Unit::TestCase
   end
 end
 
-class TestDeepDescendantsPerformance < MiniTest::Unit::TestCase
+class TestDeepDescendantsPerformance < ActsAsTreeTestCase
   def setup
     teardown_db
     setup_db
@@ -372,7 +375,7 @@ class TestDeepDescendantsPerformance < MiniTest::Unit::TestCase
   end
 end
 
-class TreeTestWithEagerLoading < MiniTest::Unit::TestCase
+class TreeTestWithEagerLoading < ActsAsTreeTestCase
 
   def setup
     teardown_db
@@ -433,7 +436,7 @@ class TreeTestWithEagerLoading < MiniTest::Unit::TestCase
   end
 end
 
-class TreeTestWithoutOrder < MiniTest::Unit::TestCase
+class TreeTestWithoutOrder < ActsAsTreeTestCase
 
   def setup
     setup_db
@@ -454,7 +457,7 @@ class TreeTestWithoutOrder < MiniTest::Unit::TestCase
   end
 end
 
-class UnsavedTreeTest < MiniTest::Unit::TestCase
+class UnsavedTreeTest < ActsAsTreeTestCase
   def setup
     setup_db
     @root       = TreeMixin.new
@@ -472,7 +475,7 @@ class UnsavedTreeTest < MiniTest::Unit::TestCase
 end
 
 
-class TreeTestWithCounterCache < MiniTest::Unit::TestCase
+class TreeTestWithCounterCache < ActsAsTreeTestCase
   def setup
     teardown_db
     setup_db(true)
@@ -514,7 +517,7 @@ class TreeTestWithCounterCache < MiniTest::Unit::TestCase
 end
 
 
-class TreeTestWithTouch < MiniTest::Unit::TestCase
+class TreeTestWithTouch < ActsAsTreeTestCase
   def setup
     teardown_db
     setup_db
@@ -534,4 +537,4 @@ class TreeTestWithTouch < MiniTest::Unit::TestCase
     
     assert @root.updated_at != previous_root_updated_at
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -60,14 +60,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.5
 description: A gem that adds simple support for organizing ActiveRecord models into
@@ -91,6 +91,9 @@ files:
 - gemfiles/rails-3.1.gemfile
 - gemfiles/rails-3.2.gemfile
 - gemfiles/rails-4.0.gemfile
+- gemfiles/rails-4.1.gemfile
+- gemfiles/rails-4.2.gemfile
+- gemfiles/rails-5.0.gemfile
 - lib/acts_as_tree.rb
 - lib/acts_as_tree/active_record/acts/tree.rb
 - lib/acts_as_tree/railtie.rb