nested_set 1.6.6 → 1.6.7
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/nested_set/base.rb +1 -7
- data/lib/nested_set/depth.rb +4 -3
- data/nested_set.gemspec +2 -2
- data/test/nested_set_test.rb +2 -2
- metadata +66 -60
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.6.
|
1
|
+
1.6.7
|
data/lib/nested_set/base.rb
CHANGED
@@ -59,12 +59,6 @@ module CollectiveIdea #:nodoc:
|
|
59
59
|
class_attribute :acts_as_nested_set_options
|
60
60
|
self.acts_as_nested_set_options = options
|
61
61
|
|
62
|
-
class_attribute :use_depth
|
63
|
-
self.use_depth = self.base_class.column_names.include?(self.base_class.acts_as_nested_set_options[:depth_column])
|
64
|
-
|
65
|
-
#backward compatibility
|
66
|
-
alias_method :depth?, :use_depth
|
67
|
-
|
68
62
|
unless self.is_a?(ClassMethods)
|
69
63
|
include Comparable
|
70
64
|
include Columns
|
@@ -109,7 +103,7 @@ module CollectiveIdea #:nodoc:
|
|
109
103
|
where("#{quoted_right_column_name} - #{quoted_left_column_name} = 1").
|
110
104
|
order(quoted_left_column_name)
|
111
105
|
}
|
112
|
-
scope :with_depth, proc {|level| where(:
|
106
|
+
scope :with_depth, proc {|level| where(:"#{depth_column_name}" => level).order(quoted_left_column_name) }
|
113
107
|
|
114
108
|
define_callbacks :move, :terminator => "result == false"
|
115
109
|
end
|
data/lib/nested_set/depth.rb
CHANGED
@@ -14,13 +14,14 @@ module CollectiveIdea #:nodoc:
|
|
14
14
|
scope_string.blank? ? "1 = 1" : scope_string
|
15
15
|
end
|
16
16
|
|
17
|
-
|
18
|
-
|
17
|
+
|
18
|
+
def depth?
|
19
|
+
respond_to?(depth_column_name)
|
19
20
|
end
|
20
21
|
|
21
22
|
# Update cached_level attribute
|
22
23
|
def update_depth
|
23
|
-
|
24
|
+
send :"#{depth_column_name}=", level
|
24
25
|
if depth_changed?
|
25
26
|
self.self_and_descendants.
|
26
27
|
update_all(["#{self.class.quoted_depth_column_name} = COALESCE(#{self.class.quoted_depth_column_name}, 0) + ?",
|
data/nested_set.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{nested_set}
|
8
|
-
s.version = "1.6.
|
8
|
+
s.version = "1.6.7"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Brandon Keepers", "Daniel Morrison"]
|
12
|
-
s.date = %q{2011-
|
12
|
+
s.date = %q{2011-06-20}
|
13
13
|
s.description = %q{An awesome nested set implementation for Active Record}
|
14
14
|
s.email = %q{info@collectiveidea.com}
|
15
15
|
s.extra_rdoc_files = [
|
data/test/nested_set_test.rb
CHANGED
@@ -197,13 +197,13 @@ class NestedSetTest < ActiveSupport::TestCase
|
|
197
197
|
end
|
198
198
|
|
199
199
|
def test_depth
|
200
|
-
assert_equal
|
200
|
+
assert_equal nil, categories(:top_level).depth
|
201
201
|
assert_equal 1, categories(:child_1).depth
|
202
202
|
assert_equal 2, categories(:child_2_1).depth
|
203
203
|
end
|
204
204
|
|
205
205
|
def test_depth_after_move
|
206
|
-
assert_equal
|
206
|
+
assert_equal nil, categories(:top_level).depth
|
207
207
|
assert_equal 1, categories(:child_2).depth
|
208
208
|
|
209
209
|
categories(:top_level).move_to_child_of(categories(:top_level_2))
|
metadata
CHANGED
@@ -1,91 +1,94 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: nested_set
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.6
|
3
|
+
version: !ruby/object:Gem::Version
|
5
4
|
prerelease:
|
5
|
+
version: 1.6.7
|
6
6
|
platform: ruby
|
7
|
-
authors:
|
7
|
+
authors:
|
8
8
|
- Brandon Keepers
|
9
9
|
- Daniel Morrison
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
|
13
|
+
|
14
|
+
date: 2011-06-20 00:00:00 +04:00
|
14
15
|
default_executable:
|
15
|
-
dependencies:
|
16
|
-
- !ruby/object:Gem::Dependency
|
16
|
+
dependencies:
|
17
|
+
- !ruby/object:Gem::Dependency
|
17
18
|
name: railties
|
18
|
-
requirement: &
|
19
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
19
20
|
none: false
|
20
|
-
requirements:
|
21
|
-
- -
|
22
|
-
- !ruby/object:Gem::Version
|
21
|
+
requirements:
|
22
|
+
- - ">="
|
23
|
+
- !ruby/object:Gem::Version
|
23
24
|
version: 3.0.0
|
24
25
|
type: :runtime
|
25
26
|
prerelease: false
|
26
|
-
version_requirements: *
|
27
|
-
- !ruby/object:Gem::Dependency
|
27
|
+
version_requirements: *id001
|
28
|
+
- !ruby/object:Gem::Dependency
|
28
29
|
name: activerecord
|
29
|
-
requirement: &
|
30
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
30
31
|
none: false
|
31
|
-
requirements:
|
32
|
-
- -
|
33
|
-
- !ruby/object:Gem::Version
|
32
|
+
requirements:
|
33
|
+
- - ">="
|
34
|
+
- !ruby/object:Gem::Version
|
34
35
|
version: 3.0.0
|
35
36
|
type: :runtime
|
36
37
|
prerelease: false
|
37
|
-
version_requirements: *
|
38
|
-
- !ruby/object:Gem::Dependency
|
38
|
+
version_requirements: *id002
|
39
|
+
- !ruby/object:Gem::Dependency
|
39
40
|
name: sqlite3-ruby
|
40
|
-
requirement: &
|
41
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
41
42
|
none: false
|
42
|
-
requirements:
|
43
|
-
- -
|
44
|
-
- !ruby/object:Gem::Version
|
45
|
-
version:
|
43
|
+
requirements:
|
44
|
+
- - ">="
|
45
|
+
- !ruby/object:Gem::Version
|
46
|
+
version: "0"
|
46
47
|
type: :development
|
47
48
|
prerelease: false
|
48
|
-
version_requirements: *
|
49
|
-
- !ruby/object:Gem::Dependency
|
49
|
+
version_requirements: *id003
|
50
|
+
- !ruby/object:Gem::Dependency
|
50
51
|
name: actionpack
|
51
|
-
requirement: &
|
52
|
+
requirement: &id004 !ruby/object:Gem::Requirement
|
52
53
|
none: false
|
53
|
-
requirements:
|
54
|
-
- -
|
55
|
-
- !ruby/object:Gem::Version
|
54
|
+
requirements:
|
55
|
+
- - ">="
|
56
|
+
- !ruby/object:Gem::Version
|
56
57
|
version: 3.0.0
|
57
58
|
type: :development
|
58
59
|
prerelease: false
|
59
|
-
version_requirements: *
|
60
|
-
- !ruby/object:Gem::Dependency
|
60
|
+
version_requirements: *id004
|
61
|
+
- !ruby/object:Gem::Dependency
|
61
62
|
name: bench_press
|
62
|
-
requirement: &
|
63
|
+
requirement: &id005 !ruby/object:Gem::Requirement
|
63
64
|
none: false
|
64
|
-
requirements:
|
65
|
-
- -
|
66
|
-
- !ruby/object:Gem::Version
|
65
|
+
requirements:
|
66
|
+
- - ">="
|
67
|
+
- !ruby/object:Gem::Version
|
67
68
|
version: 0.3.1
|
68
69
|
type: :development
|
69
70
|
prerelease: false
|
70
|
-
version_requirements: *
|
71
|
-
- !ruby/object:Gem::Dependency
|
71
|
+
version_requirements: *id005
|
72
|
+
- !ruby/object:Gem::Dependency
|
72
73
|
name: jeweler
|
73
|
-
requirement: &
|
74
|
+
requirement: &id006 !ruby/object:Gem::Requirement
|
74
75
|
none: false
|
75
|
-
requirements:
|
76
|
-
- -
|
77
|
-
- !ruby/object:Gem::Version
|
78
|
-
version:
|
76
|
+
requirements:
|
77
|
+
- - ">="
|
78
|
+
- !ruby/object:Gem::Version
|
79
|
+
version: "0"
|
79
80
|
type: :development
|
80
81
|
prerelease: false
|
81
|
-
version_requirements: *
|
82
|
+
version_requirements: *id006
|
82
83
|
description: An awesome nested set implementation for Active Record
|
83
84
|
email: info@collectiveidea.com
|
84
85
|
executables: []
|
86
|
+
|
85
87
|
extensions: []
|
86
|
-
|
88
|
+
|
89
|
+
extra_rdoc_files:
|
87
90
|
- README.md
|
88
|
-
files:
|
91
|
+
files:
|
89
92
|
- .autotest
|
90
93
|
- Gemfile
|
91
94
|
- Gemfile.lock
|
@@ -115,32 +118,35 @@ files:
|
|
115
118
|
has_rdoc: true
|
116
119
|
homepage: http://github.com/skyeagle/nested_set
|
117
120
|
licenses: []
|
121
|
+
|
118
122
|
post_install_message:
|
119
123
|
rdoc_options: []
|
120
|
-
|
124
|
+
|
125
|
+
require_paths:
|
121
126
|
- lib
|
122
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
127
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
123
128
|
none: false
|
124
|
-
requirements:
|
125
|
-
- -
|
126
|
-
- !ruby/object:Gem::Version
|
127
|
-
|
128
|
-
segments:
|
129
|
+
requirements:
|
130
|
+
- - ">="
|
131
|
+
- !ruby/object:Gem::Version
|
132
|
+
hash: 2412843186330894320
|
133
|
+
segments:
|
129
134
|
- 0
|
130
|
-
|
131
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
135
|
+
version: "0"
|
136
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
132
137
|
none: false
|
133
|
-
requirements:
|
134
|
-
- -
|
135
|
-
- !ruby/object:Gem::Version
|
136
|
-
version:
|
138
|
+
requirements:
|
139
|
+
- - ">="
|
140
|
+
- !ruby/object:Gem::Version
|
141
|
+
version: "0"
|
137
142
|
requirements: []
|
143
|
+
|
138
144
|
rubyforge_project:
|
139
145
|
rubygems_version: 1.6.2
|
140
146
|
signing_key:
|
141
147
|
specification_version: 3
|
142
148
|
summary: An awesome nested set implementation for Active Record
|
143
|
-
test_files:
|
149
|
+
test_files:
|
144
150
|
- test/benchmarks.rb
|
145
151
|
- test/db/schema.rb
|
146
152
|
- test/fixtures/category.rb
|