conjoin 0.0.48 → 0.0.49

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