esp-auth 1.0.6 → 1.0.7

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 (5) hide show
  1. data/config/locales/ru.yml +1 -1
  2. data/lib/esp_auth/engine.rb +5 -5
  3. data/lib/esp_auth/spec_helper.rb +18 -8
  4. data/lib/esp_auth/version.rb +1 -1
  5. metadata +68 -68
data/config/locales/ru.yml CHANGED
@@ -2,7 +2,7 @@ ru:
2
2
  activerecord:
3
3
  attributes:
4
4
  permission:
5
- polimorphic_context: Контекст
5
+ polymorphic_context: Контекст
6
6
  context: Категория
7
7
  role: Роль
8
8
  user_search: Пользователь
data/lib/esp_auth/engine.rb CHANGED
@@ -94,7 +94,7 @@ module EspAuth
94
94
  end
95
95
 
96
96
  def self.esp_auth_permission
97
- attr_accessor :user_search, :user_uid, :user_name, :user_email, :polimorphic_context
97
+ attr_accessor :user_search, :user_uid, :user_name, :user_email, :polymorphic_context
98
98
 
99
99
  belongs_to :context, :polymorphic => true
100
100
  belongs_to :user
@@ -117,12 +117,12 @@ module EspAuth
117
117
  end
118
118
 
119
119
  after_initialize :set_user, :if => :user_uid_present?
120
- after_initialize :set_context, :if => :polimorphic_context_present?
120
+ after_initialize :set_context, :if => :polymorphic_context_present?
121
121
 
122
122
  after_create :user_index!
123
123
  after_destroy :user_index!
124
124
 
125
- validates_presence_of :polimorphic_context, :unless => :context
125
+ validates_presence_of :polymorphic_context, :unless => :context
126
126
 
127
127
  validates_presence_of :role, :user, :context
128
128
 
@@ -135,7 +135,7 @@ module EspAuth
135
135
 
136
136
  private
137
137
  delegate :index!, :to => :user, :prefix => true
138
- delegate :present?, :to => :polimorphic_context, :prefix => true
138
+ delegate :present?, :to => :polymorphic_context, :prefix => true
139
139
  delegate :present?, :to => :user_uid, :prefix => true
140
140
 
141
141
  define_method :set_user do
@@ -145,7 +145,7 @@ module EspAuth
145
145
  end
146
146
 
147
147
  define_method :set_context do
148
- underscored_context_type, self.context_id = polimorphic_context.match(/(\w+)_(\d+)/)[1..2]
148
+ underscored_context_type, self.context_id = polymorphic_context.match(/(\w+)_(\d+)/)[1..2]
149
149
  self.context_type = underscored_context_type.camelize
150
150
  end
151
151
  end
data/lib/esp_auth/spec_helper.rb CHANGED
@@ -5,12 +5,26 @@ module EspAuth
5
5
  Ability.new(user)
6
6
  end
7
7
 
8
+ def create_user
9
+ @sequence ||= 0
10
+ @sequence += 1
11
+ User.create! :uid => @sequence, :name => "user #{@sequence}"
12
+ end
13
+
14
+ def user_with_role(role, context=root, prefix=nil)
15
+ @roles ||= {}
16
+ @roles["#{prefix}_#{role}"] ||= {}
17
+ @roles["#{prefix}_#{role}"][context] ||= create_user.tap do |user|
18
+ user.permissions.create! :context => context, :role => role
19
+ end
20
+ end
21
+
8
22
  def user
9
- @user ||= User.create! :uid => 1, :name => 'User'
23
+ @user ||= create_user
10
24
  end
11
25
 
12
26
  def another_user
13
- @another_user ||= User.create! :uid => 2, :name => 'Another user'
27
+ @another_user ||= create_user
14
28
  end
15
29
 
16
30
  def create_context(parent=nil)
@@ -51,17 +65,13 @@ module EspAuth
51
65
 
52
66
  Permission.enums[:role].each do | role |
53
67
  define_method "#{role}_of" do |context|
54
- user.tap do | user |
55
- user.permissions.create!(:context => context, :role => role) unless user.send("#{role}_of?", context)
56
- end
68
+ user_with_role role, context
57
69
  end
58
70
  define_method "#{role}" do
59
71
  self.send("#{role}_of", root)
60
72
  end
61
73
  define_method "another_#{role}_of" do |context|
62
- another_user.tap do | another_user |
63
- another_user.permissions.create!(:context => context, :role => role) unless another_user.send("#{role}_of?", context)
64
- end
74
+ user_with_role role, context, "another"
65
75
  end
66
76
  define_method "another_#{role}" do
67
77
  self.send("another_#{role}_of", root)
data/lib/esp_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspAuth
2
- VERSION = "1.0.6"
2
+ VERSION = "1.0.7"
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.6
4
+ version: 1.0.7
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-21 00:00:00.000000000 Z
12
+ date: 2012-02-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &20547320 !ruby/object:Gem::Requirement
16
+ requirement: &21550160 !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: *20547320
24
+ version_requirements: *21550160
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &20546780 !ruby/object:Gem::Requirement
27
+ requirement: &21549680 !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: *20546780
35
+ version_requirements: *21549680
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &20546260 !ruby/object:Gem::Requirement
38
+ requirement: &21549120 !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: *20546260
46
+ version_requirements: *21549120
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &20545740 !ruby/object:Gem::Requirement
49
+ requirement: &21565060 !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: *20545740
57
+ version_requirements: *21565060
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: default_value_for
60
- requirement: &20561640 !ruby/object:Gem::Requirement
60
+ requirement: &21564600 !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: *20561640
68
+ version_requirements: *21564600
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: devise
71
- requirement: &20561220 !ruby/object:Gem::Requirement
71
+ requirement: &21564180 !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: *20561220
79
+ version_requirements: *21564180
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: devise-russian
82
- requirement: &20560800 !ruby/object:Gem::Requirement
82
+ requirement: &21563760 !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: *20560800
90
+ version_requirements: *21563760
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth
93
- requirement: &20560380 !ruby/object:Gem::Requirement
93
+ requirement: &21563340 !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: *20560380
101
+ version_requirements: *21563340
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: omniauth-oauth2
104
- requirement: &20559960 !ruby/object:Gem::Requirement
104
+ requirement: &21562920 !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: *20559960
112
+ version_requirements: *21562920
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formtastic
115
- requirement: &20559540 !ruby/object:Gem::Requirement
115
+ requirement: &21562500 !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: *20559540
123
+ version_requirements: *21562500
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: has_enum
126
- requirement: &20559120 !ruby/object:Gem::Requirement
126
+ requirement: &21558280 !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: *20559120
134
+ version_requirements: *21558280
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_scope
137
- requirement: &20554900 !ruby/object:Gem::Requirement
137
+ requirement: &21557860 !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: *20554900
145
+ version_requirements: *21557860
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: has_searcher
148
- requirement: &20554480 !ruby/object:Gem::Requirement
148
+ requirement: &21557440 !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: *20554480
156
+ version_requirements: *21557440
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: inherited_resources
159
- requirement: &20554060 !ruby/object:Gem::Requirement
159
+ requirement: &21581520 !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: *20554060
167
+ version_requirements: *21581520
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: kaminari
170
- requirement: &20578140 !ruby/object:Gem::Requirement
170
+ requirement: &21581100 !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: *20578140
178
+ version_requirements: *21581100
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: progress_bar
181
- requirement: &20577720 !ruby/object:Gem::Requirement
181
+ requirement: &21580680 !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: *20577720
189
+ version_requirements: *21580680
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rails
192
- requirement: &20577300 !ruby/object:Gem::Requirement
192
+ requirement: &21580260 !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: *20577300
200
+ version_requirements: *21580260
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: sass
203
- requirement: &20576880 !ruby/object:Gem::Requirement
203
+ requirement: &21579820 !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: *20576880
211
+ version_requirements: *21579820
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sass-rails
214
- requirement: &20576440 !ruby/object:Gem::Requirement
214
+ requirement: &21579340 !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: *20576440
222
+ version_requirements: *21579340
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sunspot_rails
225
- requirement: &20575980 !ruby/object:Gem::Requirement
225
+ requirement: &21578920 !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: *20575980
233
+ version_requirements: *21578920
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: whenever
236
- requirement: &20575540 !ruby/object:Gem::Requirement
236
+ requirement: &21578460 !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: *20575540
244
+ version_requirements: *21578460
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard
247
- requirement: &20575080 !ruby/object:Gem::Requirement
247
+ requirement: &21578020 !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: *20575080
255
+ version_requirements: *21578020
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: guard-rspec
258
- requirement: &20574640 !ruby/object:Gem::Requirement
258
+ requirement: &21577560 !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: *20574640
266
+ version_requirements: *21577560
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: guard-spork
269
- requirement: &20574200 !ruby/object:Gem::Requirement
269
+ requirement: &21577120 !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: *20574200
277
+ version_requirements: *21577120
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: rspec-rails
280
- requirement: &20573740 !ruby/object:Gem::Requirement
280
+ requirement: &21576680 !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: *20573740
288
+ version_requirements: *21576680
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: russian
291
- requirement: &20573300 !ruby/object:Gem::Requirement
291
+ requirement: &21576220 !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: *20573300
299
+ version_requirements: *21576220
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: shoulda-matchers
302
- requirement: &20572860 !ruby/object:Gem::Requirement
302
+ requirement: &21575760 !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: *20572860
310
+ version_requirements: *21575760
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: spork
313
- requirement: &20572400 !ruby/object:Gem::Requirement
313
+ requirement: &21575320 !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: *20572400
321
+ version_requirements: *21575320
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sqlite3
324
- requirement: &20571960 !ruby/object:Gem::Requirement
324
+ requirement: &21574880 !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: *20571960
332
+ version_requirements: *21574880
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: sunspot_solr
335
- requirement: &20571500 !ruby/object:Gem::Requirement
335
+ requirement: &21574440 !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: *20571500
343
+ version_requirements: *21574440
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: therubyracer
346
- requirement: &20571060 !ruby/object:Gem::Requirement
346
+ requirement: &21574000 !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: *20571060
354
+ version_requirements: *21574000
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: uglifier
357
- requirement: &20570640 !ruby/object:Gem::Requirement
357
+ requirement: &21589940 !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: *20570640
365
+ version_requirements: *21589940
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: 3250993610278404714
437
+ hash: 2940160080614814310
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: 3250993610278404714
446
+ hash: 2940160080614814310
447
447
  requirements: []
448
448
  rubyforge_project:
449
449
  rubygems_version: 1.8.15