conjoin 0.0.32 → 0.0.33

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/conjoin/assets.rb +29 -28
  3. data/lib/conjoin/version.rb +1 -1
  4. metadata +90 -90
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 688caf575947e5495ebfea8e97709b5bd21d3ba4
4
- data.tar.gz: bb26569fd26ae295a713ce10924879cb987014ae
3
+ metadata.gz: 42388cce946a27a9a9f0a5e75f9162c6f8a7a2ae
4
+ data.tar.gz: 5c1c0704428cf798f10ea7878d83e1fce662c457
5
5
  SHA512:
6
- metadata.gz: 95bcc80bd8d1c7dbf6546cc5e05e940404b6e5516405d51820a3e08d9c48daedac46c3cdd9af918f77fce007b8537593a1fb41b45fa3a0029c5fe45dcb03808b
7
- data.tar.gz: 24cb0d05e631bf2ec0a8b2b75d540bd96744ad181a024705c3f8d3f430be4979125d4343cce3f8dfaafa823cfe2558c57d507a243f5a245fd1e54adf48a2a533
6
+ metadata.gz: f8609ba2528ff81dd24d4f3959abf8a229a1e5706e9544b4378218db56f8c38721793bc307a980777c152910a157ef2156ca1bd86ef75467bc4e6ab7b39041d8
7
+ data.tar.gz: 3703269d201f82893e4149e9e89088aa71cbd0c56b35c05735f6c44806188b394ba875fdf0a616a0ef4020536c74e734f9da53327c6d414514b18116156751b6
data/lib/conjoin/assets.rb CHANGED
@@ -144,30 +144,8 @@ module Conjoin
144
144
  def assets_settings as
145
145
  settings[:assets].settings.merge! as
146
146
  end
147
- end
148
-
149
- class Helpers
150
- def asset_path path
151
- app.root + '/app/assets/' + path
152
- end
153
- end
154
-
155
- class Routes < Struct.new(:settings)
156
- def app
157
- App.settings = settings
158
- App.root = settings[:root]
159
- App.plugin Conjoin::Cuba::Render
160
- App.plugin Assets
161
- App
162
- end
163
- end
164
147
 
165
- # erb = Tilt::ERBTemplate.new "#{Assets.app.root}/app/assets/#{file}.scss"
166
- # scss = Tilt::ScssTemplate.new{ erb.render(Helpers.new) }
167
-
168
- # scss.render
169
- class App < Conjoin::Cuba
170
- def add_asset file, ext
148
+ def add_asset app, file, ext
171
149
  dir = ''
172
150
  new_ext = false
173
151
 
@@ -190,20 +168,43 @@ module Conjoin
190
168
  case ext
191
169
  when 'css'
192
170
  %w(scss styl).each do |type|
193
- new_ext = type if stylesheet_assets.include? file + ".#{type}"
171
+ new_ext = type if app.settings[:assets]['stylesheet'].include? file + ".#{type}"
194
172
  end
195
173
  when 'js'
196
- new_ext = 'coffee' if javascript_assets.include? file + '.coffee' \
197
- or javascript_head_assets.include? file + '.coffee'
174
+ new_ext = 'coffee' if app.settings[:assets]['javascript'].include? file + '.coffee' \
175
+ or app.settings[:assets]['javascript_head'].include? file + '.coffee'
198
176
  end
199
177
 
200
178
  if new_ext
201
- render "#{Assets.app.root}/app/#{dir}#{file}.#{new_ext}"
179
+ app.render "#{Assets.app.root}/app/#{dir}#{file}.#{new_ext}"
202
180
  else
203
181
  File.read "#{Assets.app.root}/app/#{dir}#{file}.#{ext}"
204
182
  end
205
183
  end
184
+ end
185
+ extend ClassMethods
186
+
187
+ class Helpers
188
+ def asset_path path
189
+ app.root + '/app/assets/' + path
190
+ end
191
+ end
192
+
193
+ class Routes < Struct.new(:settings)
194
+ def app
195
+ App.settings = settings
196
+ App.root = settings[:root]
197
+ App.plugin Conjoin::Cuba::Render
198
+ App.plugin Assets
199
+ App
200
+ end
201
+ end
206
202
 
203
+ # erb = Tilt::ERBTemplate.new "#{Assets.app.root}/app/assets/#{file}.scss"
204
+ # scss = Tilt::ScssTemplate.new{ erb.render(Helpers.new) }
205
+
206
+ # scss.render
207
+ class App < Conjoin::Cuba
207
208
  define do
208
209
  on get, accepted_assets do |file, ext|
209
210
  res.headers["Content-Type"] = "#{MimeMagic.by_extension(ext).to_s}; charset=utf-8"
@@ -217,7 +218,7 @@ module Conjoin
217
218
 
218
219
  res.write content
219
220
  else
220
- res.write add_asset file, ext
221
+ res.write Assets.add_asset(self, file, ext)
221
222
  end
222
223
  end
223
224
  end
data/lib/conjoin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Conjoin
2
- VERSION = "0.0.32"
2
+ VERSION = "0.0.33"
3
3
  end
metadata CHANGED
@@ -1,433 +1,433 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjoin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.32
4
+ version: 0.0.33
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-04 00:00:00.000000000 Z
11
+ date: 2014-05-06 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: bundler
415
415
  requirement: !ruby/object:Gem::Requirement
416
416
  requirements:
417
- - - "~>"
417
+ - - ~>
418
418
  - !ruby/object:Gem::Version
419
419
  version: '1.3'
420
- - - ">="
420
+ - - '>='
421
421
  - !ruby/object:Gem::Version
422
422
  version: '1.3'
423
423
  type: :development
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'
430
- - - ">="
430
+ - - '>='
431
431
  - !ruby/object:Gem::Version
432
432
  version: '1.3'
433
433
  description: Still in development
@@ -437,7 +437,7 @@ executables: []
437
437
  extensions: []
438
438
  extra_rdoc_files: []
439
439
  files:
440
- - ".gitignore"
440
+ - .gitignore
441
441
  - Gemfile
442
442
  - LICENSE.txt
443
443
  - README.md
@@ -493,17 +493,17 @@ require_paths:
493
493
  - lib
494
494
  required_ruby_version: !ruby/object:Gem::Requirement
495
495
  requirements:
496
- - - ">="
496
+ - - '>='
497
497
  - !ruby/object:Gem::Version
498
498
  version: '0'
499
499
  required_rubygems_version: !ruby/object:Gem::Requirement
500
500
  requirements:
501
- - - ">="
501
+ - - '>='
502
502
  - !ruby/object:Gem::Version
503
503
  version: '0'
504
504
  requirements: []
505
505
  rubyforge_project:
506
- rubygems_version: 2.2.2
506
+ rubygems_version: 2.1.11
507
507
  signing_key:
508
508
  specification_version: 4
509
509
  summary: Adds certain things to Cuba to make it more familiar to rails devs