esp-permissions 0.0.16 → 0.0.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/esp-permissions/version.rb +1 -1
  2. data/lib/generators/esp_permissions/install/templates/app/models/ability.rb +6 -8
  3. data/lib/generators/esp_permissions/install/templates/spec/models/ability_spec.rb +30 -30
  4. metadata +65 -65
data/lib/esp-permissions/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspPermissions
2
- VERSION = "0.0.16"
2
+ VERSION = "0.0.17"
3
3
  end
data/lib/generators/esp_permissions/install/templates/app/models/ability.rb CHANGED
@@ -6,21 +6,19 @@ class Ability
6
6
 
7
7
  return unless user
8
8
 
9
- alias_action :create, :read, :update, :destroy, :to => :modify
10
-
11
- can :modify, Context do | context |
9
+ can :manage, Context do | context |
12
10
  user.permissions.for_roles(:manager).for_context(context).exists?
13
11
  end
14
12
 
15
- can :modify, Permission do | permission |
16
- can? :modify, permission.context
13
+ can :manage, Permission do | permission |
14
+ can? :manage, permission.context
17
15
  end
18
16
 
19
- can :modify, Permission do | permission |
20
- !permission.context && user.manager?
17
+ can :create, Permission do | permission |
18
+ user.manager?
21
19
  end
22
20
 
23
- can :modify, User do
21
+ can :manage, User do
24
22
  user.manager?
25
23
  end
26
24
  end
data/lib/generators/esp_permissions/install/templates/spec/models/ability_spec.rb CHANGED
@@ -28,30 +28,30 @@ describe Ability do
28
28
  subject { ability_for(manager_of(root)) }
29
29
 
30
30
  context 'управление пользователями' do
31
- it { should be_able_to(:modify, user) }
32
- it { should be_able_to(:modify, manager_of(root)) }
33
- it { should be_able_to(:modify, manager_of(child_1)) }
34
- it { should be_able_to(:modify, manager_of(child_1_1)) }
35
- it { should be_able_to(:modify, manager_of(child_2)) }
31
+ it { should be_able_to(:manage, user) }
32
+ it { should be_able_to(:manage, manager_of(root)) }
33
+ it { should be_able_to(:manage, manager_of(child_1)) }
34
+ it { should be_able_to(:manage, manager_of(child_1_1)) }
35
+ it { should be_able_to(:manage, manager_of(child_2)) }
36
36
  end
37
37
 
38
38
  context 'управление правами доступа' do
39
- it { should be_able_to(:modify, user.permissions.new) }
40
- it { should be_able_to(:modify, manager_of(root).permissions.first) }
41
- it { should be_able_to(:modify, manager_of(child_1).permissions.first) }
42
- it { should be_able_to(:modify, manager_of(child_1_1).permissions.first) }
43
- it { should be_able_to(:modify, manager_of(child_2).permissions.first) }
39
+ it { should be_able_to(:create, user.permissions.new) }
40
+ it { should be_able_to(:manage, manager_of(root).permissions.first) }
41
+ it { should be_able_to(:manage, manager_of(child_1).permissions.first) }
42
+ it { should be_able_to(:manage, manager_of(child_1_1).permissions.first) }
43
+ it { should be_able_to(:manage, manager_of(child_2).permissions.first) }
44
44
  end
45
45
 
46
46
  context 'управление разделами' do
47
- it { should be_able_to(:modify, category_1_1) }
47
+ it { should be_able_to(:manage, category_1_1) }
48
48
  end
49
49
 
50
50
  context 'управление подразделениями' do
51
- it { should be_able_to(:modify, root) }
52
- it { should be_able_to(:modify, child_1) }
53
- it { should be_able_to(:modify, child_1_1) }
54
- it { should be_able_to(:modify, child_2) }
51
+ it { should be_able_to(:manage, root) }
52
+ it { should be_able_to(:manage, child_1) }
53
+ it { should be_able_to(:manage, child_1_1) }
54
+ it { should be_able_to(:manage, child_2) }
55
55
  end
56
56
  end
57
57
 
@@ -59,30 +59,30 @@ describe Ability do
59
59
  subject { ability_for(manager_of(child_1)) }
60
60
 
61
61
  context 'управление пользователями' do
62
- it { should be_able_to(:modify, user) }
63
- it { should be_able_to(:modify, manager_of(root)) }
64
- it { should be_able_to(:modify, manager_of(child_1)) }
65
- it { should be_able_to(:modify, manager_of(child_1_1)) }
66
- it { should be_able_to(:modify, manager_of(child_2)) }
62
+ it { should be_able_to(:manage, user) }
63
+ it { should be_able_to(:manage, manager_of(root)) }
64
+ it { should be_able_to(:manage, manager_of(child_1)) }
65
+ it { should be_able_to(:manage, manager_of(child_1_1)) }
66
+ it { should be_able_to(:manage, manager_of(child_2)) }
67
67
  end
68
68
 
69
69
  context 'управление правами доступа' do
70
- it { should be_able_to(:modify, user.permissions.new) }
71
- it { should_not be_able_to(:modify, manager_of(root).permissions.first) }
72
- it { should be_able_to(:modify, manager_of(child_1).permissions.first) }
73
- it { should be_able_to(:modify, manager_of(child_1_1).permissions.first) }
74
- it { should_not be_able_to(:modify, manager_of(child_2).permissions.first) }
70
+ it { should be_able_to(:create, user.permissions.new) }
71
+ it { should_not be_able_to(:manage, manager_of(root).permissions.first) }
72
+ it { should be_able_to(:manage, manager_of(child_1).permissions.first) }
73
+ it { should be_able_to(:manage, manager_of(child_1_1).permissions.first) }
74
+ it { should_not be_able_to(:manage, manager_of(child_2).permissions.first) }
75
75
  end
76
76
 
77
77
  context 'управление разделами' do
78
- it { should be_able_to(:modify, category_1_1) }
78
+ it { should be_able_to(:manage, category_1_1) }
79
79
  end
80
80
 
81
81
  context 'управление подразделениями' do
82
- it { should_not be_able_to(:modify, root) }
83
- it { should be_able_to(:modify, child_1) }
84
- it { should be_able_to(:modify, child_1_1) }
85
- it { should_not be_able_to(:modify, child_2) }
82
+ it { should_not be_able_to(:manage, root) }
83
+ it { should be_able_to(:manage, child_1) }
84
+ it { should be_able_to(:manage, child_1_1) }
85
+ it { should_not be_able_to(:manage, child_2) }
86
86
  end
87
87
  end
88
88
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: esp-permissions
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.16
4
+ version: 0.0.17
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &10021620 !ruby/object:Gem::Requirement
16
+ requirement: &15663420 !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: *10021620
24
+ version_requirements: *15663420
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &10021200 !ruby/object:Gem::Requirement
27
+ requirement: &15662540 !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: *10021200
35
+ version_requirements: *15662540
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &10020700 !ruby/object:Gem::Requirement
38
+ requirement: &15660220 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.12.alpha.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *10020700
46
+ version_requirements: *15660220
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &10020280 !ruby/object:Gem::Requirement
49
+ requirement: &15657300 !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: *10020280
57
+ version_requirements: *15657300
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: formtastic
60
- requirement: &10019820 !ruby/object:Gem::Requirement
60
+ requirement: &15656180 !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: *10019820
68
+ version_requirements: *15656180
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: has_enum
71
- requirement: &10019400 !ruby/object:Gem::Requirement
71
+ requirement: &15654240 !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: *10019400
79
+ version_requirements: *15654240
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: has_scope
82
- requirement: &10018980 !ruby/object:Gem::Requirement
82
+ requirement: &15653220 !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: *10018980
90
+ version_requirements: *15653220
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: has_searcher
93
- requirement: &10018560 !ruby/object:Gem::Requirement
93
+ requirement: &15651520 !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: *10018560
101
+ version_requirements: *15651520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: inherited_resources
104
- requirement: &10018140 !ruby/object:Gem::Requirement
104
+ requirement: &15649840 !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: *10018140
112
+ version_requirements: *15649840
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: kaminari
115
- requirement: &10017720 !ruby/object:Gem::Requirement
115
+ requirement: &15648260 !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: *10017720
123
+ version_requirements: *15648260
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: progress_bar
126
- requirement: &10017300 !ruby/object:Gem::Requirement
126
+ requirement: &15637540 !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: *10017300
134
+ version_requirements: *15637540
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rails
137
- requirement: &10046700 !ruby/object:Gem::Requirement
137
+ requirement: &15636080 !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: *10046700
145
+ version_requirements: *15636080
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: sass
148
- requirement: &10046280 !ruby/object:Gem::Requirement
148
+ requirement: &15634040 !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: *10046280
156
+ version_requirements: *15634040
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: sass-rails
159
- requirement: &10045860 !ruby/object:Gem::Requirement
159
+ requirement: &15633220 !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: *10045860
167
+ version_requirements: *15633220
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: sso_client
170
- requirement: &10045440 !ruby/object:Gem::Requirement
170
+ requirement: &15632180 !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: *10045440
178
+ version_requirements: *15632180
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sunspot_rails
181
- requirement: &10045020 !ruby/object:Gem::Requirement
181
+ requirement: &15631280 !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: *10045020
189
+ version_requirements: *15631280
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: whenever
192
- requirement: &10044600 !ruby/object:Gem::Requirement
192
+ requirement: &15605540 !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: *10044600
200
+ version_requirements: *15605540
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: fabrication
203
- requirement: &10044180 !ruby/object:Gem::Requirement
203
+ requirement: &15604560 !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: *10044180
211
+ version_requirements: *15604560
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: forgery
214
- requirement: &10043760 !ruby/object:Gem::Requirement
214
+ requirement: &15603780 !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: *10043760
222
+ version_requirements: *15603780
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: guard
225
- requirement: &10043340 !ruby/object:Gem::Requirement
225
+ requirement: &15602700 !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: *10043340
233
+ version_requirements: *15602700
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: guard-rspec
236
- requirement: &10042920 !ruby/object:Gem::Requirement
236
+ requirement: &15601880 !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: *10042920
244
+ version_requirements: *15601880
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard-spork
247
- requirement: &10042500 !ruby/object:Gem::Requirement
247
+ requirement: &15601000 !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: *10042500
255
+ version_requirements: *15601000
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: rspec-rails
258
- requirement: &10042080 !ruby/object:Gem::Requirement
258
+ requirement: &15600500 !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: *10042080
266
+ version_requirements: *15600500
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: russian
269
- requirement: &10041660 !ruby/object:Gem::Requirement
269
+ requirement: &15599900 !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: *10041660
277
+ version_requirements: *15599900
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: ryba
280
- requirement: &10041240 !ruby/object:Gem::Requirement
280
+ requirement: &15599040 !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: *10041240
288
+ version_requirements: *15599040
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: shoulda-matchers
291
- requirement: &10040820 !ruby/object:Gem::Requirement
291
+ requirement: &15598320 !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: *10040820
299
+ version_requirements: *15598320
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: spork
302
- requirement: &10040400 !ruby/object:Gem::Requirement
302
+ requirement: &15594720 !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: *10040400
310
+ version_requirements: *15594720
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: sqlite3
313
- requirement: &10039980 !ruby/object:Gem::Requirement
313
+ requirement: &15594040 !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: *10039980
321
+ version_requirements: *15594040
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sunspot_solr
324
- requirement: &10039560 !ruby/object:Gem::Requirement
324
+ requirement: &15593200 !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: *10039560
332
+ version_requirements: *15593200
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: therubyracer
335
- requirement: &10039140 !ruby/object:Gem::Requirement
335
+ requirement: &15592140 !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: *10039140
343
+ version_requirements: *15592140
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: uglifier
346
- requirement: &10038720 !ruby/object:Gem::Requirement
346
+ requirement: &15591200 !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: *10038720
354
+ version_requirements: *15591200
355
355
  description: Description of EspPermissions.
356
356
  email:
357
357
  - mail@openteam.ru
@@ -414,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
414
414
  version: '0'
415
415
  segments:
416
416
  - 0
417
- hash: -2481780121980012342
417
+ hash: -3944697201234701009
418
418
  required_rubygems_version: !ruby/object:Gem::Requirement
419
419
  none: false
420
420
  requirements:
@@ -423,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
423
423
  version: '0'
424
424
  segments:
425
425
  - 0
426
- hash: -2481780121980012342
426
+ hash: -3944697201234701009
427
427
  requirements: []
428
428
  rubyforge_project:
429
429
  rubygems_version: 1.8.10