middleman-core-with-external-sources-watch-fix 4.1.0 → 4.1.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (130) hide show
  1. checksums.yaml +4 -4
  2. data/features/asset_hash.feature +47 -10
  3. data/features/builder.feature +8 -4
  4. data/features/collections.feature +27 -0
  5. data/features/custom_layouts.feature +17 -1
  6. data/features/dynamic_pages.feature +15 -12
  7. data/features/front-matter-neighbor.feature +6 -2
  8. data/features/helpers_link_to.feature +11 -1
  9. data/features/i18n_link_to.feature +34 -34
  10. data/features/markdown_redcarpet_in_slim.feature +41 -0
  11. data/features/page-id.feature +26 -0
  12. data/features/partials.feature +17 -5
  13. data/features/relative_assets.feature +1 -1
  14. data/features/relative_assets_helpers_only.feature +123 -0
  15. data/features/sass_in_slim.feature +40 -0
  16. data/features/template-key-collision.feature +26 -0
  17. data/fixtures/asset-hash-minified-app/source/images/100px.jpg +0 -0
  18. data/fixtures/asset-hash-minified-app/source/stylesheets/test.css +3 -0
  19. data/fixtures/asset-hash-prefix/config.rb +7 -0
  20. data/fixtures/asset-hash-prefix/lib/middleware.rb +16 -0
  21. data/fixtures/asset-hash-prefix/source/index.html.erb +6 -0
  22. data/fixtures/asset-hash-prefix/source/javascripts/application.js +2 -0
  23. data/fixtures/asset-hash-prefix/source/javascripts/application.js.map +1 -0
  24. data/fixtures/asset-hash-prefix/source/layout.erb +17 -0
  25. data/fixtures/asset-hash-source-map/config.rb +6 -0
  26. data/fixtures/asset-hash-source-map/lib/middleware.rb +16 -0
  27. data/fixtures/asset-hash-source-map/source/index.html.erb +6 -0
  28. data/fixtures/asset-hash-source-map/source/javascripts/application.js +2 -0
  29. data/fixtures/asset-hash-source-map/source/javascripts/application.js.map +1 -0
  30. data/fixtures/asset-hash-source-map/source/layout.erb +17 -0
  31. data/fixtures/asset-host-app/source/images/blank0.gif +0 -0
  32. data/fixtures/asset-host-app/source/images/blank1.gif +0 -0
  33. data/fixtures/asset-host-app/source/images/blank10.gif +0 -0
  34. data/fixtures/asset-host-app/source/images/blank100.gif +0 -0
  35. data/fixtures/asset-host-app/source/images/blank101.gif +0 -0
  36. data/fixtures/asset-host-app/source/images/blank1010.gif +0 -0
  37. data/fixtures/asset-host-app/source/images/blank102.gif +0 -0
  38. data/fixtures/asset-host-app/source/images/blank1020.gif +0 -0
  39. data/fixtures/asset-host-app/source/images/blank1021.gif +0 -0
  40. data/fixtures/asset-host-app/source/images/blank1022.gif +0 -0
  41. data/fixtures/asset-host-app/source/images/blank1023.gif +0 -0
  42. data/fixtures/asset-host-app/source/images/blank1024.gif +0 -0
  43. data/fixtures/asset-host-app/source/images/blank103.gif +0 -0
  44. data/fixtures/asset-host-app/source/images/blank1030.gif +0 -0
  45. data/fixtures/asset-host-app/source/images/blank1031.gif +0 -0
  46. data/fixtures/asset-host-app/source/images/blank1032.gif +0 -0
  47. data/fixtures/asset-host-app/source/images/blank1033.gif +0 -0
  48. data/fixtures/asset-host-app/source/images/blank1034.gif +0 -0
  49. data/fixtures/asset-host-app/source/images/blank104.gif +0 -0
  50. data/fixtures/asset-host-app/source/images/blank1043.gif +0 -0
  51. data/fixtures/asset-host-app/source/images/blank1054.gif +0 -0
  52. data/fixtures/asset-host-app/source/images/blank2.gif +0 -0
  53. data/fixtures/asset-host-app/source/images/blank20.gif +0 -0
  54. data/fixtures/asset-host-app/source/images/blank21.gif +0 -0
  55. data/fixtures/asset-host-app/source/images/blank22.gif +0 -0
  56. data/fixtures/asset-host-app/source/images/blank23.gif +0 -0
  57. data/fixtures/asset-host-app/source/images/blank24.gif +0 -0
  58. data/fixtures/asset-host-app/source/images/blank3.gif +0 -0
  59. data/fixtures/asset-host-app/source/images/blank30.gif +0 -0
  60. data/fixtures/asset-host-app/source/images/blank31.gif +0 -0
  61. data/fixtures/asset-host-app/source/images/blank32.gif +0 -0
  62. data/fixtures/asset-host-app/source/images/blank33.gif +0 -0
  63. data/fixtures/asset-host-app/source/images/blank34.gif +0 -0
  64. data/fixtures/asset-host-app/source/images/blank4.gif +0 -0
  65. data/fixtures/asset-host-app/source/images/blank43.gif +0 -0
  66. data/fixtures/asset-host-app/source/images/blank54.gif +0 -0
  67. data/fixtures/dynamic-pages-app/config.rb +4 -0
  68. data/fixtures/dynamic-pages-app/source/should_be_ignored9.html +1 -0
  69. data/fixtures/external-pipeline-error/config.rb +5 -0
  70. data/fixtures/external-pipeline-error/source/javascripts/file.js +0 -0
  71. data/fixtures/page-id-app/config.rb +5 -0
  72. data/fixtures/page-id-app/source/fm.html.erb +5 -0
  73. data/fixtures/page-id-app/source/index.html.erb +6 -0
  74. data/fixtures/page-id-app/source/overwrites/from-default.html.erb +1 -0
  75. data/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb +5 -0
  76. data/fixtures/partials-app/source/_block.erb +3 -0
  77. data/fixtures/partials-app/source/block.html.erb +3 -0
  78. data/fixtures/partials-app/source/index_missing.html.erb +3 -0
  79. data/fixtures/relative-assets-app/source/images/blank2.gif +0 -0
  80. data/fixtures/sass-in-slim-app/config.rb +0 -0
  81. data/lib/middleman-core/application.rb +30 -4
  82. data/lib/middleman-core/builder.rb +8 -2
  83. data/lib/middleman-core/config_context.rb +5 -1
  84. data/lib/middleman-core/configuration.rb +1 -1
  85. data/lib/middleman-core/core_extensions/collections.rb +28 -17
  86. data/lib/middleman-core/core_extensions/collections/step_context.rb +14 -7
  87. data/lib/middleman-core/core_extensions/data.rb +4 -2
  88. data/lib/middleman-core/core_extensions/default_helpers.rb +1 -0
  89. data/lib/middleman-core/core_extensions/front_matter.rb +8 -6
  90. data/lib/middleman-core/core_extensions/i18n.rb +3 -1
  91. data/lib/middleman-core/core_extensions/inline_url_rewriter.rb +20 -35
  92. data/lib/middleman-core/core_extensions/routing.rb +6 -3
  93. data/lib/middleman-core/extension.rb +41 -6
  94. data/lib/middleman-core/extensions.rb +2 -2
  95. data/lib/middleman-core/extensions/asset_hash.rb +10 -5
  96. data/lib/middleman-core/extensions/asset_host.rb +4 -3
  97. data/lib/middleman-core/extensions/cache_buster.rb +2 -2
  98. data/lib/middleman-core/extensions/directory_indexes.rb +8 -2
  99. data/lib/middleman-core/extensions/external_pipeline.rb +54 -8
  100. data/lib/middleman-core/extensions/minify_css.rb +9 -1
  101. data/lib/middleman-core/extensions/minify_javascript.rb +8 -0
  102. data/lib/middleman-core/extensions/relative_assets.rb +38 -13
  103. data/lib/middleman-core/file_renderer.rb +4 -4
  104. data/lib/middleman-core/load_paths.rb +3 -1
  105. data/lib/middleman-core/logger.rb +1 -1
  106. data/lib/middleman-core/meta_pages/templates/index.html.erb +3 -1
  107. data/lib/middleman-core/preview_server.rb +25 -18
  108. data/lib/middleman-core/rack.rb +2 -0
  109. data/lib/middleman-core/renderers/redcarpet.rb +2 -2
  110. data/lib/middleman-core/renderers/sass_functions.rb +4 -6
  111. data/lib/middleman-core/renderers/slim.rb +1 -5
  112. data/lib/middleman-core/sitemap/extensions/import.rb +2 -2
  113. data/lib/middleman-core/sitemap/extensions/proxies.rb +4 -1
  114. data/lib/middleman-core/sitemap/extensions/redirects.rb +1 -2
  115. data/lib/middleman-core/sitemap/resource.rb +15 -5
  116. data/lib/middleman-core/sitemap/store.rb +33 -2
  117. data/lib/middleman-core/sources.rb +2 -1
  118. data/lib/middleman-core/sources/source_watcher.rb +17 -6
  119. data/lib/middleman-core/template_context.rb +26 -21
  120. data/lib/middleman-core/template_renderer.rb +22 -9
  121. data/lib/middleman-core/util/binary.rb +4 -5
  122. data/lib/middleman-core/util/data.rb +33 -18
  123. data/lib/middleman-core/util/files.rb +27 -24
  124. data/lib/middleman-core/util/paths.rb +74 -14
  125. data/lib/middleman-core/util/rack.rb +16 -6
  126. data/lib/middleman-core/version.rb +1 -1
  127. data/middleman-core.gemspec +11 -8
  128. data/spec/middleman-core/core_extensions/data_spec.rb +107 -1
  129. data/spec/middleman-core/util_spec.rb +37 -0
  130. metadata +196 -18
@@ -120,6 +120,20 @@ describe Middleman::Util do
120
120
  relative: true ) ).to eq '../images/blank.gif'
121
121
  end
122
122
 
123
+ context "when the asset is stored in the same directory as current_resource" do
124
+ before do
125
+ Given.file 'source/a-path/index.html', ''
126
+ Given.file 'source/a-path/blank.gif', ''
127
+ @mm = Middleman::Application.new
128
+ end
129
+
130
+ it "returns path relative to the provided current_resource" do
131
+ current_resource = @mm.sitemap.find_resource_by_path('a-path/index.html')
132
+ expect( Middleman::Util.asset_url( @mm, 'blank.gif', 'images', current_resource: current_resource,
133
+ relative: true) ).to eq 'blank.gif'
134
+ end
135
+ end
136
+
123
137
  it "raises error if not given a current_resource" do
124
138
  expect{
125
139
  Middleman::Util.asset_url( @mm, 'blank.gif', 'images', relative: true )
@@ -148,6 +162,13 @@ describe Middleman::Util do
148
162
  expect( Middleman::Util.asset_url( @mm, '/how/about/that.html' ) ).to eq '/how/about/that/'
149
163
  end
150
164
 
165
+ it "returns a resource url when asset_hash is on" do
166
+ Given.fixture 'asset-hash-app'
167
+ @mm = Middleman::Application.new
168
+
169
+ expect( Middleman::Util.asset_url( @mm, '100px.png', 'images') ).to match %r|/images/100px-[a-f0-9]+.png|
170
+ end
171
+
151
172
  end
152
173
 
153
174
  describe "::find_related_files" do
@@ -190,4 +211,20 @@ describe Middleman::Util do
190
211
  expect(related).to include File.expand_path("source/stylesheets/include2.css.scss")
191
212
  end
192
213
  end
214
+
215
+ describe "::step_through_extensions" do
216
+ it "returns the base name after templating engine extensions are removed" do
217
+ result = Middleman::Util.step_through_extensions('my_file.html.haml.erb')
218
+ expect(result).to eq 'my_file.html'
219
+ end
220
+
221
+ it "does not loop infinitely when file name is a possible templating engine" do
222
+ expect do
223
+ Timeout::timeout(0.5) do
224
+ result = Middleman::Util.step_through_extensions("markdown.scss")
225
+ expect(result).to eq "markdown"
226
+ end
227
+ end.not_to raise_error
228
+ end
229
+ end
193
230
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-core-with-external-sources-watch-fix
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0
4
+ version: 4.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas Reynolds
@@ -104,6 +104,34 @@ dependencies:
104
104
  - - ">="
105
105
  - !ruby/object:Gem::Version
106
106
  version: '0'
107
+ - !ruby/object:Gem::Dependency
108
+ name: servolux
109
+ requirement: !ruby/object:Gem::Requirement
110
+ requirements:
111
+ - - ">="
112
+ - !ruby/object:Gem::Version
113
+ version: '0'
114
+ type: :runtime
115
+ prerelease: false
116
+ version_requirements: !ruby/object:Gem::Requirement
117
+ requirements:
118
+ - - ">="
119
+ - !ruby/object:Gem::Version
120
+ version: '0'
121
+ - !ruby/object:Gem::Dependency
122
+ name: dotenv
123
+ requirement: !ruby/object:Gem::Requirement
124
+ requirements:
125
+ - - ">="
126
+ - !ruby/object:Gem::Version
127
+ version: '0'
128
+ type: :runtime
129
+ prerelease: false
130
+ version_requirements: !ruby/object:Gem::Requirement
131
+ requirements:
132
+ - - ">="
133
+ - !ruby/object:Gem::Version
134
+ version: '0'
107
135
  - !ruby/object:Gem::Dependency
108
136
  name: activesupport
109
137
  requirement: !ruby/object:Gem::Requirement
@@ -138,28 +166,42 @@ dependencies:
138
166
  requirements:
139
167
  - - "~>"
140
168
  - !ruby/object:Gem::Version
141
- version: 2.4.0
169
+ version: '2.3'
142
170
  type: :runtime
143
171
  prerelease: false
144
172
  version_requirements: !ruby/object:Gem::Requirement
145
173
  requirements:
146
174
  - - "~>"
147
175
  - !ruby/object:Gem::Version
148
- version: 2.4.0
176
+ version: '2.3'
177
+ - !ruby/object:Gem::Dependency
178
+ name: memoist
179
+ requirement: !ruby/object:Gem::Requirement
180
+ requirements:
181
+ - - "~>"
182
+ - !ruby/object:Gem::Version
183
+ version: '0.14'
184
+ type: :runtime
185
+ prerelease: false
186
+ version_requirements: !ruby/object:Gem::Requirement
187
+ requirements:
188
+ - - "~>"
189
+ - !ruby/object:Gem::Version
190
+ version: '0.14'
149
191
  - !ruby/object:Gem::Dependency
150
192
  name: listen
151
193
  requirement: !ruby/object:Gem::Requirement
152
194
  requirements:
153
195
  - - "~>"
154
196
  - !ruby/object:Gem::Version
155
- version: '3.0'
197
+ version: 3.0.0
156
198
  type: :runtime
157
199
  prerelease: false
158
200
  version_requirements: !ruby/object:Gem::Requirement
159
201
  requirements:
160
202
  - - "~>"
161
203
  - !ruby/object:Gem::Version
162
- version: '3.0'
204
+ version: 3.0.0
163
205
  - !ruby/object:Gem::Dependency
164
206
  name: capybara
165
207
  requirement: !ruby/object:Gem::Requirement
@@ -167,7 +209,7 @@ dependencies:
167
209
  - - "~>"
168
210
  - !ruby/object:Gem::Version
169
211
  version: 2.5.0
170
- type: :runtime
212
+ type: :development
171
213
  prerelease: false
172
214
  version_requirements: !ruby/object:Gem::Requirement
173
215
  requirements:
@@ -194,14 +236,14 @@ dependencies:
194
236
  requirements:
195
237
  - - "~>"
196
238
  - !ruby/object:Gem::Version
197
- version: '1.8'
239
+ version: '2.0'
198
240
  type: :runtime
199
241
  prerelease: false
200
242
  version_requirements: !ruby/object:Gem::Requirement
201
243
  requirements:
202
244
  - - "~>"
203
245
  - !ruby/object:Gem::Version
204
- version: '1.8'
246
+ version: '2.0'
205
247
  - !ruby/object:Gem::Dependency
206
248
  name: sass
207
249
  requirement: !ruby/object:Gem::Requirement
@@ -222,14 +264,14 @@ dependencies:
222
264
  requirements:
223
265
  - - "~>"
224
266
  - !ruby/object:Gem::Version
225
- version: '2.6'
267
+ version: '3.0'
226
268
  type: :runtime
227
269
  prerelease: false
228
270
  version_requirements: !ruby/object:Gem::Requirement
229
271
  requirements:
230
272
  - - "~>"
231
273
  - !ruby/object:Gem::Version
232
- version: '2.6'
274
+ version: '3.0'
233
275
  - !ruby/object:Gem::Dependency
234
276
  name: execjs
235
277
  requirement: !ruby/object:Gem::Requirement
@@ -250,14 +292,14 @@ dependencies:
250
292
  requirements:
251
293
  - - "~>"
252
294
  - !ruby/object:Gem::Version
253
- version: 0.12.0
295
+ version: 0.13.0
254
296
  type: :runtime
255
297
  prerelease: false
256
298
  version_requirements: !ruby/object:Gem::Requirement
257
299
  requirements:
258
300
  - - "~>"
259
301
  - !ruby/object:Gem::Version
260
- version: 0.12.0
302
+ version: 0.13.0
261
303
  - !ruby/object:Gem::Dependency
262
304
  name: hashie
263
305
  requirement: !ruby/object:Gem::Requirement
@@ -278,14 +320,14 @@ dependencies:
278
320
  requirements:
279
321
  - - "~>"
280
322
  - !ruby/object:Gem::Version
281
- version: '2.0'
323
+ version: '3.0'
282
324
  type: :runtime
283
325
  prerelease: false
284
326
  version_requirements: !ruby/object:Gem::Requirement
285
327
  requirements:
286
328
  - - "~>"
287
329
  - !ruby/object:Gem::Version
288
- version: '2.0'
330
+ version: '3.0'
289
331
  - !ruby/object:Gem::Dependency
290
332
  name: backports
291
333
  requirement: !ruby/object:Gem::Requirement
@@ -300,10 +342,10 @@ dependencies:
300
342
  - - "~>"
301
343
  - !ruby/object:Gem::Version
302
344
  version: '3.6'
303
- description: 'Patch containing: https://github.com/middleman/middleman/pull/2190.
304
- A static site generator. Provides dozens of templating languages (Haml, Sass, Compass,
305
- Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml
306
- data (and more) an easy part of your development cycle.'
345
+ description: Contains patch https://github.com/middleman/middleman/pull/2190. A static
346
+ site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim,
347
+ CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data
348
+ (and more) an easy part of your development cycle.
307
349
  email:
308
350
  - me@tdreyno.com
309
351
  - ben@benhollis.net
@@ -380,6 +422,7 @@ files:
380
422
  - features/markdown_kramdown_in_slim.feature
381
423
  - features/markdown_redcarpet.feature
382
424
  - features/markdown_redcarpet_in_haml.feature
425
+ - features/markdown_redcarpet_in_slim.feature
383
426
  - features/minify_css.feature
384
427
  - features/minify_javascript.feature
385
428
  - features/missing-tilt-lib.feature
@@ -394,13 +437,16 @@ files:
394
437
  - features/multiple-sources-reload.feature
395
438
  - features/multiple-sources.feature
396
439
  - features/nested_layouts.feature
440
+ - features/page-id.feature
397
441
  - features/paginate.feature
398
442
  - features/partials.feature
399
443
  - features/preview_changes.feature
400
444
  - features/proxy_pages.feature
401
445
  - features/redirects.feature
402
446
  - features/relative_assets.feature
447
+ - features/relative_assets_helpers_only.feature
403
448
  - features/sass-assets-paths.feature
449
+ - features/sass_in_slim.feature
404
450
  - features/sass_partials.feature
405
451
  - features/scss-support.feature
406
452
  - features/sitemap_traversal.feature
@@ -409,6 +455,7 @@ files:
409
455
  - features/stylus.feature
410
456
  - features/support/env.rb
411
457
  - features/support/preserve_mime_types.rb
458
+ - features/template-key-collision.feature
412
459
  - features/tilde_directories.feature
413
460
  - features/unicode_filecontents.feature
414
461
  - features/unicode_filenames.feature
@@ -449,11 +496,61 @@ files:
449
496
  - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
450
497
  - fixtures/asset-hash-host-app/source/subdir/index.html.erb
451
498
  - fixtures/asset-hash-minified-app/config.rb
499
+ - fixtures/asset-hash-minified-app/source/images/100px.jpg
452
500
  - fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js
501
+ - fixtures/asset-hash-minified-app/source/stylesheets/test.css
502
+ - fixtures/asset-hash-prefix/config.rb
503
+ - fixtures/asset-hash-prefix/lib/middleware.rb
504
+ - fixtures/asset-hash-prefix/source/index.html.erb
505
+ - fixtures/asset-hash-prefix/source/javascripts/application.js
506
+ - fixtures/asset-hash-prefix/source/javascripts/application.js.map
507
+ - fixtures/asset-hash-prefix/source/layout.erb
508
+ - fixtures/asset-hash-source-map/config.rb
509
+ - fixtures/asset-hash-source-map/lib/middleware.rb
510
+ - fixtures/asset-hash-source-map/source/index.html.erb
511
+ - fixtures/asset-hash-source-map/source/javascripts/application.js
512
+ - fixtures/asset-hash-source-map/source/javascripts/application.js.map
513
+ - fixtures/asset-hash-source-map/source/layout.erb
453
514
  - fixtures/asset-host-app/config.rb
454
515
  - fixtures/asset-host-app/source/.htaccess
455
516
  - fixtures/asset-host-app/source/asset_host.html.erb
456
517
  - fixtures/asset-host-app/source/images/blank.gif
518
+ - fixtures/asset-host-app/source/images/blank0.gif
519
+ - fixtures/asset-host-app/source/images/blank1.gif
520
+ - fixtures/asset-host-app/source/images/blank10.gif
521
+ - fixtures/asset-host-app/source/images/blank100.gif
522
+ - fixtures/asset-host-app/source/images/blank101.gif
523
+ - fixtures/asset-host-app/source/images/blank1010.gif
524
+ - fixtures/asset-host-app/source/images/blank102.gif
525
+ - fixtures/asset-host-app/source/images/blank1020.gif
526
+ - fixtures/asset-host-app/source/images/blank1021.gif
527
+ - fixtures/asset-host-app/source/images/blank1022.gif
528
+ - fixtures/asset-host-app/source/images/blank1023.gif
529
+ - fixtures/asset-host-app/source/images/blank1024.gif
530
+ - fixtures/asset-host-app/source/images/blank103.gif
531
+ - fixtures/asset-host-app/source/images/blank1030.gif
532
+ - fixtures/asset-host-app/source/images/blank1031.gif
533
+ - fixtures/asset-host-app/source/images/blank1032.gif
534
+ - fixtures/asset-host-app/source/images/blank1033.gif
535
+ - fixtures/asset-host-app/source/images/blank1034.gif
536
+ - fixtures/asset-host-app/source/images/blank104.gif
537
+ - fixtures/asset-host-app/source/images/blank1043.gif
538
+ - fixtures/asset-host-app/source/images/blank1054.gif
539
+ - fixtures/asset-host-app/source/images/blank2.gif
540
+ - fixtures/asset-host-app/source/images/blank20.gif
541
+ - fixtures/asset-host-app/source/images/blank21.gif
542
+ - fixtures/asset-host-app/source/images/blank22.gif
543
+ - fixtures/asset-host-app/source/images/blank23.gif
544
+ - fixtures/asset-host-app/source/images/blank24.gif
545
+ - fixtures/asset-host-app/source/images/blank3.gif
546
+ - fixtures/asset-host-app/source/images/blank30.gif
547
+ - fixtures/asset-host-app/source/images/blank31.gif
548
+ - fixtures/asset-host-app/source/images/blank32.gif
549
+ - fixtures/asset-host-app/source/images/blank33.gif
550
+ - fixtures/asset-host-app/source/images/blank34.gif
551
+ - fixtures/asset-host-app/source/images/blank4.gif
552
+ - fixtures/asset-host-app/source/images/blank43.gif
553
+ - fixtures/asset-host-app/source/images/blank54.gif
457
554
  - fixtures/asset-host-app/source/javascripts/asset_host.js
458
555
  - fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
459
556
  - fixtures/auto-css-app/config.rb
@@ -592,6 +689,7 @@ files:
592
689
  - fixtures/dynamic-pages-app/source/should_be_ignored6.html
593
690
  - fixtures/dynamic-pages-app/source/should_be_ignored7.html
594
691
  - fixtures/dynamic-pages-app/source/should_be_ignored8.html
692
+ - fixtures/dynamic-pages-app/source/should_be_ignored9.html
595
693
  - fixtures/ember-cli-app/config.rb
596
694
  - fixtures/ember-cli-app/source/javascripts/file.js
597
695
  - fixtures/ember-cli-app/test-app/.bowerrc
@@ -651,6 +749,8 @@ files:
651
749
  - fixtures/external-helpers/lib/hello_helper.rb
652
750
  - fixtures/external-helpers/source/automatic.html.erb
653
751
  - fixtures/external-helpers/source/index.html.erb
752
+ - fixtures/external-pipeline-error/config.rb
753
+ - fixtures/external-pipeline-error/source/javascripts/file.js
654
754
  - fixtures/feature-params-app/config.rb
655
755
  - fixtures/feature-params-app/source/index.html.erb
656
756
  - fixtures/fonts-app/config.rb
@@ -1180,6 +1280,11 @@ files:
1180
1280
  - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
1181
1281
  - fixtures/page-helper-layout-block-app/source/path/child.html.erb
1182
1282
  - fixtures/page-helper-layout-block-app/source/path/index.html.erb
1283
+ - fixtures/page-id-app/config.rb
1284
+ - fixtures/page-id-app/source/fm.html.erb
1285
+ - fixtures/page-id-app/source/index.html.erb
1286
+ - fixtures/page-id-app/source/overwrites/from-default.html.erb
1287
+ - fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
1183
1288
  - fixtures/paginate-app/config.rb
1184
1289
  - fixtures/paginate-app/source/archive/2011/index.html.erb
1185
1290
  - fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
@@ -1193,12 +1298,15 @@ files:
1193
1298
  - fixtures/paginate-app/source/tag.html.erb
1194
1299
  - fixtures/partial-chained_templates-app/config.rb
1195
1300
  - fixtures/partials-app/config.rb
1301
+ - fixtures/partials-app/source/_block.erb
1196
1302
  - fixtures/partials-app/source/_code_snippet.html
1197
1303
  - fixtures/partials-app/source/_locals.erb
1198
1304
  - fixtures/partials-app/source/_main.erb
1199
1305
  - fixtures/partials-app/source/_main.str
1306
+ - fixtures/partials-app/source/block.html.erb
1200
1307
  - fixtures/partials-app/source/images/tiger.svg
1201
1308
  - fixtures/partials-app/source/index.html.erb
1309
+ - fixtures/partials-app/source/index_missing.html.erb
1202
1310
  - fixtures/partials-app/source/locals.html.erb
1203
1311
  - fixtures/partials-app/source/second.html.str
1204
1312
  - fixtures/partials-app/source/shared/_footer.erb
@@ -1251,6 +1359,7 @@ files:
1251
1359
  - fixtures/relative-assets-app/source/fonts/roboto/roboto-regular-webfont.ttf
1252
1360
  - fixtures/relative-assets-app/source/fonts/roboto/roboto-regular-webfont.woff
1253
1361
  - fixtures/relative-assets-app/source/images/blank.gif
1362
+ - fixtures/relative-assets-app/source/images/blank2.gif
1254
1363
  - fixtures/relative-assets-app/source/img/blank.gif
1255
1364
  - fixtures/relative-assets-app/source/javascripts/app.js
1256
1365
  - fixtures/relative-assets-app/source/javascripts/application.js
@@ -1264,6 +1373,7 @@ files:
1264
1373
  - fixtures/sass-assets-path-app/config.rb
1265
1374
  - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
1266
1375
  - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
1376
+ - fixtures/sass-in-slim-app/config.rb
1267
1377
  - fixtures/scss-app/config.rb
1268
1378
  - fixtures/scss-app/source/stylesheets/layout.css.sass
1269
1379
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss
@@ -1528,6 +1638,7 @@ test_files:
1528
1638
  - features/markdown_kramdown_in_slim.feature
1529
1639
  - features/markdown_redcarpet.feature
1530
1640
  - features/markdown_redcarpet_in_haml.feature
1641
+ - features/markdown_redcarpet_in_slim.feature
1531
1642
  - features/minify_css.feature
1532
1643
  - features/minify_javascript.feature
1533
1644
  - features/missing-tilt-lib.feature
@@ -1542,13 +1653,16 @@ test_files:
1542
1653
  - features/multiple-sources-reload.feature
1543
1654
  - features/multiple-sources.feature
1544
1655
  - features/nested_layouts.feature
1656
+ - features/page-id.feature
1545
1657
  - features/paginate.feature
1546
1658
  - features/partials.feature
1547
1659
  - features/preview_changes.feature
1548
1660
  - features/proxy_pages.feature
1549
1661
  - features/redirects.feature
1550
1662
  - features/relative_assets.feature
1663
+ - features/relative_assets_helpers_only.feature
1551
1664
  - features/sass-assets-paths.feature
1665
+ - features/sass_in_slim.feature
1552
1666
  - features/sass_partials.feature
1553
1667
  - features/scss-support.feature
1554
1668
  - features/sitemap_traversal.feature
@@ -1557,6 +1671,7 @@ test_files:
1557
1671
  - features/stylus.feature
1558
1672
  - features/support/env.rb
1559
1673
  - features/support/preserve_mime_types.rb
1674
+ - features/template-key-collision.feature
1560
1675
  - features/tilde_directories.feature
1561
1676
  - features/unicode_filecontents.feature
1562
1677
  - features/unicode_filenames.feature
@@ -1597,11 +1712,61 @@ test_files:
1597
1712
  - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
1598
1713
  - fixtures/asset-hash-host-app/source/subdir/index.html.erb
1599
1714
  - fixtures/asset-hash-minified-app/config.rb
1715
+ - fixtures/asset-hash-minified-app/source/images/100px.jpg
1600
1716
  - fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js
1717
+ - fixtures/asset-hash-minified-app/source/stylesheets/test.css
1718
+ - fixtures/asset-hash-prefix/config.rb
1719
+ - fixtures/asset-hash-prefix/lib/middleware.rb
1720
+ - fixtures/asset-hash-prefix/source/index.html.erb
1721
+ - fixtures/asset-hash-prefix/source/javascripts/application.js
1722
+ - fixtures/asset-hash-prefix/source/javascripts/application.js.map
1723
+ - fixtures/asset-hash-prefix/source/layout.erb
1724
+ - fixtures/asset-hash-source-map/config.rb
1725
+ - fixtures/asset-hash-source-map/lib/middleware.rb
1726
+ - fixtures/asset-hash-source-map/source/index.html.erb
1727
+ - fixtures/asset-hash-source-map/source/javascripts/application.js
1728
+ - fixtures/asset-hash-source-map/source/javascripts/application.js.map
1729
+ - fixtures/asset-hash-source-map/source/layout.erb
1601
1730
  - fixtures/asset-host-app/config.rb
1602
1731
  - fixtures/asset-host-app/source/.htaccess
1603
1732
  - fixtures/asset-host-app/source/asset_host.html.erb
1604
1733
  - fixtures/asset-host-app/source/images/blank.gif
1734
+ - fixtures/asset-host-app/source/images/blank0.gif
1735
+ - fixtures/asset-host-app/source/images/blank1.gif
1736
+ - fixtures/asset-host-app/source/images/blank10.gif
1737
+ - fixtures/asset-host-app/source/images/blank100.gif
1738
+ - fixtures/asset-host-app/source/images/blank101.gif
1739
+ - fixtures/asset-host-app/source/images/blank1010.gif
1740
+ - fixtures/asset-host-app/source/images/blank102.gif
1741
+ - fixtures/asset-host-app/source/images/blank1020.gif
1742
+ - fixtures/asset-host-app/source/images/blank1021.gif
1743
+ - fixtures/asset-host-app/source/images/blank1022.gif
1744
+ - fixtures/asset-host-app/source/images/blank1023.gif
1745
+ - fixtures/asset-host-app/source/images/blank1024.gif
1746
+ - fixtures/asset-host-app/source/images/blank103.gif
1747
+ - fixtures/asset-host-app/source/images/blank1030.gif
1748
+ - fixtures/asset-host-app/source/images/blank1031.gif
1749
+ - fixtures/asset-host-app/source/images/blank1032.gif
1750
+ - fixtures/asset-host-app/source/images/blank1033.gif
1751
+ - fixtures/asset-host-app/source/images/blank1034.gif
1752
+ - fixtures/asset-host-app/source/images/blank104.gif
1753
+ - fixtures/asset-host-app/source/images/blank1043.gif
1754
+ - fixtures/asset-host-app/source/images/blank1054.gif
1755
+ - fixtures/asset-host-app/source/images/blank2.gif
1756
+ - fixtures/asset-host-app/source/images/blank20.gif
1757
+ - fixtures/asset-host-app/source/images/blank21.gif
1758
+ - fixtures/asset-host-app/source/images/blank22.gif
1759
+ - fixtures/asset-host-app/source/images/blank23.gif
1760
+ - fixtures/asset-host-app/source/images/blank24.gif
1761
+ - fixtures/asset-host-app/source/images/blank3.gif
1762
+ - fixtures/asset-host-app/source/images/blank30.gif
1763
+ - fixtures/asset-host-app/source/images/blank31.gif
1764
+ - fixtures/asset-host-app/source/images/blank32.gif
1765
+ - fixtures/asset-host-app/source/images/blank33.gif
1766
+ - fixtures/asset-host-app/source/images/blank34.gif
1767
+ - fixtures/asset-host-app/source/images/blank4.gif
1768
+ - fixtures/asset-host-app/source/images/blank43.gif
1769
+ - fixtures/asset-host-app/source/images/blank54.gif
1605
1770
  - fixtures/asset-host-app/source/javascripts/asset_host.js
1606
1771
  - fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
1607
1772
  - fixtures/auto-css-app/config.rb
@@ -1740,6 +1905,7 @@ test_files:
1740
1905
  - fixtures/dynamic-pages-app/source/should_be_ignored6.html
1741
1906
  - fixtures/dynamic-pages-app/source/should_be_ignored7.html
1742
1907
  - fixtures/dynamic-pages-app/source/should_be_ignored8.html
1908
+ - fixtures/dynamic-pages-app/source/should_be_ignored9.html
1743
1909
  - fixtures/ember-cli-app/config.rb
1744
1910
  - fixtures/ember-cli-app/source/javascripts/file.js
1745
1911
  - fixtures/ember-cli-app/test-app/.bowerrc
@@ -1799,6 +1965,8 @@ test_files:
1799
1965
  - fixtures/external-helpers/lib/hello_helper.rb
1800
1966
  - fixtures/external-helpers/source/automatic.html.erb
1801
1967
  - fixtures/external-helpers/source/index.html.erb
1968
+ - fixtures/external-pipeline-error/config.rb
1969
+ - fixtures/external-pipeline-error/source/javascripts/file.js
1802
1970
  - fixtures/feature-params-app/config.rb
1803
1971
  - fixtures/feature-params-app/source/index.html.erb
1804
1972
  - fixtures/fonts-app/config.rb
@@ -2328,6 +2496,11 @@ test_files:
2328
2496
  - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
2329
2497
  - fixtures/page-helper-layout-block-app/source/path/child.html.erb
2330
2498
  - fixtures/page-helper-layout-block-app/source/path/index.html.erb
2499
+ - fixtures/page-id-app/config.rb
2500
+ - fixtures/page-id-app/source/fm.html.erb
2501
+ - fixtures/page-id-app/source/index.html.erb
2502
+ - fixtures/page-id-app/source/overwrites/from-default.html.erb
2503
+ - fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
2331
2504
  - fixtures/paginate-app/config.rb
2332
2505
  - fixtures/paginate-app/source/archive/2011/index.html.erb
2333
2506
  - fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
@@ -2341,12 +2514,15 @@ test_files:
2341
2514
  - fixtures/paginate-app/source/tag.html.erb
2342
2515
  - fixtures/partial-chained_templates-app/config.rb
2343
2516
  - fixtures/partials-app/config.rb
2517
+ - fixtures/partials-app/source/_block.erb
2344
2518
  - fixtures/partials-app/source/_code_snippet.html
2345
2519
  - fixtures/partials-app/source/_locals.erb
2346
2520
  - fixtures/partials-app/source/_main.erb
2347
2521
  - fixtures/partials-app/source/_main.str
2522
+ - fixtures/partials-app/source/block.html.erb
2348
2523
  - fixtures/partials-app/source/images/tiger.svg
2349
2524
  - fixtures/partials-app/source/index.html.erb
2525
+ - fixtures/partials-app/source/index_missing.html.erb
2350
2526
  - fixtures/partials-app/source/locals.html.erb
2351
2527
  - fixtures/partials-app/source/second.html.str
2352
2528
  - fixtures/partials-app/source/shared/_footer.erb
@@ -2399,6 +2575,7 @@ test_files:
2399
2575
  - fixtures/relative-assets-app/source/fonts/roboto/roboto-regular-webfont.ttf
2400
2576
  - fixtures/relative-assets-app/source/fonts/roboto/roboto-regular-webfont.woff
2401
2577
  - fixtures/relative-assets-app/source/images/blank.gif
2578
+ - fixtures/relative-assets-app/source/images/blank2.gif
2402
2579
  - fixtures/relative-assets-app/source/img/blank.gif
2403
2580
  - fixtures/relative-assets-app/source/javascripts/app.js
2404
2581
  - fixtures/relative-assets-app/source/javascripts/application.js
@@ -2412,6 +2589,7 @@ test_files:
2412
2589
  - fixtures/sass-assets-path-app/config.rb
2413
2590
  - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
2414
2591
  - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
2592
+ - fixtures/sass-in-slim-app/config.rb
2415
2593
  - fixtures/scss-app/config.rb
2416
2594
  - fixtures/scss-app/source/stylesheets/layout.css.sass
2417
2595
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss