middleman-core 3.4.0 → 3.4.1
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.
- checksums.yaml +4 -4
- data/Rakefile +1 -7
- data/features/clean_build.feature +18 -0
- data/features/cli/preview_server-hook.feature +17 -0
- data/features/cli/preview_server.feature +20 -20
- data/features/data.feature +28 -0
- data/features/step_definitions/queryable_steps.rb +122 -45
- data/features/stylus.feature +1 -1
- data/fixtures/asciidoc-app/source/hello-with-title.adoc +1 -0
- data/fixtures/clean-app/config-hidden-dir-after.rb +5 -0
- data/fixtures/clean-app/config-hidden-dir-before.rb +1 -0
- data/fixtures/preview-server-hook-app/config.rb +19 -0
- data/fixtures/preview-server-hook-app/source/index.html.erb +9 -0
- data/lib/middleman-core.rb +0 -4
- data/lib/middleman-core/application.rb +3 -0
- data/lib/middleman-core/cli.rb +1 -1
- data/lib/middleman-core/cli/build.rb +1 -1
- data/lib/middleman-core/cli/server.rb +1 -1
- data/lib/middleman-core/configuration.rb +1 -1
- data/lib/middleman-core/core_extensions/data.rb +4 -8
- data/lib/middleman-core/core_extensions/data/file_loader.rb +71 -0
- data/lib/middleman-core/core_extensions/rendering.rb +8 -8
- data/lib/middleman-core/core_extensions/show_exceptions.rb +1 -1
- data/lib/middleman-core/dns_resolver/basic_network_resolver.rb +2 -2
- data/lib/middleman-core/extensions.rb +0 -2
- data/lib/middleman-core/meta_pages/sitemap_resource.rb +2 -0
- data/lib/middleman-core/meta_pages/sitemap_tree.rb +1 -1
- data/lib/middleman-core/preview_server.rb +9 -10
- data/lib/middleman-core/preview_server/server_information.rb +12 -3
- data/lib/middleman-core/preview_server/server_information_callback_proxy.rb +35 -0
- data/lib/middleman-core/preview_server/server_url.rb +17 -4
- data/lib/middleman-core/renderers/asciidoc.rb +1 -1
- data/lib/middleman-core/renderers/liquid.rb +1 -1
- data/lib/middleman-core/sitemap/extensions/content_type.rb +1 -1
- data/lib/middleman-core/sitemap/store.rb +9 -8
- data/lib/middleman-core/step_definitions.rb +1 -1
- data/lib/middleman-core/step_definitions/builder_steps.rb +10 -12
- data/lib/middleman-core/step_definitions/commandline_steps.rb +9 -9
- data/lib/middleman-core/step_definitions/middleman_steps.rb +10 -2
- data/lib/middleman-core/step_definitions/server_steps.rb +50 -30
- data/lib/middleman-core/templates/shared/Gemfile.tt +2 -2
- data/lib/middleman-core/templates/shared/config.ru +0 -1
- data/lib/middleman-core/templates/shared/gitignore +3 -0
- data/lib/middleman-core/util.rb +1 -1
- data/lib/middleman-core/version.rb +1 -1
- data/lib/middleman-more/core_extensions/default_helpers.rb +13 -2
- data/lib/middleman-more/extensions/cache_buster.rb +1 -1
- data/middleman-core.gemspec +4 -2
- metadata +15 -5
- data/.gemtest +0 -0
- data/.rspec +0 -1
@@ -1,10 +1,17 @@
|
|
1
1
|
require 'padrino-helpers'
|
2
|
+
require 'padrino-helpers/asset_tag_helpers'
|
3
|
+
require 'padrino-helpers/form_helpers'
|
4
|
+
require 'padrino-helpers/format_helpers'
|
5
|
+
require 'padrino-helpers/number_helpers'
|
6
|
+
require 'padrino-helpers/output_helpers'
|
7
|
+
require 'padrino-helpers/render_helpers'
|
8
|
+
require 'padrino-helpers/tag_helpers'
|
2
9
|
|
3
10
|
# Don't fail on invalid locale, that's not what our current
|
4
11
|
# users expect.
|
5
12
|
::I18n.enforce_available_locales = false
|
6
13
|
|
7
|
-
class Padrino::Helpers::OutputHelpers::ErbHandler
|
14
|
+
class ::Padrino::Helpers::OutputHelpers::ErbHandler
|
8
15
|
# Force Erb capture not to use safebuffer
|
9
16
|
# rubocop:disable UnderscorePrefixedVariableName
|
10
17
|
def capture_from_template(*args, &block)
|
@@ -216,7 +223,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
|
|
216
223
|
# @return [String] The fully qualified asset url
|
217
224
|
def asset_url(path, prefix='', options={})
|
218
225
|
# Don't touch assets which already have a full path
|
219
|
-
if path.include?('//') || path.start_with?('data:')
|
226
|
+
if path.include?('//') || path.start_with?('data:')
|
220
227
|
path
|
221
228
|
else # rewrite paths to use their destination path
|
222
229
|
result = if resource = sitemap.find_resource_by_destination_path(url_for(path))
|
@@ -234,6 +241,10 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
|
|
234
241
|
if options[:relative] != true
|
235
242
|
result
|
236
243
|
else
|
244
|
+
unless current_resource
|
245
|
+
raise ArgumentError, "#asset_url must be run in a context with current_resource if relative: true"
|
246
|
+
end
|
247
|
+
|
237
248
|
current_dir = Pathname('/' + current_resource.destination_path)
|
238
249
|
Pathname(result).relative_path_from(current_dir.dirname).to_s
|
239
250
|
end
|
@@ -43,7 +43,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
|
|
43
43
|
else
|
44
44
|
# It's a template, possible with partials. We can't really
|
45
45
|
# know when it's updated, so generate fresh cache buster every
|
46
|
-
# time during
|
46
|
+
# time during development
|
47
47
|
http_path << '?' + Time.now.strftime('%s')
|
48
48
|
end
|
49
49
|
end
|
data/middleman-core.gemspec
CHANGED
@@ -1,5 +1,7 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
lib = File.expand_path("../lib", __FILE__)
|
2
|
+
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
3
|
+
|
4
|
+
require "middleman-core/version"
|
3
5
|
|
4
6
|
Gem::Specification.new do |s|
|
5
7
|
s.name = "middleman-core"
|
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: 3.4.
|
4
|
+
version: 3.4.1
|
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: 2015-
|
13
|
+
date: 2015-12-10 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: bundler
|
@@ -196,8 +196,6 @@ executables:
|
|
196
196
|
extensions: []
|
197
197
|
extra_rdoc_files: []
|
198
198
|
files:
|
199
|
-
- ".gemtest"
|
200
|
-
- ".rspec"
|
201
199
|
- ".simplecov"
|
202
200
|
- ".yardopts"
|
203
201
|
- Rakefile
|
@@ -216,6 +214,7 @@ files:
|
|
216
214
|
- features/capture_html.feature
|
217
215
|
- features/chained_templates.feature
|
218
216
|
- features/clean_build.feature
|
217
|
+
- features/cli/preview_server-hook.feature
|
219
218
|
- features/cli/preview_server.feature
|
220
219
|
- features/cli_extension.feature
|
221
220
|
- features/cli_init.feature
|
@@ -417,6 +416,8 @@ files:
|
|
417
416
|
- fixtures/chained-app/source/test.erb.combobreaker.str.erb
|
418
417
|
- fixtures/clean-app/config-complications.rb
|
419
418
|
- fixtures/clean-app/config-empty.rb
|
419
|
+
- fixtures/clean-app/config-hidden-dir-after.rb
|
420
|
+
- fixtures/clean-app/config-hidden-dir-before.rb
|
420
421
|
- fixtures/clean-app/config.rb
|
421
422
|
- fixtures/clean-app/source/index.html.erb
|
422
423
|
- fixtures/clean-app/source/layout.erb
|
@@ -896,6 +897,8 @@ files:
|
|
896
897
|
- fixtures/preview-server-app/source/should_be_ignored2.html
|
897
898
|
- fixtures/preview-server-app/source/should_be_ignored3.html
|
898
899
|
- fixtures/preview-server-app/source/static.html
|
900
|
+
- fixtures/preview-server-hook-app/config.rb
|
901
|
+
- fixtures/preview-server-hook-app/source/index.html.erb
|
899
902
|
- fixtures/proxy-pages-app/config.rb
|
900
903
|
- fixtures/proxy-pages-app/source/real.html
|
901
904
|
- fixtures/proxy-pages-app/source/real/index-ivars.html.erb
|
@@ -1075,6 +1078,7 @@ files:
|
|
1075
1078
|
- lib/middleman-core/configuration.rb
|
1076
1079
|
- lib/middleman-core/core_extensions.rb
|
1077
1080
|
- lib/middleman-core/core_extensions/data.rb
|
1081
|
+
- lib/middleman-core/core_extensions/data/file_loader.rb
|
1078
1082
|
- lib/middleman-core/core_extensions/extensions.rb
|
1079
1083
|
- lib/middleman-core/core_extensions/external_helpers.rb
|
1080
1084
|
- lib/middleman-core/core_extensions/file_watcher.rb
|
@@ -1112,6 +1116,7 @@ files:
|
|
1112
1116
|
- lib/middleman-core/preview_server/network_interface_inventory.rb
|
1113
1117
|
- lib/middleman-core/preview_server/server_hostname.rb
|
1114
1118
|
- lib/middleman-core/preview_server/server_information.rb
|
1119
|
+
- lib/middleman-core/preview_server/server_information_callback_proxy.rb
|
1115
1120
|
- lib/middleman-core/preview_server/server_information_validator.rb
|
1116
1121
|
- lib/middleman-core/preview_server/server_ip_address.rb
|
1117
1122
|
- lib/middleman-core/preview_server/server_url.rb
|
@@ -1324,7 +1329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1324
1329
|
version: '0'
|
1325
1330
|
requirements: []
|
1326
1331
|
rubyforge_project:
|
1327
|
-
rubygems_version: 2.4.
|
1332
|
+
rubygems_version: 2.4.8
|
1328
1333
|
signing_key:
|
1329
1334
|
specification_version: 4
|
1330
1335
|
summary: Hand-crafted frontend development
|
@@ -1342,6 +1347,7 @@ test_files:
|
|
1342
1347
|
- features/capture_html.feature
|
1343
1348
|
- features/chained_templates.feature
|
1344
1349
|
- features/clean_build.feature
|
1350
|
+
- features/cli/preview_server-hook.feature
|
1345
1351
|
- features/cli/preview_server.feature
|
1346
1352
|
- features/cli_extension.feature
|
1347
1353
|
- features/cli_init.feature
|
@@ -1543,6 +1549,8 @@ test_files:
|
|
1543
1549
|
- fixtures/chained-app/source/test.erb.combobreaker.str.erb
|
1544
1550
|
- fixtures/clean-app/config-complications.rb
|
1545
1551
|
- fixtures/clean-app/config-empty.rb
|
1552
|
+
- fixtures/clean-app/config-hidden-dir-after.rb
|
1553
|
+
- fixtures/clean-app/config-hidden-dir-before.rb
|
1546
1554
|
- fixtures/clean-app/config.rb
|
1547
1555
|
- fixtures/clean-app/source/index.html.erb
|
1548
1556
|
- fixtures/clean-app/source/layout.erb
|
@@ -2022,6 +2030,8 @@ test_files:
|
|
2022
2030
|
- fixtures/preview-server-app/source/should_be_ignored2.html
|
2023
2031
|
- fixtures/preview-server-app/source/should_be_ignored3.html
|
2024
2032
|
- fixtures/preview-server-app/source/static.html
|
2033
|
+
- fixtures/preview-server-hook-app/config.rb
|
2034
|
+
- fixtures/preview-server-hook-app/source/index.html.erb
|
2025
2035
|
- fixtures/proxy-pages-app/config.rb
|
2026
2036
|
- fixtures/proxy-pages-app/source/real.html
|
2027
2037
|
- fixtures/proxy-pages-app/source/real/index-ivars.html.erb
|
data/.gemtest
DELETED
File without changes
|
data/.rspec
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
--color
|