awesome_nested_set 3.1.1 → 3.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +5 -1
  3. data/README.md +3 -7
  4. data/lib/awesome_nested_set.rb +6 -3
  5. data/lib/awesome_nested_set/awesome_nested_set.rb +11 -7
  6. data/lib/awesome_nested_set/version.rb +2 -2
  7. metadata +55 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7b5aa9a8f785705dbab9b31c76596fb6094db51c
4
- data.tar.gz: ad5e1df7600ccc0c475daf39ce765016ba0493d0
3
+ metadata.gz: c9da353d3271eba6feb10b2d7199f810b457b141
4
+ data.tar.gz: 659ddfcf5e9f242e3c7b99af5b8082a1a8cb1a28
5
5
  SHA512:
6
- metadata.gz: 2aebdeeee003cd9201fa2711c474adff48d5d4a82546cc2e3ed5f4d837d5e9e2214aef34c9507ec22f2cf6b0e8dd95b97055b459704e2006a84e864069792973
7
- data.tar.gz: 296d1586a9c3900966b9a1521564240624077bd5499a08a1cd33e6255f8bea4ac04b736adb95c65ee294f7ba1cfc6b0443fe298387bc21f05499bb6d50af47d0
6
+ metadata.gz: 59a55895c7cec560382b4af428133b182e00f0d3b89517ee01612d6ba9f5dfaa996f7d578885785b9d5cc7ec4647ff1562545e984e33ced61ba9ec7dc38862f5
7
+ data.tar.gz: 91a51a67914cfce57ae5b2475899d85aa6c0ca13e629cb3d2098e74969ade46ec500b4e1212bac5fc7780eaff4aacd68f42f9faa5c52070e8f14d87c6d862e16
data/CHANGELOG CHANGED
@@ -1,9 +1,13 @@
1
- 3.1.0
1
+ 3.1.2
2
+ * Make belongs_to relation optional again [Jan Matusz](https://marahin.pl/)
3
+
4
+ 3.1.1
2
5
  * Fix a reloading bug when using default scope [Krzysztof Rybka](https://github.com/krzysiek1507)
3
6
 
4
7
  3.1.0
5
8
  * Ensure that nested_set queries respect the model's default_scope. [oesgalha](https://github.com/oesgalha)
6
9
  * Add Rails 5 support [Krzysztof Rybka](https://github.com/krzysiek1507)
10
+ * Drop support for ruby 1.9.3 [Krzysztof Rybka](https://github.com/krzysiek1507)
7
11
  * Fix .all_roots_valid? method when model is ordered by default [Adam Hodowany](https://github.com/hodak)
8
12
  * Reuse the current model's connection when available [Tim Bugai] [#322](https://github.com/collectiveidea/awesome_nested_set/pull/322)
9
13
 
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Awesome Nested Set
2
2
 
3
- [![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.png?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.png)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Dependency Status](https://gemnasium.com/collectiveidea/awesome_nested_set.svg)](https://gemnasium.com/collectiveidea/awesome_nested_set)
3
+ [![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.svg?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.svg)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Dependency Status](https://gemnasium.com/collectiveidea/awesome_nested_set.svg)](https://gemnasium.com/collectiveidea/awesome_nested_set) [![Security](https://hakiri.io/github/collectiveidea/awesome_nested_set/master.svg)](https://hakiri.io/github/collectiveidea/awesome_nested_set/master)
4
4
 
5
5
 
6
6
  Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models.
@@ -26,7 +26,7 @@ gem 'awesome_nested_set'
26
26
  To make use of `awesome_nested_set` your model needs to have 3 fields:
27
27
  `lft`, `rgt`, and `parent_id`. The names of these fields are configurable.
28
28
  You can also have optional fields: `depth` and `children_count`. These fields are configurable.
29
- Note that the `childrent_count` column must have `null: false` and `default: 0` to
29
+ Note that the `children_count` column must have `null: false` and `default: 0` to
30
30
  function properly.
31
31
 
32
32
  ```ruby
@@ -135,7 +135,7 @@ class Category < ActiveRecord::Base
135
135
  end
136
136
  ```
137
137
 
138
- ## Protecting attributes from mass assignment
138
+ ## Protecting attributes from mass assignment (for Rails < 4)
139
139
 
140
140
  It's generally best to "whitelist" the attributes that can be used in mass assignment:
141
141
 
@@ -231,10 +231,6 @@ Example usage:
231
231
 
232
232
  See [CollectiveIdea::Acts::NestedSet::Helper](lib/awesome_nested_set/helper.rb) for more information about the helpers.
233
233
 
234
- ## References
235
-
236
- You can learn more about nested sets at: http://threebit.net/tutorials/nestedset/tutorial1.html
237
-
238
234
  ## How to contribute
239
235
 
240
236
  Please see the ['Contributing' document](CONTRIBUTING.md).
data/lib/awesome_nested_set.rb CHANGED
@@ -1,8 +1,11 @@
1
+ require 'active_support/lazy_load_hooks'
1
2
  require 'awesome_nested_set/awesome_nested_set'
2
- require 'active_record'
3
- ActiveRecord::Base.send :extend, CollectiveIdea::Acts::NestedSet
4
3
 
5
- if defined?(ActionView)
4
+ ActiveSupport.on_load(:active_record) do
5
+ ActiveRecord::Base.send :extend, CollectiveIdea::Acts::NestedSet
6
+ end
7
+
8
+ ActiveSupport.on_load(:action_view) do
6
9
  require 'awesome_nested_set/helper'
7
10
  ActionView::Base.send :include, CollectiveIdea::Acts::NestedSet::Helper
8
11
  end
data/lib/awesome_nested_set/awesome_nested_set.rb CHANGED
@@ -92,13 +92,17 @@ module CollectiveIdea #:nodoc:
92
92
  end
93
93
 
94
94
  def acts_as_nested_set_relate_parent!
95
- belongs_to :parent, :class_name => self.base_class.to_s,
96
- :foreign_key => parent_column_name,
97
- :primary_key => primary_column_name,
98
- :counter_cache => acts_as_nested_set_options[:counter_cache],
99
- :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
100
- :polymorphic => acts_as_nested_set_options[:polymorphic],
101
- :touch => acts_as_nested_set_options[:touch]
95
+ options = {
96
+ :class_name => self.base_class.to_s,
97
+ :foreign_key => parent_column_name,
98
+ :primary_key => primary_column_name,
99
+ :counter_cache => acts_as_nested_set_options[:counter_cache],
100
+ :inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
101
+ :polymorphic => acts_as_nested_set_options[:polymorphic],
102
+ :touch => acts_as_nested_set_options[:touch]
103
+ }
104
+ options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
105
+ belongs_to :parent, options
102
106
  end
103
107
 
104
108
  def acts_as_nested_set_default_options
data/lib/awesome_nested_set/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AwesomeNestedSet
2
- VERSION = '3.1.1' unless defined?(::AwesomeNestedSet::VERSION)
3
- end
2
+ VERSION = '3.1.2' unless defined?(::AwesomeNestedSet::VERSION)
3
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: awesome_nested_set
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.1
4
+ version: 3.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-05-31 00:00:00.000000000 Z
13
+ date: 2017-04-06 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activerecord
@@ -32,20 +32,62 @@ dependencies:
32
32
  - - "<"
33
33
  - !ruby/object:Gem::Version
34
34
  version: '5.1'
35
+ - !ruby/object:Gem::Dependency
36
+ name: appraisal
37
+ requirement: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">="
40
+ - !ruby/object:Gem::Version
41
+ version: '0'
42
+ type: :development
43
+ prerelease: false
44
+ version_requirements: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
49
+ - !ruby/object:Gem::Dependency
50
+ name: pry
51
+ requirement: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ type: :development
57
+ prerelease: false
58
+ version_requirements: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ - !ruby/object:Gem::Dependency
64
+ name: pry-nav
65
+ requirement: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ type: :development
71
+ prerelease: false
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
35
77
  - !ruby/object:Gem::Dependency
36
78
  name: rspec-rails
37
79
  requirement: !ruby/object:Gem::Requirement
38
80
  requirements:
39
- - - '='
81
+ - - "~>"
40
82
  - !ruby/object:Gem::Version
41
- version: 3.5.0.beta3
83
+ version: 3.5.0
42
84
  type: :development
43
85
  prerelease: false
44
86
  version_requirements: !ruby/object:Gem::Requirement
45
87
  requirements:
46
- - - '='
88
+ - - "~>"
47
89
  - !ruby/object:Gem::Version
48
- version: 3.5.0.beta3
90
+ version: 3.5.0
49
91
  - !ruby/object:Gem::Dependency
50
92
  name: rake
51
93
  requirement: !ruby/object:Gem::Requirement
@@ -67,6 +109,9 @@ dependencies:
67
109
  - - ">="
68
110
  - !ruby/object:Gem::Version
69
111
  version: 0.5.2
112
+ - - "<"
113
+ - !ruby/object:Gem::Version
114
+ version: 0.5.5
70
115
  type: :development
71
116
  prerelease: false
72
117
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,6 +119,9 @@ dependencies:
74
119
  - - ">="
75
120
  - !ruby/object:Gem::Version
76
121
  version: 0.5.2
122
+ - - "<"
123
+ - !ruby/object:Gem::Version
124
+ version: 0.5.5
77
125
  - !ruby/object:Gem::Dependency
78
126
  name: database_cleaner
79
127
  requirement: !ruby/object:Gem::Requirement
@@ -138,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
138
186
  version: '0'
139
187
  requirements: []
140
188
  rubyforge_project:
141
- rubygems_version: 2.6.2
189
+ rubygems_version: 2.4.8
142
190
  signing_key:
143
191
  specification_version: 4
144
192
  summary: An awesome nested set implementation for Active Record