middleman-core 3.0.0.rc.1 → 3.0.0.rc.2
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.
- data/bin/middleman +12 -2
- data/features/custom_layouts.feature +15 -1
- data/fixtures/page-helper-layout-block-app/config.rb +6 -0
- data/fixtures/page-helper-layout-block-app/source/index.html.erb +1 -0
- data/fixtures/page-helper-layout-block-app/source/layouts/alt.erb +3 -0
- data/fixtures/page-helper-layout-block-app/source/layouts/layout.erb +3 -0
- data/fixtures/page-helper-layout-block-app/source/path/child.html.erb +1 -0
- data/fixtures/page-helper-layout-block-app/source/path/index.html.erb +1 -0
- data/lib/middleman-core/application.rb +47 -36
- data/lib/middleman-core/cli/build.rb +6 -2
- data/lib/middleman-core/core_extensions.rb +4 -1
- data/lib/middleman-core/core_extensions/request.rb +3 -3
- data/lib/middleman-core/core_extensions/ruby_encoding.rb +24 -0
- data/lib/middleman-core/extensions.rb +13 -17
- data/lib/middleman-core/preview_server.rb +14 -4
- data/lib/middleman-core/util.rb +20 -1
- data/lib/middleman-core/version.rb +1 -1
- data/middleman-core.gemspec +2 -2
- metadata +128 -130
data/bin/middleman
CHANGED
@@ -22,6 +22,8 @@ if !ENV["MM_ROOT"] && found_path = locate_root
|
|
22
22
|
ENV["MM_ROOT"] = found_path
|
23
23
|
end
|
24
24
|
|
25
|
+
is_bundler_setup = false
|
26
|
+
|
25
27
|
# If we've found the root, try to setup Bundler
|
26
28
|
if ENV["MM_ROOT"]
|
27
29
|
|
@@ -33,12 +35,20 @@ if ENV["MM_ROOT"]
|
|
33
35
|
ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
|
34
36
|
end
|
35
37
|
|
36
|
-
|
38
|
+
if File.exists?(ENV['BUNDLE_GEMFILE'])
|
39
|
+
is_bundler_setup = true
|
40
|
+
require 'bundler/setup'
|
41
|
+
end
|
37
42
|
end
|
38
43
|
|
39
44
|
# Automatically discover extensions in RubyGems
|
40
45
|
require "middleman-core/extensions"
|
41
|
-
|
46
|
+
|
47
|
+
if is_bundler_setup
|
48
|
+
Bundler.require
|
49
|
+
else
|
50
|
+
::Middleman.load_extensions_in_path
|
51
|
+
end
|
42
52
|
|
43
53
|
require "middleman-core/cli"
|
44
54
|
|
@@ -47,4 +47,18 @@ Feature: Custom layouts
|
|
47
47
|
When I go to "/custom-layout-dir/"
|
48
48
|
Then I should see "Custom Layout"
|
49
49
|
When I go to "/custom-layout-dir/index.html"
|
50
|
-
Then I should see "Custom Layout"
|
50
|
+
Then I should see "Custom Layout"
|
51
|
+
|
52
|
+
Scenario: Setting layout inside a matching page block
|
53
|
+
Given the Server is running at "page-helper-layout-block-app"
|
54
|
+
When I go to "/index.html"
|
55
|
+
Then I should see "Hello"
|
56
|
+
And I should see "World"
|
57
|
+
When I go to "/path/child.html"
|
58
|
+
Then I should see "Alt"
|
59
|
+
And I should see "Child"
|
60
|
+
And I should not see "Hello"
|
61
|
+
When I go to "/path/index.html"
|
62
|
+
Then I should see "Alt"
|
63
|
+
And I should see "Monde"
|
64
|
+
And I should not see "Hello"
|
@@ -0,0 +1 @@
|
|
1
|
+
World
|
@@ -0,0 +1 @@
|
|
1
|
+
Child
|
@@ -0,0 +1 @@
|
|
1
|
+
Monde
|
@@ -11,19 +11,19 @@ require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
|
|
11
11
|
require "middleman-core/sitemap"
|
12
12
|
|
13
13
|
require "middleman-core/core_extensions"
|
14
|
-
|
14
|
+
|
15
15
|
# Core Middleman Class
|
16
16
|
module Middleman
|
17
17
|
class Application
|
18
18
|
# Uses callbacks
|
19
19
|
include Hooks
|
20
|
-
|
20
|
+
|
21
21
|
# Before request hook
|
22
22
|
define_hook :before
|
23
|
-
|
23
|
+
|
24
24
|
# Ready (all loading and parsing of extensions complete) hook
|
25
25
|
define_hook :ready
|
26
|
-
|
26
|
+
|
27
27
|
class << self
|
28
28
|
# Mix-in helper methods. Accepts either a list of Modules
|
29
29
|
# and/or a block to be evaluated
|
@@ -32,7 +32,7 @@ module Middleman
|
|
32
32
|
class_eval(&block) if block_given?
|
33
33
|
include(*extensions) if extensions.any?
|
34
34
|
end
|
35
|
-
|
35
|
+
|
36
36
|
# Access class-wide defaults
|
37
37
|
#
|
38
38
|
# @private
|
@@ -40,7 +40,7 @@ module Middleman
|
|
40
40
|
def defaults
|
41
41
|
@defaults ||= {}
|
42
42
|
end
|
43
|
-
|
43
|
+
|
44
44
|
# Set class-wide defaults
|
45
45
|
#
|
46
46
|
# @param [Symbol] key Unique key name
|
@@ -49,13 +49,13 @@ module Middleman
|
|
49
49
|
def set(key, value=nil, &block)
|
50
50
|
@defaults ||= {}
|
51
51
|
@defaults[key] = value
|
52
|
-
|
52
|
+
|
53
53
|
@inst.set(key, value, &block) if @inst
|
54
54
|
end
|
55
55
|
end
|
56
|
-
|
56
|
+
|
57
57
|
delegate :helpers, :to => :"self.class"
|
58
|
-
|
58
|
+
|
59
59
|
# Set attributes (global variables)
|
60
60
|
#
|
61
61
|
# @param [Symbol] key Name of the attribue
|
@@ -67,24 +67,24 @@ module Middleman
|
|
67
67
|
value = block if block_given?
|
68
68
|
send(setter, value)
|
69
69
|
end
|
70
|
-
|
70
|
+
|
71
71
|
# Root project directory (overwritten in middleman build/server)
|
72
72
|
# @return [String]
|
73
73
|
set :root, ENV["MM_ROOT"] || Dir.pwd
|
74
|
-
|
74
|
+
|
75
75
|
# Pathname-addressed root
|
76
76
|
def root_path
|
77
77
|
@_root_path ||= Pathname.new(root)
|
78
78
|
end
|
79
|
-
|
79
|
+
|
80
80
|
# Name of the source directory
|
81
81
|
# @return [String]
|
82
82
|
set :source, "source"
|
83
|
-
|
83
|
+
|
84
84
|
# Middleman environment. Defaults to :development, set to :build by the build process
|
85
85
|
# @return [String]
|
86
86
|
set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
|
87
|
-
|
87
|
+
|
88
88
|
# Whether logging is active, disabled by default
|
89
89
|
# @return [String]
|
90
90
|
set :logging, false
|
@@ -96,23 +96,31 @@ module Middleman
|
|
96
96
|
# Location of javascripts within source.
|
97
97
|
# @return [String]
|
98
98
|
set :js_dir, "javascripts"
|
99
|
-
|
99
|
+
|
100
100
|
# Location of stylesheets within source. Used by Compass.
|
101
101
|
# @return [String]
|
102
102
|
set :css_dir, "stylesheets"
|
103
|
-
|
103
|
+
|
104
104
|
# Location of images within source. Used by HTML helpers and Compass.
|
105
105
|
# @return [String]
|
106
106
|
set :images_dir, "images"
|
107
107
|
|
108
|
+
# Location of fonts within source. Used by Compass.
|
109
|
+
# @return [String]
|
110
|
+
set :fonts_dir, "fonts"
|
111
|
+
|
108
112
|
# Where to build output files
|
109
113
|
# @return [String]
|
110
114
|
set :build_dir, "build"
|
111
|
-
|
115
|
+
|
112
116
|
# Default prefix for building paths. Used by HTML helpers and Compass.
|
113
117
|
# @return [String]
|
114
118
|
set :http_prefix, "/"
|
115
119
|
|
120
|
+
# Default string encoding for templates and output.
|
121
|
+
# @return [String]
|
122
|
+
set :encoding, "utf-8"
|
123
|
+
|
116
124
|
# Whether to catch and display exceptions
|
117
125
|
# @return [Boolean]
|
118
126
|
set :show_exceptions, true
|
@@ -120,61 +128,64 @@ module Middleman
|
|
120
128
|
# Default layout name
|
121
129
|
# @return [String, Symbold]
|
122
130
|
set :layout, :_auto_layout
|
123
|
-
|
131
|
+
|
124
132
|
# Activate custom features and extensions
|
125
133
|
include Middleman::CoreExtensions::Extensions
|
126
|
-
|
134
|
+
|
135
|
+
# Manage Ruby string encodings
|
136
|
+
include Middleman::CoreExtensions::RubyEncoding
|
137
|
+
|
127
138
|
# Basic Rack Request Handling
|
128
139
|
include Middleman::CoreExtensions::Request
|
129
|
-
|
140
|
+
|
130
141
|
# Handle exceptions
|
131
142
|
register Middleman::CoreExtensions::ShowExceptions
|
132
|
-
|
143
|
+
|
133
144
|
# Add Builder Callbacks
|
134
145
|
register Middleman::CoreExtensions::Builder
|
135
|
-
|
146
|
+
|
136
147
|
# Add Watcher Callbacks
|
137
148
|
register Middleman::CoreExtensions::FileWatcher
|
138
|
-
|
149
|
+
|
139
150
|
# Activate Data package
|
140
151
|
register Middleman::CoreExtensions::Data
|
141
152
|
|
142
153
|
# Setup custom rendering
|
143
154
|
register Middleman::CoreExtensions::Rendering
|
144
|
-
|
155
|
+
|
145
156
|
# Parse YAML from templates. Must be before sitemap so sitemap
|
146
157
|
# extensions see updated frontmatter!
|
147
158
|
register Middleman::CoreExtensions::FrontMatter
|
148
159
|
|
149
160
|
# Sitemap
|
150
161
|
register Middleman::Sitemap
|
151
|
-
|
162
|
+
|
152
163
|
# Setup external helpers
|
153
164
|
register Middleman::CoreExtensions::ExternalHelpers
|
154
|
-
|
165
|
+
|
155
166
|
# with_layout and page routing
|
156
167
|
register Middleman::CoreExtensions::Routing
|
157
|
-
|
168
|
+
|
158
169
|
# Initialize the Middleman project
|
159
170
|
def initialize(&block)
|
160
171
|
# Clear the static class cache
|
161
172
|
cache.clear
|
162
|
-
|
173
|
+
|
163
174
|
# Setup the default values from calls to set before initialization
|
164
175
|
self.class.superclass.defaults.each { |k,v| set(k,v) }
|
165
|
-
|
176
|
+
|
166
177
|
# Evaluate a passed block if given
|
167
178
|
instance_exec(&block) if block_given?
|
168
|
-
|
179
|
+
|
169
180
|
# Build expanded source path once paths have been parsed
|
170
181
|
path = root.dup
|
171
182
|
source_path = ENV["MM_SOURCE"] || self.source
|
172
183
|
path = File.join(root, source_path) unless source_path.empty?
|
173
184
|
set :source_dir, path
|
174
|
-
|
185
|
+
|
175
186
|
super
|
176
187
|
end
|
177
|
-
|
188
|
+
|
178
189
|
# Shared cache instance
|
179
190
|
#
|
180
191
|
# @private
|
@@ -187,7 +198,7 @@ module Middleman
|
|
187
198
|
# Whether we're in development mode
|
188
199
|
# @return [Boolean] If we're in dev mode
|
189
200
|
def development?; environment == :development; end
|
190
|
-
|
201
|
+
|
191
202
|
# Whether we're in build mode
|
192
203
|
# @return [Boolean] If we're in build mode
|
193
204
|
def build?; environment == :build; end
|
@@ -205,7 +216,7 @@ module Middleman
|
|
205
216
|
def logging?
|
206
217
|
logging
|
207
218
|
end
|
208
|
-
|
219
|
+
|
209
220
|
# Expand a path to include the index file if it's a directory
|
210
221
|
#
|
211
222
|
# @private
|
@@ -215,11 +226,11 @@ module Middleman
|
|
215
226
|
cache.fetch(:full_path, path) do
|
216
227
|
parts = path ? path.split('/') : []
|
217
228
|
if parts.last.nil? || parts.last.split('.').length == 1
|
218
|
-
path = File.join(path, index_file)
|
229
|
+
path = File.join(path, index_file)
|
219
230
|
end
|
220
231
|
"/" + path.sub(%r{^/}, '')
|
221
232
|
end
|
222
233
|
end
|
223
|
-
|
234
|
+
|
224
235
|
end
|
225
236
|
end
|
@@ -265,7 +265,11 @@ end
|
|
265
265
|
# Quiet down create file
|
266
266
|
class ::Thor::Actions::CreateFile
|
267
267
|
def on_conflict_behavior(&block)
|
268
|
-
|
269
|
-
|
268
|
+
if identical?
|
269
|
+
say_status :identical, :blue
|
270
|
+
else
|
271
|
+
say_status :create, :green
|
272
|
+
block.call unless pretend?
|
273
|
+
end
|
270
274
|
end
|
271
275
|
end
|
@@ -27,4 +27,7 @@ require "middleman-core/core_extensions/rendering"
|
|
27
27
|
require "middleman-core/core_extensions/routing"
|
28
28
|
|
29
29
|
# Catch and show exceptions at the Rack level
|
30
|
-
require "middleman-core/core_extensions/show_exceptions"
|
30
|
+
require "middleman-core/core_extensions/show_exceptions"
|
31
|
+
|
32
|
+
# Manage Ruby string encodings
|
33
|
+
require "middleman-core/core_extensions/ruby_encoding"
|
@@ -17,8 +17,8 @@ module Middleman
|
|
17
17
|
::Rack::Mime::MIME_TYPES['.htc'] = 'text/x-component'
|
18
18
|
|
19
19
|
# Let's serve all HTML as UTF-8
|
20
|
-
::Rack::Mime::MIME_TYPES['.html'] = 'text/html;charset=
|
21
|
-
::Rack::Mime::MIME_TYPES['.htm'] = 'text/html;charset=
|
20
|
+
::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=utf-8'
|
21
|
+
::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=utf-8'
|
22
22
|
|
23
23
|
app.extend ClassMethods
|
24
24
|
app.extend ServerMethods
|
@@ -170,7 +170,7 @@ module Middleman
|
|
170
170
|
})
|
171
171
|
end
|
172
172
|
|
173
|
-
def use(*args, &block); self.class.use(*args); end
|
173
|
+
def use(*args, &block); self.class.use(*args, &block); end
|
174
174
|
def map(*args, &block); self.class.map(*args, &block); end
|
175
175
|
|
176
176
|
# Rack env
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# Simple extension to manage Ruby encodings
|
2
|
+
module Middleman::CoreExtensions::RubyEncoding
|
3
|
+
|
4
|
+
# Setup extension
|
5
|
+
class << self
|
6
|
+
|
7
|
+
# Once registerd
|
8
|
+
def registered(app)
|
9
|
+
app.send :include, InstanceMethods
|
10
|
+
end
|
11
|
+
|
12
|
+
end
|
13
|
+
|
14
|
+
module InstanceMethods
|
15
|
+
def initialize
|
16
|
+
if Object.const_defined?(:Encoding)
|
17
|
+
Encoding.default_internal = encoding
|
18
|
+
Encoding.default_external = encoding
|
19
|
+
end
|
20
|
+
|
21
|
+
super
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -58,23 +58,19 @@ module Middleman
|
|
58
58
|
#
|
59
59
|
# @private
|
60
60
|
def load_extensions_in_path
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
require "
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
extensions.each do |spec|
|
76
|
-
require spec.name
|
77
|
-
end
|
61
|
+
require "rubygems"
|
62
|
+
|
63
|
+
begin
|
64
|
+
require "middleman-more"
|
65
|
+
rescue LoadError
|
66
|
+
end
|
67
|
+
|
68
|
+
extensions = rubygems_latest_specs.select do |spec|
|
69
|
+
spec_has_file?(spec, EXTENSION_FILE)
|
70
|
+
end
|
71
|
+
|
72
|
+
extensions.each do |spec|
|
73
|
+
require spec.name
|
78
74
|
end
|
79
75
|
end
|
80
76
|
|
@@ -32,6 +32,8 @@ module Middleman
|
|
32
32
|
)
|
33
33
|
|
34
34
|
mount_instance(app)
|
35
|
+
|
36
|
+
start_file_watcher unless options[:"disable-watcher"]
|
35
37
|
|
36
38
|
@initialized ||= false
|
37
39
|
unless @initialized
|
@@ -39,7 +41,9 @@ module Middleman
|
|
39
41
|
|
40
42
|
register_signal_handlers unless ::Middleman::WINDOWS
|
41
43
|
|
42
|
-
|
44
|
+
# Save the last-used options so it may be re-used when
|
45
|
+
# reloading later on.
|
46
|
+
@last_options = options
|
43
47
|
|
44
48
|
@webrick.start
|
45
49
|
end
|
@@ -56,7 +60,7 @@ module Middleman
|
|
56
60
|
# @return [void]
|
57
61
|
def reload
|
58
62
|
stop
|
59
|
-
start
|
63
|
+
start @last_options
|
60
64
|
end
|
61
65
|
|
62
66
|
# Stop the current instance, exit Webrick
|
@@ -79,7 +83,10 @@ module Middleman
|
|
79
83
|
|
80
84
|
if added_and_modified.length > 0
|
81
85
|
# See if the changed file is config.rb or lib/*.rb
|
82
|
-
|
86
|
+
if needs_to_reload?(added_and_modified)
|
87
|
+
reload
|
88
|
+
return listener.stop
|
89
|
+
end
|
83
90
|
|
84
91
|
# Otherwise forward to Middleman
|
85
92
|
added_and_modified.each do |path|
|
@@ -89,7 +96,10 @@ module Middleman
|
|
89
96
|
|
90
97
|
if removed.length > 0
|
91
98
|
# See if the changed file is config.rb or lib/*.rb
|
92
|
-
|
99
|
+
if needs_to_reload?(removed)
|
100
|
+
reload
|
101
|
+
return listener.stop
|
102
|
+
end
|
93
103
|
|
94
104
|
# Otherwise forward to Middleman
|
95
105
|
removed.each do |path|
|
data/lib/middleman-core/util.rb
CHANGED
@@ -56,6 +56,25 @@ module Middleman
|
|
56
56
|
end
|
57
57
|
end
|
58
58
|
|
59
|
+
# Takes a matcher, which can be a literal string
|
60
|
+
# or a string containing glob expressions, or a
|
61
|
+
# regexp, or a proc, or anything else that responds
|
62
|
+
# to #match or #call, and returns whether or not the
|
63
|
+
# given path matches that matcher.
|
64
|
+
#
|
65
|
+
# @param matcher A matcher string/regexp/proc/etc
|
66
|
+
# @param path A path as a string
|
67
|
+
# @return [Boolean] Whether the path matches the matcher
|
68
|
+
def self.path_match(matcher, path)
|
69
|
+
if matcher.respond_to? :match
|
70
|
+
matcher.match path
|
71
|
+
elsif matcher.respond_to? :call
|
72
|
+
matcher.call path
|
73
|
+
else
|
74
|
+
File.fnmatch(matcher.to_s, path)
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
59
78
|
# Simple shared cache implementation
|
60
79
|
class Cache
|
61
80
|
# Initialize
|
@@ -113,4 +132,4 @@ module Middleman
|
|
113
132
|
end
|
114
133
|
end
|
115
134
|
end
|
116
|
-
end
|
135
|
+
end
|
data/middleman-core.gemspec
CHANGED
@@ -30,9 +30,9 @@ Gem::Specification.new do |s|
|
|
30
30
|
s.add_dependency("thor", ["~> 0.14.3"])
|
31
31
|
|
32
32
|
# Helpers
|
33
|
-
s.add_dependency("activesupport", ["~> 3.2.
|
33
|
+
s.add_dependency("activesupport", ["~> 3.2.6"])
|
34
34
|
|
35
35
|
# Watcher
|
36
|
-
s.add_dependency("listen", ["~> 0.4.
|
36
|
+
s.add_dependency("listen", ["~> 0.4.5"])
|
37
37
|
end
|
38
38
|
|
metadata
CHANGED
@@ -1,148 +1,140 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman-core
|
3
|
-
version: !ruby/object:Gem::Version
|
4
|
-
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 3.0.0.rc.2
|
5
5
|
prerelease: 6
|
6
|
-
segments:
|
7
|
-
- 3
|
8
|
-
- 0
|
9
|
-
- 0
|
10
|
-
- rc
|
11
|
-
- 1
|
12
|
-
version: 3.0.0.rc.1
|
13
6
|
platform: ruby
|
14
|
-
authors:
|
7
|
+
authors:
|
15
8
|
- Thomas Reynolds
|
16
9
|
- Ben Hollis
|
17
10
|
autorequire:
|
18
11
|
bindir: bin
|
19
12
|
cert_chain: []
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
13
|
+
date: 2012-06-17 00:00:00.000000000 Z
|
14
|
+
dependencies:
|
15
|
+
- !ruby/object:Gem::Dependency
|
16
|
+
name: bundler
|
17
|
+
requirement: !ruby/object:Gem::Requirement
|
26
18
|
none: false
|
27
|
-
requirements:
|
19
|
+
requirements:
|
28
20
|
- - ~>
|
29
|
-
- !ruby/object:Gem::Version
|
30
|
-
|
31
|
-
segments:
|
32
|
-
- 1
|
33
|
-
- 1
|
34
|
-
version: "1.1"
|
35
|
-
version_requirements: *id001
|
36
|
-
name: bundler
|
37
|
-
prerelease: false
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: '1.1'
|
38
23
|
type: :runtime
|
39
|
-
|
40
|
-
|
24
|
+
prerelease: false
|
25
|
+
version_requirements: !ruby/object:Gem::Requirement
|
41
26
|
none: false
|
42
|
-
requirements:
|
27
|
+
requirements:
|
43
28
|
- - ~>
|
44
|
-
- !ruby/object:Gem::Version
|
45
|
-
|
46
|
-
|
47
|
-
- 1
|
48
|
-
- 4
|
49
|
-
- 0
|
50
|
-
version: 1.4.0
|
51
|
-
version_requirements: *id002
|
29
|
+
- !ruby/object:Gem::Version
|
30
|
+
version: '1.1'
|
31
|
+
- !ruby/object:Gem::Dependency
|
52
32
|
name: rack
|
53
|
-
|
33
|
+
requirement: !ruby/object:Gem::Requirement
|
34
|
+
none: false
|
35
|
+
requirements:
|
36
|
+
- - ~>
|
37
|
+
- !ruby/object:Gem::Version
|
38
|
+
version: 1.4.0
|
54
39
|
type: :runtime
|
55
|
-
|
56
|
-
|
40
|
+
prerelease: false
|
41
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
42
|
none: false
|
58
|
-
requirements:
|
43
|
+
requirements:
|
59
44
|
- - ~>
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
|
62
|
-
|
63
|
-
- 1
|
64
|
-
- 3
|
65
|
-
- 1
|
66
|
-
version: 1.3.1
|
67
|
-
version_requirements: *id003
|
45
|
+
- !ruby/object:Gem::Version
|
46
|
+
version: 1.4.0
|
47
|
+
- !ruby/object:Gem::Dependency
|
68
48
|
name: tilt
|
69
|
-
|
49
|
+
requirement: !ruby/object:Gem::Requirement
|
50
|
+
none: false
|
51
|
+
requirements:
|
52
|
+
- - ~>
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: 1.3.1
|
70
55
|
type: :runtime
|
71
|
-
|
72
|
-
|
56
|
+
prerelease: false
|
57
|
+
version_requirements: !ruby/object:Gem::Requirement
|
73
58
|
none: false
|
74
|
-
requirements:
|
59
|
+
requirements:
|
75
60
|
- - ~>
|
76
|
-
- !ruby/object:Gem::Version
|
77
|
-
|
78
|
-
|
79
|
-
- 0
|
80
|
-
- 6
|
81
|
-
- 1
|
82
|
-
version: 0.6.1
|
83
|
-
version_requirements: *id004
|
61
|
+
- !ruby/object:Gem::Version
|
62
|
+
version: 1.3.1
|
63
|
+
- !ruby/object:Gem::Dependency
|
84
64
|
name: rack-test
|
85
|
-
|
65
|
+
requirement: !ruby/object:Gem::Requirement
|
66
|
+
none: false
|
67
|
+
requirements:
|
68
|
+
- - ~>
|
69
|
+
- !ruby/object:Gem::Version
|
70
|
+
version: 0.6.1
|
86
71
|
type: :runtime
|
87
|
-
|
88
|
-
|
72
|
+
prerelease: false
|
73
|
+
version_requirements: !ruby/object:Gem::Requirement
|
89
74
|
none: false
|
90
|
-
requirements:
|
75
|
+
requirements:
|
91
76
|
- - ~>
|
92
|
-
- !ruby/object:Gem::Version
|
93
|
-
|
94
|
-
|
95
|
-
- 0
|
96
|
-
- 14
|
97
|
-
- 3
|
98
|
-
version: 0.14.3
|
99
|
-
version_requirements: *id005
|
77
|
+
- !ruby/object:Gem::Version
|
78
|
+
version: 0.6.1
|
79
|
+
- !ruby/object:Gem::Dependency
|
100
80
|
name: thor
|
101
|
-
|
81
|
+
requirement: !ruby/object:Gem::Requirement
|
82
|
+
none: false
|
83
|
+
requirements:
|
84
|
+
- - ~>
|
85
|
+
- !ruby/object:Gem::Version
|
86
|
+
version: 0.14.3
|
102
87
|
type: :runtime
|
103
|
-
|
104
|
-
|
88
|
+
prerelease: false
|
89
|
+
version_requirements: !ruby/object:Gem::Requirement
|
105
90
|
none: false
|
106
|
-
requirements:
|
91
|
+
requirements:
|
107
92
|
- - ~>
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
|
110
|
-
|
111
|
-
- 3
|
112
|
-
- 2
|
113
|
-
- 4
|
114
|
-
version: 3.2.4
|
115
|
-
version_requirements: *id006
|
93
|
+
- !ruby/object:Gem::Version
|
94
|
+
version: 0.14.3
|
95
|
+
- !ruby/object:Gem::Dependency
|
116
96
|
name: activesupport
|
117
|
-
|
97
|
+
requirement: !ruby/object:Gem::Requirement
|
98
|
+
none: false
|
99
|
+
requirements:
|
100
|
+
- - ~>
|
101
|
+
- !ruby/object:Gem::Version
|
102
|
+
version: 3.2.6
|
118
103
|
type: :runtime
|
119
|
-
|
120
|
-
|
104
|
+
prerelease: false
|
105
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
106
|
none: false
|
122
|
-
requirements:
|
107
|
+
requirements:
|
123
108
|
- - ~>
|
124
|
-
- !ruby/object:Gem::Version
|
125
|
-
|
126
|
-
|
127
|
-
- 0
|
128
|
-
- 4
|
129
|
-
- 2
|
130
|
-
version: 0.4.2
|
131
|
-
version_requirements: *id007
|
109
|
+
- !ruby/object:Gem::Version
|
110
|
+
version: 3.2.6
|
111
|
+
- !ruby/object:Gem::Dependency
|
132
112
|
name: listen
|
133
|
-
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
114
|
+
none: false
|
115
|
+
requirements:
|
116
|
+
- - ~>
|
117
|
+
- !ruby/object:Gem::Version
|
118
|
+
version: 0.4.5
|
134
119
|
type: :runtime
|
135
|
-
|
136
|
-
|
120
|
+
prerelease: false
|
121
|
+
version_requirements: !ruby/object:Gem::Requirement
|
122
|
+
none: false
|
123
|
+
requirements:
|
124
|
+
- - ~>
|
125
|
+
- !ruby/object:Gem::Version
|
126
|
+
version: 0.4.5
|
127
|
+
description: A static site generator. Provides dozens of templating languages (Haml,
|
128
|
+
Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
|
129
|
+
busting, Yaml data (and more) an easy part of your development cycle.
|
130
|
+
email:
|
137
131
|
- me@tdreyno.com
|
138
132
|
- ben@benhollis.net
|
139
|
-
executables:
|
133
|
+
executables:
|
140
134
|
- middleman
|
141
135
|
extensions: []
|
142
|
-
|
143
136
|
extra_rdoc_files: []
|
144
|
-
|
145
|
-
files:
|
137
|
+
files:
|
146
138
|
- .gemtest
|
147
139
|
- Rakefile
|
148
140
|
- bin/middleman
|
@@ -314,6 +306,12 @@ files:
|
|
314
306
|
- fixtures/multiple-layouts/source/layout.str
|
315
307
|
- fixtures/no-layout/config.rb
|
316
308
|
- fixtures/no-layout/source/index.html.erb
|
309
|
+
- fixtures/page-helper-layout-block-app/config.rb
|
310
|
+
- fixtures/page-helper-layout-block-app/source/index.html.erb
|
311
|
+
- fixtures/page-helper-layout-block-app/source/layouts/alt.erb
|
312
|
+
- fixtures/page-helper-layout-block-app/source/layouts/layout.erb
|
313
|
+
- fixtures/page-helper-layout-block-app/source/path/child.html.erb
|
314
|
+
- fixtures/page-helper-layout-block-app/source/path/index.html.erb
|
317
315
|
- fixtures/plain-app/index.html
|
318
316
|
- fixtures/preview-app/config.rb
|
319
317
|
- fixtures/preview-app/source/content.html.erb
|
@@ -338,7 +336,7 @@ files:
|
|
338
336
|
- fixtures/traversal-app/source/sub/sub2/index.html.erb
|
339
337
|
- fixtures/traversal-app/source/sub/sub3/deep.html.erb
|
340
338
|
- fixtures/unicode-filenames-app/config.rb
|
341
|
-
-
|
339
|
+
- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
|
342
340
|
- fixtures/wildcard-app/config.rb
|
343
341
|
- fixtures/wildcard-app/source/admin/index.html.erb
|
344
342
|
- fixtures/wildcard-app/source/admin/page.html.erb
|
@@ -363,6 +361,7 @@ files:
|
|
363
361
|
- lib/middleman-core/core_extensions/rendering.rb
|
364
362
|
- lib/middleman-core/core_extensions/request.rb
|
365
363
|
- lib/middleman-core/core_extensions/routing.rb
|
364
|
+
- lib/middleman-core/core_extensions/ruby_encoding.rb
|
366
365
|
- lib/middleman-core/core_extensions/show_exceptions.rb
|
367
366
|
- lib/middleman-core/extensions.rb
|
368
367
|
- lib/middleman-core/preview_server.rb
|
@@ -510,43 +509,35 @@ files:
|
|
510
509
|
- lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb
|
511
510
|
- lib/middleman-core/version.rb
|
512
511
|
- middleman-core.gemspec
|
513
|
-
has_rdoc: true
|
514
512
|
homepage: http://middlemanapp.com
|
515
|
-
licenses:
|
513
|
+
licenses:
|
516
514
|
- MIT
|
517
515
|
post_install_message:
|
518
516
|
rdoc_options: []
|
519
|
-
|
520
|
-
require_paths:
|
517
|
+
require_paths:
|
521
518
|
- lib
|
522
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
519
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
523
520
|
none: false
|
524
|
-
requirements:
|
525
|
-
- -
|
526
|
-
- !ruby/object:Gem::Version
|
527
|
-
|
528
|
-
segments:
|
521
|
+
requirements:
|
522
|
+
- - ! '>='
|
523
|
+
- !ruby/object:Gem::Version
|
524
|
+
version: '0'
|
525
|
+
segments:
|
529
526
|
- 0
|
530
|
-
|
531
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
527
|
+
hash: 1155091797610046415
|
528
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
532
529
|
none: false
|
533
|
-
requirements:
|
534
|
-
- -
|
535
|
-
- !ruby/object:Gem::Version
|
536
|
-
hash: 25
|
537
|
-
segments:
|
538
|
-
- 1
|
539
|
-
- 3
|
540
|
-
- 1
|
530
|
+
requirements:
|
531
|
+
- - ! '>'
|
532
|
+
- !ruby/object:Gem::Version
|
541
533
|
version: 1.3.1
|
542
534
|
requirements: []
|
543
|
-
|
544
535
|
rubyforge_project:
|
545
|
-
rubygems_version: 1.
|
536
|
+
rubygems_version: 1.8.23
|
546
537
|
signing_key:
|
547
538
|
specification_version: 3
|
548
539
|
summary: Hand-crafted frontend development
|
549
|
-
test_files:
|
540
|
+
test_files:
|
550
541
|
- features/3rd_party_cli.feature
|
551
542
|
- features/auto_layout.feature
|
552
543
|
- features/builder.feature
|
@@ -715,6 +706,12 @@ test_files:
|
|
715
706
|
- fixtures/multiple-layouts/source/layout.str
|
716
707
|
- fixtures/no-layout/config.rb
|
717
708
|
- fixtures/no-layout/source/index.html.erb
|
709
|
+
- fixtures/page-helper-layout-block-app/config.rb
|
710
|
+
- fixtures/page-helper-layout-block-app/source/index.html.erb
|
711
|
+
- fixtures/page-helper-layout-block-app/source/layouts/alt.erb
|
712
|
+
- fixtures/page-helper-layout-block-app/source/layouts/layout.erb
|
713
|
+
- fixtures/page-helper-layout-block-app/source/path/child.html.erb
|
714
|
+
- fixtures/page-helper-layout-block-app/source/path/index.html.erb
|
718
715
|
- fixtures/plain-app/index.html
|
719
716
|
- fixtures/preview-app/config.rb
|
720
717
|
- fixtures/preview-app/source/content.html.erb
|
@@ -739,10 +736,11 @@ test_files:
|
|
739
736
|
- fixtures/traversal-app/source/sub/sub2/index.html.erb
|
740
737
|
- fixtures/traversal-app/source/sub/sub3/deep.html.erb
|
741
738
|
- fixtures/unicode-filenames-app/config.rb
|
742
|
-
-
|
739
|
+
- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
|
743
740
|
- fixtures/wildcard-app/config.rb
|
744
741
|
- fixtures/wildcard-app/source/admin/index.html.erb
|
745
742
|
- fixtures/wildcard-app/source/admin/page.html.erb
|
746
743
|
- fixtures/wildcard-app/source/index.html.erb
|
747
744
|
- fixtures/wildcard-app/source/layouts/admin.erb
|
748
745
|
- fixtures/wildcard-app/source/layouts/layout.erb
|
746
|
+
has_rdoc:
|