esp-auth 1.0.8 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/esp_auth/engine.rb +14 -8
  2. data/lib/esp_auth/version.rb +1 -1
  3. metadata +68 -68
data/lib/esp_auth/engine.rb CHANGED
@@ -39,9 +39,9 @@ module EspAuth
39
39
 
40
40
  def polymorphic_context_tree_for(form)
41
41
  form.input :polymorphic_context, :as => :select,
42
- :collection => current_user.contexts_tree,
42
+ :collection => current_user.context_tree,
43
43
  :member_value => ->(c) { [c.class.model_name.underscore, c.id].join('_') },
44
- :member_label => ->(c) { (' ' * 2 * c.depth + c.title).html_safe },
44
+ :member_label => ->(c) { (' ' * 2 * c.absolute_depth + c.title).html_safe },
45
45
  :include_blank => t('commons.not_selected')
46
46
  end
47
47
  end
@@ -81,11 +81,16 @@ module EspAuth
81
81
  permissions.map(&:context).uniq
82
82
  end
83
83
 
84
- define_method :contexts_tree do
85
- contexts.flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
86
- .uniq
87
- .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
88
- .uniq
84
+ define_method :context_tree do
85
+ instance_variable_get(:@context_tree) || instance_variable_set(:@context_tree, contexts
86
+ .flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
87
+ .uniq
88
+ .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
89
+ .uniq)
90
+ end
91
+
92
+ define_method :context_tree_of do | klass |
93
+ context_tree.select{|node| node.is_a?(klass)}
89
94
  end
90
95
 
91
96
  define_method :to_s do
@@ -157,6 +162,7 @@ module EspAuth
157
162
  has_many :permissions, :as => :context
158
163
  has_ancestry
159
164
 
165
+ alias_method :absolute_depth, :depth
160
166
  alias_attribute :to_s, :title
161
167
  end
162
168
 
@@ -166,7 +172,7 @@ module EspAuth
166
172
 
167
173
  alias_attribute :to_s, :title
168
174
 
169
- def depth
175
+ def absolute_depth
170
176
  context.depth + 1
171
177
  end
172
178
  end
data/lib/esp_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspAuth
2
- VERSION = "1.0.8"
2
+ VERSION = "1.1.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: esp-auth
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.8
4
+ version: 1.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-24 00:00:00.000000000 Z
12
+ date: 2012-02-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &19659740 !ruby/object:Gem::Requirement
16
+ requirement: &14292000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *19659740
24
+ version_requirements: *14292000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &19659200 !ruby/object:Gem::Requirement
27
+ requirement: &14291580 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *19659200
35
+ version_requirements: *14291580
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &19658580 !ruby/object:Gem::Requirement
38
+ requirement: &14290960 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.12.alpha.4
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *19658580
46
+ version_requirements: *14290960
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &19658160 !ruby/object:Gem::Requirement
49
+ requirement: &14306920 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *19658160
57
+ version_requirements: *14306920
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: default_value_for
60
- requirement: &19657580 !ruby/object:Gem::Requirement
60
+ requirement: &14306460 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *19657580
68
+ version_requirements: *14306460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: devise
71
- requirement: &19657140 !ruby/object:Gem::Requirement
71
+ requirement: &14306040 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *19657140
79
+ version_requirements: *14306040
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: devise-russian
82
- requirement: &19673000 !ruby/object:Gem::Requirement
82
+ requirement: &14305620 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *19673000
90
+ version_requirements: *14305620
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth
93
- requirement: &19672580 !ruby/object:Gem::Requirement
93
+ requirement: &14305200 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *19672580
101
+ version_requirements: *14305200
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: omniauth-oauth2
104
- requirement: &19672160 !ruby/object:Gem::Requirement
104
+ requirement: &14304780 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *19672160
112
+ version_requirements: *14304780
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formtastic
115
- requirement: &19671740 !ruby/object:Gem::Requirement
115
+ requirement: &14300560 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *19671740
123
+ version_requirements: *14300560
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: has_enum
126
- requirement: &19671320 !ruby/object:Gem::Requirement
126
+ requirement: &14300140 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *19671320
134
+ version_requirements: *14300140
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_scope
137
- requirement: &19670900 !ruby/object:Gem::Requirement
137
+ requirement: &14299720 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *19670900
145
+ version_requirements: *14299720
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: has_searcher
148
- requirement: &19666680 !ruby/object:Gem::Requirement
148
+ requirement: &14299300 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *19666680
156
+ version_requirements: *14299300
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: inherited_resources
159
- requirement: &19666260 !ruby/object:Gem::Requirement
159
+ requirement: &14323380 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *19666260
167
+ version_requirements: *14323380
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: kaminari
170
- requirement: &19665840 !ruby/object:Gem::Requirement
170
+ requirement: &14322960 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *19665840
178
+ version_requirements: *14322960
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: progress_bar
181
- requirement: &19665420 !ruby/object:Gem::Requirement
181
+ requirement: &14322520 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *19665420
189
+ version_requirements: *14322520
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rails
192
- requirement: &19665000 !ruby/object:Gem::Requirement
192
+ requirement: &14322080 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :runtime
199
199
  prerelease: false
200
- version_requirements: *19665000
200
+ version_requirements: *14322080
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: sass
203
- requirement: &19689080 !ruby/object:Gem::Requirement
203
+ requirement: &14321620 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '0'
209
209
  type: :runtime
210
210
  prerelease: false
211
- version_requirements: *19689080
211
+ version_requirements: *14321620
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sass-rails
214
- requirement: &19688660 !ruby/object:Gem::Requirement
214
+ requirement: &14321180 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: '0'
220
220
  type: :runtime
221
221
  prerelease: false
222
- version_requirements: *19688660
222
+ version_requirements: *14321180
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sunspot_rails
225
- requirement: &19688200 !ruby/object:Gem::Requirement
225
+ requirement: &14320720 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: '0'
231
231
  type: :runtime
232
232
  prerelease: false
233
- version_requirements: *19688200
233
+ version_requirements: *14320720
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: whenever
236
- requirement: &19687740 !ruby/object:Gem::Requirement
236
+ requirement: &14320280 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: '0'
242
242
  type: :runtime
243
243
  prerelease: false
244
- version_requirements: *19687740
244
+ version_requirements: *14320280
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard
247
- requirement: &19687300 !ruby/object:Gem::Requirement
247
+ requirement: &14319840 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
252
252
  version: '0'
253
253
  type: :development
254
254
  prerelease: false
255
- version_requirements: *19687300
255
+ version_requirements: *14319840
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: guard-rspec
258
- requirement: &19686860 !ruby/object:Gem::Requirement
258
+ requirement: &14319380 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
263
263
  version: '0'
264
264
  type: :development
265
265
  prerelease: false
266
- version_requirements: *19686860
266
+ version_requirements: *14319380
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: guard-spork
269
- requirement: &19686420 !ruby/object:Gem::Requirement
269
+ requirement: &14318940 !ruby/object:Gem::Requirement
270
270
  none: false
271
271
  requirements:
272
272
  - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
274
274
  version: '0'
275
275
  type: :development
276
276
  prerelease: false
277
- version_requirements: *19686420
277
+ version_requirements: *14318940
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: rspec-rails
280
- requirement: &19685960 !ruby/object:Gem::Requirement
280
+ requirement: &14318480 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
285
285
  version: '0'
286
286
  type: :development
287
287
  prerelease: false
288
- version_requirements: *19685960
288
+ version_requirements: *14318480
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: russian
291
- requirement: &19685520 !ruby/object:Gem::Requirement
291
+ requirement: &14318040 !ruby/object:Gem::Requirement
292
292
  none: false
293
293
  requirements:
294
294
  - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
296
296
  version: '0'
297
297
  type: :development
298
298
  prerelease: false
299
- version_requirements: *19685520
299
+ version_requirements: *14318040
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: shoulda-matchers
302
- requirement: &19685060 !ruby/object:Gem::Requirement
302
+ requirement: &14317600 !ruby/object:Gem::Requirement
303
303
  none: false
304
304
  requirements:
305
305
  - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
307
307
  version: '0'
308
308
  type: :development
309
309
  prerelease: false
310
- version_requirements: *19685060
310
+ version_requirements: *14317600
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: spork
313
- requirement: &19684620 !ruby/object:Gem::Requirement
313
+ requirement: &14317160 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
318
318
  version: '0'
319
319
  type: :development
320
320
  prerelease: false
321
- version_requirements: *19684620
321
+ version_requirements: *14317160
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sqlite3
324
- requirement: &19684160 !ruby/object:Gem::Requirement
324
+ requirement: &14316720 !ruby/object:Gem::Requirement
325
325
  none: false
326
326
  requirements:
327
327
  - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
329
329
  version: '0'
330
330
  type: :development
331
331
  prerelease: false
332
- version_requirements: *19684160
332
+ version_requirements: *14316720
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: sunspot_solr
335
- requirement: &19683720 !ruby/object:Gem::Requirement
335
+ requirement: &14316280 !ruby/object:Gem::Requirement
336
336
  none: false
337
337
  requirements:
338
338
  - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
340
340
  version: '0'
341
341
  type: :development
342
342
  prerelease: false
343
- version_requirements: *19683720
343
+ version_requirements: *14316280
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: therubyracer
346
- requirement: &19683280 !ruby/object:Gem::Requirement
346
+ requirement: &14315840 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - ! '>='
@@ -351,10 +351,10 @@ dependencies:
351
351
  version: '0'
352
352
  type: :development
353
353
  prerelease: false
354
- version_requirements: *19683280
354
+ version_requirements: *14315840
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: uglifier
357
- requirement: &19682840 !ruby/object:Gem::Requirement
357
+ requirement: &14331760 !ruby/object:Gem::Requirement
358
358
  none: false
359
359
  requirements:
360
360
  - - ! '>='
@@ -362,7 +362,7 @@ dependencies:
362
362
  version: '0'
363
363
  type: :development
364
364
  prerelease: false
365
- version_requirements: *19682840
365
+ version_requirements: *14331760
366
366
  description: Description of EspAuth.
367
367
  email:
368
368
  - mail@openteam.ru
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
434
434
  version: '0'
435
435
  segments:
436
436
  - 0
437
- hash: 4425170649980545011
437
+ hash: 1663371989005486869
438
438
  required_rubygems_version: !ruby/object:Gem::Requirement
439
439
  none: false
440
440
  requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
443
443
  version: '0'
444
444
  segments:
445
445
  - 0
446
- hash: 4425170649980545011
446
+ hash: 1663371989005486869
447
447
  requirements: []
448
448
  rubyforge_project:
449
449
  rubygems_version: 1.8.15