esp-auth 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/esp-auth.rb +1 -0
  2. data/lib/esp_auth/engine.rb +45 -0
  3. data/lib/esp_auth/version.rb +1 -1
  4. data/lib/generators/esp_auth/install/templates/app/models/ability.rb +1 -1
  5. data/lib/generators/esp_auth/install/templates/app/models/user.rb +1 -34
  6. metadata +68 -68
data/lib/esp-auth.rb CHANGED
@@ -4,6 +4,7 @@ require 'ancestry'
4
4
  require 'cancan'
5
5
  require 'curb'
6
6
  require 'devise'
7
+ require 'devise-russian'
7
8
  require 'default_value_for'
8
9
  require 'has_enum'
9
10
  require 'has_scope'
data/lib/esp_auth/engine.rb CHANGED
@@ -38,6 +38,51 @@ module EspAuth
38
38
  authorize! :manage, :application
39
39
  end
40
40
  end
41
+ ActiveRecord::Base.class_eval do
42
+ def self.esp_authable
43
+
44
+ attr_accessible :name, :email, :nickname, :name, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info, :uid
45
+
46
+ has_many :permissions
47
+
48
+ default_value_for :sign_in_count, 0
49
+
50
+ devise :omniauthable, :trackable, :timeoutable
51
+
52
+ searchable do
53
+ integer :uid
54
+ text :term do [name, email, nickname].join(' ') end
55
+ integer :permissions_count do permissions.count end
56
+ end
57
+
58
+ Permission.enums[:role].each do | role |
59
+ define_method "#{role}_of?" do |context|
60
+ permissions.for_role(role).for_context_and_ancestors(context).exists?
61
+ end
62
+ define_method "#{role}?" do
63
+ permissions.for_role(role).exists?
64
+ end
65
+ end
66
+
67
+ define_method :have_permissions? do
68
+ permissions.exists?
69
+ end
70
+
71
+ alias_method :have_roles?, :have_permissions?
72
+
73
+ define_method :contexts do
74
+ permissions.map(&:context).uniq
75
+ end
76
+
77
+ define_method :contexts_tree do
78
+ contexts.flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
79
+ .uniq
80
+ .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
81
+ .uniq
82
+ end
83
+
84
+ end
85
+ end
41
86
  end
42
87
  end
43
88
  end
data/lib/esp_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspAuth
2
- VERSION = "1.0.2"
2
+ VERSION = "1.0.3"
3
3
  end
data/lib/generators/esp_auth/install/templates/app/models/ability.rb CHANGED
@@ -22,7 +22,7 @@ class Ability
22
22
  end
23
23
 
24
24
  can :manage, :application do
25
- user.permissions.exists?
25
+ user.have_permissions?
26
26
  end
27
27
 
28
28
  can :manage, :permissions do
data/lib/generators/esp_auth/install/templates/app/models/user.rb CHANGED
@@ -1,39 +1,6 @@
1
1
  class User < ActiveRecord::Base
2
- attr_accessible :name, :email, :nickname, :name, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info, :uid
3
2
 
4
- validates_presence_of :uid
5
-
6
- has_many :permissions
7
-
8
- default_value_for :sign_in_count, 0
9
-
10
- devise :omniauthable, :trackable, :timeoutable
11
-
12
- searchable do
13
- integer :uid
14
- text :term do [name, email, nickname].join(' ') end
15
- integer :permissions_count do permissions.count end
16
- end
17
-
18
- Permission.enums[:role].each do | role |
19
- define_method "#{role}_of?" do |context|
20
- permissions.for_role(role).for_context_and_ancestors(context).exists?
21
- end
22
- define_method "#{role}?" do
23
- permissions.for_role(role).exists?
24
- end
25
- end
26
-
27
- def contexts
28
- permissions.map(&:context).uniq
29
- end
30
-
31
- def contexts_tree
32
- contexts.flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
33
- .uniq
34
- .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
35
- .uniq
36
- end
3
+ esp_authable
37
4
 
38
5
  end
39
6
 
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.2
4
+ version: 1.0.3
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-02 00:00:00.000000000 Z
12
+ date: 2012-02-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &21854220 !ruby/object:Gem::Requirement
16
+ requirement: &19520500 !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: *21854220
24
+ version_requirements: *19520500
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &21853740 !ruby/object:Gem::Requirement
27
+ requirement: &19520080 !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: *21853740
35
+ version_requirements: *19520080
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: compass
38
- requirement: &21853120 !ruby/object:Gem::Requirement
38
+ requirement: &19519540 !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: *21853120
46
+ version_requirements: *19519540
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: curb
49
- requirement: &21852680 !ruby/object:Gem::Requirement
49
+ requirement: &19519080 !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: *21852680
57
+ version_requirements: *19519080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: default_value_for
60
- requirement: &21868500 !ruby/object:Gem::Requirement
60
+ requirement: &19518600 !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: *21868500
68
+ version_requirements: *19518600
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: devise
71
- requirement: &21868080 !ruby/object:Gem::Requirement
71
+ requirement: &19518140 !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: *21868080
79
+ version_requirements: *19518140
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: devise-russian
82
- requirement: &21867660 !ruby/object:Gem::Requirement
82
+ requirement: &19517700 !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: *21867660
90
+ version_requirements: *19517700
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth
93
- requirement: &21867240 !ruby/object:Gem::Requirement
93
+ requirement: &19533640 !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: *21867240
101
+ version_requirements: *19533640
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: omniauth-oauth2
104
- requirement: &21866820 !ruby/object:Gem::Requirement
104
+ requirement: &19533200 !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: *21866820
112
+ version_requirements: *19533200
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: formtastic
115
- requirement: &21866400 !ruby/object:Gem::Requirement
115
+ requirement: &19532760 !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: *21866400
123
+ version_requirements: *19532760
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: has_enum
126
- requirement: &21862180 !ruby/object:Gem::Requirement
126
+ requirement: &19532320 !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: *21862180
134
+ version_requirements: *19532320
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_scope
137
- requirement: &21861760 !ruby/object:Gem::Requirement
137
+ requirement: &19531880 !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: *21861760
145
+ version_requirements: *19531880
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: has_searcher
148
- requirement: &21861340 !ruby/object:Gem::Requirement
148
+ requirement: &19531440 !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: *21861340
156
+ version_requirements: *19531440
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: inherited_resources
159
- requirement: &21860920 !ruby/object:Gem::Requirement
159
+ requirement: &19531020 !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: *21860920
167
+ version_requirements: *19531020
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: kaminari
170
- requirement: &21860500 !ruby/object:Gem::Requirement
170
+ requirement: &19530580 !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: *21860500
178
+ version_requirements: *19530580
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: progress_bar
181
- requirement: &21884580 !ruby/object:Gem::Requirement
181
+ requirement: &19530160 !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: *21884580
189
+ version_requirements: *19530160
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rails
192
- requirement: &21884160 !ruby/object:Gem::Requirement
192
+ requirement: &19529720 !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: *21884160
200
+ version_requirements: *19529720
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: sass
203
- requirement: &21883720 !ruby/object:Gem::Requirement
203
+ requirement: &19529280 !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: *21883720
211
+ version_requirements: *19529280
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sass-rails
214
- requirement: &21883280 !ruby/object:Gem::Requirement
214
+ requirement: &19528840 !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: *21883280
222
+ version_requirements: *19528840
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sunspot_rails
225
- requirement: &21882820 !ruby/object:Gem::Requirement
225
+ requirement: &19528400 !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: *21882820
233
+ version_requirements: *19528400
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: whenever
236
- requirement: &21882360 !ruby/object:Gem::Requirement
236
+ requirement: &19527940 !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: *21882360
244
+ version_requirements: *19527940
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard
247
- requirement: &21881920 !ruby/object:Gem::Requirement
247
+ requirement: &19527500 !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: *21881920
255
+ version_requirements: *19527500
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: guard-rspec
258
- requirement: &21881480 !ruby/object:Gem::Requirement
258
+ requirement: &19527060 !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: *21881480
266
+ version_requirements: *19527060
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: guard-spork
269
- requirement: &21881020 !ruby/object:Gem::Requirement
269
+ requirement: &19526600 !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: *21881020
277
+ version_requirements: *19526600
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: rspec-rails
280
- requirement: &21880580 !ruby/object:Gem::Requirement
280
+ requirement: &19526140 !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: *21880580
288
+ version_requirements: *19526140
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: russian
291
- requirement: &21880140 !ruby/object:Gem::Requirement
291
+ requirement: &19525720 !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: *21880140
299
+ version_requirements: *19525720
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: shoulda-matchers
302
- requirement: &21879680 !ruby/object:Gem::Requirement
302
+ requirement: &19541640 !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: *21879680
310
+ version_requirements: *19541640
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: spork
313
- requirement: &21879240 !ruby/object:Gem::Requirement
313
+ requirement: &19541200 !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: *21879240
321
+ version_requirements: *19541200
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sqlite3
324
- requirement: &21878800 !ruby/object:Gem::Requirement
324
+ requirement: &19540760 !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: *21878800
332
+ version_requirements: *19540760
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: sunspot_solr
335
- requirement: &21878340 !ruby/object:Gem::Requirement
335
+ requirement: &19540300 !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: *21878340
343
+ version_requirements: *19540300
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: therubyracer
346
- requirement: &21877920 !ruby/object:Gem::Requirement
346
+ requirement: &19539860 !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: *21877920
354
+ version_requirements: *19539860
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: uglifier
357
- requirement: &21877460 !ruby/object:Gem::Requirement
357
+ requirement: &19539420 !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: *21877460
365
+ version_requirements: *19539420
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: -2136812480467550892
437
+ hash: -3144382037214944273
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: -2136812480467550892
446
+ hash: -3144382037214944273
447
447
  requirements: []
448
448
  rubyforge_project:
449
449
  rubygems_version: 1.8.15