middleman-core 4.3.3 → 4.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61cbb0971519b39e43ab5691e5b7de36ef5c582c23378c667ab2cc059e3d006b
-  data.tar.gz: 277df7e8ba7b78e776212de95518611a920ca80a03fac4e373f8a5f1a7f75810
+  metadata.gz: 1753d9a760b75d406bc9e1853dc09a0ee7599f13e9973134044b9ab4fdf017d1
+  data.tar.gz: 35fb8d16787d1b8c26b5a842a4b63fd95ad81d325dbcd6648732449fea324919
 SHA512:
-  metadata.gz: 31be3f47fc41353b3e58a70f4760baa81fc34f0ae1d8a6a08b88aefa9b1682e7b89bb3bb02409d916b945bf21b3e772cb39b911c7bdc26b2137d881181d9cc22
-  data.tar.gz: abd1e8c5ca18cb09484947d7241e44dccf93f02b0e20dec82b87e5d223c4e07a5839f9b7452994b98134f49f0a42514d06c8efd8e136f3dad4b477e9eccf098b
+  metadata.gz: 7a18f53041a601160e5413ffa1294366826fe3d57c4d9927a6cda48eb25dcda81e2484db15d9f55925e653e24dc748dc4501630fa622d77318a0bba23e1c6f6f
+  data.tar.gz: 02061053f863a4895c0070b3b1e11734ff71a17870bd4168e7ce762ec892669a3500694dde15a4dca74978c7e6180b782d70bb0f94668d4876d6e64795d9c456

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/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/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.3'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.3.8'.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.3
+  version: 4.3.8
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2020-08-12 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
@@ -658,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
@@ -1553,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
@@ -1579,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
@@ -1867,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