conjoin 0.0.80 → 0.0.82

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: aed0bd30991d7ee755d92b45bb4bbca3997ef8e3
4
- data.tar.gz: 5662ba36711a59fcf09be1db1a2fc3ad26e6416e
3
+ metadata.gz: a4d45e8442a949edc2a3aa825d0711d241bae84b
4
+ data.tar.gz: 73adae773e7bd99a1b3b1deba889545ec77d79fd
5
5
  SHA512:
6
- metadata.gz: e7f65aa8eef87b791a05c510e943db8b0c72bd6924fe6a08d68c08bc13621097ff4a50e8b3bcfcf23075dc4e25cf06489c8f8d004d49cafbca777b78303eff7f
7
- data.tar.gz: 056e7124a5ab68cf8a2109f8cc81c09d5a00fdcc98327cb8757c50022b590510a384aa9033dca1d7de89fbbef719e6a87011d845d4ea4379d753ab23bf9140fc
6
+ metadata.gz: 355c6c9fb23483aa8611a5b491f313fd5254b63d64120b69dd34c2193c3436344d70800a723fc1ed72f49e51fa4726a6050296e9bcfd2dcdef3cc00de43bd854
7
+ data.tar.gz: 8acfcbb22c05bf17a7977c89591df317bd7e88d52fc7423d10c1f88bfdb3145c836c2a8c278f480ad618c3e83da77150baee556e0a4289b1b06833293786e46c
@@ -10,18 +10,28 @@ module Conjoin
10
10
  @settings
11
11
  end
12
12
 
13
- def self.encrypt auth_token
13
+ def self.encrypt auth_token, iv=nil, salt=nil
14
14
  auth_token = auth_token.to_json
15
15
 
16
- Base64.encode64(Encryptor.encrypt auth_token, key: AuthToken.settings.key, salt: begin
17
- "%AuthToken%#{AuthToken.settings.salt}%#{auth_token}%Salt%"
18
- end).strip
16
+ if iv.present?
17
+ encrypted = Encryptor.encrypt auth_token, key: AuthToken.settings.key, iv: iv,
18
+ salt: salt
19
+ else
20
+ encrypted = Encryptor.encrypt auth_token, key: AuthToken.settings.key
21
+ end
22
+
23
+ Base64.encode64(encrypted).strip
19
24
  end
20
25
 
21
- def self.decrypt auth_token
22
- JSON.parse Encryptor.decrypt(Base64.decode64(auth_token), key: AuthToken.settings.key, salt: begin
23
- "%AuthToken%#{AuthToken.settings.salt}%#{auth_token}%Salt%"
24
- end)
26
+ def self.decrypt auth_token, iv=nil, salt=nil
27
+ if iv.present?
28
+ decrypted = Encryptor.decrypt Base64.decode64(auth_token), key: AuthToken.settings.key, iv: iv,
29
+ salt: salt
30
+ else
31
+ decrypted = Encryptor.decrypt Base64.decode64(auth_token), key: AuthToken.settings.key
32
+ end
33
+
34
+ JSON.parse decrypted
25
35
  end
26
36
 
27
37
  class Middleware
@@ -42,17 +52,22 @@ module Conjoin
42
52
  end
43
53
 
44
54
  def respond
45
- if auth_token = req.params['auth_token']
46
- obj = AuthToken.decrypt auth_token
55
+ if req.params['auth_token'] and (auth_token = req.params['auth_token']) and\
56
+ req.params['iv'] and (iv = Base64.decode64(req.params['iv']))
57
+
58
+ salt = Base64.decode64(req.params['salt']) if req.params['salt']
59
+ salt ||= nil
60
+
61
+ obj = AuthToken.decrypt auth_token, iv, salt
47
62
 
48
63
  if Time.now < Time.parse(obj['expires_at'])
49
- user = AuthToken.settings.klass.constantize.find obj['id']
64
+ user = AuthToken.settings.klass.constantize.find_by_username obj['username']
50
65
  case AuthToken.settings.type.to_sym
51
66
  when :warden
52
- req.env['warden'].set_user(user, scope: :user)
67
+ req.env['warden'].set_user(user, scope: :user) if user
53
68
  when :shield
54
69
  req.session.clear
55
- req.session[AuthToken.settings.klass] = obj['id']
70
+ req.session[AuthToken.settings.klass] = user.id if user
56
71
  end
57
72
  end
58
73
  end
@@ -1,3 +1,3 @@
1
1
  module Conjoin
2
- VERSION = "0.0.80"
2
+ VERSION = "0.0.82"
3
3
  end
metadata CHANGED
@@ -1,455 +1,455 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjoin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.80
4
+ version: 0.0.82
5
5
  platform: ruby
6
6
  authors:
7
7
  - cj
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-09 00:00:00.000000000 Z
11
+ date: 2014-09-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cuba
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: 3.1.1
20
- - - ">="
20
+ - - '>='
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.1.1
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - "~>"
27
+ - - ~>
28
28
  - !ruby/object:Gem::Version
29
29
  version: 3.1.1
30
- - - ">="
30
+ - - '>='
31
31
  - !ruby/object:Gem::Version
32
32
  version: 3.1.1
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: cuba-sugar-cj
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
- - - "~>"
37
+ - - ~>
38
38
  - !ruby/object:Gem::Version
39
39
  version: 0.3.0
40
- - - ">="
40
+ - - '>='
41
41
  - !ruby/object:Gem::Version
42
42
  version: 0.3.0
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - "~>"
47
+ - - ~>
48
48
  - !ruby/object:Gem::Version
49
49
  version: 0.3.0
50
- - - ">="
50
+ - - '>='
51
51
  - !ruby/object:Gem::Version
52
52
  version: 0.3.0
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: dominate
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
- - - ">="
57
+ - - '>='
58
58
  - !ruby/object:Gem::Version
59
59
  version: '0'
60
60
  type: :runtime
61
61
  prerelease: false
62
62
  version_requirements: !ruby/object:Gem::Requirement
63
63
  requirements:
64
- - - ">="
64
+ - - '>='
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0'
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: rack_csrf
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - "~>"
71
+ - - ~>
72
72
  - !ruby/object:Gem::Version
73
73
  version: 2.4.0
74
- - - ">="
74
+ - - '>='
75
75
  - !ruby/object:Gem::Version
76
76
  version: 2.4.0
77
77
  type: :runtime
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - "~>"
81
+ - - ~>
82
82
  - !ruby/object:Gem::Version
83
83
  version: 2.4.0
84
- - - ">="
84
+ - - '>='
85
85
  - !ruby/object:Gem::Version
86
86
  version: 2.4.0
87
87
  - !ruby/object:Gem::Dependency
88
88
  name: rack-protection
89
89
  requirement: !ruby/object:Gem::Requirement
90
90
  requirements:
91
- - - "~>"
91
+ - - ~>
92
92
  - !ruby/object:Gem::Version
93
93
  version: 1.5.2
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.5.2
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.5.2
104
- - - ">="
104
+ - - '>='
105
105
  - !ruby/object:Gem::Version
106
106
  version: 1.5.2
107
107
  - !ruby/object:Gem::Dependency
108
108
  name: r18n-core
109
109
  requirement: !ruby/object:Gem::Requirement
110
110
  requirements:
111
- - - "~>"
111
+ - - ~>
112
112
  - !ruby/object:Gem::Version
113
113
  version: 1.1.10
114
- - - ">="
114
+ - - '>='
115
115
  - !ruby/object:Gem::Version
116
116
  version: 1.1.10
117
117
  type: :runtime
118
118
  prerelease: false
119
119
  version_requirements: !ruby/object:Gem::Requirement
120
120
  requirements:
121
- - - "~>"
121
+ - - ~>
122
122
  - !ruby/object:Gem::Version
123
123
  version: 1.1.10
124
- - - ">="
124
+ - - '>='
125
125
  - !ruby/object:Gem::Version
126
126
  version: 1.1.10
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: highline
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - "~>"
131
+ - - ~>
132
132
  - !ruby/object:Gem::Version
133
133
  version: 1.6.11
134
- - - ">="
134
+ - - '>='
135
135
  - !ruby/object:Gem::Version
136
136
  version: 1.6.11
137
137
  type: :runtime
138
138
  prerelease: false
139
139
  version_requirements: !ruby/object:Gem::Requirement
140
140
  requirements:
141
- - - "~>"
141
+ - - ~>
142
142
  - !ruby/object:Gem::Version
143
143
  version: 1.6.11
144
- - - ">="
144
+ - - '>='
145
145
  - !ruby/object:Gem::Version
146
146
  version: 1.6.11
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: mab
149
149
  requirement: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - "~>"
151
+ - - ~>
152
152
  - !ruby/object:Gem::Version
153
153
  version: 0.0.3
154
- - - ">="
154
+ - - '>='
155
155
  - !ruby/object:Gem::Version
156
156
  version: 0.0.3
157
157
  type: :runtime
158
158
  prerelease: false
159
159
  version_requirements: !ruby/object:Gem::Requirement
160
160
  requirements:
161
- - - "~>"
161
+ - - ~>
162
162
  - !ruby/object:Gem::Version
163
163
  version: 0.0.3
164
- - - ">="
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: 0.0.3
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: tilt
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: 1.4.1
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.4.1
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: sass
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: 3.2.19
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: 3.2.19
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: stylus
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - "~>"
199
+ - - ~>
200
200
  - !ruby/object:Gem::Version
201
201
  version: 1.0.1
202
- - - ">="
202
+ - - '>='
203
203
  - !ruby/object:Gem::Version
204
204
  version: 1.0.1
205
205
  type: :runtime
206
206
  prerelease: false
207
207
  version_requirements: !ruby/object:Gem::Requirement
208
208
  requirements:
209
- - - "~>"
209
+ - - ~>
210
210
  - !ruby/object:Gem::Version
211
211
  version: 1.0.1
212
- - - ">="
212
+ - - '>='
213
213
  - !ruby/object:Gem::Version
214
214
  version: 1.0.1
215
215
  - !ruby/object:Gem::Dependency
216
216
  name: coffee-script
217
217
  requirement: !ruby/object:Gem::Requirement
218
218
  requirements:
219
- - - "~>"
219
+ - - ~>
220
220
  - !ruby/object:Gem::Version
221
221
  version: 2.2.0
222
- - - ">="
222
+ - - '>='
223
223
  - !ruby/object:Gem::Version
224
224
  version: 2.2.0
225
225
  type: :runtime
226
226
  prerelease: false
227
227
  version_requirements: !ruby/object:Gem::Requirement
228
228
  requirements:
229
- - - "~>"
229
+ - - ~>
230
230
  - !ruby/object:Gem::Version
231
231
  version: 2.2.0
232
- - - ">="
232
+ - - '>='
233
233
  - !ruby/object:Gem::Version
234
234
  version: 2.2.0
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: slim
237
237
  requirement: !ruby/object:Gem::Requirement
238
238
  requirements:
239
- - - "~>"
239
+ - - ~>
240
240
  - !ruby/object:Gem::Version
241
241
  version: 2.0.2
242
- - - ">="
242
+ - - '>='
243
243
  - !ruby/object:Gem::Version
244
244
  version: 2.0.2
245
245
  type: :runtime
246
246
  prerelease: false
247
247
  version_requirements: !ruby/object:Gem::Requirement
248
248
  requirements:
249
- - - "~>"
249
+ - - ~>
250
250
  - !ruby/object:Gem::Version
251
251
  version: 2.0.2
252
- - - ">="
252
+ - - '>='
253
253
  - !ruby/object:Gem::Version
254
254
  version: 2.0.2
255
255
  - !ruby/object:Gem::Dependency
256
256
  name: mimemagic
257
257
  requirement: !ruby/object:Gem::Requirement
258
258
  requirements:
259
- - - "~>"
259
+ - - ~>
260
260
  - !ruby/object:Gem::Version
261
261
  version: 0.2.1
262
- - - ">="
262
+ - - '>='
263
263
  - !ruby/object:Gem::Version
264
264
  version: 0.2.1
265
265
  type: :runtime
266
266
  prerelease: false
267
267
  version_requirements: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - "~>"
269
+ - - ~>
270
270
  - !ruby/object:Gem::Version
271
271
  version: 0.2.1
272
- - - ">="
272
+ - - '>='
273
273
  - !ruby/object:Gem::Version
274
274
  version: 0.2.1
275
275
  - !ruby/object:Gem::Dependency
276
276
  name: hashie
277
277
  requirement: !ruby/object:Gem::Requirement
278
278
  requirements:
279
- - - "~>"
279
+ - - ~>
280
280
  - !ruby/object:Gem::Version
281
281
  version: 2.1.1
282
- - - ">="
282
+ - - '>='
283
283
  - !ruby/object:Gem::Version
284
284
  version: 2.1.1
285
285
  type: :runtime
286
286
  prerelease: false
287
287
  version_requirements: !ruby/object:Gem::Requirement
288
288
  requirements:
289
- - - "~>"
289
+ - - ~>
290
290
  - !ruby/object:Gem::Version
291
291
  version: 2.1.1
292
- - - ">="
292
+ - - '>='
293
293
  - !ruby/object:Gem::Version
294
294
  version: 2.1.1
295
295
  - !ruby/object:Gem::Dependency
296
296
  name: chronic
297
297
  requirement: !ruby/object:Gem::Requirement
298
298
  requirements:
299
- - - "~>"
299
+ - - ~>
300
300
  - !ruby/object:Gem::Version
301
301
  version: 0.10.2
302
- - - ">="
302
+ - - '>='
303
303
  - !ruby/object:Gem::Version
304
304
  version: 0.10.2
305
305
  type: :runtime
306
306
  prerelease: false
307
307
  version_requirements: !ruby/object:Gem::Requirement
308
308
  requirements:
309
- - - "~>"
309
+ - - ~>
310
310
  - !ruby/object:Gem::Version
311
311
  version: 0.10.2
312
- - - ">="
312
+ - - '>='
313
313
  - !ruby/object:Gem::Version
314
314
  version: 0.10.2
315
315
  - !ruby/object:Gem::Dependency
316
316
  name: unicorn
317
317
  requirement: !ruby/object:Gem::Requirement
318
318
  requirements:
319
- - - "~>"
319
+ - - ~>
320
320
  - !ruby/object:Gem::Version
321
321
  version: 4.8.2
322
- - - ">="
322
+ - - '>='
323
323
  - !ruby/object:Gem::Version
324
324
  version: 4.8.2
325
325
  type: :runtime
326
326
  prerelease: false
327
327
  version_requirements: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - "~>"
329
+ - - ~>
330
330
  - !ruby/object:Gem::Version
331
331
  version: 4.8.2
332
- - - ">="
332
+ - - '>='
333
333
  - !ruby/object:Gem::Version
334
334
  version: 4.8.2
335
335
  - !ruby/object:Gem::Dependency
336
336
  name: clap
337
337
  requirement: !ruby/object:Gem::Requirement
338
338
  requirements:
339
- - - "~>"
339
+ - - ~>
340
340
  - !ruby/object:Gem::Version
341
341
  version: 1.0.0
342
- - - ">="
342
+ - - '>='
343
343
  - !ruby/object:Gem::Version
344
344
  version: 1.0.0
345
345
  type: :runtime
346
346
  prerelease: false
347
347
  version_requirements: !ruby/object:Gem::Requirement
348
348
  requirements:
349
- - - "~>"
349
+ - - ~>
350
350
  - !ruby/object:Gem::Version
351
351
  version: 1.0.0
352
- - - ">="
352
+ - - '>='
353
353
  - !ruby/object:Gem::Version
354
354
  version: 1.0.0
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: shield
357
357
  requirement: !ruby/object:Gem::Requirement
358
358
  requirements:
359
- - - "~>"
359
+ - - ~>
360
360
  - !ruby/object:Gem::Version
361
361
  version: 2.1.0
362
- - - ">="
362
+ - - '>='
363
363
  - !ruby/object:Gem::Version
364
364
  version: 2.1.0
365
365
  type: :runtime
366
366
  prerelease: false
367
367
  version_requirements: !ruby/object:Gem::Requirement
368
368
  requirements:
369
- - - "~>"
369
+ - - ~>
370
370
  - !ruby/object:Gem::Version
371
371
  version: 2.1.0
372
- - - ">="
372
+ - - '>='
373
373
  - !ruby/object:Gem::Version
374
374
  version: 2.1.0
375
375
  - !ruby/object:Gem::Dependency
376
376
  name: better_errors
377
377
  requirement: !ruby/object:Gem::Requirement
378
378
  requirements:
379
- - - "~>"
379
+ - - ~>
380
380
  - !ruby/object:Gem::Version
381
381
  version: 1.1.0
382
- - - ">="
382
+ - - '>='
383
383
  - !ruby/object:Gem::Version
384
384
  version: 1.1.0
385
385
  type: :runtime
386
386
  prerelease: false
387
387
  version_requirements: !ruby/object:Gem::Requirement
388
388
  requirements:
389
- - - "~>"
389
+ - - ~>
390
390
  - !ruby/object:Gem::Version
391
391
  version: 1.1.0
392
- - - ">="
392
+ - - '>='
393
393
  - !ruby/object:Gem::Version
394
394
  version: 1.1.0
395
395
  - !ruby/object:Gem::Dependency
396
396
  name: rake
397
397
  requirement: !ruby/object:Gem::Requirement
398
398
  requirements:
399
- - - "~>"
399
+ - - ~>
400
400
  - !ruby/object:Gem::Version
401
401
  version: 10.3.1
402
- - - ">="
402
+ - - '>='
403
403
  - !ruby/object:Gem::Version
404
404
  version: 10.3.1
405
405
  type: :runtime
406
406
  prerelease: false
407
407
  version_requirements: !ruby/object:Gem::Requirement
408
408
  requirements:
409
- - - "~>"
409
+ - - ~>
410
410
  - !ruby/object:Gem::Version
411
411
  version: 10.3.1
412
- - - ">="
412
+ - - '>='
413
413
  - !ruby/object:Gem::Version
414
414
  version: 10.3.1
415
415
  - !ruby/object:Gem::Dependency
416
416
  name: encryptor
417
417
  requirement: !ruby/object:Gem::Requirement
418
418
  requirements:
419
- - - "~>"
419
+ - - ~>
420
420
  - !ruby/object:Gem::Version
421
421
  version: 1.3.0
422
- - - ">="
422
+ - - '>='
423
423
  - !ruby/object:Gem::Version
424
424
  version: 1.3.0
425
425
  type: :runtime
426
426
  prerelease: false
427
427
  version_requirements: !ruby/object:Gem::Requirement
428
428
  requirements:
429
- - - "~>"
429
+ - - ~>
430
430
  - !ruby/object:Gem::Version
431
431
  version: 1.3.0
432
- - - ">="
432
+ - - '>='
433
433
  - !ruby/object:Gem::Version
434
434
  version: 1.3.0
435
435
  - !ruby/object:Gem::Dependency
436
436
  name: bundler
437
437
  requirement: !ruby/object:Gem::Requirement
438
438
  requirements:
439
- - - "~>"
439
+ - - ~>
440
440
  - !ruby/object:Gem::Version
441
441
  version: '1.3'
442
- - - ">="
442
+ - - '>='
443
443
  - !ruby/object:Gem::Version
444
444
  version: '1.3'
445
445
  type: :development
446
446
  prerelease: false
447
447
  version_requirements: !ruby/object:Gem::Requirement
448
448
  requirements:
449
- - - "~>"
449
+ - - ~>
450
450
  - !ruby/object:Gem::Version
451
451
  version: '1.3'
452
- - - ">="
452
+ - - '>='
453
453
  - !ruby/object:Gem::Version
454
454
  version: '1.3'
455
455
  description: Still in development
@@ -460,7 +460,7 @@ executables:
460
460
  extensions: []
461
461
  extra_rdoc_files: []
462
462
  files:
463
- - ".gitignore"
463
+ - .gitignore
464
464
  - Gemfile
465
465
  - LICENSE.txt
466
466
  - README.md
@@ -518,17 +518,17 @@ require_paths:
518
518
  - lib
519
519
  required_ruby_version: !ruby/object:Gem::Requirement
520
520
  requirements:
521
- - - ">="
521
+ - - '>='
522
522
  - !ruby/object:Gem::Version
523
523
  version: '0'
524
524
  required_rubygems_version: !ruby/object:Gem::Requirement
525
525
  requirements:
526
- - - ">="
526
+ - - '>='
527
527
  - !ruby/object:Gem::Version
528
528
  version: '0'
529
529
  requirements: []
530
530
  rubyforge_project:
531
- rubygems_version: 2.3.0
531
+ rubygems_version: 2.2.2
532
532
  signing_key:
533
533
  specification_version: 4
534
534
  summary: Adds certain things to Cuba to make it more familiar to rails devs