middleman-core 4.3.2 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb75ea4ac0afae1968d76af0348066991e0fe4d6be8b7554cb0fd57744da8ae5
-  data.tar.gz: a01a7220b19626efe15591e61c98b7698b6ab92d9be9734f6044e1a3fe7ae52e
+  metadata.gz: a62bb451348c77bfb582a6fd7a97f8913c30e1602e256bb307672e022bfcc314
+  data.tar.gz: 83fe52a59f84380ad4eb754d00c79754eeb546ed3f15fa15f47603d0740e72b5
 SHA512:
-  metadata.gz: fde264ab5c1cfce6903ebe2cd32e461ce6aef586085cf10b3c1bb2d2bc7fb7c1423094032c7f4a2fbea57ef3f0037ff2cb7e354ccacff80bee87a4b77aff6cda
-  data.tar.gz: ad5160848a55cc8353856d0ad556d6e14dbac20f62f29c71886fa67d29334412d892fcdf070e0d3ec6ea4541f1c58efefff9e5371c085968206e80ecfded7d2c
+  metadata.gz: 33de280861e5d60ef103a6abb8fd1602dc7c36899dc08731a63975049c96961c5e0e8bda083b14a40d1638f08c614dcd903799d15ffa550a39d3e276287f74ae
+  data.tar.gz: 5e42f113d14f5dcd70276bfb548ed6c2f8d38ce889e1fbd4f35f6407d906827b46132e156c152f80c77de4b93afc8df65f6f381c4292fd569d0922145cc50c8e

data/features/asset_hash.feature

@@ -322,3 +322,17 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/application.js.map |
 
     And the file "javascripts/application-myprefix-4553338c.js" should contain "//# sourceMappingURL=application.js-myprefix-22cc2b5f.map"
+
+  Scenario: Filenames can be removed by option
+    Given a successfully built app at "asset-hash-remove-filename"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | javascripts/4553338c.js |
+      | javascripts/22cc2b5f.map |
+      | index.html |
+    And the following files should not exist:
+      | javascripts/application.js |
+      | javascripts/application.js.map |
+
+    And the file "javascripts/4553338c.js" should contain "//# sourceMappingURL=22cc2b5f.map"

data/features/default_alt_tag.feature

@@ -0,0 +1,11 @@
+Feature: Add an empty alt tag for images that don't have alt tags specified
+
+  Scenario: Image does not have alt tag specified
+    Given the Server is running at "default-alt-tags-app"
+    When I go to "/empty-alt-tag.html"
+    Then I should see 'alt=""'
+
+  Scenario: Image has alt tag specified
+    Given the Server is running at "default-alt-tags-app"
+    When I go to "/meaningful-alt-tag.html"
+    Then I should see 'alt="Meaningful alt text"'

data/features/i18n_link_to.feature

@@ -178,6 +178,7 @@ Feature: i18n Paths
 
       Current: <%= url_for "/article.html" %>
       Other: <%= url_for "/article.html", locale: ::I18n.locale == :en ? :es : :en %>
+      Current with anchor: <%= url_for "/article.html", :anchor => "test-anchor" %>
       """
     And a file named "source/localizable/article.es.html.erb" with:
       """
@@ -185,6 +186,7 @@ Feature: i18n Paths
 
       Current: <%= url_for "/article.html" %>
       Other: <%= url_for "/article.html", locale: :en %>
+      Current with anchor: <%= url_for "/article.html", :anchor => "test-anchor" %>
       """
     And a file named "config.rb" with:
       """
@@ -203,7 +205,9 @@ Feature: i18n Paths
     Then I should see "Page Lang: Default"
     Then I should see 'Current: /article.html'
     Then I should see 'Other: /es/article.html'
+    Then I should see 'Current with anchor: /article.html#test-anchor'
     When I go to "/es/article.html"
     Then I should see "Page Lang: Spanish"
     Then I should see 'Current: /es/article.html'
     Then I should see 'Other: /article.html'
+    Then I should see 'Current with anchor: /es/article.html#test-anchor'

data/features/ignore.feature

@@ -7,11 +7,12 @@ Feature: Ignoring paths
       ignore 'plain.html'
       """
     And a successfully built app at "ignore-app"
+    When I cd to "build"
     Then the following files should exist:
-      | build/index.html |
+      | index.html |
     And the following files should not exist:
-      | build/plain.html |
-      | build/about.html |
+      | plain.html |
+      | about.html |
 
   Scenario: Ignore a single path (server)
     Given a fixture app "ignore-app"
@@ -66,16 +67,17 @@ Feature: Ignoring paths
       ignore 'images/**/*.png'
       """
     And a successfully built app at "ignore-app"
+    When I cd to "build"
     Then the following files should exist:
-      | build/plain.html |
-      | build/images/portrait.jpg |
-      | build/images/pic.png |
+      | plain.html |
+      | images/portrait.jpg |
+      | images/pic.png |
     And the following files should not exist:
-      | build/about.html |
-      | build/index.html |
-      | build/reports/index.html |
-      | build/reports/another.html |
-      | build/images/icons/messages.png |
+      | about.html |
+      | index.html |
+      | reports/index.html |
+      | reports/another.html |
+      | images/icons/messages.png |
 
   Scenario: Ignore a globbed path (server)
     Given a fixture app "ignore-app"
@@ -148,3 +150,57 @@ Feature: Ignoring paths
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
     Then I should see "File Not Found"
+
+  Scenario: Ignore localized templates (build)
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      ignore 'localizable/hello.html.erb'
+      ignore /morning/
+      ignore 'localizable/*.md'
+      """
+    And a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | es/index.html |
+    And the following files should not exist:
+      | hello.html |
+      | morning.html |
+      | one.html |
+      | es/hola.html |
+      | es/manana.html |
+      | es/una.html |
+      | es/hello.html |
+      | es/morning.html |
+      | es/one.html |
+    And the file "index.html" should contain "Howdy"
+    And the file "es/index.html" should contain "Como Esta?"
+
+  Scenario: Ignore localized templates (server)
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      ignore 'localizable/hello.html.erb'
+      ignore /morning/
+      ignore 'localizable/*.md'
+      """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should not see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should not see "File Not Found"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/morning.html"
+    Then I should see "File Not Found"
+    When I go to "/one.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+    When I go to "/es/manana.html"
+    Then I should see "File Not Found"
+    When I go to "/es/una.html"
+    Then I should see "File Not Found"

data/features/markdown_kramdown.feature

@@ -36,3 +36,20 @@ Feature: Markdown (Kramdown) support
     And I should see 'src="/images/blank.gif"'
     And I should see 'src="/images/blank.gif"'
     And I should see "mail@mail.com"
+
+  Scenario: Kramdown uses our link_to with options parameter
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      activate :directory_indexes
+      """
+    And a file named "source/links.html.markdown" with:
+      """
+      [A link](/smarty_pants.html)
+      [A second link](/smarty_pants.html){: anchor="test-anchor"}
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/links/"
+    Then I should see "/smarty_pants/"
+    And I should see "/smarty_pants/#test-anchor"

data/features/relative_assets.feature

@@ -131,7 +131,7 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" alt="" />'
 
   Scenario: URLs are not rewritten for rewrite ignored paths
     Given a fixture app "relative-assets-app"

data/features/relative_assets_helpers_only.feature

@@ -87,7 +87,7 @@ Feature: Relative Assets (Helpers Only)
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" alt="" />'
 
   @wip
   Scenario: URLs are not rewritten for rewrite ignored paths

data/fixtures/asset-hash-remove-filename/config.rb

@@ -0,0 +1,9 @@
+
+activate :asset_hash,
+         rename_proc: lambda { |path, _basename, digest, extension, _options|
+           "#{path}#{digest}#{extension}"
+         }
+
+activate :relative_assets
+
+activate :directory_indexes

data/fixtures/asset-hash-remove-filename/source/index.html.erb

@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+
+<h1>Testing the sitemap hashing</h1>
+<br /><br /><br />

data/fixtures/asset-hash-remove-filename/source/javascripts/application.js

@@ -0,0 +1,2 @@
+function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
+//# sourceMappingURL=application.js.map

data/fixtures/asset-hash-remove-filename/source/javascripts/application.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}

data/fixtures/asset-hash-remove-filename/source/layout.erb

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+
+    <%= javascript_include_tag "application" %>
+    <%= yield_content :head %>
+  </head>
+
+  <body class="<%= page_classes %>">
+
+    <div id="main" role="main">
+      <%= yield %>
+    </div>
+
+  </body>
+</html>

data/fixtures/default-alt-tags-app/source/empty-alt-tag.html.erb

@@ -0,0 +1 @@
+<%= image_tag "blank.gif" %>

data/fixtures/default-alt-tags-app/source/meaningful-alt-tag.html.erb

@@ -0,0 +1 @@
+<%= image_tag "blank.gif", alt: "Meaningful alt text" %>

data/lib/middleman-core/core_extensions/default_helpers.rb

@@ -282,6 +282,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
         params[:srcset] = images_sources.join(', ')
       end
 
+      params[:alt] ||= ''
+
       super(path, params)
     end
 

data/lib/middleman-core/core_extensions/i18n.rb

@@ -74,8 +74,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       opts = options.dup
 
       should_relativize = opts.key?(:relative) ? opts[:relative] : config[:relative_links]
+      anchor = opts[:anchor]
 
+      # The first call to `super()` is only to find the correct URL. The next
+      # call will relativize and add the anchor.
       opts[:relative] = false
+      opts[:anchor] = nil
 
       href = super(path_or_resource, opts)
 
@@ -87,6 +91,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       end
 
       opts[:relative] = should_relativize
+      opts[:anchor] = anchor
 
       begin
         super(final_path, opts)
@@ -155,6 +160,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it's a "localizable template"
     localizable_folder_resources.each do |resource|
+      next if resource.ignored?
+
       page_id = File.basename(resource.path, File.extname(resource.path))
       locales.each do |locale|
         # Remove folder name
@@ -174,6 +181,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it uses file extension localization
     file_extension_resources.each do |resource|
+      next if resource.ignored?
+
       result = parse_locale_extension(resource.path)
       ext_locale, path, page_id = result
       new_resources << build_resource(path, resource.path, page_id, ext_locale)

data/lib/middleman-core/core_extensions/inline_url_rewriter.rb

@@ -123,6 +123,11 @@ module Middleman
             end
           end
 
+          # Rewriting might have changed Content-Length, so we need
+          # to reset it to the actual result. The rewritten result is
+          # always a String, not an Array or Enumerable.
+          headers['Content-Length'] = rewritten.bytesize.to_s
+
           ::Rack::Response.new(
             rewritten,
             status,

data/lib/middleman-core/extensions/asset_hash.rb

@@ -7,6 +7,9 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
   option :prefix, '', 'Prefix for hash'
+  option :rename_proc, proc { |path, basename, digest, extension, options|
+    "#{path}#{basename}-#{options.prefix}#{digest}#{extension}"
+  }, 'Accepts path parameters and returns path name'
 
   def initialize(app, options_hash={}, &block)
     super
@@ -93,7 +96,8 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       ::Digest::SHA1.hexdigest(response.body)[0..7]
     end
 
-    resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{options.prefix}#{digest}#{ext}" }
+    path, basename, extension = split_path(resource.destination_path)
+    resource.destination_path = options.rename_proc.call(path, basename, digest, extension, options)
     resource
   end
 
@@ -103,4 +107,14 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       Middleman::Util.path_match(ignore, resource.destination_path)
     end
   end
+
+  private
+
+  # Splits resource path into path, basename and extension
+  # (e.g. "/images/landscape.png" => ["/images/", "landscape", ".png]
+  def split_path(filepath)
+    basename = File.basename(filepath, extension = File.extname(filepath))
+    path = filepath.chomp(basename + extension)
+    [path, basename, extension]
+  end
 end

data/lib/middleman-core/renderers/kramdown.rb

@@ -45,6 +45,10 @@ module Middleman
         attr = el.attr.dup
         link = attr.delete('href')
 
+        # options to link_to are expected to be symbols, but in Markdown
+        # everything is a string.
+        attr.transform_keys!(&:to_sym)
+
         scope.link_to(content, link, attr)
       end
     end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.3.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.3.7'.freeze unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency('dotenv')
 
   # Helpers
-  s.add_dependency('activesupport', ['>= 4.2', '< 5.1'])
+  s.add_dependency('activesupport', ['>= 4.2', '< 6.0'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
   s.add_dependency("addressable", ["~> 2.3"])
   s.add_dependency('memoist', ['~> 0.14'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.7
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,7 +139,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,7 @@ files:
 - features/custom_layouts.feature
 - features/data.feature
 - features/default-layout.feature
+- features/default_alt_tag.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
 - features/encoding_option.feature
@@ -492,6 +493,11 @@ files:
 - fixtures/asset-hash-prefix/source/javascripts/application.js
 - fixtures/asset-hash-prefix/source/javascripts/application.js.map
 - fixtures/asset-hash-prefix/source/layout.erb
+- fixtures/asset-hash-remove-filename/config.rb
+- fixtures/asset-hash-remove-filename/source/index.html.erb
+- fixtures/asset-hash-remove-filename/source/javascripts/application.js
+- fixtures/asset-hash-remove-filename/source/javascripts/application.js.map
+- fixtures/asset-hash-remove-filename/source/layout.erb
 - fixtures/asset-hash-source-map/config.rb
 - fixtures/asset-hash-source-map/lib/middleware.rb
 - fixtures/asset-hash-source-map/source/index.html.erb
@@ -653,6 +659,10 @@ files:
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.erb
 - fixtures/data-app/source/layout.erb
+- fixtures/default-alt-tags-app/config.rb
+- fixtures/default-alt-tags-app/source/empty-alt-tag.html.erb
+- fixtures/default-alt-tags-app/source/images/blank.gif
+- fixtures/default-alt-tags-app/source/meaningful-alt-tag.html.erb
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.haml
 - fixtures/different-engine-layout/source/index.html.str
@@ -1548,7 +1558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1574,6 +1584,7 @@ test_files:
 - features/custom_layouts.feature
 - features/data.feature
 - features/default-layout.feature
+- features/default_alt_tag.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
 - features/encoding_option.feature
@@ -1696,6 +1707,11 @@ test_files:
 - fixtures/asset-hash-prefix/source/javascripts/application.js
 - fixtures/asset-hash-prefix/source/javascripts/application.js.map
 - fixtures/asset-hash-prefix/source/layout.erb
+- fixtures/asset-hash-remove-filename/config.rb
+- fixtures/asset-hash-remove-filename/source/index.html.erb
+- fixtures/asset-hash-remove-filename/source/javascripts/application.js
+- fixtures/asset-hash-remove-filename/source/javascripts/application.js.map
+- fixtures/asset-hash-remove-filename/source/layout.erb
 - fixtures/asset-hash-source-map/config.rb
 - fixtures/asset-hash-source-map/lib/middleware.rb
 - fixtures/asset-hash-source-map/source/index.html.erb
@@ -1857,6 +1873,10 @@ test_files:
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.erb
 - fixtures/data-app/source/layout.erb
+- fixtures/default-alt-tags-app/config.rb
+- fixtures/default-alt-tags-app/source/empty-alt-tag.html.erb
+- fixtures/default-alt-tags-app/source/images/blank.gif
+- fixtures/default-alt-tags-app/source/meaningful-alt-tag.html.erb
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.haml
 - fixtures/different-engine-layout/source/index.html.str