middleman 2.0.3 → 2.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/middleman/core_extensions/data.rb +14 -20
- data/lib/middleman/version.rb +1 -1
- data/middleman.gemspec +1 -2
- metadata +20 -36
@@ -1,5 +1,4 @@
|
|
1
1
|
require "yaml"
|
2
|
-
require "httparty"
|
3
2
|
require "thor"
|
4
3
|
|
5
4
|
module Middleman::CoreExtensions::Data
|
@@ -27,12 +26,12 @@ module Middleman::CoreExtensions::Data
|
|
27
26
|
response = nil
|
28
27
|
|
29
28
|
@@local_sources ||= {}
|
30
|
-
@@
|
29
|
+
@@callback_sources ||= {}
|
31
30
|
|
32
31
|
if @@local_sources.has_key?(path.to_s)
|
33
32
|
response = @@local_sources[path.to_s]
|
34
|
-
elsif @@
|
35
|
-
response =
|
33
|
+
elsif @@callback_sources.has_key?(path.to_s)
|
34
|
+
response = @@callback_sources[path.to_s].call()
|
36
35
|
else
|
37
36
|
file_path = File.join(@app.class.root, @app.class.data_dir, "#{path}.yml")
|
38
37
|
if File.exists? file_path
|
@@ -44,16 +43,16 @@ module Middleman::CoreExtensions::Data
|
|
44
43
|
recursively_enhance(response)
|
45
44
|
end
|
46
45
|
end
|
47
|
-
|
48
|
-
def self.add_source(name, json_url)
|
49
|
-
@@remote_sources ||= {}
|
50
|
-
@@remote_sources[name.to_s] = json_url
|
51
|
-
end
|
52
46
|
|
53
47
|
def self.data_content(name, content)
|
54
48
|
@@local_sources ||= {}
|
55
49
|
@@local_sources[name.to_s] = content
|
56
50
|
end
|
51
|
+
|
52
|
+
def self.data_callback(name, proc)
|
53
|
+
@@callback_sources ||= {}
|
54
|
+
@@callback_sources[name.to_s] = proc
|
55
|
+
end
|
57
56
|
|
58
57
|
private
|
59
58
|
def recursively_enhance(data)
|
@@ -75,19 +74,14 @@ module Middleman::CoreExtensions::Data
|
|
75
74
|
end
|
76
75
|
|
77
76
|
module ClassMethods
|
78
|
-
# Makes
|
79
|
-
#
|
80
|
-
# data_source :my_json, "http://my/file.json"
|
81
|
-
#
|
82
|
-
# Available in templates as:
|
83
|
-
#
|
84
|
-
# data.my_json
|
85
|
-
def data_source(name, url)
|
86
|
-
DataObject.add_source(name, url)
|
87
|
-
end
|
88
|
-
|
77
|
+
# Makes a hash available on the data var with a given name
|
89
78
|
def data_content(name, content)
|
90
79
|
DataObject.data_content(name, content)
|
91
80
|
end
|
81
|
+
|
82
|
+
# Makes a hash available on the data var with a given name
|
83
|
+
def data_callback(name, &block)
|
84
|
+
DataObject.data_callback(name, block)
|
85
|
+
end
|
92
86
|
end
|
93
87
|
end
|
data/lib/middleman/version.rb
CHANGED
data/middleman.gemspec
CHANGED
@@ -52,8 +52,7 @@ eos
|
|
52
52
|
s.add_runtime_dependency("sass", ["~> 3.1.7"])
|
53
53
|
s.add_runtime_dependency("compass", ["~> 0.11.3"])
|
54
54
|
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
|
55
|
-
s.add_runtime_dependency("sprockets", ["2.0.0.beta.
|
56
|
-
s.add_runtime_dependency("httparty", ["~> 0.7.8"])
|
55
|
+
s.add_runtime_dependency("sprockets", ["2.0.0.beta.14"])
|
57
56
|
|
58
57
|
case Config::CONFIG['host_os'].downcase
|
59
58
|
when %r{mswin|mingw}
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 7
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 2
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 2.0.
|
9
|
+
- 4
|
10
|
+
version: 2.0.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Thomas Reynolds
|
@@ -281,36 +281,20 @@ dependencies:
|
|
281
281
|
requirements:
|
282
282
|
- - "="
|
283
283
|
- !ruby/object:Gem::Version
|
284
|
-
hash:
|
284
|
+
hash: 62196479
|
285
285
|
segments:
|
286
286
|
- 2
|
287
287
|
- 0
|
288
288
|
- 0
|
289
289
|
- beta
|
290
|
-
-
|
291
|
-
version: 2.0.0.beta.
|
290
|
+
- 14
|
291
|
+
version: 2.0.0.beta.14
|
292
292
|
type: :runtime
|
293
293
|
version_requirements: *id016
|
294
|
-
- !ruby/object:Gem::Dependency
|
295
|
-
name: httparty
|
296
|
-
prerelease: false
|
297
|
-
requirement: &id017 !ruby/object:Gem::Requirement
|
298
|
-
none: false
|
299
|
-
requirements:
|
300
|
-
- - ~>
|
301
|
-
- !ruby/object:Gem::Version
|
302
|
-
hash: 19
|
303
|
-
segments:
|
304
|
-
- 0
|
305
|
-
- 7
|
306
|
-
- 8
|
307
|
-
version: 0.7.8
|
308
|
-
type: :runtime
|
309
|
-
version_requirements: *id017
|
310
294
|
- !ruby/object:Gem::Dependency
|
311
295
|
name: rb-fsevent
|
312
296
|
prerelease: false
|
313
|
-
requirement: &
|
297
|
+
requirement: &id017 !ruby/object:Gem::Requirement
|
314
298
|
none: false
|
315
299
|
requirements:
|
316
300
|
- - ~>
|
@@ -322,11 +306,11 @@ dependencies:
|
|
322
306
|
- 2
|
323
307
|
version: 0.4.2
|
324
308
|
type: :runtime
|
325
|
-
version_requirements: *
|
309
|
+
version_requirements: *id017
|
326
310
|
- !ruby/object:Gem::Dependency
|
327
311
|
name: guard
|
328
312
|
prerelease: false
|
329
|
-
requirement: &
|
313
|
+
requirement: &id018 !ruby/object:Gem::Requirement
|
330
314
|
none: false
|
331
315
|
requirements:
|
332
316
|
- - ~>
|
@@ -338,11 +322,11 @@ dependencies:
|
|
338
322
|
- 2
|
339
323
|
version: 0.6.2
|
340
324
|
type: :runtime
|
341
|
-
version_requirements: *
|
325
|
+
version_requirements: *id018
|
342
326
|
- !ruby/object:Gem::Dependency
|
343
327
|
name: guard-livereload
|
344
328
|
prerelease: false
|
345
|
-
requirement: &
|
329
|
+
requirement: &id019 !ruby/object:Gem::Requirement
|
346
330
|
none: false
|
347
331
|
requirements:
|
348
332
|
- - ~>
|
@@ -354,11 +338,11 @@ dependencies:
|
|
354
338
|
- 0
|
355
339
|
version: 0.3.0
|
356
340
|
type: :runtime
|
357
|
-
version_requirements: *
|
341
|
+
version_requirements: *id019
|
358
342
|
- !ruby/object:Gem::Dependency
|
359
343
|
name: coffee-filter
|
360
344
|
prerelease: false
|
361
|
-
requirement: &
|
345
|
+
requirement: &id020 !ruby/object:Gem::Requirement
|
362
346
|
none: false
|
363
347
|
requirements:
|
364
348
|
- - ~>
|
@@ -370,11 +354,11 @@ dependencies:
|
|
370
354
|
- 1
|
371
355
|
version: 0.1.1
|
372
356
|
type: :development
|
373
|
-
version_requirements: *
|
357
|
+
version_requirements: *id020
|
374
358
|
- !ruby/object:Gem::Dependency
|
375
359
|
name: cucumber
|
376
360
|
prerelease: false
|
377
|
-
requirement: &
|
361
|
+
requirement: &id021 !ruby/object:Gem::Requirement
|
378
362
|
none: false
|
379
363
|
requirements:
|
380
364
|
- - ~>
|
@@ -386,11 +370,11 @@ dependencies:
|
|
386
370
|
- 2
|
387
371
|
version: 1.0.2
|
388
372
|
type: :development
|
389
|
-
version_requirements: *
|
373
|
+
version_requirements: *id021
|
390
374
|
- !ruby/object:Gem::Dependency
|
391
375
|
name: rake
|
392
376
|
prerelease: false
|
393
|
-
requirement: &
|
377
|
+
requirement: &id022 !ruby/object:Gem::Requirement
|
394
378
|
none: false
|
395
379
|
requirements:
|
396
380
|
- - "="
|
@@ -402,11 +386,11 @@ dependencies:
|
|
402
386
|
- 7
|
403
387
|
version: 0.8.7
|
404
388
|
type: :development
|
405
|
-
version_requirements: *
|
389
|
+
version_requirements: *id022
|
406
390
|
- !ruby/object:Gem::Dependency
|
407
391
|
name: rspec
|
408
392
|
prerelease: false
|
409
|
-
requirement: &
|
393
|
+
requirement: &id023 !ruby/object:Gem::Requirement
|
410
394
|
none: false
|
411
395
|
requirements:
|
412
396
|
- - ~>
|
@@ -418,7 +402,7 @@ dependencies:
|
|
418
402
|
- 0
|
419
403
|
version: 2.6.0
|
420
404
|
type: :development
|
421
|
-
version_requirements: *
|
405
|
+
version_requirements: *id023
|
422
406
|
description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
|
423
407
|
email:
|
424
408
|
- me@tdreyno.com
|