middleman-core 4.1.0.rc.1 → 4.1.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.
Files changed (83) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -1
  3. data/features/asset_hash.feature +44 -6
  4. data/features/asset_host.feature +1 -0
  5. data/features/automatic_image_sizes.feature +18 -5
  6. data/fixtures/asset-hash-host-app/source/index.html.erb +1 -1
  7. data/fixtures/asset-host-app/config.rb +1 -0
  8. data/fixtures/asset-host-app/source/asset_host.html.erb +9 -0
  9. data/fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown +1 -0
  10. data/lib/middleman-core/application.rb +68 -58
  11. data/lib/middleman-core/builder.rb +24 -18
  12. data/lib/middleman-core/callback_manager.rb +8 -1
  13. data/lib/middleman-core/contracts.rb +13 -102
  14. data/lib/middleman-core/core_extensions.rb +6 -0
  15. data/lib/middleman-core/core_extensions/collections/lazy_step.rb +1 -1
  16. data/lib/middleman-core/core_extensions/data.rb +3 -2
  17. data/lib/middleman-core/core_extensions/default_helpers.rb +5 -5
  18. data/lib/middleman-core/core_extensions/external_helpers.rb +6 -11
  19. data/lib/middleman-core/core_extensions/file_watcher.rb +1 -1
  20. data/lib/middleman-core/core_extensions/front_matter.rb +1 -0
  21. data/lib/middleman-core/core_extensions/i18n.rb +4 -4
  22. data/lib/middleman-core/core_extensions/inline_url_rewriter.rb +150 -0
  23. data/lib/middleman-core/core_extensions/routing.rb +22 -28
  24. data/lib/middleman-core/core_extensions/show_exceptions.rb +1 -7
  25. data/lib/middleman-core/extension.rb +19 -2
  26. data/lib/middleman-core/extension_manager.rb +2 -0
  27. data/lib/middleman-core/extensions.rb +12 -0
  28. data/lib/middleman-core/extensions/asset_hash.rb +21 -20
  29. data/lib/middleman-core/extensions/asset_host.rb +9 -10
  30. data/lib/middleman-core/extensions/automatic_image_sizes.rb +1 -1
  31. data/lib/middleman-core/extensions/cache_buster.rb +6 -12
  32. data/lib/middleman-core/extensions/gzip.rb +2 -2
  33. data/lib/middleman-core/extensions/lorem.rb +1 -1
  34. data/lib/middleman-core/extensions/minify_css.rb +2 -2
  35. data/lib/middleman-core/extensions/minify_javascript.rb +2 -2
  36. data/lib/middleman-core/extensions/relative_assets.rb +6 -12
  37. data/lib/middleman-core/preview_server.rb +11 -9
  38. data/lib/middleman-core/preview_server/server_hostname.rb +2 -2
  39. data/lib/middleman-core/rack.rb +1 -1
  40. data/lib/middleman-core/renderers/kramdown.rb +1 -1
  41. data/lib/middleman-core/renderers/less.rb +3 -4
  42. data/lib/middleman-core/renderers/markdown.rb +2 -8
  43. data/lib/middleman-core/renderers/redcarpet.rb +1 -1
  44. data/lib/middleman-core/renderers/sass.rb +8 -11
  45. data/lib/middleman-core/renderers/stylus.rb +1 -5
  46. data/lib/middleman-core/sitemap/extensions/ignores.rb +5 -4
  47. data/lib/middleman-core/sitemap/extensions/import.rb +12 -15
  48. data/lib/middleman-core/sitemap/extensions/move_file.rb +3 -3
  49. data/lib/middleman-core/sitemap/extensions/proxies.rb +4 -4
  50. data/lib/middleman-core/sitemap/extensions/redirects.rb +16 -28
  51. data/lib/middleman-core/sitemap/extensions/request_endpoints.rb +17 -35
  52. data/lib/middleman-core/sitemap/extensions/traversal.rb +5 -5
  53. data/lib/middleman-core/sitemap/resource.rb +16 -16
  54. data/lib/middleman-core/sitemap/store.rb +42 -31
  55. data/lib/middleman-core/sources.rb +9 -9
  56. data/lib/middleman-core/sources/source_watcher.rb +14 -10
  57. data/lib/middleman-core/step_definitions/server_steps.rb +12 -4
  58. data/lib/middleman-core/template_context.rb +1 -1
  59. data/lib/middleman-core/template_renderer.rb +74 -75
  60. data/lib/middleman-core/util.rb +19 -16
  61. data/lib/middleman-core/util/data.rb +86 -82
  62. data/lib/middleman-core/version.rb +1 -1
  63. data/middleman-core.gemspec +1 -0
  64. metadata +19 -39
  65. data/features/cli/preview_server-hook.feature +0 -17
  66. data/features/cli/preview_server.feature +0 -536
  67. data/features/cli_extension.feature +0 -14
  68. data/features/cli_init.feature +0 -89
  69. data/fixtures/asset-hash-host-app/config.rb +0 -4
  70. data/fixtures/preview-server-app/bin/dns_server.rb +0 -33
  71. data/fixtures/preview-server-app/config.rb +0 -0
  72. data/fixtures/preview-server-app/source/index.html.erb +0 -1
  73. data/fixtures/preview-server-app/source/layout.erb +0 -9
  74. data/fixtures/preview-server-app/source/layouts/custom.erb +0 -8
  75. data/fixtures/preview-server-app/source/real.html +0 -1
  76. data/fixtures/preview-server-app/source/real/index.html.erb +0 -5
  77. data/fixtures/preview-server-app/source/should_be_ignored.html +0 -1
  78. data/fixtures/preview-server-app/source/should_be_ignored2.html +0 -1
  79. data/fixtures/preview-server-app/source/should_be_ignored3.html +0 -1
  80. data/fixtures/preview-server-app/source/static.html +0 -1
  81. data/fixtures/preview-server-hook-app/config.rb +0 -19
  82. data/fixtures/preview-server-hook-app/source/index.html.erb +0 -9
  83. data/lib/middleman-core/middleware/inline_url_rewriter.rb +0 -109
@@ -10,6 +10,9 @@ require 'rack/mime'
10
10
 
11
11
  # DbC
12
12
  require 'middleman-core/contracts'
13
+ require 'middleman-core/application'
14
+ require 'middleman-core/sources'
15
+ require 'middleman-core/sitemap/resource'
13
16
 
14
17
  # Indifferent Access
15
18
  require 'hashie'
@@ -104,7 +107,7 @@ module Middleman
104
107
  Contract String => String
105
108
  def normalize_path(path)
106
109
  # The tr call works around a bug in Ruby's Unicode handling
107
- URI.decode(path).sub(%r{^/}, '').tr('', '')
110
+ ::URI.decode(path).sub(%r{^/}, '').tr('', '')
108
111
  end
109
112
 
110
113
  # This is a separate method from normalize_path in case we
@@ -150,7 +153,7 @@ module Middleman
150
153
  all_files_under(child, &ignore)
151
154
  end.compact
152
155
  elsif path.file?
153
- if block_given? && ignore.call(path)
156
+ if block_given? && yield(path)
154
157
  []
155
158
  else
156
159
  [path]
@@ -167,7 +170,7 @@ module Middleman
167
170
  # @param [String, Symbol] source The path to the file
168
171
  # @param [Hash] options Data to pass through.
169
172
  # @return [String]
170
- Contract IsA['Middleman::Application'], Symbol, Or[String, Symbol], Hash => String
173
+ Contract ::Middleman::Application, Symbol, Or[String, Symbol], Hash => String
171
174
  def asset_path(app, kind, source, options={})
172
175
  return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
173
176
 
@@ -198,7 +201,7 @@ module Middleman
198
201
  # @param [String] prefix The type prefix (such as "images")
199
202
  # @param [Hash] options Data to pass through.
200
203
  # @return [String] The fully qualified asset url
201
- Contract IsA['Middleman::Application'], String, String, Hash => String
204
+ Contract ::Middleman::Application, String, String, Hash => String
202
205
  def asset_url(app, path, prefix='', options={})
203
206
  # Don't touch assets which already have a full path
204
207
  return path if path.include?('//') || path.start_with?('data:')
@@ -221,7 +224,7 @@ module Middleman
221
224
  end
222
225
  end
223
226
 
224
- final_result = URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
227
+ final_result = ::URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
225
228
 
226
229
  result_uri = URI(final_result)
227
230
  result_uri.query = uri.query
@@ -232,7 +235,7 @@ module Middleman
232
235
  # Given a source path (referenced either absolutely or relatively)
233
236
  # or a Resource, this will produce the nice URL configured for that
234
237
  # path, respecting :relative_links, directory indexes, etc.
235
- Contract IsA['Middleman::Application'], Or[String, IsA['Middleman::Sitemap::Resource']], Hash => String
238
+ Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
236
239
  def url_for(app, path_or_resource, options={})
237
240
  # Handle Resources and other things which define their own url method
238
241
  url = if path_or_resource.respond_to?(:url)
@@ -244,7 +247,7 @@ module Middleman
244
247
  # Try to parse URL
245
248
  begin
246
249
  uri = URI(url)
247
- rescue URI::InvalidURIError
250
+ rescue ::URI::InvalidURIError
248
251
  # Nothing we can do with it, it's not really a URI
249
252
  return url
250
253
  end
@@ -287,7 +290,7 @@ module Middleman
287
290
 
288
291
  if resource
289
292
  uri.path = if this_resource
290
- URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
293
+ ::URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
291
294
  else
292
295
  resource_url
293
296
  end
@@ -311,7 +314,7 @@ module Middleman
311
314
  # @param [String] path Request path/
312
315
  # @param [Middleman::Application] app The requesting app.
313
316
  # @return [String] Path with index file if necessary.
314
- Contract String, IsA['Middleman::Application'] => String
317
+ Contract String, ::Middleman::Application => String
315
318
  def full_path(path, app)
316
319
  resource = app.sitemap.find_resource_by_destination_path(path)
317
320
 
@@ -346,7 +349,7 @@ module Middleman
346
349
  begin
347
350
  uri = ::Addressable::URI.parse(asset_path)
348
351
 
349
- if uri.relative? && uri.host.nil? && (result = yield(asset_path))
352
+ if uri.relative? && uri.host.nil? && !asset_path.match(/^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
350
353
  "#{opening_character}#{result}"
351
354
  else
352
355
  match
@@ -422,7 +425,7 @@ module Middleman
422
425
  # @param [String] resource_url The target url.
423
426
  # @param [Boolean] relative If the path should be relative.
424
427
  # @return [String]
425
- Contract IsA['Middleman::Sitemap::Resource'], String, Bool => String
428
+ Contract ::Middleman::Sitemap::Resource, String, Bool => String
426
429
  def relative_path_from_resource(curr_resource, resource_url, relative)
427
430
  # Switch to the relative path between resource and the given resource
428
431
  # if we've been asked to.
@@ -480,12 +483,12 @@ module Middleman
480
483
  #
481
484
  # @param [Pathname] path The path.
482
485
  # @return [Middleman::SourceFile]
483
- Contract Pathname, Pathname, Symbol, Bool => IsA['Middleman::SourceFile']
486
+ Contract Pathname, Pathname, Symbol, Bool => ::Middleman::SourceFile
484
487
  def path_to_source_file(path, directory, type, destination_dir)
485
488
  types = Set.new([type])
486
489
 
487
490
  relative_path = path.relative_path_from(directory)
488
- relative_path = File.join(destination_dir, relative_path) if destination_dir
491
+ relative_path = File.join(destination_dir, relative_path) if destination_dir
489
492
 
490
493
  ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types)
491
494
  end
@@ -496,7 +499,7 @@ module Middleman
496
499
  # @param [Middleman::Application] app The app.
497
500
  # @param [Pathname] files The original touched file paths.
498
501
  # @return [Middleman::SourceFile] All related file paths, not including the source file paths.
499
- Contract IsA['Middleman::Application'], ArrayOf[Pathname] => ArrayOf[IsA['Middleman::SourceFile']]
502
+ Contract ::Middleman::Application, ArrayOf[Pathname] => ArrayOf[::Middleman::SourceFile]
500
503
  def find_related_files(app, files)
501
504
  all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
502
505
 
@@ -546,7 +549,7 @@ module Middleman
546
549
  tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
547
550
  end
548
551
 
549
- Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
552
+ ::Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
550
553
  end
551
554
 
552
555
  # Apply a URI template with the given data, producing a normalized
@@ -556,7 +559,7 @@ module Middleman
556
559
  # @param [Hash] data
557
560
  # @return [String] normalized path
558
561
  def apply_uri_template(template, data)
559
- ::Middleman::Util.normalize_path Addressable::URI.unencode(template.expand(data)).to_s
562
+ ::Middleman::Util.normalize_path ::Addressable::URI.unencode(template.expand(data)).to_s
560
563
  end
561
564
 
562
565
  # Use a template to extract parameters from a path, and validate some special (date)
@@ -5,98 +5,102 @@ require 'middleman-core/util'
5
5
  require 'middleman-core/contracts'
6
6
  require 'backports/2.1.0/array/to_h'
7
7
 
8
- module Middleman::Util::Data
9
- include Contracts
8
+ module Middleman
9
+ module Util
10
+ module Data
11
+ include Contracts
10
12
 
11
- module_function
13
+ module_function
12
14
 
13
- # Get the frontmatter and plain content from a file
14
- # @param [String] path
15
- # @return [Array<Hash, String>]
16
- Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]]
17
- def parse(full_path, frontmatter_delims, known_type=nil)
18
- return [{}, nil] if Middleman::Util.binary?(full_path)
15
+ # Get the frontmatter and plain content from a file
16
+ # @param [String] path
17
+ # @return [Array<Hash, String>]
18
+ Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]]
19
+ def parse(full_path, frontmatter_delims, known_type=nil)
20
+ return [{}, nil] if ::Middleman::Util.binary?(full_path)
19
21
 
20
- # Avoid weird race condition when a file is renamed
21
- begin
22
- content = File.read(full_path)
23
- rescue EOFError, IOError, Errno::ENOENT
24
- return [{}, nil]
25
- end
22
+ # Avoid weird race condition when a file is renamed
23
+ begin
24
+ content = File.read(full_path)
25
+ rescue EOFError, IOError, Errno::ENOENT
26
+ return [{}, nil]
27
+ end
26
28
 
27
- start_delims, stop_delims = frontmatter_delims
28
- .values
29
- .flatten(1)
30
- .transpose
31
- .map(&Regexp.method(:union))
29
+ start_delims, stop_delims = frontmatter_delims
30
+ .values
31
+ .flatten(1)
32
+ .transpose
33
+ .map(&Regexp.method(:union))
32
34
 
33
- match = /
34
- \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
35
- (?<start>#{start_delims})[ ]*\r?\n
36
- (?<frontmatter>.*?)[ ]*\r?\n?
37
- ^(?<stop>#{stop_delims})[ ]*\r?\n?
38
- \r?\n?
39
- (?<additional_content>.*)
40
- /mx.match(content) || {}
35
+ match = /
36
+ \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
37
+ (?<start>#{start_delims})[ ]*\r?\n
38
+ (?<frontmatter>.*?)[ ]*\r?\n?
39
+ ^(?<stop>#{stop_delims})[ ]*\r?\n?
40
+ \r?\n?
41
+ (?<additional_content>.*)
42
+ /mx.match(content) || {}
41
43
 
42
- unless match[:frontmatter]
43
- case known_type
44
- when :yaml
45
- return [parse_yaml(content, full_path), nil]
46
- when :json
47
- return [parse_json(content, full_path), nil]
48
- end
49
- end
44
+ unless match[:frontmatter]
45
+ case known_type
46
+ when :yaml
47
+ return [parse_yaml(content, full_path), nil]
48
+ when :json
49
+ return [parse_json(content, full_path), nil]
50
+ end
51
+ end
50
52
 
51
- case [match[:start], match[:stop]]
52
- when *frontmatter_delims[:yaml]
53
- [
54
- parse_yaml(match[:frontmatter], full_path),
55
- match[:additional_content]
56
- ]
57
- when *frontmatter_delims[:json]
58
- [
59
- parse_json("{#{match[:frontmatter]}}", full_path),
60
- match[:additional_content]
61
- ]
62
- else
63
- [
64
- {},
65
- content
66
- ]
67
- end
68
- end
53
+ case [match[:start], match[:stop]]
54
+ when *frontmatter_delims[:yaml]
55
+ [
56
+ parse_yaml(match[:frontmatter], full_path),
57
+ match[:additional_content]
58
+ ]
59
+ when *frontmatter_delims[:json]
60
+ [
61
+ parse_json("{#{match[:frontmatter]}}", full_path),
62
+ match[:additional_content]
63
+ ]
64
+ else
65
+ [
66
+ {},
67
+ content
68
+ ]
69
+ end
70
+ end
69
71
 
70
- # Parse YAML frontmatter out of a string
71
- # @param [String] content
72
- # @return [Hash]
73
- Contract String, Pathname, Bool => Hash
74
- def parse_yaml(content, full_path)
75
- symbolize_recursive(YAML.load(content) || {})
76
- rescue StandardError, Psych::SyntaxError => error
77
- warn "YAML Exception parsing #{full_path}: #{error.message}"
78
- {}
79
- end
72
+ # Parse YAML frontmatter out of a string
73
+ # @param [String] content
74
+ # @return [Hash]
75
+ Contract String, Pathname, Bool => Hash
76
+ def parse_yaml(content, full_path)
77
+ symbolize_recursive(::YAML.load(content) || {})
78
+ rescue StandardError, ::Psych::SyntaxError => error
79
+ warn "YAML Exception parsing #{full_path}: #{error.message}"
80
+ {}
81
+ end
80
82
 
81
- # Parse JSON frontmatter out of a string
82
- # @param [String] content
83
- # @return [Hash]
84
- Contract String, Pathname => Hash
85
- def parse_json(content, full_path)
86
- symbolize_recursive(JSON.parse(content) || {})
87
- rescue StandardError => error
88
- warn "JSON Exception parsing #{full_path}: #{error.message}"
89
- {}
90
- end
83
+ # Parse JSON frontmatter out of a string
84
+ # @param [String] content
85
+ # @return [Hash]
86
+ Contract String, Pathname => Hash
87
+ def parse_json(content, full_path)
88
+ symbolize_recursive(::JSON.parse(content) || {})
89
+ rescue StandardError => error
90
+ warn "JSON Exception parsing #{full_path}: #{error.message}"
91
+ {}
92
+ end
91
93
 
92
- def symbolize_recursive(value)
93
- case value
94
- when Hash
95
- value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h
96
- when Array
97
- value.map { |v| symbolize_recursive(v) }
98
- else
99
- value
94
+ def symbolize_recursive(value)
95
+ case value
96
+ when Hash
97
+ value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h
98
+ when Array
99
+ value.map { |v| symbolize_recursive(v) }
100
+ else
101
+ value
102
+ end
103
+ end
100
104
  end
101
105
  end
102
106
  end
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  # Current Version
3
3
  # @return [String]
4
- VERSION = '4.1.0.rc.1' unless const_defined?(:VERSION)
4
+ VERSION = '4.1.0.rc.2'.freeze unless const_defined?(:VERSION)
5
5
  end
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_dependency('rack', ['>= 1.4.5', '< 2.0'])
24
24
  s.add_dependency('tilt', ['~> 1.4.1'])
25
25
  s.add_dependency('erubis')
26
+ s.add_dependency('fast_blank')
26
27
 
27
28
  # Helpers
28
29
  s.add_dependency('activesupport', ['~> 4.2'])
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.rc.1
4
+ version: 4.1.0.rc.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-01-11 00:00:00.000000000 Z
13
+ date: 2016-01-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
@@ -74,6 +74,20 @@ dependencies:
74
74
  - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
+ - !ruby/object:Gem::Dependency
78
+ name: fast_blank
79
+ requirement: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - ">="
82
+ - !ruby/object:Gem::Version
83
+ version: '0'
84
+ type: :runtime
85
+ prerelease: false
86
+ version_requirements: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - ">="
89
+ - !ruby/object:Gem::Version
90
+ version: '0'
77
91
  - !ruby/object:Gem::Dependency
78
92
  name: activesupport
79
93
  requirement: !ruby/object:Gem::Requirement
@@ -298,10 +312,6 @@ files:
298
312
  - features/capture_html.feature
299
313
  - features/chained_templates.feature
300
314
  - features/clean_build.feature
301
- - features/cli/preview_server-hook.feature
302
- - features/cli/preview_server.feature
303
- - features/cli_extension.feature
304
- - features/cli_init.feature
305
315
  - features/coffee-script.feature
306
316
  - features/collections.feature
307
317
  - features/console.feature
@@ -411,7 +421,6 @@ files:
411
421
  - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
412
422
  - fixtures/asset-hash-app/source/subdir/api.json.erb
413
423
  - fixtures/asset-hash-app/source/subdir/index.html.erb
414
- - fixtures/asset-hash-host-app/config.rb
415
424
  - fixtures/asset-hash-host-app/source/images/100px.gif
416
425
  - fixtures/asset-hash-host-app/source/images/100px.jpg
417
426
  - fixtures/asset-hash-host-app/source/images/100px.png
@@ -462,6 +471,7 @@ files:
462
471
  - fixtures/automatic-image-size-app/config.rb
463
472
  - fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
464
473
  - fixtures/automatic-image-size-app/source/images/blank.gif
474
+ - fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown
465
475
  - fixtures/basic-data-app/config.rb
466
476
  - fixtures/basic-data-app/data/test.yml
467
477
  - fixtures/basic-data-app/data/test2.json
@@ -1181,19 +1191,6 @@ files:
1181
1191
  - fixtures/preview-app/config.rb
1182
1192
  - fixtures/preview-app/source/content.html.erb
1183
1193
  - fixtures/preview-app/source/layout.erb
1184
- - fixtures/preview-server-app/bin/dns_server.rb
1185
- - fixtures/preview-server-app/config.rb
1186
- - fixtures/preview-server-app/source/index.html.erb
1187
- - fixtures/preview-server-app/source/layout.erb
1188
- - fixtures/preview-server-app/source/layouts/custom.erb
1189
- - fixtures/preview-server-app/source/real.html
1190
- - fixtures/preview-server-app/source/real/index.html.erb
1191
- - fixtures/preview-server-app/source/should_be_ignored.html
1192
- - fixtures/preview-server-app/source/should_be_ignored2.html
1193
- - fixtures/preview-server-app/source/should_be_ignored3.html
1194
- - fixtures/preview-server-app/source/static.html
1195
- - fixtures/preview-server-hook-app/config.rb
1196
- - fixtures/preview-server-hook-app/source/index.html.erb
1197
1194
  - fixtures/proxy-pages-app/config.rb
1198
1195
  - fixtures/proxy-pages-app/source/real.html
1199
1196
  - fixtures/proxy-pages-app/source/real/index.html.erb
@@ -1307,6 +1304,7 @@ files:
1307
1304
  - lib/middleman-core/core_extensions/file_watcher.rb
1308
1305
  - lib/middleman-core/core_extensions/front_matter.rb
1309
1306
  - lib/middleman-core/core_extensions/i18n.rb
1307
+ - lib/middleman-core/core_extensions/inline_url_rewriter.rb
1310
1308
  - lib/middleman-core/core_extensions/rendering.rb
1311
1309
  - lib/middleman-core/core_extensions/routing.rb
1312
1310
  - lib/middleman-core/core_extensions/show_exceptions.rb
@@ -1347,7 +1345,6 @@ files:
1347
1345
  - lib/middleman-core/meta_pages/templates/config.html.erb
1348
1346
  - lib/middleman-core/meta_pages/templates/index.html.erb
1349
1347
  - lib/middleman-core/meta_pages/templates/sitemap.html.erb
1350
- - lib/middleman-core/middleware/inline_url_rewriter.rb
1351
1348
  - lib/middleman-core/preview_server.rb
1352
1349
  - lib/middleman-core/preview_server/checks.rb
1353
1350
  - lib/middleman-core/preview_server/information.rb
@@ -1447,10 +1444,6 @@ test_files:
1447
1444
  - features/capture_html.feature
1448
1445
  - features/chained_templates.feature
1449
1446
  - features/clean_build.feature
1450
- - features/cli/preview_server-hook.feature
1451
- - features/cli/preview_server.feature
1452
- - features/cli_extension.feature
1453
- - features/cli_init.feature
1454
1447
  - features/coffee-script.feature
1455
1448
  - features/collections.feature
1456
1449
  - features/console.feature
@@ -1560,7 +1553,6 @@ test_files:
1560
1553
  - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
1561
1554
  - fixtures/asset-hash-app/source/subdir/api.json.erb
1562
1555
  - fixtures/asset-hash-app/source/subdir/index.html.erb
1563
- - fixtures/asset-hash-host-app/config.rb
1564
1556
  - fixtures/asset-hash-host-app/source/images/100px.gif
1565
1557
  - fixtures/asset-hash-host-app/source/images/100px.jpg
1566
1558
  - fixtures/asset-hash-host-app/source/images/100px.png
@@ -1611,6 +1603,7 @@ test_files:
1611
1603
  - fixtures/automatic-image-size-app/config.rb
1612
1604
  - fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
1613
1605
  - fixtures/automatic-image-size-app/source/images/blank.gif
1606
+ - fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown
1614
1607
  - fixtures/basic-data-app/config.rb
1615
1608
  - fixtures/basic-data-app/data/test.yml
1616
1609
  - fixtures/basic-data-app/data/test2.json
@@ -2330,19 +2323,6 @@ test_files:
2330
2323
  - fixtures/preview-app/config.rb
2331
2324
  - fixtures/preview-app/source/content.html.erb
2332
2325
  - fixtures/preview-app/source/layout.erb
2333
- - fixtures/preview-server-app/bin/dns_server.rb
2334
- - fixtures/preview-server-app/config.rb
2335
- - fixtures/preview-server-app/source/index.html.erb
2336
- - fixtures/preview-server-app/source/layout.erb
2337
- - fixtures/preview-server-app/source/layouts/custom.erb
2338
- - fixtures/preview-server-app/source/real.html
2339
- - fixtures/preview-server-app/source/real/index.html.erb
2340
- - fixtures/preview-server-app/source/should_be_ignored.html
2341
- - fixtures/preview-server-app/source/should_be_ignored2.html
2342
- - fixtures/preview-server-app/source/should_be_ignored3.html
2343
- - fixtures/preview-server-app/source/static.html
2344
- - fixtures/preview-server-hook-app/config.rb
2345
- - fixtures/preview-server-hook-app/source/index.html.erb
2346
2326
  - fixtures/proxy-pages-app/config.rb
2347
2327
  - fixtures/proxy-pages-app/source/real.html
2348
2328
  - fixtures/proxy-pages-app/source/real/index.html.erb