esp-auth 1.1.3 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/app/controllers/esp_auth/users_controller.rb +2 -1
  2. data/lib/esp-auth.rb +1 -0
  3. data/lib/esp_auth/engine.rb +2 -1
  4. data/lib/esp_auth/version.rb +1 -1
  5. data/lib/tasks/sync.rake +2 -2
  6. metadata +70 -70
data/app/controllers/esp_auth/users_controller.rb CHANGED
@@ -6,7 +6,8 @@ class EspAuth::UsersController < EspAuth::ApplicationController
6
6
  has_scope :page, :default => 1
7
7
 
8
8
  def search
9
- render :json => JSON.parse(Curl::Easy.http_get("#{Settings['sso.url']}/users.json?user_search[keywords]=#{URI.escape(params[:term])}").body_str) and return
9
+ url = "#{Settings['sso.url']}/users.json?user_search[keywords]=#{URI.escape(params[:term])}"
10
+ render :json => JSON.parse(Requester.new(url).response_body) and return
10
11
  end
11
12
 
12
13
  protected
data/lib/esp-auth.rb CHANGED
@@ -5,6 +5,7 @@ require 'cancan'
5
5
  require 'devise'
6
6
  require 'devise-russian'
7
7
  require 'default_value_for'
8
+ require 'esp-commons'
8
9
  require 'has_enum'
9
10
  require 'has_scope'
10
11
  require 'has_searcher'
data/lib/esp_auth/engine.rb CHANGED
@@ -107,12 +107,13 @@ module EspAuth
107
107
  belongs_to :context, :polymorphic => true
108
108
  belongs_to :user
109
109
 
110
+ scope :empty, -> { where('0 = 1') }
110
111
  scope :for_role, ->(role) { where(:role => role) }
111
112
  scope :for_context_ancestors, ->(context, ids=context.ancestor_ids) do
112
113
  where(:context_id => ids,
113
114
  :context_type => (context.class.ancestors + context.class.descendants - context.class.included_modules).map(&:name))
114
115
  end
115
- scope :for_context, ->(context) { where(:context_id => context.id, :context_type => context.class) }
116
+ scope :for_context, ->(context) { context ? where(:context_id => context.id, :context_type => context.class) : empty }
116
117
 
117
118
  scope :for_context_type, ->(context_type) { where(:context_type => context_type) }
118
119
 
data/lib/esp_auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EspAuth
2
- VERSION = "1.1.3"
2
+ VERSION = "1.2.0"
3
3
  end
data/lib/tasks/sync.rake CHANGED
@@ -1,11 +1,11 @@
1
- require 'curb'
1
+ require 'esp-commons'
2
2
  require 'progress_bar'
3
3
 
4
4
  desc "Syncronize blue-pages tree"
5
5
 
6
6
  namespace :esp_auth do
7
7
  task :sync => :environment do
8
- remotes = JSON.parse(Curl::Easy.http_get("#{Settings['blue-pages.url']}/categories/2.json?sync=true").body_str)
8
+ remotes = JSON.parse(Requester.new("#{Settings['blue-pages.url']}/categories/2.json?sync=true").response_body)
9
9
  bar = ProgressBar.new(remotes.count)
10
10
  remotes.each do | remote |
11
11
  (Context.find_by_id(remote['id']) || Context.new).tap do | context |
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.1.3
4
+ version: 1.2.0
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-05-17 00:00:00.000000000 Z
12
+ date: 2012-05-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ancestry
16
- requirement: &15326020 !ruby/object:Gem::Requirement
16
+ requirement: &12171980 !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: *15326020
24
+ version_requirements: *12171980
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: cancan
27
- requirement: &15325600 !ruby/object:Gem::Requirement
27
+ requirement: &12171560 !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: *15325600
35
+ version_requirements: *12171560
36
36
  - !ruby/object:Gem::Dependency
37
- name: curb
38
- requirement: &15325180 !ruby/object:Gem::Requirement
37
+ name: default_value_for
38
+ requirement: &12171140 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *15325180
46
+ version_requirements: *12171140
47
47
  - !ruby/object:Gem::Dependency
48
- name: default_value_for
49
- requirement: &15324760 !ruby/object:Gem::Requirement
48
+ name: devise
49
+ requirement: &12170720 !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: *15324760
57
+ version_requirements: *12170720
58
58
  - !ruby/object:Gem::Dependency
59
- name: devise
60
- requirement: &15324340 !ruby/object:Gem::Requirement
59
+ name: devise-russian
60
+ requirement: &12170300 !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: *15324340
68
+ version_requirements: *12170300
69
69
  - !ruby/object:Gem::Dependency
70
- name: devise-russian
71
- requirement: &15323920 !ruby/object:Gem::Requirement
70
+ name: esp-commons
71
+ requirement: &12169880 !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: *15323920
79
+ version_requirements: *12169880
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: omniauth
82
- requirement: &15339880 !ruby/object:Gem::Requirement
82
+ requirement: &12169320 !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: *15339880
90
+ version_requirements: *12169320
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth-oauth2
93
- requirement: &15339460 !ruby/object:Gem::Requirement
93
+ requirement: &12168640 !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: *15339460
101
+ version_requirements: *12168640
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: formtastic
104
- requirement: &15339040 !ruby/object:Gem::Requirement
104
+ requirement: &12168120 !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: *15339040
112
+ version_requirements: *12168120
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: has_enum
115
- requirement: &15338620 !ruby/object:Gem::Requirement
115
+ requirement: &12167660 !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: *15338620
123
+ version_requirements: *12167660
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: has_scope
126
- requirement: &15338200 !ruby/object:Gem::Requirement
126
+ requirement: &12167100 !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: *15338200
134
+ version_requirements: *12167100
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: has_searcher
137
- requirement: &15337780 !ruby/object:Gem::Requirement
137
+ requirement: &12166640 !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: *15337780
145
+ version_requirements: *12166640
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: inherited_resources
148
- requirement: &15337360 !ruby/object:Gem::Requirement
148
+ requirement: &12166180 !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: *15337360
156
+ version_requirements: *12166180
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: kaminari
159
- requirement: &15336940 !ruby/object:Gem::Requirement
159
+ requirement: &12165720 !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: *15336940
167
+ version_requirements: *12165720
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: progress_bar
170
- requirement: &15336520 !ruby/object:Gem::Requirement
170
+ requirement: &12165280 !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: *15336520
178
+ version_requirements: *12165280
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sunspot_rails
181
- requirement: &15336100 !ruby/object:Gem::Requirement
181
+ requirement: &12164840 !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: *15336100
189
+ version_requirements: *12164840
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: whenever
192
- requirement: &15335680 !ruby/object:Gem::Requirement
192
+ requirement: &12164420 !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: *15335680
200
+ version_requirements: *12164420
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: rails
203
- requirement: &15335260 !ruby/object:Gem::Requirement
203
+ requirement: &12164000 !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: *15335260
211
+ version_requirements: *12164000
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sass
214
- requirement: &15334840 !ruby/object:Gem::Requirement
214
+ requirement: &12163580 !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: *15334840
222
+ version_requirements: *12163580
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sass-rails
225
- requirement: &15334420 !ruby/object:Gem::Requirement
225
+ requirement: &12163160 !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: *15334420
233
+ version_requirements: *12163160
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: guard
236
- requirement: &15334000 !ruby/object:Gem::Requirement
236
+ requirement: &12162740 !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: *15334000
244
+ version_requirements: *12162740
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: guard-rspec
247
- requirement: &15333580 !ruby/object:Gem::Requirement
247
+ requirement: &12162320 !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: *15333580
255
+ version_requirements: *12162320
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: guard-spork
258
- requirement: &15333160 !ruby/object:Gem::Requirement
258
+ requirement: &12161900 !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: *15333160
266
+ version_requirements: *12161900
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: rspec-rails
269
- requirement: &15332740 !ruby/object:Gem::Requirement
269
+ requirement: &12161480 !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: *15332740
277
+ version_requirements: *12161480
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: russian
280
- requirement: &15332320 !ruby/object:Gem::Requirement
280
+ requirement: &12161060 !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: *15332320
288
+ version_requirements: *12161060
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: shoulda-matchers
291
- requirement: &15331900 !ruby/object:Gem::Requirement
291
+ requirement: &12156520 !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: *15331900
299
+ version_requirements: *12156520
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: spork
302
- requirement: &15339440 !ruby/object:Gem::Requirement
302
+ requirement: &12156080 !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: *15339440
310
+ version_requirements: *12156080
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: sqlite3
313
- requirement: &15338780 !ruby/object:Gem::Requirement
313
+ requirement: &12155660 !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: *15338780
321
+ version_requirements: *12155660
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: sunspot_solr
324
- requirement: &15338100 !ruby/object:Gem::Requirement
324
+ requirement: &12155240 !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: *15338100
332
+ version_requirements: *12155240
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: therubyracer
335
- requirement: &15337400 !ruby/object:Gem::Requirement
335
+ requirement: &12154820 !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: *15337400
343
+ version_requirements: *12154820
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: uglifier
346
- requirement: &15336720 !ruby/object:Gem::Requirement
346
+ requirement: &12154400 !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: *15336720
354
+ version_requirements: *12154400
355
355
  description: Description of EspAuth.
356
356
  email:
357
357
  - mail@openteam.ru
@@ -423,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
423
423
  version: '0'
424
424
  segments:
425
425
  - 0
426
- hash: 3633722960509794955
426
+ hash: 3721574999694862178
427
427
  required_rubygems_version: !ruby/object:Gem::Requirement
428
428
  none: false
429
429
  requirements:
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
432
432
  version: '0'
433
433
  segments:
434
434
  - 0
435
- hash: 3633722960509794955
435
+ hash: 3721574999694862178
436
436
  requirements: []
437
437
  rubyforge_project:
438
438
  rubygems_version: 1.8.15