esp-auth 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/esp_auth/engine.rb +4 -1
  2. data/lib/esp_auth/version.rb +1 -1
  3. metadata +93 -93
data/lib/esp_auth/engine.rb CHANGED
@@ -42,7 +42,10 @@ module EspAuth
42
42
  :collection => current_user.context_tree,
43
43
  :member_value => ->(c) { [c.class.model_name.underscore, c.id].join('_') },
44
44
  :member_label => ->(c) { (' ' * 2 * c.absolute_depth + c.title).html_safe },
45
- :include_blank => t('commons.not_selected')
45
+ :include_blank => t('commons.not_selected'),
46
+ :selected => form.object.respond_to?(:selected_context) ? form.object.selected_context : nil,
47
+ :disabled => form.object.respond_to?(:disabled_contexts) ? form.object.disabled_contexts : []
48
+
46
49
  end
47
50
  end
48
51
  ActiveRecord::Base.class_eval do
data/lib/esp_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspAuth
2
- VERSION = "1.1.1"
2
+ VERSION = "1.1.2"
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.1.1
4
+ version: 1.1.2
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-28 00:00:00.000000000 Z
12
+ date: 2012-03-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &15032880 !ruby/object:Gem::Requirement
16
+ requirement: &19182660 !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: *15032880
24
+ version_requirements: *19182660
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &15032460 !ruby/object:Gem::Requirement
27
+ requirement: &19182220 !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: *15032460
35
+ version_requirements: *19182220
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: curb
38
- requirement: &15032040 !ruby/object:Gem::Requirement
38
+ requirement: &19181780 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *15032040
46
+ version_requirements: *19181780
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: default_value_for
49
- requirement: &15031620 !ruby/object:Gem::Requirement
49
+ requirement: &19205880 !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: *15031620
57
+ version_requirements: *19205880
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: devise
60
- requirement: &15031200 !ruby/object:Gem::Requirement
60
+ requirement: &19205440 !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: *15031200
68
+ version_requirements: *19205440
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: devise-russian
71
- requirement: &15030780 !ruby/object:Gem::Requirement
71
+ requirement: &19205020 !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: *15030780
79
+ version_requirements: *19205020
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: omniauth
82
- requirement: &15030360 !ruby/object:Gem::Requirement
82
+ requirement: &19204580 !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: *15030360
90
+ version_requirements: *19204580
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth-oauth2
93
- requirement: &15029900 !ruby/object:Gem::Requirement
93
+ requirement: &19204120 !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: *15029900
101
+ version_requirements: *19204120
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: formtastic
104
- requirement: &15029440 !ruby/object:Gem::Requirement
104
+ requirement: &19203680 !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: *15029440
112
+ version_requirements: *19203680
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: has_enum
115
- requirement: &15029000 !ruby/object:Gem::Requirement
115
+ requirement: &19203240 !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: *15029000
123
+ version_requirements: *19203240
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: has_scope
126
- requirement: &15028560 !ruby/object:Gem::Requirement
126
+ requirement: &19202800 !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: *15028560
134
+ version_requirements: *19202800
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_searcher
137
- requirement: &15052720 !ruby/object:Gem::Requirement
137
+ requirement: &19202360 !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: *15052720
145
+ version_requirements: *19202360
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: inherited_resources
148
- requirement: &15052280 !ruby/object:Gem::Requirement
148
+ requirement: &19201920 !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: *15052280
156
+ version_requirements: *19201920
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: kaminari
159
- requirement: &15051840 !ruby/object:Gem::Requirement
159
+ requirement: &19201480 !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: *15051840
167
+ version_requirements: *19201480
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: progress_bar
170
- requirement: &15051380 !ruby/object:Gem::Requirement
170
+ requirement: &19201040 !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: *15051380
178
+ version_requirements: *19201040
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sunspot_rails
181
- requirement: &15050960 !ruby/object:Gem::Requirement
181
+ requirement: &19200620 !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: *15050960
189
+ version_requirements: *19200620
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: whenever
192
- requirement: &15050520 !ruby/object:Gem::Requirement
192
+ requirement: &19200160 !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: *15050520
200
+ version_requirements: *19200160
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: rails
203
- requirement: &15050080 !ruby/object:Gem::Requirement
203
+ requirement: &19199720 !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: :development
210
210
  prerelease: false
211
- version_requirements: *15050080
211
+ version_requirements: *19199720
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sass
214
- requirement: &15049660 !ruby/object:Gem::Requirement
214
+ requirement: &19199300 !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: :development
221
221
  prerelease: false
222
- version_requirements: *15049660
222
+ version_requirements: *19199300
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sass-rails
225
- requirement: &15049220 !ruby/object:Gem::Requirement
225
+ requirement: &19198860 !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: :development
232
232
  prerelease: false
233
- version_requirements: *15049220
233
+ version_requirements: *19198860
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: guard
236
- requirement: &15048780 !ruby/object:Gem::Requirement
236
+ requirement: &19198420 !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: :development
243
243
  prerelease: false
244
- version_requirements: *15048780
244
+ version_requirements: *19198420
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard-rspec
247
- requirement: &15048340 !ruby/object:Gem::Requirement
247
+ requirement: &19197980 !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: *15048340
255
+ version_requirements: *19197980
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: guard-spork
258
- requirement: &15047900 !ruby/object:Gem::Requirement
258
+ requirement: &19213920 !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: *15047900
266
+ version_requirements: *19213920
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: rspec-rails
269
- requirement: &15047480 !ruby/object:Gem::Requirement
269
+ requirement: &19213480 !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: *15047480
277
+ version_requirements: *19213480
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: russian
280
- requirement: &15047040 !ruby/object:Gem::Requirement
280
+ requirement: &19213040 !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: *15047040
288
+ version_requirements: *19213040
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: shoulda-matchers
291
- requirement: &15046580 !ruby/object:Gem::Requirement
291
+ requirement: &19212600 !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: *15046580
299
+ version_requirements: *19212600
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: spork
302
- requirement: &15046160 !ruby/object:Gem::Requirement
302
+ requirement: &19212180 !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: *15046160
310
+ version_requirements: *19212180
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: sqlite3
313
- requirement: &15045720 !ruby/object:Gem::Requirement
313
+ requirement: &19211760 !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: *15045720
321
+ version_requirements: *19211760
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sunspot_solr
324
- requirement: &15045280 !ruby/object:Gem::Requirement
324
+ requirement: &19211340 !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: *15045280
332
+ version_requirements: *19211340
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: therubyracer
335
- requirement: &15044820 !ruby/object:Gem::Requirement
335
+ requirement: &19210920 !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: *15044820
343
+ version_requirements: *19210920
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: uglifier
346
- requirement: &15060780 !ruby/object:Gem::Requirement
346
+ requirement: &19210500 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - ! '>='
@@ -351,7 +351,7 @@ dependencies:
351
351
  version: '0'
352
352
  type: :development
353
353
  prerelease: false
354
- version_requirements: *15060780
354
+ version_requirements: *19210500
355
355
  description: Description of EspAuth.
356
356
  email:
357
357
  - mail@openteam.ru
@@ -359,53 +359,53 @@ executables: []
359
359
  extensions: []
360
360
  extra_rdoc_files: []
361
361
  files:
362
+ - app/assets/images/esp_auth/gh_icons.png
362
363
  - app/assets/images/esp_auth/inline_error_arrow.png
363
364
  - app/assets/images/esp_auth/wood.jpg
364
- - app/assets/images/esp_auth/gh_icons.png
365
- - app/assets/stylesheets/esp_auth/shared.sass
366
- - app/assets/stylesheets/esp_auth/pagination.sass
365
+ - app/assets/javascripts/esp_auth/application.js
366
+ - app/assets/javascripts/esp_auth/jquery.noisy.min.js
367
+ - app/assets/javascripts/esp_auth/permissions.js
367
368
  - app/assets/stylesheets/esp_auth/application.css
369
+ - app/assets/stylesheets/esp_auth/buttons.sass
368
370
  - app/assets/stylesheets/esp_auth/jquery_ui.sass
371
+ - app/assets/stylesheets/esp_auth/pagination.sass
369
372
  - app/assets/stylesheets/esp_auth/permissions.sass
370
- - app/assets/stylesheets/esp_auth/buttons.sass
371
- - app/assets/javascripts/esp_auth/jquery.noisy.min.js
372
- - app/assets/javascripts/esp_auth/application.js
373
- - app/assets/javascripts/esp_auth/permissions.js
374
- - app/models/user_search.rb
375
- - app/controllers/esp_auth/sessions_controller.rb
376
- - app/controllers/esp_auth/omniauth_callbacks_controller.rb
377
- - app/controllers/esp_auth/users_controller.rb
373
+ - app/assets/stylesheets/esp_auth/shared.sass
378
374
  - app/controllers/esp_auth/application_controller.rb
375
+ - app/controllers/esp_auth/omniauth_callbacks_controller.rb
379
376
  - app/controllers/esp_auth/permissions_controller.rb
380
- - app/views/layouts/esp_auth/application.html.erb
377
+ - app/controllers/esp_auth/sessions_controller.rb
378
+ - app/controllers/esp_auth/users_controller.rb
379
+ - app/models/user_search.rb
381
380
  - app/views/esp_auth/permissions/new.html.erb
382
381
  - app/views/esp_auth/shared/_footer.html.erb
383
382
  - app/views/esp_auth/shared/_header.html.erb
384
383
  - app/views/esp_auth/users/index.html.erb
384
+ - app/views/layouts/esp_auth/application.html.erb
385
385
  - config/initializers/devise.rb
386
- - config/routes.rb
387
386
  - config/locales/ru.yml
388
- - lib/omniauth/strategies/identity.rb
387
+ - config/routes.rb
388
+ - lib/esp-auth.rb
389
+ - lib/esp_auth/engine.rb
390
+ - lib/esp_auth/spec_helper.rb
391
+ - lib/esp_auth/version.rb
389
392
  - lib/generators/esp_auth/install/install_generator.rb
390
- - lib/generators/esp_auth/install/templates/spec/models/ability_spec.rb
391
- - lib/generators/esp_auth/install/templates/app/models/subcontext.rb
393
+ - lib/generators/esp_auth/install/templates/app/controllers/manage/application_controller.rb
394
+ - lib/generators/esp_auth/install/templates/app/models/ability.rb
395
+ - lib/generators/esp_auth/install/templates/app/models/context.rb
392
396
  - lib/generators/esp_auth/install/templates/app/models/permission.rb
397
+ - lib/generators/esp_auth/install/templates/app/models/subcontext.rb
393
398
  - lib/generators/esp_auth/install/templates/app/models/user.rb
394
- - lib/generators/esp_auth/install/templates/app/models/context.rb
395
- - lib/generators/esp_auth/install/templates/app/models/ability.rb
396
- - lib/generators/esp_auth/install/templates/app/controllers/manage/application_controller.rb
397
- - lib/generators/esp_auth/install/templates/config/schedule.rb
398
399
  - lib/generators/esp_auth/install/templates/config/locales/permissions_enum.ru.yml
399
- - lib/generators/esp_auth/install/templates/db/migrate/create_users.rb
400
- - lib/generators/esp_auth/install/templates/db/migrate/create_subcontexts.rb
400
+ - lib/generators/esp_auth/install/templates/config/schedule.rb
401
401
  - lib/generators/esp_auth/install/templates/db/migrate/create_contexts.rb
402
402
  - lib/generators/esp_auth/install/templates/db/migrate/create_permissions.rb
403
+ - lib/generators/esp_auth/install/templates/db/migrate/create_subcontexts.rb
404
+ - lib/generators/esp_auth/install/templates/db/migrate/create_users.rb
403
405
  - lib/generators/esp_auth/install/templates/db/seeds.rb
406
+ - lib/generators/esp_auth/install/templates/spec/models/ability_spec.rb
407
+ - lib/omniauth/strategies/identity.rb
404
408
  - lib/tasks/sync.rake
405
- - lib/esp_auth/engine.rb
406
- - lib/esp_auth/version.rb
407
- - lib/esp_auth/spec_helper.rb
408
- - lib/esp-auth.rb
409
409
  - MIT-LICENSE
410
410
  - Rakefile
411
411
  - README.rdoc
@@ -423,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
423
423
  version: '0'
424
424
  segments:
425
425
  - 0
426
- hash: 4521711900688567485
426
+ hash: -427697919932416519
427
427
  required_rubygems_version: !ruby/object:Gem::Requirement
428
428
  none: false
429
429
  requirements:
@@ -432,10 +432,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
432
432
  version: '0'
433
433
  segments:
434
434
  - 0
435
- hash: 4521711900688567485
435
+ hash: -427697919932416519
436
436
  requirements: []
437
437
  rubyforge_project:
438
- rubygems_version: 1.8.15
438
+ rubygems_version: 1.8.16
439
439
  signing_key:
440
440
  specification_version: 3
441
441
  summary: Summary of EspAuth.