esp-permissions 0.0.13 → 0.0.14

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 (6) hide show
  1. data/lib/esp-permissions/version.rb +1 -1
  2. data/lib/generators/esp_permissions/install/templates/app/models/ability.rb +1 -1
  3. data/lib/generators/esp_permissions/install/templates/app/models/permission.rb +11 -9
  4. data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.rb +5 -0
  5. data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb +0 -1
  6. metadata +75 -63
data/lib/esp-permissions/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspPermissions
2
- VERSION = "0.0.13"
2
+ VERSION = "0.0.14"
3
3
  end
data/lib/generators/esp_permissions/install/templates/app/models/ability.rb CHANGED
@@ -6,7 +6,7 @@ class Ability
6
6
  alias_action :create, :read, :update, :destroy, :to => :modify
7
7
 
8
8
  can :modify, Context do | context |
9
- user.permissions.where(:role => :manager).where(:context_id => context.ancestor_ids + [context.id]).exists?
9
+ user.permissions.for_roles(:manager).for_context(context).exists?
10
10
  end
11
11
 
12
12
  can :modify, Permission do | permission |
data/lib/generators/esp_permissions/install/templates/app/models/permission.rb CHANGED
@@ -1,26 +1,28 @@
1
1
  class Permission < ActiveRecord::Base
2
+ attr_accessor :user_search, :user_uid, :user_first_name, :user_last_name, :user_email
3
+
2
4
  belongs_to :context
3
5
  belongs_to :user, :counter_cache => true
4
- has_enum :role, :scopes => true
5
6
 
6
- attr_accessor :user_search, :user_uid, :user_first_name, :user_last_name, :user_email
7
+ scope :for_roles, ->(*roles) { where(:role => roles) }
8
+ scope :for_context, ->(context) { where(:context_id => (context.ancestor_ids + [context.id])) }
7
9
 
8
- before_validation :reset_user_id, :unless => :user_id?
10
+ before_validation :reset_user_attributes, :unless => :user_id?
9
11
 
10
12
  validates_presence_of :role, :user, :context
11
13
 
14
+ validates_uniqueness_of :role, :scope => [:user_id, :context_id]
15
+
16
+ has_enum :role
17
+
12
18
  private
13
- def reset_user_id
19
+ def reset_user_attributes
14
20
  self.user_id = nil
15
- clear_attr_accessors
16
- self.errors[:user_search] = ::I18n.t('activerecord.errors.models.permission.attributes.user_id.blank')
17
- end
18
-
19
- def clear_attr_accessors
20
21
  self.user_uid = nil
21
22
  self.user_first_name = nil
22
23
  self.user_last_name = nil
23
24
  self.user_email = nil
25
+ self.errors[:user_search] = ::I18n.t('activerecord.errors.models.permission.attributes.user_id.blank')
24
26
  end
25
27
  end
26
28
 
data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.rb ADDED
@@ -0,0 +1,5 @@
1
+ class EspPermissionsAddRoleUserIdContextIdIndexToPermissions < ActiveRecord::Migration
2
+ def change
3
+ add_index :permissions, :role, :context_id, :user_id
4
+ end
5
+ end
data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb CHANGED
@@ -5,7 +5,6 @@ class EspPermissionsCreateContexts < ActiveRecord::Migration
5
5
  t.string :title
6
6
  t.string :ancestry
7
7
  t.string :weight
8
- t.integer :position
9
8
  t.timestamps
10
9
  end
11
10
  add_index :contexts, :weight
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.13
4
+ version: 0.0.14
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: &19825220 !ruby/object:Gem::Requirement
16
+ requirement: &23762420 !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: *19825220
24
+ version_requirements: *23762420
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &19824580 !ruby/object:Gem::Requirement
27
+ requirement: &23762000 !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: *19824580
35
+ version_requirements: *23762000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &19823780 !ruby/object:Gem::Requirement
38
+ requirement: &23761500 !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: *19823780
46
+ version_requirements: *23761500
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &19823160 !ruby/object:Gem::Requirement
49
+ requirement: &23761080 !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: *19823160
57
+ version_requirements: *23761080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: formtastic
60
- requirement: &19822420 !ruby/object:Gem::Requirement
60
+ requirement: &23760620 !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: *19822420
68
+ version_requirements: *23760620
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: has_enum
71
- requirement: &19821800 !ruby/object:Gem::Requirement
71
+ requirement: &23760200 !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: *19821800
79
+ version_requirements: *23760200
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: has_scope
82
- requirement: &19821100 !ruby/object:Gem::Requirement
82
+ requirement: &23759780 !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: *19821100
90
+ version_requirements: *23759780
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: has_searcher
93
- requirement: &19820640 !ruby/object:Gem::Requirement
93
+ requirement: &23759360 !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: *19820640
101
+ version_requirements: *23759360
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: inherited_resources
104
- requirement: &19820220 !ruby/object:Gem::Requirement
104
+ requirement: &23758880 !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: *19820220
112
+ version_requirements: *23758880
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: kaminari
115
- requirement: &19819700 !ruby/object:Gem::Requirement
115
+ requirement: &23758460 !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: *19819700
123
+ version_requirements: *23758460
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: progress_bar
126
- requirement: &19819280 !ruby/object:Gem::Requirement
126
+ requirement: &23758040 !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: *19819280
134
+ version_requirements: *23758040
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rails
137
- requirement: &19818860 !ruby/object:Gem::Requirement
137
+ requirement: &23757620 !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: *19818860
145
+ version_requirements: *23757620
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: sass
148
- requirement: &19818440 !ruby/object:Gem::Requirement
148
+ requirement: &23757200 !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: *19818440
156
+ version_requirements: *23757200
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: sass-rails
159
- requirement: &19818020 !ruby/object:Gem::Requirement
159
+ requirement: &23756780 !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: *19818020
167
+ version_requirements: *23756780
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: sso_client
170
- requirement: &19817600 !ruby/object:Gem::Requirement
170
+ requirement: &23756360 !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: *19817600
178
+ version_requirements: *23756360
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sunspot_rails
181
- requirement: &19817180 !ruby/object:Gem::Requirement
181
+ requirement: &23755940 !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: *19817180
189
+ version_requirements: *23755940
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: whenever
192
- requirement: &19816620 !ruby/object:Gem::Requirement
192
+ requirement: &23755520 !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: *19816620
200
+ version_requirements: *23755520
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: fabrication
203
- requirement: &19816000 !ruby/object:Gem::Requirement
203
+ requirement: &23755100 !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: *19816000
211
+ version_requirements: *23755100
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: forgery
214
- requirement: &19815460 !ruby/object:Gem::Requirement
214
+ requirement: &23754680 !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: *19815460
222
+ version_requirements: *23754680
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: guard
225
- requirement: &19815040 !ruby/object:Gem::Requirement
225
+ requirement: &23754260 !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: *19815040
233
+ version_requirements: *23754260
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: guard-rspec
236
- requirement: &19814600 !ruby/object:Gem::Requirement
236
+ requirement: &23753840 !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: *19814600
244
+ version_requirements: *23753840
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard-spork
247
- requirement: &19813980 !ruby/object:Gem::Requirement
247
+ requirement: &23753420 !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: *19813980
255
+ version_requirements: *23753420
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: rspec-rails
258
- requirement: &19813320 !ruby/object:Gem::Requirement
258
+ requirement: &23753000 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ! '>='
@@ -263,10 +263,21 @@ dependencies:
263
263
  version: '0'
264
264
  type: :development
265
265
  prerelease: false
266
- version_requirements: *19813320
266
+ version_requirements: *23753000
267
+ - !ruby/object:Gem::Dependency
268
+ name: russian
269
+ requirement: &23752580 !ruby/object:Gem::Requirement
270
+ none: false
271
+ requirements:
272
+ - - ! '>='
273
+ - !ruby/object:Gem::Version
274
+ version: '0'
275
+ type: :development
276
+ prerelease: false
277
+ version_requirements: *23752580
267
278
  - !ruby/object:Gem::Dependency
268
279
  name: ryba
269
- requirement: &19812600 !ruby/object:Gem::Requirement
280
+ requirement: &23752160 !ruby/object:Gem::Requirement
270
281
  none: false
271
282
  requirements:
272
283
  - - ! '>='
@@ -274,10 +285,10 @@ dependencies:
274
285
  version: '0'
275
286
  type: :development
276
287
  prerelease: false
277
- version_requirements: *19812600
288
+ version_requirements: *23752160
278
289
  - !ruby/object:Gem::Dependency
279
290
  name: shoulda-matchers
280
- requirement: &19811960 !ruby/object:Gem::Requirement
291
+ requirement: &23751740 !ruby/object:Gem::Requirement
281
292
  none: false
282
293
  requirements:
283
294
  - - ! '>='
@@ -285,10 +296,10 @@ dependencies:
285
296
  version: '0'
286
297
  type: :development
287
298
  prerelease: false
288
- version_requirements: *19811960
299
+ version_requirements: *23751740
289
300
  - !ruby/object:Gem::Dependency
290
301
  name: spork
291
- requirement: &19811280 !ruby/object:Gem::Requirement
302
+ requirement: &23751320 !ruby/object:Gem::Requirement
292
303
  none: false
293
304
  requirements:
294
305
  - - ! '>='
@@ -296,10 +307,10 @@ dependencies:
296
307
  version: '0'
297
308
  type: :development
298
309
  prerelease: false
299
- version_requirements: *19811280
310
+ version_requirements: *23751320
300
311
  - !ruby/object:Gem::Dependency
301
312
  name: sqlite3
302
- requirement: &19810640 !ruby/object:Gem::Requirement
313
+ requirement: &23750860 !ruby/object:Gem::Requirement
303
314
  none: false
304
315
  requirements:
305
316
  - - ! '>='
@@ -307,10 +318,10 @@ dependencies:
307
318
  version: '0'
308
319
  type: :development
309
320
  prerelease: false
310
- version_requirements: *19810640
321
+ version_requirements: *23750860
311
322
  - !ruby/object:Gem::Dependency
312
323
  name: sunspot_solr
313
- requirement: &19810000 !ruby/object:Gem::Requirement
324
+ requirement: &23750440 !ruby/object:Gem::Requirement
314
325
  none: false
315
326
  requirements:
316
327
  - - ! '>='
@@ -318,10 +329,10 @@ dependencies:
318
329
  version: '0'
319
330
  type: :development
320
331
  prerelease: false
321
- version_requirements: *19810000
332
+ version_requirements: *23750440
322
333
  - !ruby/object:Gem::Dependency
323
334
  name: therubyracer
324
- requirement: &19809380 !ruby/object:Gem::Requirement
335
+ requirement: &23750020 !ruby/object:Gem::Requirement
325
336
  none: false
326
337
  requirements:
327
338
  - - ! '>='
@@ -329,10 +340,10 @@ dependencies:
329
340
  version: '0'
330
341
  type: :development
331
342
  prerelease: false
332
- version_requirements: *19809380
343
+ version_requirements: *23750020
333
344
  - !ruby/object:Gem::Dependency
334
345
  name: uglifier
335
- requirement: &19808680 !ruby/object:Gem::Requirement
346
+ requirement: &23749600 !ruby/object:Gem::Requirement
336
347
  none: false
337
348
  requirements:
338
349
  - - ! '>='
@@ -340,7 +351,7 @@ dependencies:
340
351
  version: '0'
341
352
  type: :development
342
353
  prerelease: false
343
- version_requirements: *19808680
354
+ version_requirements: *23749600
344
355
  description: Description of EspPermissions.
345
356
  email:
346
357
  - mail@openteam.ru
@@ -377,6 +388,7 @@ files:
377
388
  - lib/generators/esp_permissions/install/templates/app/models/ability.rb
378
389
  - lib/generators/esp_permissions/install/templates/config/schedule.rb
379
390
  - lib/generators/esp_permissions/install/templates/config/locales/permissions_enum.ru.yml
391
+ - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.rb
380
392
  - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_permissions.rb
381
393
  - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb
382
394
  - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_permissions_count_to_users.rb
@@ -402,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
402
414
  version: '0'
403
415
  segments:
404
416
  - 0
405
- hash: 1397279406002446305
417
+ hash: -3814911068645841062
406
418
  required_rubygems_version: !ruby/object:Gem::Requirement
407
419
  none: false
408
420
  requirements:
@@ -411,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
411
423
  version: '0'
412
424
  segments:
413
425
  - 0
414
- hash: 1397279406002446305
426
+ hash: -3814911068645841062
415
427
  requirements: []
416
428
  rubyforge_project:
417
429
  rubygems_version: 1.8.10