acts_as_tree 2.8.0 → 2.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +19 -58
- data/README.md +3 -0
- data/acts_as_tree.gemspec +1 -1
- data/gemfiles/rails-6.0.gemfile +5 -0
- data/lib/acts_as_tree.rb +10 -13
- data/lib/acts_as_tree/version.rb +1 -1
- data/test/acts_as_tree_test.rb +5 -3
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 51b594e27b4911c9946f0219c57b664042839e2a7d61156f5b8140373020c7ff
|
4
|
+
data.tar.gz: d34d0ff6809f01c44215181020f982aec0addc9fcfa642801e5eb2db471b6987
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7b0fb4d675a73bdacf06f97ac04df824024071e3b4ff385893aad83cec393ec2f9ffad0a1f73a6c5626d41ddd00aaf5f750468edd69292e6e9232cf833a179e3
|
7
|
+
data.tar.gz: 82bed9b227d439fdd24761a96beb7cdc894617181a393189e378673b1d34c60514a6bf10c518f079fc9e013f412a15025162ff66e7337a21f085d9f6480c6a33
|
data/.travis.yml
CHANGED
@@ -5,70 +5,31 @@ cache: bundler
|
|
5
5
|
|
6
6
|
before_install: gem install bundler -v '~> 1.15' --conservative --minimal-deps
|
7
7
|
|
8
|
-
rvm:
|
9
|
-
- 1.9.2
|
10
|
-
- 1.9.3
|
11
|
-
- 2.0.0
|
12
|
-
- 2.1.8
|
13
|
-
- 2.2.4
|
14
|
-
|
15
|
-
gemfile:
|
16
|
-
- gemfiles/rails-3.0.gemfile
|
17
|
-
- gemfiles/rails-3.1.gemfile
|
18
|
-
- gemfiles/rails-3.2.gemfile
|
19
|
-
- gemfiles/rails-4.0.gemfile
|
20
|
-
- gemfiles/rails-4.1.gemfile
|
21
|
-
- gemfiles/rails-4.2.gemfile
|
22
|
-
- gemfiles/rails-5.0.gemfile
|
23
|
-
- gemfiles/rails-5.1.gemfile
|
24
|
-
- gemfiles/rails-5.2.gemfile
|
25
|
-
|
26
8
|
matrix:
|
27
|
-
|
28
|
-
# rails 4.x requries ruby 1.9.3 or newer
|
29
|
-
- rvm: 1.9.2
|
30
|
-
gemfile: gemfiles/rails-4.0.gemfile
|
9
|
+
include:
|
31
10
|
- rvm: 1.9.2
|
32
|
-
gemfile: gemfiles/rails-4.1.gemfile
|
33
|
-
- rvm: 1.9.2
|
34
|
-
gemfile: gemfiles/rails-4.2.gemfile
|
35
|
-
# rails < 3.2 is unsupported on ruby 2.0+
|
36
|
-
- rvm: 2.0.0
|
37
11
|
gemfile: gemfiles/rails-3.0.gemfile
|
38
|
-
- rvm:
|
39
|
-
gemfile: gemfiles/rails-3.1.gemfile
|
40
|
-
- rvm: 2.1.8
|
41
|
-
gemfile: gemfiles/rails-3.0.gemfile
|
42
|
-
- rvm: 2.1.8
|
43
|
-
gemfile: gemfiles/rails-3.1.gemfile
|
44
|
-
- rvm: 2.2.4
|
45
|
-
gemfile: gemfiles/rails-3.0.gemfile
|
46
|
-
- rvm: 2.2.4
|
12
|
+
- rvm: 1.9.2
|
47
13
|
gemfile: gemfiles/rails-3.1.gemfile
|
48
|
-
# rails 5.0 requires ruby 2.2.2+
|
49
14
|
- rvm: 1.9.2
|
50
|
-
gemfile: gemfiles/rails-
|
15
|
+
gemfile: gemfiles/rails-3.2.gemfile
|
16
|
+
# rails 4.x requries ruby >= 1.9.3
|
51
17
|
- rvm: 1.9.3
|
52
|
-
gemfile: gemfiles/rails-
|
53
|
-
- rvm: 2.0.0
|
54
|
-
gemfile: gemfiles/rails-5.0.gemfile
|
55
|
-
- rvm: 2.1.8
|
56
|
-
gemfile: gemfiles/rails-5.0.gemfile
|
57
|
-
# rails 5.1 requires ruby 2.2.2+
|
58
|
-
- rvm: 1.9.2
|
59
|
-
gemfile: gemfiles/rails-5.1.gemfile
|
18
|
+
gemfile: gemfiles/rails-4.0.gemfile
|
60
19
|
- rvm: 1.9.3
|
61
|
-
gemfile: gemfiles/rails-
|
62
|
-
- rvm: 2.0.0
|
63
|
-
gemfile: gemfiles/rails-5.1.gemfile
|
64
|
-
- rvm: 2.1.8
|
65
|
-
gemfile: gemfiles/rails-5.1.gemfile
|
66
|
-
# rails 5.2 requires ruby 2.2.2+
|
67
|
-
- rvm: 1.9.2
|
68
|
-
gemfile: gemfiles/rails-5.2.gemfile
|
20
|
+
gemfile: gemfiles/rails-4.1.gemfile
|
69
21
|
- rvm: 1.9.3
|
22
|
+
gemfile: gemfiles/rails-4.2.gemfile
|
23
|
+
# rails 5.x requires ruby >= 2.2.2
|
24
|
+
- rvm: 2.2.10
|
25
|
+
gemfile: gemfiles/rails-5.0.gemfile
|
26
|
+
- rvm: 2.2.10
|
27
|
+
gemfile: gemfiles/rails-5.1.gemfile
|
28
|
+
- rvm: 2.2.10
|
70
29
|
gemfile: gemfiles/rails-5.2.gemfile
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
30
|
+
# rails 6.x requires ruby >= 2.5.0
|
31
|
+
- rvm: 2.5.3
|
32
|
+
gemfile: gemfiles/rails-6.0.gemfile
|
33
|
+
# test latest rails and ruby
|
34
|
+
- rvm: 2.6.1
|
35
|
+
gemfile: gemfiles/rails-6.0.gemfile
|
data/README.md
CHANGED
@@ -74,6 +74,9 @@ We no longer support Ruby 1.8 or versions of Rails/ActiveRecord older than 3.0.
|
|
74
74
|
Moving forward we will do our best to support the latest versions of ActiveRecord and Ruby.
|
75
75
|
|
76
76
|
## Change Log
|
77
|
+
* 2.9.0 - March 7, 2019
|
78
|
+
* Allow arel nodes in the `:order` option, see #78, #79 -- felixbuenemann, vladvinnikov
|
79
|
+
* Added support for rails 6.0, see #81 -- felixbuenemann
|
77
80
|
* 2.8.0 - August 27, 2018
|
78
81
|
* Added support for rails 5.2, see #76, #77 -- felixbuenemann
|
79
82
|
* 2.7.1 - January 30, 2018
|
data/acts_as_tree.gemspec
CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
|
|
20
20
|
s.add_dependency "activerecord", ">= 3.0.0"
|
21
21
|
|
22
22
|
# Dependencies (installed via 'bundle install')...
|
23
|
-
s.add_development_dependency "sqlite3"
|
23
|
+
s.add_development_dependency "sqlite3", "~> 1.3.6"
|
24
24
|
s.add_development_dependency "rdoc"
|
25
25
|
s.add_development_dependency "minitest", ">= 4.7.5"
|
26
26
|
end
|
data/lib/acts_as_tree.rb
CHANGED
@@ -108,22 +108,19 @@ module ActsAsTree
|
|
108
108
|
inverse_of: :parent
|
109
109
|
end
|
110
110
|
|
111
|
-
|
112
|
-
include ActsAsTree::InstanceMethods
|
111
|
+
include ActsAsTree::InstanceMethods
|
113
112
|
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
end
|
113
|
+
define_singleton_method :default_tree_order do
|
114
|
+
order(configuration[:order])
|
115
|
+
end
|
118
116
|
|
119
|
-
|
120
|
-
|
121
|
-
|
117
|
+
define_singleton_method :root do
|
118
|
+
self.roots.first
|
119
|
+
end
|
122
120
|
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
EOV
|
121
|
+
define_singleton_method :roots do
|
122
|
+
where(configuration[:foreign_key] => nil).default_tree_order
|
123
|
+
end
|
127
124
|
|
128
125
|
# Returns a hash of all nodes grouped by their level in the tree structure.
|
129
126
|
#
|
data/lib/acts_as_tree/version.rb
CHANGED
data/test/acts_as_tree_test.rb
CHANGED
@@ -4,6 +4,8 @@ require 'active_record'
|
|
4
4
|
require 'acts_as_tree'
|
5
5
|
|
6
6
|
class ActsAsTreeTestCase < (defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase)
|
7
|
+
UPDATE_METHOD = ActiveRecord::VERSION::MAJOR >= 4 ? :update : :update_attributes
|
8
|
+
|
7
9
|
def assert_queries(num = 1, &block)
|
8
10
|
query_count, result = count_queries(&block)
|
9
11
|
result
|
@@ -51,7 +53,7 @@ def setup_db(options = {})
|
|
51
53
|
# AR keeps printing annoying schema statements
|
52
54
|
capture_stdout do
|
53
55
|
ActiveRecord::Base.logger
|
54
|
-
ActiveRecord::Schema.define
|
56
|
+
ActiveRecord::Schema.define do
|
55
57
|
create_table :mixins, force: true do |t|
|
56
58
|
t.column :type, :string
|
57
59
|
t.column :parent_id, :integer
|
@@ -497,7 +499,7 @@ class TreeTestWithCounterCache < ActsAsTreeTestCase
|
|
497
499
|
end
|
498
500
|
|
499
501
|
def test_update_parents_counter_cache
|
500
|
-
@child1_child1.
|
502
|
+
@child1_child1.public_send(UPDATE_METHOD, :parent_id => @root.id)
|
501
503
|
assert_equal 3, @root.reload.children_count
|
502
504
|
assert_equal 0, @child1.reload.children_count
|
503
505
|
end
|
@@ -525,7 +527,7 @@ class TreeTestWithTouch < ActsAsTreeTestCase
|
|
525
527
|
|
526
528
|
def test_updated_at
|
527
529
|
previous_root_updated_at = @root.updated_at
|
528
|
-
@child.
|
530
|
+
@child.public_send(UPDATE_METHOD, :type => "new_type")
|
529
531
|
@root.reload
|
530
532
|
|
531
533
|
assert @root.updated_at != previous_root_updated_at
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: acts_as_tree
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Erik Dahlstrand
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date:
|
15
|
+
date: 2019-03-07 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: activerecord
|
@@ -32,16 +32,16 @@ dependencies:
|
|
32
32
|
name: sqlite3
|
33
33
|
requirement: !ruby/object:Gem::Requirement
|
34
34
|
requirements:
|
35
|
-
- - "
|
35
|
+
- - "~>"
|
36
36
|
- !ruby/object:Gem::Version
|
37
|
-
version:
|
37
|
+
version: 1.3.6
|
38
38
|
type: :development
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
41
41
|
requirements:
|
42
|
-
- - "
|
42
|
+
- - "~>"
|
43
43
|
- !ruby/object:Gem::Version
|
44
|
-
version:
|
44
|
+
version: 1.3.6
|
45
45
|
- !ruby/object:Gem::Dependency
|
46
46
|
name: rdoc
|
47
47
|
requirement: !ruby/object:Gem::Requirement
|
@@ -96,6 +96,7 @@ files:
|
|
96
96
|
- gemfiles/rails-5.0.gemfile
|
97
97
|
- gemfiles/rails-5.1.gemfile
|
98
98
|
- gemfiles/rails-5.2.gemfile
|
99
|
+
- gemfiles/rails-6.0.gemfile
|
99
100
|
- lib/acts_as_tree.rb
|
100
101
|
- lib/acts_as_tree/active_record/acts/tree.rb
|
101
102
|
- lib/acts_as_tree/railtie.rb
|
@@ -120,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
120
121
|
- !ruby/object:Gem::Version
|
121
122
|
version: '0'
|
122
123
|
requirements: []
|
123
|
-
|
124
|
-
rubygems_version: 2.7.7
|
124
|
+
rubygems_version: 3.0.2
|
125
125
|
signing_key:
|
126
126
|
specification_version: 4
|
127
127
|
summary: Provides a simple tree behaviour to active_record models.
|