acts_as_tree 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b594e27b4911c9946f0219c57b664042839e2a7d61156f5b8140373020c7ff
-  data.tar.gz: d34d0ff6809f01c44215181020f982aec0addc9fcfa642801e5eb2db471b6987
+  metadata.gz: 5b54406e889488d26198bfd828c4b7c4f5bbbd9591d72587383a54a98d3a4f2e
+  data.tar.gz: 4985d8855958455cbc3b5bf8ae9bae905f77f127b784b07a053ed46fc6b75ac3
 SHA512:
-  metadata.gz: 7b0fb4d675a73bdacf06f97ac04df824024071e3b4ff385893aad83cec393ec2f9ffad0a1f73a6c5626d41ddd00aaf5f750468edd69292e6e9232cf833a179e3
-  data.tar.gz: 82bed9b227d439fdd24761a96beb7cdc894617181a393189e378673b1d34c60514a6bf10c518f079fc9e013f412a15025162ff66e7337a21f085d9f6480c6a33
+  metadata.gz: b4a7588a2627dde7931dbfd61586e7d710893eb431f25c2972893cb66ff6f1c7f443b99ec6c361e6897ca660fbfd0d82e3cf5d4c01e158be76e607c006aa76ca
+  data.tar.gz: c3b54fa299a2fc63422e9fa302138a8fc3aef4e69965dae10223c911b2e25763ecb3021ad46a4ad60d18c4cc9bb2da7b9c341a3c6562a2c5103b4c533be7b9d6

data/.travis.yml

@@ -7,11 +7,12 @@ before_install: gem install bundler -v '~> 1.15' --conservative --minimal-deps
 
 matrix:
   include:
-    - rvm: 1.9.2
+    # using ruby 1.9.3 for lack of 1.9.2 rvm binaries
+    - rvm: 1.9.3
       gemfile: gemfiles/rails-3.0.gemfile
-    - rvm: 1.9.2
+    - rvm: 1.9.3
       gemfile: gemfiles/rails-3.1.gemfile
-    - rvm: 1.9.2
+    - rvm: 1.9.3
       gemfile: gemfiles/rails-3.2.gemfile
     # rails 4.x requries ruby >= 1.9.3
     - rvm: 1.9.3
@@ -28,8 +29,10 @@ matrix:
     - rvm: 2.2.10
       gemfile: gemfiles/rails-5.2.gemfile
     # rails 6.x requires ruby >= 2.5.0
-    - rvm: 2.5.3
+    - rvm: 2.5.6
+      gemfile: gemfiles/rails-6.0.gemfile
+    - rvm: 2.6.4
       gemfile: gemfiles/rails-6.0.gemfile
     # test latest rails and ruby
-    - rvm: 2.6.1
+    - rvm: 2.7.0
       gemfile: gemfiles/rails-6.0.gemfile

data/README.md

@@ -74,68 +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.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
-	* Fix column quoting if the `:order` option is a symbol, see #73, #74 -- felixbuenemann
-* 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
-* 2.6.0 - October 9, 2016
-	* Add generations methods, see #56 -- markhgbrewster
-* 2.5.1 - September 8, 2016
-	* Fix early database connection in acts\_as\_tree, see #55 -- felixbuenemann
-* 2.5.0 - August 14, 2016
-	* Allow for use of a different primary key, see #50 -- Two9A
-* 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
-* 2.2.0 - June 15, 2015
-	* Added TreeWalker.walk\_tree instance method. See #32, #37, #38 -- felixbuenemann, genewoo
-	* Fix tests on rails 3.x. See #36 -- marshall-lee
-* 2.1.0 - September 25, 2014
-	* Added TreeWalker. See #30 -- 545ch4
-* 2.0.0 - July 3, 2014
-	* Renamed Presentation module to TreeView, see #27, #28 -- felixbuenemann
-* 1.6.1 - May 29, 2014
-	* Readme Improvements, see #26 -- schlick
-	* Improvements and Fixes for counter cache (fix counter\_cache: true). See #24, #25 -- dv
-	* Cleanup and fix tests, see #24.
-* 1.6.0 - April 21, 2014
-	* Added new `leaves` method. See #23 -- MichalPokorny
-* 1.5.1 - March 28, 2014
-	* Fixing descendants modification bug. See #20 -- amerine, tmuerell
-* 1.5.0 - December 16, 2013
-	* Added new `descendants` method -- adamkleingit
-	* Fixed warning message -- akicho8
-* 1.4.0 - June 25, 2013
-	* `Presentation#tree_view` -- rainchen
-	* `root?` && `leaf?` methods. -- xuanxu
-* 1.3.0 - March 29, 2013
-	* Rails 4.0 Support! -- mischa78
-	* Readme Fixes -- mischa78 & seanhussey
-* 1.2.0 - October 29, 2012
-	* Adding new `self_with_ancestors` accessor -- felixbuenemann
-	* `roots` is now a scope.
-* 1.1.0 - April 24, 2012
-	* Deprecate the ActiveRecord::Acts::Tree module in favor of ActsAsTree
-* 1.0.1 - April 18, 2012
-	* Include the Railtie for easier loading in Rails. Will reassess the forced module inclusion in the future.
-* 1.0.0 - April 14, 2012
-	* Official 1.0 release. Force users to include the ActiveRecord::Acts::Tree module.
-* 0.2.0 - April 9, 2012
-	* Rails 3 Support
-* 0.1.1 - February 3, 2010
-	* Bug Fixes
-* 0.1.0 - October 9, 2009
-	* First Gem Release
+
+The Change Log has moved to the [releases](https://github.com/amerine/acts_as_tree/releases) page.
 
 ## Note on Patches/Pull Requests
 
@@ -159,13 +99,14 @@ Moving forward we will do our best to support the latest versions of ActiveRecor
    adding new features, but not changing existing functionality bump the minor
    version, if you're shipping a bugfix, just bump the patch.
 2. Following the above rules, change the version found in lib/acts\_as\_tree/version.rb.
-3. Make sure the Change log in the README includes a brief summary of the versions
-   changes, with credit to the contributors.
-4. Commit these changes in one "release-prep" commit (on the master branch).
-5. Push that commit up to the repo.
-6. Run `rake release`
-   This will create and push a tag to Github, then generate a gem and push it to
+3. Commit these changes in one "release-prep" commit (on the master branch).
+4. Push that commit up to the repo.
+5. Run `rake release`
+   This will create and push a tag to GitHub, then generate a gem and push it to
    Rubygems.
+6. Create a new release from the tag on GitHub, by choosing "Draft a new release" button
+   on the [releases](https://github.com/amerine/acts_as_tree/releases) tab and include
+   the relevant changes in the description.
 7. Profit.
 
 ## License (MIT)

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", "~> 1.3.6"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "minitest", ">= 4.7.5"
 end

data/gemfiles/rails-3.0.gemfile

@@ -3,5 +3,6 @@ source "https://rubygems.org"
 gem "rails", "~> 3.0.0"
 gem "i18n", "< 0.7"
 gem "rake", "< 11"
+gem "sqlite3", "~> 1.3.4"
 
 gemspec path: "../"

data/gemfiles/rails-3.1.gemfile

@@ -4,5 +4,6 @@ gem "rails", "~> 3.1.0"
 gem "i18n", "< 0.7"
 gem "rack-cache", "< 1.3"
 gem "rake", "< 11"
+gem "sqlite3", "~> 1.3.4"
 
 gemspec path: "../"

data/gemfiles/rails-3.2.gemfile

@@ -4,5 +4,6 @@ gem "rails", "~> 3.2.22"
 gem "i18n", "< 0.7"
 gem "rack-cache", "< 1.3"
 gem "rake", "< 11"
+gem "sqlite3", "~> 1.3.5"
 
 gemspec path: "../"

data/gemfiles/rails-4.0.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
 gem "mime-types", "< 3"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails-4.1.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.1.0"
 gem "mime-types", "< 3"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails-4.2.gemfile

@@ -3,5 +3,6 @@ source "https://rubygems.org"
 gem "rails", "~> 4.2.0"
 gem "mime-types", "< 3"
 gem "nokogiri", "< 1.7"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

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

data/gemfiles/rails-5.1.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails-5.2.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec path: "../"

data/gemfiles/rails-6.0.gemfile

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

data/lib/acts_as_tree.rb

@@ -79,18 +79,24 @@ module ActsAsTree
         configuration[:counter_cache] = :children_count
       end
 
-      belongs_to_opts = {
-        class_name:    name,
-        primary_key:   configuration[:primary_key],
-        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 >= 5
+        belongs_to :parent,
+          class_name:    name,
+          primary_key:   configuration[:primary_key],
+          foreign_key:   configuration[:foreign_key],
+          counter_cache: configuration[:counter_cache],
+          touch:         configuration[:touch],
+          inverse_of:    :children,
+          optional:      true
+      else
+        belongs_to :parent,
+          class_name:    name,
+          primary_key:   configuration[:primary_key],
+          foreign_key:   configuration[:foreign_key],
+          counter_cache: configuration[:counter_cache],
+          touch:         configuration[:touch],
+          inverse_of:    :children
+      end
 
       if ActiveRecord::VERSION::MAJOR >= 4
         has_many :children, lambda { order configuration[:order] },
@@ -100,7 +106,8 @@ module ActsAsTree
           dependent:   configuration[:dependent],
           inverse_of:  :parent
       else
-        has_many :children, class_name:  name,
+        has_many :children,
+          class_name:  name,
           primary_key: configuration[:primary_key],
           foreign_key: configuration[:foreign_key],
           order:       configuration[:order],

data/lib/acts_as_tree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-12-28 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: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.