acts_as_tree 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12616559e89eeee23f6e37d97779cc5e1f3c50de
-  data.tar.gz: 32344222affc6cd7746e14fe4a0d218e0fca5e35
+  metadata.gz: 75417b3f6a18bdc37755a52d6864b30fd7dd1222
+  data.tar.gz: 3cb4d2e1bc5a105fa0be41136f715c88e59d19a1
 SHA512:
-  metadata.gz: 484644c639c9dceda0c847ac3e57e861ed3429316116ae5d1f34547f8109a0d99811a3a98a205a5e7b6bc50b25348104bb8e03da1043d8b4cc0e8f34d870408f
-  data.tar.gz: 75cf6219da3b6d5a87c46246b16431d81dd5966df06e82d23996e474078afa1d734ab02e0a1afbd544393421ee0f305beff914b29e76cfbe551b3f25438892b3
+  metadata.gz: 4412b677467ff33f58855d1b498dfc6852f08c1e024af9f0669c23741b2acb2787f966e793ec5774613449922795f3d80c30aff119cbd0692c8779769e94faff
+  data.tar.gz: 0f229e16aed8c8844292e7cb9f2ea9707fb615c7afd5cab06622cda82543c90beecfe34499cdd1993972c4ca9911dd6855a91b9b48702bcf35b31bd55ca09038

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 sudo: false
 cache: bundler
 
+before_install: gem install bundler -v '~> 1.15' --conservative --minimal-deps
+
 rvm:
   - 1.9.2
   - 1.9.3
@@ -18,6 +20,7 @@ gemfile:
   - gemfiles/rails-4.1.gemfile
   - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-5.1.gemfile
 
 matrix:
   exclude:
@@ -50,3 +53,12 @@ matrix:
       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
+    - 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

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.7.0 - September 15, 2017
+	* Added support for rails 5.1, see #67, #68 -- felixbuenemann, marcinwierzbicki
 * 2.6.1 - January 18, 2017
 	* Avoid conflicts of `#level` method with existing column, see #57, #58, #60 -- markhgbrewster
 	* Fix tests on rails 4.2 with ruby < 2.1 -- felixbuenemann

data/gemfiles/rails-5.0.gemfile

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

data/gemfiles/rails-5.1.gemfile

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

data/lib/acts_as_tree.rb

@@ -145,7 +145,7 @@ module ActsAsTree
         end
 
       else
-        # Fallback to less efficent ways to find leaves.
+        # Fallback to less efficient ways to find leaves.
         class_eval <<-EOV
           def self.leaves
             internal_ids = select(:#{configuration[:foreign_key]}).where(arel_table[:#{configuration[:foreign_key]}].not_eq(nil))
@@ -355,12 +355,23 @@ module ActsAsTree
 
     private
 
-    def update_parents_counter_cache
-      counter_cache_column = self.class.children_counter_cache_column
+    if ActiveRecord::VERSION::MAJOR > 5 || ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1
+      def update_parents_counter_cache
+        counter_cache_column = self.class.children_counter_cache_column
 
-      if parent_id_changed?
-        self.class.decrement_counter(counter_cache_column, parent_id_was)
-        self.class.increment_counter(counter_cache_column, parent_id)
+        if saved_change_to_parent_id?
+          self.class.decrement_counter(counter_cache_column, parent_id_before_last_save)
+          self.class.increment_counter(counter_cache_column, parent_id)
+        end
+      end
+    else
+      def update_parents_counter_cache
+        counter_cache_column = self.class.children_counter_cache_column
+
+        if parent_id_changed?
+          self.class.decrement_counter(counter_cache_column, parent_id_was)
+          self.class.increment_counter(counter_cache_column, parent_id)
+        end
       end
     end
   end

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,7 @@ files:
 - gemfiles/rails-4.1.gemfile
 - gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
+- gemfiles/rails-5.1.gemfile
 - lib/acts_as_tree.rb
 - lib/acts_as_tree/active_record/acts/tree.rb
 - lib/acts_as_tree/railtie.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.