middleman 2.0.0.beta2 → 2.0.0.beta3
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.
|
@@ -50,7 +50,7 @@ module Middleman::Features::DefaultHelpers
|
|
|
50
50
|
else kind.to_s
|
|
51
51
|
end
|
|
52
52
|
source = source.to_s.gsub(/\s/, '')
|
|
53
|
-
ignore_extension = (
|
|
53
|
+
ignore_extension = (kind == :images) # don't append extension
|
|
54
54
|
source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
|
|
55
55
|
result_path = source if source =~ %r{^/} # absolute path
|
|
56
56
|
result_path ||= asset_url(source, asset_folder)
|
|
@@ -6,12 +6,15 @@ module Middleman::Features::FrontMatter
|
|
|
6
6
|
def registered(app)
|
|
7
7
|
app.extend ClassMethods
|
|
8
8
|
|
|
9
|
+
::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
|
|
9
10
|
::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
|
|
10
11
|
::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
|
|
11
12
|
::Tilt::register BlueClothTemplate, 'markdown', 'mkd', 'md'
|
|
12
13
|
::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
|
|
13
14
|
::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
|
|
14
15
|
::Tilt::register RedClothTemplate, 'textile'
|
|
16
|
+
::Tilt::register ERBTemplate, 'erb', 'rhtml'
|
|
17
|
+
::Tilt::register ErubisTemplate, 'erb', 'rhtml', 'erubis'
|
|
15
18
|
end
|
|
16
19
|
alias :included :registered
|
|
17
20
|
end
|
|
@@ -66,4 +69,13 @@ module Middleman::Features::FrontMatter
|
|
|
66
69
|
class RedClothTemplate < ::Tilt::RedClothTemplate
|
|
67
70
|
include Middleman::Features::FrontMatter::YamlAware
|
|
68
71
|
end
|
|
72
|
+
|
|
73
|
+
# ERb
|
|
74
|
+
class ERBTemplate < ::Tilt::ERBTemplate
|
|
75
|
+
include Middleman::Features::FrontMatter::YamlAware
|
|
76
|
+
end
|
|
77
|
+
|
|
78
|
+
class ErubisTemplate < ::Tilt::ErubisTemplate
|
|
79
|
+
include Middleman::Features::FrontMatter::YamlAware
|
|
80
|
+
end
|
|
69
81
|
end
|
data/lib/middleman/version.rb
CHANGED
data/middleman.gemspec
CHANGED
|
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
|
|
|
31
31
|
s.add_runtime_dependency("haml", ["~> 3.1.0"])
|
|
32
32
|
s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
|
|
33
33
|
s.add_runtime_dependency("sass", ["~> 3.1.0"])
|
|
34
|
-
s.add_runtime_dependency("compass", ["
|
|
34
|
+
s.add_runtime_dependency("compass", ["0.11.2"])
|
|
35
35
|
s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
|
|
36
36
|
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
|
|
37
37
|
s.add_runtime_dependency("httparty", ["~> 0.7.0"])
|
metadata
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
name: middleman
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease: 6
|
|
5
|
-
version: 2.0.0.
|
|
5
|
+
version: 2.0.0.beta3
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
8
8
|
- Thomas Reynolds
|
|
@@ -161,9 +161,9 @@ dependencies:
|
|
|
161
161
|
requirement: &id014 !ruby/object:Gem::Requirement
|
|
162
162
|
none: false
|
|
163
163
|
requirements:
|
|
164
|
-
- -
|
|
164
|
+
- - "="
|
|
165
165
|
- !ruby/object:Gem::Version
|
|
166
|
-
version: 0.11.
|
|
166
|
+
version: 0.11.2
|
|
167
167
|
type: :runtime
|
|
168
168
|
version_requirements: *id014
|
|
169
169
|
- !ruby/object:Gem::Dependency
|