acts_as_tree 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f213a482f1a2b2b32c7d0da25ed401c181200fd0ba395f10adf0507c4176c141
-  data.tar.gz: 838b60e6cb6cacaf67636c4481c8d1a91bc09ed69e04dab6ac88386bb07627ce
+  metadata.gz: 51b594e27b4911c9946f0219c57b664042839e2a7d61156f5b8140373020c7ff
+  data.tar.gz: d34d0ff6809f01c44215181020f982aec0addc9fcfa642801e5eb2db471b6987
 SHA512:
-  metadata.gz: afd79dd6589217a4af6ff173a4908845ce1a433c693cb09ebaf596457c3df52bb14b17361b6c930f74c5a6fe6a2a397db46ac3f6066b4e888b122dbf861c3f82
-  data.tar.gz: 0d7467f13dfa0667797786352f50395ba7e547cbb3787d67b667762f0868d697d83e2db3674c1f5df1988f20f94b1f2d093809c0dc592eb8529d40de7f426003
+  metadata.gz: 7b0fb4d675a73bdacf06f97ac04df824024071e3b4ff385893aad83cec393ec2f9ffad0a1f73a6c5626d41ddd00aaf5f750468edd69292e6e9232cf833a179e3
+  data.tar.gz: 82bed9b227d439fdd24761a96beb7cdc894617181a393189e378673b1d34c60514a6bf10c518f079fc9e013f412a15025162ff66e7337a21f085d9f6480c6a33

data/.travis.yml

@@ -5,70 +5,31 @@ cache: bundler
 
 before_install: gem install bundler -v '~> 1.15' --conservative --minimal-deps
 
-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
-  - gemfiles/rails-5.1.gemfile
-  - gemfiles/rails-5.2.gemfile
-
 matrix:
-  exclude:
-    # rails 4.x requries ruby 1.9.3 or newer
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails-4.0.gemfile
+  include:
     - 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
+    - rvm: 1.9.2
       gemfile: gemfiles/rails-3.1.gemfile
-    # rails 5.0 requires ruby 2.2.2+
     - rvm: 1.9.2
-      gemfile: gemfiles/rails-5.0.gemfile
+      gemfile: gemfiles/rails-3.2.gemfile
+    # rails 4.x requries ruby >= 1.9.3
     - 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
-    # rails 5.1 requires ruby 2.2.2+
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails-5.1.gemfile
+      gemfile: gemfiles/rails-4.0.gemfile
     - rvm: 1.9.3
-      gemfile: gemfiles/rails-5.1.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails-5.1.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/rails-5.1.gemfile
-    # rails 5.2 requires ruby 2.2.2+
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails-5.2.gemfile
+      gemfile: gemfiles/rails-4.1.gemfile
     - rvm: 1.9.3
+      gemfile: gemfiles/rails-4.2.gemfile
+    # rails 5.x requires ruby >= 2.2.2
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails-5.0.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails-5.1.gemfile
+    - rvm: 2.2.10
       gemfile: gemfiles/rails-5.2.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails-5.2.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/rails-5.2.gemfile
+    # rails 6.x requires ruby >= 2.5.0
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails-6.0.gemfile
+    # test latest rails and ruby
+    - rvm: 2.6.1
+      gemfile: gemfiles/rails-6.0.gemfile

data/README.md

@@ -74,6 +74,9 @@ 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.9.0 - March 7, 2019
+	* Allow arel nodes in the `:order` option, see #78, #79 -- felixbuenemann, vladvinnikov
+	* Added support for rails 6.0, see #81 -- felixbuenemann
 * 2.8.0 - August 27, 2018
 	* Added support for rails 5.2, see #76, #77 -- felixbuenemann
 * 2.7.1 - January 30, 2018

data/acts_as_tree.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord", ">= 3.0.0"
 
   # Dependencies (installed via 'bundle install')...
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", "~> 1.3.6"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "minitest", ">= 4.7.5"
 end

data/gemfiles/rails-6.0.gemfile

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

data/lib/acts_as_tree.rb

@@ -108,22 +108,19 @@ module ActsAsTree
           inverse_of:  :parent
       end
 
-      class_eval <<-EOV
-        include ActsAsTree::InstanceMethods
+      include ActsAsTree::InstanceMethods
 
-        def self.default_tree_order
-          order_option = #{configuration[:order].inspect}
-          order(order_option)
-        end
+      define_singleton_method :default_tree_order do
+        order(configuration[:order])
+      end
 
-        def self.root
-          self.roots.first
-        end
+      define_singleton_method :root do
+        self.roots.first
+      end
 
-        def self.roots
-          where(:#{configuration[:foreign_key]} => nil).default_tree_order
-        end
-      EOV
+      define_singleton_method :roots do
+        where(configuration[:foreign_key] => nil).default_tree_order
+      end
 
       # Returns a hash of all nodes grouped by their level in the tree structure.
       #

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.8.0"
+  VERSION = "2.9.0"
 end

data/test/acts_as_tree_test.rb

@@ -4,6 +4,8 @@ require 'active_record'
 require 'acts_as_tree'
 
 class ActsAsTreeTestCase < (defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase)
+  UPDATE_METHOD = ActiveRecord::VERSION::MAJOR >= 4 ? :update : :update_attributes
+
   def assert_queries(num = 1, &block)
     query_count, result = count_queries(&block)
     result
@@ -51,7 +53,7 @@ def setup_db(options = {})
   # AR keeps printing annoying schema statements
   capture_stdout do
     ActiveRecord::Base.logger
-    ActiveRecord::Schema.define(version: 1) do
+    ActiveRecord::Schema.define do
       create_table :mixins, force: true do |t|
         t.column :type, :string
         t.column :parent_id, :integer
@@ -497,7 +499,7 @@ class TreeTestWithCounterCache < ActsAsTreeTestCase
   end
 
   def test_update_parents_counter_cache
-    @child1_child1.update_attributes(:parent_id => @root.id)
+    @child1_child1.public_send(UPDATE_METHOD, :parent_id => @root.id)
     assert_equal 3, @root.reload.children_count
     assert_equal 0, @child1.reload.children_count
   end
@@ -525,7 +527,7 @@ class TreeTestWithTouch < ActsAsTreeTestCase
 
   def test_updated_at
     previous_root_updated_at = @root.updated_at
-    @child.update_attributes(:type => "new_type")
+    @child.public_send(UPDATE_METHOD, :type => "new_type")
     @root.reload
 
     assert @root.updated_at != previous_root_updated_at

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -32,16 +32,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
+- gemfiles/rails-6.0.gemfile
 - lib/acts_as_tree.rb
 - lib/acts_as_tree/active_record/acts/tree.rb
 - lib/acts_as_tree/railtie.rb
@@ -120,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.