esp-auth 1.2.2 → 1.2.3
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.
- data/lib/esp_auth/engine.rb +2 -2
- data/lib/esp_auth/version.rb +1 -1
- data/lib/tasks/sync.rake +18 -4
- metadata +82 -71
data/lib/esp_auth/engine.rb
CHANGED
|
@@ -162,8 +162,8 @@ module EspAuth
|
|
|
162
162
|
def self.esp_auth_context(options={})
|
|
163
163
|
default_scope order('weight')
|
|
164
164
|
attr_accessible :id, :title, :ancestry, :weight, :parent
|
|
165
|
-
has_many :subcontexts, :class_name => options[:subcontext] unless options[:subcontext] == false
|
|
166
|
-
has_many :permissions, :as => :context
|
|
165
|
+
has_many :subcontexts, :class_name => options[:subcontext], :dependent => :destroy unless options[:subcontext] == false
|
|
166
|
+
has_many :permissions, :as => :context, :dependent => :destroy
|
|
167
167
|
has_ancestry
|
|
168
168
|
|
|
169
169
|
alias_method :absolute_depth, :depth
|
data/lib/esp_auth/version.rb
CHANGED
data/lib/tasks/sync.rake
CHANGED
|
@@ -1,17 +1,31 @@
|
|
|
1
1
|
require 'esp-commons'
|
|
2
2
|
require 'progress_bar'
|
|
3
|
+
require 'timecop'
|
|
3
4
|
|
|
4
5
|
desc "Syncronize blue-pages tree"
|
|
5
6
|
|
|
6
7
|
namespace :esp_auth do
|
|
7
8
|
task :sync => :environment do
|
|
8
9
|
remotes = JSON.parse(Requester.new("#{Settings['blue-pages.url']}/categories/2.json?sync=true").response_body)
|
|
9
|
-
bar = ProgressBar.new(remotes.count)
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
bar = ProgressBar.new(remotes.count + (Context.pluck('id') - remotes.map{|r| r['id']}).count)
|
|
11
|
+
|
|
12
|
+
Context.record_timestamps = false
|
|
13
|
+
updated_at = DateTime.now
|
|
14
|
+
|
|
15
|
+
remotes.each do |remote|
|
|
16
|
+
Timecop.freeze(updated_at) do
|
|
17
|
+
(Context.find_or_initialize_by_id(remote['id'])).tap do |context|
|
|
18
|
+
context.created_at ||= updated_at
|
|
19
|
+
context.updated_at = updated_at
|
|
20
|
+
context.update_attributes! remote
|
|
21
|
+
end
|
|
13
22
|
end
|
|
14
23
|
bar.increment!
|
|
15
24
|
end
|
|
25
|
+
|
|
26
|
+
Context.where('updated_at <> ?', updated_at).each do |stale_context|
|
|
27
|
+
stale_context.destroy
|
|
28
|
+
bar.increment!
|
|
29
|
+
end
|
|
16
30
|
end
|
|
17
31
|
end
|
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.2.
|
|
4
|
+
version: 1.2.3
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2012-06-14 00:00:00.000000000 Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: ancestry
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &21131500 !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: *
|
|
24
|
+
version_requirements: *21131500
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: cancan
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &21131060 !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: *
|
|
35
|
+
version_requirements: *21131060
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: default_value_for
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &21130640 !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: *
|
|
46
|
+
version_requirements: *21130640
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: devise
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &21130220 !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: *
|
|
57
|
+
version_requirements: *21130220
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: devise-russian
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &21129800 !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: *
|
|
68
|
+
version_requirements: *21129800
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: esp-commons
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &21129380 !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: *
|
|
79
|
+
version_requirements: *21129380
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
|
-
name:
|
|
82
|
-
requirement: &
|
|
81
|
+
name: formtastic
|
|
82
|
+
requirement: &21128960 !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: *
|
|
90
|
+
version_requirements: *21128960
|
|
91
91
|
- !ruby/object:Gem::Dependency
|
|
92
|
-
name:
|
|
93
|
-
requirement: &
|
|
92
|
+
name: has_enum
|
|
93
|
+
requirement: &21128540 !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: *
|
|
101
|
+
version_requirements: *21128540
|
|
102
102
|
- !ruby/object:Gem::Dependency
|
|
103
|
-
name:
|
|
104
|
-
requirement: &
|
|
103
|
+
name: has_scope
|
|
104
|
+
requirement: &21128120 !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: *
|
|
112
|
+
version_requirements: *21128120
|
|
113
113
|
- !ruby/object:Gem::Dependency
|
|
114
|
-
name:
|
|
115
|
-
requirement: &
|
|
114
|
+
name: has_searcher
|
|
115
|
+
requirement: &21127700 !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: *
|
|
123
|
+
version_requirements: *21127700
|
|
124
124
|
- !ruby/object:Gem::Dependency
|
|
125
|
-
name:
|
|
126
|
-
requirement: &
|
|
125
|
+
name: inherited_resources
|
|
126
|
+
requirement: &21127280 !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: *
|
|
134
|
+
version_requirements: *21127280
|
|
135
135
|
- !ruby/object:Gem::Dependency
|
|
136
|
-
name:
|
|
137
|
-
requirement: &
|
|
136
|
+
name: kaminari
|
|
137
|
+
requirement: &21126860 !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: *
|
|
145
|
+
version_requirements: *21126860
|
|
146
146
|
- !ruby/object:Gem::Dependency
|
|
147
|
-
name:
|
|
148
|
-
requirement: &
|
|
147
|
+
name: omniauth
|
|
148
|
+
requirement: &21126380 !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: *
|
|
156
|
+
version_requirements: *21126380
|
|
157
157
|
- !ruby/object:Gem::Dependency
|
|
158
|
-
name:
|
|
159
|
-
requirement: &
|
|
158
|
+
name: omniauth-oauth2
|
|
159
|
+
requirement: &21125840 !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: *
|
|
167
|
+
version_requirements: *21125840
|
|
168
168
|
- !ruby/object:Gem::Dependency
|
|
169
169
|
name: progress_bar
|
|
170
|
-
requirement: &
|
|
170
|
+
requirement: &21125380 !ruby/object:Gem::Requirement
|
|
171
171
|
none: false
|
|
172
172
|
requirements:
|
|
173
173
|
- - ! '>='
|
|
@@ -175,10 +175,21 @@ dependencies:
|
|
|
175
175
|
version: '0'
|
|
176
176
|
type: :runtime
|
|
177
177
|
prerelease: false
|
|
178
|
-
version_requirements: *
|
|
178
|
+
version_requirements: *21125380
|
|
179
179
|
- !ruby/object:Gem::Dependency
|
|
180
180
|
name: sunspot_rails
|
|
181
|
-
requirement: &
|
|
181
|
+
requirement: &21124940 !ruby/object:Gem::Requirement
|
|
182
|
+
none: false
|
|
183
|
+
requirements:
|
|
184
|
+
- - ! '>='
|
|
185
|
+
- !ruby/object:Gem::Version
|
|
186
|
+
version: '0'
|
|
187
|
+
type: :runtime
|
|
188
|
+
prerelease: false
|
|
189
|
+
version_requirements: *21124940
|
|
190
|
+
- !ruby/object:Gem::Dependency
|
|
191
|
+
name: timecop
|
|
192
|
+
requirement: &21124520 !ruby/object:Gem::Requirement
|
|
182
193
|
none: false
|
|
183
194
|
requirements:
|
|
184
195
|
- - ! '>='
|
|
@@ -186,10 +197,10 @@ dependencies:
|
|
|
186
197
|
version: '0'
|
|
187
198
|
type: :runtime
|
|
188
199
|
prerelease: false
|
|
189
|
-
version_requirements: *
|
|
200
|
+
version_requirements: *21124520
|
|
190
201
|
- !ruby/object:Gem::Dependency
|
|
191
202
|
name: rails
|
|
192
|
-
requirement: &
|
|
203
|
+
requirement: &21124080 !ruby/object:Gem::Requirement
|
|
193
204
|
none: false
|
|
194
205
|
requirements:
|
|
195
206
|
- - ! '>='
|
|
@@ -197,10 +208,10 @@ dependencies:
|
|
|
197
208
|
version: '0'
|
|
198
209
|
type: :development
|
|
199
210
|
prerelease: false
|
|
200
|
-
version_requirements: *
|
|
211
|
+
version_requirements: *21124080
|
|
201
212
|
- !ruby/object:Gem::Dependency
|
|
202
213
|
name: sass
|
|
203
|
-
requirement: &
|
|
214
|
+
requirement: &21123660 !ruby/object:Gem::Requirement
|
|
204
215
|
none: false
|
|
205
216
|
requirements:
|
|
206
217
|
- - ! '>='
|
|
@@ -208,10 +219,10 @@ dependencies:
|
|
|
208
219
|
version: '0'
|
|
209
220
|
type: :development
|
|
210
221
|
prerelease: false
|
|
211
|
-
version_requirements: *
|
|
222
|
+
version_requirements: *21123660
|
|
212
223
|
- !ruby/object:Gem::Dependency
|
|
213
224
|
name: sass-rails
|
|
214
|
-
requirement: &
|
|
225
|
+
requirement: &21123240 !ruby/object:Gem::Requirement
|
|
215
226
|
none: false
|
|
216
227
|
requirements:
|
|
217
228
|
- - ! '>='
|
|
@@ -219,10 +230,10 @@ dependencies:
|
|
|
219
230
|
version: '0'
|
|
220
231
|
type: :development
|
|
221
232
|
prerelease: false
|
|
222
|
-
version_requirements: *
|
|
233
|
+
version_requirements: *21123240
|
|
223
234
|
- !ruby/object:Gem::Dependency
|
|
224
235
|
name: guard
|
|
225
|
-
requirement: &
|
|
236
|
+
requirement: &21118720 !ruby/object:Gem::Requirement
|
|
226
237
|
none: false
|
|
227
238
|
requirements:
|
|
228
239
|
- - ! '>='
|
|
@@ -230,10 +241,10 @@ dependencies:
|
|
|
230
241
|
version: '0'
|
|
231
242
|
type: :development
|
|
232
243
|
prerelease: false
|
|
233
|
-
version_requirements: *
|
|
244
|
+
version_requirements: *21118720
|
|
234
245
|
- !ruby/object:Gem::Dependency
|
|
235
246
|
name: guard-rspec
|
|
236
|
-
requirement: &
|
|
247
|
+
requirement: &21118300 !ruby/object:Gem::Requirement
|
|
237
248
|
none: false
|
|
238
249
|
requirements:
|
|
239
250
|
- - ! '>='
|
|
@@ -241,10 +252,10 @@ dependencies:
|
|
|
241
252
|
version: '0'
|
|
242
253
|
type: :development
|
|
243
254
|
prerelease: false
|
|
244
|
-
version_requirements: *
|
|
255
|
+
version_requirements: *21118300
|
|
245
256
|
- !ruby/object:Gem::Dependency
|
|
246
257
|
name: guard-spork
|
|
247
|
-
requirement: &
|
|
258
|
+
requirement: &21117880 !ruby/object:Gem::Requirement
|
|
248
259
|
none: false
|
|
249
260
|
requirements:
|
|
250
261
|
- - ! '>='
|
|
@@ -252,10 +263,10 @@ dependencies:
|
|
|
252
263
|
version: '0'
|
|
253
264
|
type: :development
|
|
254
265
|
prerelease: false
|
|
255
|
-
version_requirements: *
|
|
266
|
+
version_requirements: *21117880
|
|
256
267
|
- !ruby/object:Gem::Dependency
|
|
257
268
|
name: rspec-rails
|
|
258
|
-
requirement: &
|
|
269
|
+
requirement: &21117440 !ruby/object:Gem::Requirement
|
|
259
270
|
none: false
|
|
260
271
|
requirements:
|
|
261
272
|
- - ! '>='
|
|
@@ -263,10 +274,10 @@ dependencies:
|
|
|
263
274
|
version: '0'
|
|
264
275
|
type: :development
|
|
265
276
|
prerelease: false
|
|
266
|
-
version_requirements: *
|
|
277
|
+
version_requirements: *21117440
|
|
267
278
|
- !ruby/object:Gem::Dependency
|
|
268
279
|
name: russian
|
|
269
|
-
requirement: &
|
|
280
|
+
requirement: &21117020 !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: *
|
|
288
|
+
version_requirements: *21117020
|
|
278
289
|
- !ruby/object:Gem::Dependency
|
|
279
290
|
name: shoulda-matchers
|
|
280
|
-
requirement: &
|
|
291
|
+
requirement: &21116600 !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: *
|
|
299
|
+
version_requirements: *21116600
|
|
289
300
|
- !ruby/object:Gem::Dependency
|
|
290
301
|
name: spork
|
|
291
|
-
requirement: &
|
|
302
|
+
requirement: &21116180 !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: *
|
|
310
|
+
version_requirements: *21116180
|
|
300
311
|
- !ruby/object:Gem::Dependency
|
|
301
312
|
name: sqlite3
|
|
302
|
-
requirement: &
|
|
313
|
+
requirement: &21115760 !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: *
|
|
321
|
+
version_requirements: *21115760
|
|
311
322
|
- !ruby/object:Gem::Dependency
|
|
312
323
|
name: sunspot_solr
|
|
313
|
-
requirement: &
|
|
324
|
+
requirement: &21115340 !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: *
|
|
332
|
+
version_requirements: *21115340
|
|
322
333
|
- !ruby/object:Gem::Dependency
|
|
323
334
|
name: therubyracer
|
|
324
|
-
requirement: &
|
|
335
|
+
requirement: &21114920 !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: *
|
|
343
|
+
version_requirements: *21114920
|
|
333
344
|
- !ruby/object:Gem::Dependency
|
|
334
345
|
name: uglifier
|
|
335
|
-
requirement: &
|
|
346
|
+
requirement: &21114500 !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: *
|
|
354
|
+
version_requirements: *21114500
|
|
344
355
|
description: Description of EspAuth.
|
|
345
356
|
email:
|
|
346
357
|
- mail@openteam.ru
|
|
@@ -411,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
411
422
|
version: '0'
|
|
412
423
|
segments:
|
|
413
424
|
- 0
|
|
414
|
-
hash: -
|
|
425
|
+
hash: -4508669976932556479
|
|
415
426
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
416
427
|
none: false
|
|
417
428
|
requirements:
|
|
@@ -420,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
420
431
|
version: '0'
|
|
421
432
|
segments:
|
|
422
433
|
- 0
|
|
423
|
-
hash: -
|
|
434
|
+
hash: -4508669976932556479
|
|
424
435
|
requirements: []
|
|
425
436
|
rubyforge_project:
|
|
426
437
|
rubygems_version: 1.8.15
|