esp-permissions 0.0.4 → 0.0.5

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/app/controllers/esp_permissions/application_controller.rb +7 -0
  2. data/app/views/esp_permissions/users/index.html.erb +2 -2
  3. data/lib/esp-permissions/version.rb +1 -1
  4. data/lib/generators/esp_permissions/install/templates/app/models/permission.rb +1 -1
  5. data/lib/generators/esp_permissions/install/templates/app/models/user.rb +17 -5
  6. metadata +60 -60
data/app/controllers/esp_permissions/application_controller.rb CHANGED
@@ -1,4 +1,11 @@
1
1
  class EspPermissions::ApplicationController < ApplicationController
2
2
  inherit_resources
3
3
  before_filter :authenticate_user!
4
+ before_filter :authorize_user!
5
+
6
+ protected
7
+
8
+ def authorize_user!
9
+ authorize! :create, Permission.new
10
+ end
4
11
  end
data/app/views/esp_permissions/users/index.html.erb CHANGED
@@ -9,13 +9,13 @@
9
9
 
10
10
  <%= link_to "&#43;#{t('permissions.create_permission')}".html_safe,
11
11
  esp_permissions.new_permission_path,
12
- :class => 'new_permission' if can?(:modify, Permission)%>
12
+ :class => 'new_permission' %>
13
13
 
14
14
  <ul class='collection_list'>
15
15
  <% collection.each do |user| %>
16
16
  <li>
17
17
  <div class="name">
18
- <%= user.full_name %>
18
+ <%= user.name %>
19
19
  </div>
20
20
  <div class="email">
21
21
  &lt;<%= mail_to user.email, user.email %>&gt;
data/lib/esp-permissions/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspPermissions
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
data/lib/generators/esp_permissions/install/templates/app/models/permission.rb CHANGED
@@ -7,7 +7,7 @@ class Permission < ActiveRecord::Base
7
7
 
8
8
  before_validation :reset_user_id, :unless => :user_id?
9
9
 
10
- validates_presence_of :role, :user
10
+ validates_presence_of :role, :user, :context
11
11
 
12
12
  private
13
13
  def reset_user_id
data/lib/generators/esp_permissions/install/templates/app/models/user.rb CHANGED
@@ -6,22 +6,34 @@ class User < ActiveRecord::Base
6
6
  has_many :permissions
7
7
  has_many :contexts, :through => :permissions
8
8
 
9
+ searchable do
10
+ text :name, :email, :nickname, :phone, :last_name, :first_name
11
+ end
12
+
9
13
  def self.from_omniauth(hash)
10
14
  User.find_or_initialize_by_uid(hash['uid']).tap do |user|
11
15
  user.update_attributes hash['info']
12
16
  end
13
17
  end
14
18
 
15
- def full_name
16
- nickname || name || "#{last_name} #{first_name}"
19
+ def contexts_for(role)
20
+ contexts.where(:permissions => {:role => role})
17
21
  end
18
22
 
19
- searchable do
20
- text :name, :email, :nickname, :phone, :last_name, :first_name
23
+ def contexts_subtree_for(role)
24
+ contexts_for(role).map(&:subtree).flatten.uniq
25
+ end
26
+
27
+ def contexts_subtree
28
+ contexts_subtree_for(Permission.enums[:role])
21
29
  end
22
30
 
23
31
  def available_contexts
24
- contexts.where(:permissions => {:role => :manager}).map(&:subtree).flatten.uniq
32
+ contexts_subtree_for(:manager)
33
+ end
34
+
35
+ def manager?
36
+ permissions.where(:role => :manager).exists?
25
37
  end
26
38
  end
27
39
 
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.4
4
+ version: 0.0.5
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-01-20 00:00:00.000000000 Z
12
+ date: 2012-01-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &20315920 !ruby/object:Gem::Requirement
16
+ requirement: &19894260 !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: *20315920
24
+ version_requirements: *19894260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &20315500 !ruby/object:Gem::Requirement
27
+ requirement: &19893700 !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: *20315500
35
+ version_requirements: *19893700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &20315000 !ruby/object:Gem::Requirement
38
+ requirement: &19893180 !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: *20315000
46
+ version_requirements: *19893180
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &20312880 !ruby/object:Gem::Requirement
49
+ requirement: &19892700 !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: *20312880
57
+ version_requirements: *19892700
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: formtastic
60
- requirement: &20312420 !ruby/object:Gem::Requirement
60
+ requirement: &19892200 !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: *20312420
68
+ version_requirements: *19892200
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: has_enum
71
- requirement: &20312000 !ruby/object:Gem::Requirement
71
+ requirement: &19891760 !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: *20312000
79
+ version_requirements: *19891760
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: has_searcher
82
- requirement: &20311580 !ruby/object:Gem::Requirement
82
+ requirement: &19891320 !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: *20311580
90
+ version_requirements: *19891320
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: inherited_resources
93
- requirement: &20311160 !ruby/object:Gem::Requirement
93
+ requirement: &19890840 !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: *20311160
101
+ version_requirements: *19890840
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: kaminari
104
- requirement: &20310740 !ruby/object:Gem::Requirement
104
+ requirement: &19890400 !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: *20310740
112
+ version_requirements: *19890400
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: progress_bar
115
- requirement: &20310320 !ruby/object:Gem::Requirement
115
+ requirement: &19889960 !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: *20310320
123
+ version_requirements: *19889960
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rails
126
- requirement: &20309900 !ruby/object:Gem::Requirement
126
+ requirement: &19889300 !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: *20309900
134
+ version_requirements: *19889300
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: sass
137
- requirement: &20309480 !ruby/object:Gem::Requirement
137
+ requirement: &19888820 !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: *20309480
145
+ version_requirements: *19888820
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: sass-rails
148
- requirement: &20309060 !ruby/object:Gem::Requirement
148
+ requirement: &19888280 !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: *20309060
156
+ version_requirements: *19888280
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: sso_client
159
- requirement: &20308640 !ruby/object:Gem::Requirement
159
+ requirement: &19887840 !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: *20308640
167
+ version_requirements: *19887840
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: spork
170
- requirement: &20308140 !ruby/object:Gem::Requirement
170
+ requirement: &19885280 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 0.9.0.rc9
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *20308140
178
+ version_requirements: *19885280
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sunspot_rails
181
- requirement: &20307720 !ruby/object:Gem::Requirement
181
+ requirement: &19884840 !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: *20307720
189
+ version_requirements: *19884840
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rspec-rails
192
- requirement: &20307260 !ruby/object:Gem::Requirement
192
+ requirement: &19884360 !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: :development
199
199
  prerelease: false
200
- version_requirements: *20307260
200
+ version_requirements: *19884360
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: guard
203
- requirement: &20306840 !ruby/object:Gem::Requirement
203
+ requirement: &19883920 !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: *20306840
211
+ version_requirements: *19883920
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: guard-spork
214
- requirement: &20306420 !ruby/object:Gem::Requirement
214
+ requirement: &19883480 !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: *20306420
222
+ version_requirements: *19883480
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: guard-rspec
225
- requirement: &20306000 !ruby/object:Gem::Requirement
225
+ requirement: &19883060 !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: *20306000
233
+ version_requirements: *19883060
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: sqlite3
236
- requirement: &20305580 !ruby/object:Gem::Requirement
236
+ requirement: &19882640 !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: *20305580
244
+ version_requirements: *19882640
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: sunspot_solr
247
- requirement: &20305160 !ruby/object:Gem::Requirement
247
+ requirement: &19882000 !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: *20305160
255
+ version_requirements: *19882000
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: shoulda-matchers
258
- requirement: &20301940 !ruby/object:Gem::Requirement
258
+ requirement: &19881560 !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: *20301940
266
+ version_requirements: *19881560
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: forgery
269
- requirement: &20301520 !ruby/object:Gem::Requirement
269
+ requirement: &19881100 !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: *20301520
277
+ version_requirements: *19881100
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: ryba
280
- requirement: &20301100 !ruby/object:Gem::Requirement
280
+ requirement: &19880660 !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: *20301100
288
+ version_requirements: *19880660
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: fabrication
291
- requirement: &20300680 !ruby/object:Gem::Requirement
291
+ requirement: &19880240 !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: *20300680
299
+ version_requirements: *19880240
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: therubyracer
302
- requirement: &20300260 !ruby/object:Gem::Requirement
302
+ requirement: &19879820 !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: *20300260
310
+ version_requirements: *19879820
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: uglifier
313
- requirement: &20299840 !ruby/object:Gem::Requirement
313
+ requirement: &19879400 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
318
318
  version: '0'
319
319
  type: :development
320
320
  prerelease: false
321
- version_requirements: *20299840
321
+ version_requirements: *19879400
322
322
  description: Description of EspPermissions.
323
323
  email:
324
324
  - mail@openteam.ru
@@ -374,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
374
374
  version: '0'
375
375
  segments:
376
376
  - 0
377
- hash: 486234487026628515
377
+ hash: -691955280667446019
378
378
  required_rubygems_version: !ruby/object:Gem::Requirement
379
379
  none: false
380
380
  requirements:
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
383
383
  version: '0'
384
384
  segments:
385
385
  - 0
386
- hash: 486234487026628515
386
+ hash: -691955280667446019
387
387
  requirements: []
388
388
  rubyforge_project:
389
389
  rubygems_version: 1.8.10