middleman-core 4.3.0.rc.4 → 4.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (223) hide show
  1. checksums.yaml +4 -4
  2. data/cucumber.yml +2 -2
  3. data/features/builder.feature +1 -1
  4. data/features/chained_templates.feature +0 -7
  5. data/features/coffee-script.feature +1 -1
  6. data/features/collections.feature +2 -2
  7. data/features/console.feature +1 -1
  8. data/features/data.feature +31 -0
  9. data/features/extension_api_deprecations.feature +3 -1
  10. data/features/extension_hooks.feature +3 -1
  11. data/features/helpers_external.feature +1 -17
  12. data/features/i18n_link_to.feature +0 -23
  13. data/features/i18n_mixed_sources.feature +0 -8
  14. data/features/i18n_preview.feature +1 -30
  15. data/features/ignore.feature +11 -67
  16. data/features/ignore_already_minified.feature +1 -1
  17. data/features/markdown.feature +1 -0
  18. data/features/minify_javascript.feature +35 -35
  19. data/features/mount_rack.feature +0 -1
  20. data/features/page-id.feature +2 -2
  21. data/features/partials.feature +1 -1
  22. data/features/relative_assets_helpers_only.feature +6 -4
  23. data/features/scss-support.feature +6 -1
  24. data/features/support/env.rb +5 -5
  25. data/features/tilde_directories.feature +2 -0
  26. data/features/unicode_filenames.feature +1 -1
  27. data/fixtures/asset-hash-app/config.rb +1 -0
  28. data/fixtures/asset-hash-app/lib/middleware.rb +2 -2
  29. data/fixtures/asset-hash-app/source/stylesheets/_partial.sass +1 -1
  30. data/fixtures/asset-hash-minified-app/config.rb +1 -1
  31. data/fixtures/asset-hash-prefix/config.rb +2 -1
  32. data/fixtures/asset-hash-prefix/lib/middleware.rb +2 -2
  33. data/fixtures/asset-hash-source-map/config.rb +1 -0
  34. data/fixtures/asset-hash-source-map/lib/middleware.rb +2 -2
  35. data/fixtures/asset-host-app/config.rb +1 -1
  36. data/fixtures/auto-css-app/config.rb +2 -2
  37. data/fixtures/auto-js-app/config.rb +2 -2
  38. data/fixtures/auto-js-directory-index-app/config.rb +1 -1
  39. data/fixtures/automatic-directory-matcher-app/config.rb +1 -1
  40. data/fixtures/basic-data-app/config.rb +2 -2
  41. data/fixtures/capture-html-app/config.rb +4 -4
  42. data/fixtures/clean-app/config-complications.rb +6 -6
  43. data/fixtures/clean-app/config-hidden-dir-after.rb +4 -4
  44. data/fixtures/clean-app/config-hidden-dir-before.rb +1 -1
  45. data/fixtures/clean-app/config.rb +6 -6
  46. data/fixtures/clean-dir-app/config.rb +1 -0
  47. data/fixtures/clean-nested-app/config.rb +1 -1
  48. data/fixtures/collections-app/source/blog1/2011-01-01-new-article.html.markdown +1 -1
  49. data/fixtures/collections-app/source/blog1/2011-01-02-another-article.html.markdown +1 -1
  50. data/fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown +1 -1
  51. data/fixtures/collections-app/source/blog2/2011-01-02-another-article.html.markdown +1 -1
  52. data/fixtures/content-for-app/config.rb +4 -4
  53. data/fixtures/dynamic-pages-app/config.rb +26 -25
  54. data/fixtures/ember-cli-app/config.rb +4 -4
  55. data/fixtures/env-app/environments/development.rb +1 -1
  56. data/fixtures/env-app/environments/production.rb +1 -1
  57. data/fixtures/env-app/source/stylesheets/site.css.scss +1 -1
  58. data/fixtures/extension-hooks-app/config.rb +8 -8
  59. data/fixtures/external-helpers/config.rb +2 -2
  60. data/fixtures/external-helpers/helpers/derp.rb +1 -3
  61. data/fixtures/external-helpers/helpers/four_helpers.rb +1 -3
  62. data/fixtures/external-helpers/helpers/one_helper.rb +1 -3
  63. data/fixtures/external-helpers/helpers/yet_another_thingy.rb +1 -3
  64. data/fixtures/external-helpers/lib/hello_helper.rb +1 -1
  65. data/fixtures/external-pipeline-error/config.rb +4 -4
  66. data/fixtures/feature-params-app/config.rb +1 -1
  67. data/fixtures/frontmatter-app/config.rb +1 -1
  68. data/fixtures/generator-test/config.rb +15 -1
  69. data/fixtures/glob-app/config.rb +1 -1
  70. data/fixtures/i-8859-1-app/config.rb +1 -1
  71. data/fixtures/i18n-force-locale/config.rb +4 -4
  72. data/fixtures/i18n-mixed-sources/config.rb +1 -1
  73. data/fixtures/i18n-test-app/locales/en.yml +1 -7
  74. data/fixtures/i18n-test-app/locales/es.yml +1 -2
  75. data/fixtures/import-app/config.rb +3 -3
  76. data/fixtures/indexable-app/config.rb +3 -3
  77. data/fixtures/large-build-app/config.rb +1 -1
  78. data/fixtures/manual-layout-override/config.rb +1 -1
  79. data/fixtures/missing-tilt-library-app/config.rb +2 -2
  80. data/fixtures/more-traversal-app/config.rb +4 -4
  81. data/fixtures/multiple-data-sources-app/config.rb +1 -1
  82. data/fixtures/multiple-sources-app/config.rb +1 -1
  83. data/fixtures/multiple-sources-with-duplicate-file-names-app/config.rb +1 -1
  84. data/fixtures/nested-layout-app/source/another.html.markdown +1 -1
  85. data/fixtures/nested-layout-app/source/haml-test.html.markdown +1 -1
  86. data/fixtures/nested-layout-app/source/slim-test.html.markdown +1 -1
  87. data/fixtures/padrino-helpers-app/config.rb +1 -1
  88. data/fixtures/page-classes-app/config.rb +2 -2
  89. data/fixtures/page-helper-layout-block-app/config.rb +1 -1
  90. data/fixtures/page-id-app/config-proc.rb +4 -4
  91. data/fixtures/page-id-app/config.rb +3 -3
  92. data/fixtures/page-id-app/source/{forty-two.html.erb → fourty-two.html.erb} +0 -0
  93. data/fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown +1 -1
  94. data/fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown +1 -1
  95. data/fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown +1 -1
  96. data/fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown +1 -1
  97. data/fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown +1 -1
  98. data/fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown +1 -1
  99. data/fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown +1 -1
  100. data/fixtures/partials-app/source/_locals.erb +1 -1
  101. data/fixtures/partials-app/source/locals.html.erb +1 -1
  102. data/fixtures/proxy-pages-app/config.rb +14 -13
  103. data/fixtures/sass-assets-path-app/config.rb +2 -2
  104. data/fixtures/scss-app/source/stylesheets/error.css.sass +1 -0
  105. data/fixtures/sinatra-app/config.rb +6 -6
  106. data/fixtures/traversal-app/config.rb +4 -4
  107. data/fixtures/v4-extension-callbacks/config.rb +2 -2
  108. data/fixtures/wildcard-app/config.rb +1 -1
  109. data/fixtures/wildcard-directory-index-app/config.rb +1 -1
  110. data/lib/middleman/rack.rb +7 -0
  111. data/lib/middleman-core/application.rb +9 -10
  112. data/lib/middleman-core/builder.rb +21 -50
  113. data/lib/middleman-core/callback_manager.rb +1 -1
  114. data/lib/middleman-core/config_context.rb +2 -2
  115. data/lib/middleman-core/configuration.rb +5 -5
  116. data/lib/middleman-core/contracts.rb +2 -2
  117. data/lib/middleman-core/core_extensions/collections/lazy_root.rb +1 -1
  118. data/lib/middleman-core/core_extensions/collections/lazy_step.rb +9 -9
  119. data/lib/middleman-core/core_extensions/collections/pagination.rb +6 -6
  120. data/lib/middleman-core/core_extensions/collections.rb +1 -1
  121. data/lib/middleman-core/core_extensions/data.rb +11 -11
  122. data/lib/middleman-core/core_extensions/default_helpers.rb +29 -26
  123. data/lib/middleman-core/core_extensions/external_helpers.rb +1 -1
  124. data/lib/middleman-core/core_extensions/file_watcher.rb +1 -1
  125. data/lib/middleman-core/core_extensions/front_matter.rb +3 -3
  126. data/lib/middleman-core/core_extensions/i18n.rb +23 -44
  127. data/lib/middleman-core/core_extensions/inline_url_rewriter.rb +7 -10
  128. data/lib/middleman-core/core_extensions/routing.rb +1 -1
  129. data/lib/middleman-core/core_extensions.rb +2 -2
  130. data/lib/middleman-core/dns_resolver/basic_network_resolver.rb +3 -3
  131. data/lib/middleman-core/dns_resolver/hosts_resolver.rb +1 -1
  132. data/lib/middleman-core/dns_resolver/local_link_resolver.rb +1 -1
  133. data/lib/middleman-core/dns_resolver/network_resolver.rb +1 -1
  134. data/lib/middleman-core/dns_resolver.rb +1 -1
  135. data/lib/middleman-core/extension.rb +32 -34
  136. data/lib/middleman-core/extension_manager.rb +2 -6
  137. data/lib/middleman-core/extensions/asset_hash.rb +22 -24
  138. data/lib/middleman-core/extensions/asset_host.rb +10 -10
  139. data/lib/middleman-core/extensions/automatic_alt_tags.rb +1 -1
  140. data/lib/middleman-core/extensions/automatic_image_sizes.rb +3 -3
  141. data/lib/middleman-core/extensions/cache_buster.rb +2 -2
  142. data/lib/middleman-core/extensions/directory_indexes.rb +1 -1
  143. data/lib/middleman-core/extensions/external_pipeline.rb +9 -14
  144. data/lib/middleman-core/extensions/gzip.rb +6 -8
  145. data/lib/middleman-core/extensions/lorem.rb +9 -9
  146. data/lib/middleman-core/extensions/minify_css.rb +16 -14
  147. data/lib/middleman-core/extensions/minify_javascript.rb +13 -13
  148. data/lib/middleman-core/extensions/relative_assets.rb +8 -8
  149. data/lib/middleman-core/extensions.rb +7 -8
  150. data/lib/middleman-core/file_renderer.rb +6 -7
  151. data/lib/middleman-core/load_paths.rb +10 -13
  152. data/lib/middleman-core/logger.rb +4 -3
  153. data/lib/middleman-core/meta_pages/sitemap_resource.rb +2 -0
  154. data/lib/middleman-core/meta_pages/sitemap_tree.rb +1 -1
  155. data/lib/middleman-core/meta_pages.rb +1 -1
  156. data/lib/middleman-core/preview_server/checks.rb +1 -1
  157. data/lib/middleman-core/preview_server/information.rb +13 -13
  158. data/lib/middleman-core/preview_server/network_interface_inventory.rb +3 -3
  159. data/lib/middleman-core/preview_server/server_information.rb +1 -1
  160. data/lib/middleman-core/preview_server/server_information_callback_proxy.rb +1 -1
  161. data/lib/middleman-core/preview_server/server_url.rb +1 -1
  162. data/lib/middleman-core/preview_server/tcp_port_prober.rb +1 -1
  163. data/lib/middleman-core/preview_server.rb +25 -25
  164. data/lib/middleman-core/rack.rb +1 -1
  165. data/lib/middleman-core/renderers/coffee_script.rb +2 -2
  166. data/lib/middleman-core/renderers/haml.rb +4 -8
  167. data/lib/middleman-core/renderers/less.rb +1 -1
  168. data/lib/middleman-core/renderers/liquid.rb +2 -3
  169. data/lib/middleman-core/renderers/markdown.rb +7 -7
  170. data/lib/middleman-core/renderers/redcarpet.rb +2 -2
  171. data/lib/middleman-core/renderers/sass.rb +23 -26
  172. data/lib/middleman-core/renderers/sass_functions.rb +14 -17
  173. data/lib/middleman-core/renderers/slim.rb +2 -2
  174. data/lib/middleman-core/sitemap/extensions/ignores.rb +4 -2
  175. data/lib/middleman-core/sitemap/extensions/import.rb +1 -1
  176. data/lib/middleman-core/sitemap/extensions/on_disk.rb +1 -1
  177. data/lib/middleman-core/sitemap/extensions/proxies.rb +1 -2
  178. data/lib/middleman-core/sitemap/extensions/redirects.rb +1 -1
  179. data/lib/middleman-core/sitemap/extensions/request_endpoints.rb +1 -1
  180. data/lib/middleman-core/sitemap/extensions/traversal.rb +25 -80
  181. data/lib/middleman-core/sitemap/resource.rb +20 -21
  182. data/lib/middleman-core/sitemap/store.rb +6 -6
  183. data/lib/middleman-core/sources/source_watcher.rb +11 -17
  184. data/lib/middleman-core/sources.rb +12 -12
  185. data/lib/middleman-core/step_definitions/builder_steps.rb +12 -38
  186. data/lib/middleman-core/step_definitions/commandline_steps.rb +6 -6
  187. data/lib/middleman-core/step_definitions/middleman_steps.rb +14 -13
  188. data/lib/middleman-core/step_definitions/server_steps.rb +16 -18
  189. data/lib/middleman-core/template_context.rb +10 -17
  190. data/lib/middleman-core/template_renderer.rb +33 -35
  191. data/lib/middleman-core/util/binary.rb +1 -3
  192. data/lib/middleman-core/util/data.rb +22 -12
  193. data/lib/middleman-core/util/files.rb +3 -3
  194. data/lib/middleman-core/util/paths.rb +44 -47
  195. data/lib/middleman-core/util/rack.rb +3 -3
  196. data/lib/middleman-core/util/uri_templates.rb +0 -1
  197. data/lib/middleman-core/util.rb +2 -2
  198. data/lib/middleman-core/version.rb +1 -1
  199. data/lib/middleman-core.rb +3 -3
  200. data/middleman-core.gemspec +13 -12
  201. data/spec/middleman-core/callbacks_spec.rb +14 -15
  202. data/spec/middleman-core/core_extensions/data_spec.rb +74 -70
  203. data/spec/middleman-core/dns_resolver_spec.rb +6 -6
  204. data/spec/middleman-core/util_spec.rb +86 -81
  205. data/spec/spec_helper.rb +6 -1
  206. data/spec/support/given.rb +15 -11
  207. metadata +59 -76
  208. data/features/multiple-sources-reload.feature +0 -40
  209. data/fixtures/chained-app/source/stylesheets/main.css.scss.erb +0 -3
  210. data/fixtures/chained-app/source/stylesheets/sub.scss +0 -1
  211. data/fixtures/destination-dir-different-from-source-dir-name/external/page.html.erb +0 -1
  212. data/fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb +0 -2
  213. data/fixtures/destination-dir-different-from-source-dir-name/my-app/source/index.html.erb +0 -1
  214. data/fixtures/i18n-default-app/source/name.html.erb +0 -1
  215. data/fixtures/i18n-mixed-sources/source/c/d/index.html.erb +0 -9
  216. data/fixtures/i18n-mixed-sources/source/localizable/c/d/index.html.erb +0 -9
  217. data/fixtures/i18n-test-app/source/localizable/tac.html.erb +0 -1
  218. data/fixtures/multiple-sources-with-destination-dir/config.rb +0 -2
  219. data/fixtures/multiple-sources-with-destination-dir/external/page.html.erb +0 -1
  220. data/fixtures/multiple-sources-with-destination-dir/source/index.html.erb +0 -1
  221. data/fixtures/multiple-sources-without-destination-dir/config.rb +0 -1
  222. data/fixtures/multiple-sources-without-destination-dir/external/page.html.erb +0 -1
  223. data/fixtures/multiple-sources-without-destination-dir/source/index.html.erb +0 -1
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.3.0.rc.4
4
+ version: 4.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas Reynolds
@@ -10,22 +10,22 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2018-11-07 00:00:00.000000000 Z
13
+ date: 2019-01-11 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - "~>"
19
+ - - ">="
20
20
  - !ruby/object:Gem::Version
21
- version: '1.1'
21
+ version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - "~>"
26
+ - - ">="
27
27
  - !ruby/object:Gem::Version
28
- version: '1.1'
28
+ version: '0'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: rack
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -52,14 +52,14 @@ dependencies:
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '2.0'
55
+ version: 2.0.9
56
56
  type: :runtime
57
57
  prerelease: false
58
58
  version_requirements: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '2.0'
62
+ version: 2.0.9
63
63
  - !ruby/object:Gem::Dependency
64
64
  name: erubis
65
65
  requirement: !ruby/object:Gem::Requirement
@@ -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: parallel
79
93
  requirement: !ruby/object:Gem::Requirement
@@ -125,7 +139,7 @@ dependencies:
125
139
  version: '4.2'
126
140
  - - "<"
127
141
  - !ruby/object:Gem::Version
128
- version: '5.2'
142
+ version: '5.1'
129
143
  type: :runtime
130
144
  prerelease: false
131
145
  version_requirements: !ruby/object:Gem::Requirement
@@ -135,7 +149,7 @@ dependencies:
135
149
  version: '4.2'
136
150
  - - "<"
137
151
  - !ruby/object:Gem::Version
138
- version: '5.2'
152
+ version: '5.1'
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: padrino-helpers
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -178,48 +192,34 @@ dependencies:
178
192
  - - "~>"
179
193
  - !ruby/object:Gem::Version
180
194
  version: '0.14'
181
- - !ruby/object:Gem::Dependency
182
- name: backports
183
- requirement: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - "~>"
186
- - !ruby/object:Gem::Version
187
- version: '3.11'
188
- type: :runtime
189
- prerelease: false
190
- version_requirements: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - "~>"
193
- - !ruby/object:Gem::Version
194
- version: '3.11'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: listen
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
199
  - - "~>"
200
200
  - !ruby/object:Gem::Version
201
- version: '3.0'
201
+ version: 3.0.0
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - "~>"
207
207
  - !ruby/object:Gem::Version
208
- version: '3.0'
208
+ version: 3.0.0
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: i18n
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
213
  - - "~>"
214
214
  - !ruby/object:Gem::Version
215
- version: '0.7'
215
+ version: 0.9.0
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
220
  - - "~>"
221
221
  - !ruby/object:Gem::Version
222
- version: '0.7'
222
+ version: 0.9.0
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: fastimage
225
225
  requirement: !ruby/object:Gem::Requirement
@@ -235,19 +235,19 @@ dependencies:
235
235
  - !ruby/object:Gem::Version
236
236
  version: '2.0'
237
237
  - !ruby/object:Gem::Dependency
238
- name: sass
238
+ name: sassc
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - ">="
241
+ - - "~>"
242
242
  - !ruby/object:Gem::Version
243
- version: '3.4'
243
+ version: '2.0'
244
244
  type: :runtime
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ">="
248
+ - - "~>"
249
249
  - !ruby/object:Gem::Version
250
- version: '3.4'
250
+ version: '2.0'
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: uglifier
253
253
  requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
282
282
  requirements:
283
283
  - - "~>"
284
284
  - !ruby/object:Gem::Version
285
- version: 0.16.0
285
+ version: 0.13.0
286
286
  type: :runtime
287
287
  prerelease: false
288
288
  version_requirements: !ruby/object:Gem::Requirement
289
289
  requirements:
290
290
  - - "~>"
291
291
  - !ruby/object:Gem::Version
292
- version: 0.16.0
292
+ version: 0.13.0
293
293
  - !ruby/object:Gem::Dependency
294
294
  name: hashie
295
295
  requirement: !ruby/object:Gem::Requirement
@@ -318,9 +318,23 @@ dependencies:
318
318
  - - "~>"
319
319
  - !ruby/object:Gem::Version
320
320
  version: '3.0'
321
+ - !ruby/object:Gem::Dependency
322
+ name: backports
323
+ requirement: !ruby/object:Gem::Requirement
324
+ requirements:
325
+ - - "~>"
326
+ - !ruby/object:Gem::Version
327
+ version: '3.6'
328
+ type: :runtime
329
+ prerelease: false
330
+ version_requirements: !ruby/object:Gem::Requirement
331
+ requirements:
332
+ - - "~>"
333
+ - !ruby/object:Gem::Version
334
+ version: '3.6'
321
335
  description: A static site generator. Provides dozens of templating languages (Haml,
322
- Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting,
323
- Yaml data (and more) an easy part of your development cycle.
336
+ Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
337
+ busting, Yaml data (and more) an easy part of your development cycle.
324
338
  email:
325
339
  - me@tdreyno.com
326
340
  - ben@benhollis.net
@@ -408,7 +422,6 @@ files:
408
422
  - features/more-wildcard_page_helper.feature
409
423
  - features/mount_rack.feature
410
424
  - features/move_files.feature
411
- - features/multiple-sources-reload.feature
412
425
  - features/multiple-sources.feature
413
426
  - features/nested_layouts.feature
414
427
  - features/page-id.feature
@@ -582,8 +595,6 @@ files:
582
595
  - fixtures/chained-app/config.rb
583
596
  - fixtures/chained-app/data/article.yml
584
597
  - fixtures/chained-app/source/index.html.str.erb
585
- - fixtures/chained-app/source/stylesheets/main.css.scss.erb
586
- - fixtures/chained-app/source/stylesheets/sub.scss
587
598
  - fixtures/chained-app/source/test.erb.combobreaker.str.erb
588
599
  - fixtures/clean-app/config-complications.rb
589
600
  - fixtures/clean-app/config-empty.rb
@@ -642,9 +653,6 @@ files:
642
653
  - fixtures/data-app/data/pages.yml
643
654
  - fixtures/data-app/source/index.html.erb
644
655
  - fixtures/data-app/source/layout.erb
645
- - fixtures/destination-dir-different-from-source-dir-name/external/page.html.erb
646
- - fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb
647
- - fixtures/destination-dir-different-from-source-dir-name/my-app/source/index.html.erb
648
656
  - fixtures/different-engine-layout/config.rb
649
657
  - fixtures/different-engine-layout/source/index.haml
650
658
  - fixtures/different-engine-layout/source/index.html.str
@@ -790,7 +798,6 @@ files:
790
798
  - fixtures/i18n-default-app/locales/en.yml
791
799
  - fixtures/i18n-default-app/locales/es.yml
792
800
  - fixtures/i18n-default-app/source/localizable/index.html.erb
793
- - fixtures/i18n-default-app/source/name.html.erb
794
801
  - fixtures/i18n-force-locale/config.rb
795
802
  - fixtures/i18n-force-locale/locales/en.yml
796
803
  - fixtures/i18n-force-locale/locales/es.yml
@@ -801,11 +808,9 @@ files:
801
808
  - fixtures/i18n-mixed-sources/locales/es.yml
802
809
  - fixtures/i18n-mixed-sources/source/a/sub.html.erb
803
810
  - fixtures/i18n-mixed-sources/source/b/index.html.erb
804
- - fixtures/i18n-mixed-sources/source/c/d/index.html.erb
805
811
  - fixtures/i18n-mixed-sources/source/index.html.erb
806
812
  - fixtures/i18n-mixed-sources/source/localizable/a/index.html.erb
807
813
  - fixtures/i18n-mixed-sources/source/localizable/b/sub.html.erb
808
- - fixtures/i18n-mixed-sources/source/localizable/c/d/index.html.erb
809
814
  - fixtures/i18n-mixed-sources/source/localizable/index.html.erb
810
815
  - fixtures/i18n-nested-app/locales/en.yml
811
816
  - fixtures/i18n-nested-app/locales/en/more.yml
@@ -837,7 +842,6 @@ files:
837
842
  - fixtures/i18n-test-app/source/localizable/partials/_greeting.en.erb
838
843
  - fixtures/i18n-test-app/source/localizable/partials/_greeting.es.erb
839
844
  - fixtures/i18n-test-app/source/localizable/partials/index.html.erb
840
- - fixtures/i18n-test-app/source/localizable/tac.html.erb
841
845
  - fixtures/i18n-test-app/source/password.txt
842
846
  - fixtures/i18n-test-app/source/stylesheets/site.css
843
847
  - fixtures/ignore-app/source/about.html.erb
@@ -1211,15 +1215,9 @@ files:
1211
1215
  - fixtures/multiple-sources-app/source1/override-in-one.html.erb
1212
1216
  - fixtures/multiple-sources-app/source2/index2.html.erb
1213
1217
  - fixtures/multiple-sources-app/source2/override-in-two.html.erb
1214
- - fixtures/multiple-sources-with-destination-dir/config.rb
1215
- - fixtures/multiple-sources-with-destination-dir/external/page.html.erb
1216
- - fixtures/multiple-sources-with-destination-dir/source/index.html.erb
1217
1218
  - fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
1218
1219
  - fixtures/multiple-sources-with-duplicate-file-names-app/source/index.html.erb
1219
1220
  - fixtures/multiple-sources-with-duplicate-file-names-app/source2/index.html.erb
1220
- - fixtures/multiple-sources-without-destination-dir/config.rb
1221
- - fixtures/multiple-sources-without-destination-dir/external/page.html.erb
1222
- - fixtures/multiple-sources-without-destination-dir/source/index.html.erb
1223
1221
  - fixtures/nested-data-app/config.rb
1224
1222
  - fixtures/nested-data-app/data/examples/deeper/stuff.yml
1225
1223
  - fixtures/nested-data-app/data/examples/more.yml
@@ -1265,7 +1263,7 @@ files:
1265
1263
  - fixtures/page-id-app/source/feed.xml.erb
1266
1264
  - fixtures/page-id-app/source/fm.html.erb
1267
1265
  - fixtures/page-id-app/source/folder/foldern.html.erb
1268
- - fixtures/page-id-app/source/forty-two.html.erb
1266
+ - fixtures/page-id-app/source/fourty-two.html.erb
1269
1267
  - fixtures/page-id-app/source/implicit.html.erb
1270
1268
  - fixtures/page-id-app/source/index.html.erb
1271
1269
  - fixtures/page-id-app/source/overwrites/from-default.html.erb
@@ -1354,6 +1352,7 @@ files:
1354
1352
  - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
1355
1353
  - fixtures/sass-in-slim-app/config.rb
1356
1354
  - fixtures/scss-app/config.rb
1355
+ - fixtures/scss-app/source/stylesheets/error.css.sass
1357
1356
  - fixtures/scss-app/source/stylesheets/layout.css.sass
1358
1357
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss
1359
1358
  - fixtures/sinatra-app/config.rb
@@ -1542,15 +1541,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
1542
1541
  requirements:
1543
1542
  - - ">="
1544
1543
  - !ruby/object:Gem::Version
1545
- version: 2.3.0
1544
+ version: 2.2.0
1546
1545
  required_rubygems_version: !ruby/object:Gem::Requirement
1547
1546
  requirements:
1548
- - - ">"
1547
+ - - ">="
1549
1548
  - !ruby/object:Gem::Version
1550
- version: 1.3.1
1549
+ version: '0'
1551
1550
  requirements: []
1552
- rubyforge_project:
1553
- rubygems_version: 2.7.7
1551
+ rubygems_version: 3.0.2
1554
1552
  signing_key:
1555
1553
  specification_version: 4
1556
1554
  summary: Hand-crafted frontend development
@@ -1628,7 +1626,6 @@ test_files:
1628
1626
  - features/more-wildcard_page_helper.feature
1629
1627
  - features/mount_rack.feature
1630
1628
  - features/move_files.feature
1631
- - features/multiple-sources-reload.feature
1632
1629
  - features/multiple-sources.feature
1633
1630
  - features/nested_layouts.feature
1634
1631
  - features/page-id.feature
@@ -1802,8 +1799,6 @@ test_files:
1802
1799
  - fixtures/chained-app/config.rb
1803
1800
  - fixtures/chained-app/data/article.yml
1804
1801
  - fixtures/chained-app/source/index.html.str.erb
1805
- - fixtures/chained-app/source/stylesheets/main.css.scss.erb
1806
- - fixtures/chained-app/source/stylesheets/sub.scss
1807
1802
  - fixtures/chained-app/source/test.erb.combobreaker.str.erb
1808
1803
  - fixtures/clean-app/config-complications.rb
1809
1804
  - fixtures/clean-app/config-empty.rb
@@ -1862,9 +1857,6 @@ test_files:
1862
1857
  - fixtures/data-app/data/pages.yml
1863
1858
  - fixtures/data-app/source/index.html.erb
1864
1859
  - fixtures/data-app/source/layout.erb
1865
- - fixtures/destination-dir-different-from-source-dir-name/external/page.html.erb
1866
- - fixtures/destination-dir-different-from-source-dir-name/my-app/config.rb
1867
- - fixtures/destination-dir-different-from-source-dir-name/my-app/source/index.html.erb
1868
1860
  - fixtures/different-engine-layout/config.rb
1869
1861
  - fixtures/different-engine-layout/source/index.haml
1870
1862
  - fixtures/different-engine-layout/source/index.html.str
@@ -2010,7 +2002,6 @@ test_files:
2010
2002
  - fixtures/i18n-default-app/locales/en.yml
2011
2003
  - fixtures/i18n-default-app/locales/es.yml
2012
2004
  - fixtures/i18n-default-app/source/localizable/index.html.erb
2013
- - fixtures/i18n-default-app/source/name.html.erb
2014
2005
  - fixtures/i18n-force-locale/config.rb
2015
2006
  - fixtures/i18n-force-locale/locales/en.yml
2016
2007
  - fixtures/i18n-force-locale/locales/es.yml
@@ -2021,11 +2012,9 @@ test_files:
2021
2012
  - fixtures/i18n-mixed-sources/locales/es.yml
2022
2013
  - fixtures/i18n-mixed-sources/source/a/sub.html.erb
2023
2014
  - fixtures/i18n-mixed-sources/source/b/index.html.erb
2024
- - fixtures/i18n-mixed-sources/source/c/d/index.html.erb
2025
2015
  - fixtures/i18n-mixed-sources/source/index.html.erb
2026
2016
  - fixtures/i18n-mixed-sources/source/localizable/a/index.html.erb
2027
2017
  - fixtures/i18n-mixed-sources/source/localizable/b/sub.html.erb
2028
- - fixtures/i18n-mixed-sources/source/localizable/c/d/index.html.erb
2029
2018
  - fixtures/i18n-mixed-sources/source/localizable/index.html.erb
2030
2019
  - fixtures/i18n-nested-app/locales/en.yml
2031
2020
  - fixtures/i18n-nested-app/locales/en/more.yml
@@ -2057,7 +2046,6 @@ test_files:
2057
2046
  - fixtures/i18n-test-app/source/localizable/partials/_greeting.en.erb
2058
2047
  - fixtures/i18n-test-app/source/localizable/partials/_greeting.es.erb
2059
2048
  - fixtures/i18n-test-app/source/localizable/partials/index.html.erb
2060
- - fixtures/i18n-test-app/source/localizable/tac.html.erb
2061
2049
  - fixtures/i18n-test-app/source/password.txt
2062
2050
  - fixtures/i18n-test-app/source/stylesheets/site.css
2063
2051
  - fixtures/ignore-app/source/about.html.erb
@@ -2431,15 +2419,9 @@ test_files:
2431
2419
  - fixtures/multiple-sources-app/source1/override-in-one.html.erb
2432
2420
  - fixtures/multiple-sources-app/source2/index2.html.erb
2433
2421
  - fixtures/multiple-sources-app/source2/override-in-two.html.erb
2434
- - fixtures/multiple-sources-with-destination-dir/config.rb
2435
- - fixtures/multiple-sources-with-destination-dir/external/page.html.erb
2436
- - fixtures/multiple-sources-with-destination-dir/source/index.html.erb
2437
2422
  - fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
2438
2423
  - fixtures/multiple-sources-with-duplicate-file-names-app/source/index.html.erb
2439
2424
  - fixtures/multiple-sources-with-duplicate-file-names-app/source2/index.html.erb
2440
- - fixtures/multiple-sources-without-destination-dir/config.rb
2441
- - fixtures/multiple-sources-without-destination-dir/external/page.html.erb
2442
- - fixtures/multiple-sources-without-destination-dir/source/index.html.erb
2443
2425
  - fixtures/nested-data-app/config.rb
2444
2426
  - fixtures/nested-data-app/data/examples/deeper/stuff.yml
2445
2427
  - fixtures/nested-data-app/data/examples/more.yml
@@ -2485,7 +2467,7 @@ test_files:
2485
2467
  - fixtures/page-id-app/source/feed.xml.erb
2486
2468
  - fixtures/page-id-app/source/fm.html.erb
2487
2469
  - fixtures/page-id-app/source/folder/foldern.html.erb
2488
- - fixtures/page-id-app/source/forty-two.html.erb
2470
+ - fixtures/page-id-app/source/fourty-two.html.erb
2489
2471
  - fixtures/page-id-app/source/implicit.html.erb
2490
2472
  - fixtures/page-id-app/source/index.html.erb
2491
2473
  - fixtures/page-id-app/source/overwrites/from-default.html.erb
@@ -2574,6 +2556,7 @@ test_files:
2574
2556
  - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
2575
2557
  - fixtures/sass-in-slim-app/config.rb
2576
2558
  - fixtures/scss-app/config.rb
2559
+ - fixtures/scss-app/source/stylesheets/error.css.sass
2577
2560
  - fixtures/scss-app/source/stylesheets/layout.css.sass
2578
2561
  - fixtures/scss-app/source/stylesheets/site_scss.css.scss
2579
2562
  - fixtures/sinatra-app/config.rb
@@ -1,40 +0,0 @@
1
- Feature: Allow content with multiple sources to reload
2
- Scenario: With source that does not specify a destination directory
3
- Given the Server is running at "multiple-sources-without-destination-dir"
4
- When I go to "/page.html"
5
- Then I should see "Before edit"
6
-
7
- When the file "external/page.html.erb" has the contents
8
- """
9
- After edit
10
- """
11
- And I go to "/page.html"
12
- Then I should see "After edit"
13
-
14
-
15
- Scenario: With source that specifies destination directory
16
- Given the Server is running at "multiple-sources-with-destination-dir"
17
- When I go to "/external/page.html"
18
- Then I should see "Before edit"
19
-
20
- When the file "external/page.html.erb" has the contents
21
- """
22
- After edit
23
- """
24
- And I go to "/external/page.html"
25
- Then I should see "After edit"
26
-
27
- Scenario: With external source and a destination directory name different from source directory name
28
- Given a fixture app "destination-dir-different-from-source-dir-name"
29
- And I cd to "my-app"
30
- And the Server is running
31
-
32
- When I go to "/my_dir/page.html"
33
- Then I should see "Before edit"
34
-
35
- When the file "../external/page.html.erb" has the contents
36
- """
37
- After edit
38
- """
39
- And I go to "/my_dir/page.html"
40
- Then I should see "After edit"
@@ -1,3 +0,0 @@
1
- @import 'sub';
2
-
3
- <%= 'body { color: from_main; }' %>
@@ -1 +0,0 @@
1
- body { background: from_sub; }
@@ -1,2 +0,0 @@
1
- files.watch :source, path: File.join(root, '..', 'external'),
2
- destination_dir: 'my_dir'
@@ -1 +0,0 @@
1
- <%= t(:greetings) %> <%= name %>
@@ -1,9 +0,0 @@
1
- ---
2
- title: c/d/index.html.erb
3
- ---
4
- Current locale: <%= I18n.locale %>
5
- path: <%=
6
- hierarchy = [current_page]
7
- hierarchy.unshift hierarchy.first.parent true while hierarchy.first.parent true
8
- hierarchy.collect {|page| page.data.title }.join(" # ")
9
- %>
@@ -1,9 +0,0 @@
1
- ---
2
- title: c/d/index.html.erb
3
- ---
4
- Current locale: <%= I18n.locale %>
5
- path: <%=
6
- hierarchy = [current_page]
7
- hierarchy.unshift hierarchy.first.parent true while hierarchy.first.parent true
8
- hierarchy.collect {|page| page.data.title }.join(" # ")
9
- %>
@@ -1 +0,0 @@
1
- <%= I18n.t('tac') %>
@@ -1,2 +0,0 @@
1
- files.watch :source, path: File.join(root, 'external'),
2
- destination_dir: 'external'
@@ -1 +0,0 @@
1
- files.watch :source, path: File.join(root, 'external')