middleman-core 4.4.3 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a1d9d5037e308781c5d071bdbd012631dffec9f2439e1c73b6bf8b6e9d27ff
-  data.tar.gz: fe51eb33932856df3019ad8ad8a41a4abf80266b814da9c716f0aeeda4db74c9
+  metadata.gz: 955d0ea89728b170a8a5e7b94dadbf9c7e848ac05c41ee69e8d6932e531c6d45
+  data.tar.gz: 1c59256a26b181e745b0a263514411c61aa6887fff9c293b5a9dba0ebb10f665
 SHA512:
-  metadata.gz: df1e1c37ccb433f391dcc05122297f83c3a9d19bef1a8b4c8738f40d156ddd014affa6ecd583a358f9b749ad891afa4d788d7d837aef0d3c42eaa6e79d899029
-  data.tar.gz: 1cfdb65af805d4599b34b939d8dc1377a2d29f830d8aa21692e6e851cce5d6ff612d9122865aa67f8f4e142c46644b334eacccf9d0b1a9586add6d72539aac90
+  metadata.gz: 6a7956f26e7c55806f06ab7dc18e5fb544f3f91a43b814011edb5aecec5fa0d9124cd873b402a04d65edabba4f0d3f32750d963be889d3379a0f17bb1356428a
+  data.tar.gz: a6f6e1038e04ea990628b2a6a62b59fdfb4da77acfa46f49a07ac3774c2f706c1ff7366a1f745e0a70ccd1dbe4f18ad276664a616bb05da4f0033186b3fe292e

data/.simplecov

@@ -1,7 +1,7 @@
-SimpleCov.start do
+SimpleCov.configure do
   add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
   add_filter '/step_definitions/'
   add_filter '/lib/vendored-middleman-deps/'
-end
+end

data/features/i18n_builder.feature

@@ -123,8 +123,10 @@ Feature: i18n Builder
       | hello.html                                    |
     And the file "en/index.html" should contain "Howdy"
     And the file "en/hello.html" should contain "Hello World"
+    And the file "en/fallback.html" should contain "Fallback"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
+    And the file "es/fallback.html" should contain "Fallback"
 
   Scenario: Running localize with the subset config
     Given a fixture app "i18n-test-app"

data/features/i18n_link_to.feature

@@ -211,3 +211,97 @@ Feature: i18n Paths
     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'
+
+  Scenario: Using url_for with the no mount config
+    Given a fixture app "empty-app"
+    And a file named "data/pages.yml" with:
+      """
+      - hello.html
+      """
+    And a file named "locales/en.yml" with:
+      """
+      ---
+      en:
+        msg: Hello
+      """
+    And a file named "locales/es.yml" with:
+      """
+      ---
+      es:
+        paths:
+          hello: "hola"
+        msg: Hola
+      """
+    And a file named "source/localizable/hello.html.erb" with:
+      """
+      Page: <%= t(:msg) %>
+      <% data.pages.each_with_index do |p, i| %>
+        Current: <%= url_for "/#{p}" %>
+        Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
+      <% end %>
+      """
+    And a file named "source/localizable/article.html.erb" with:
+      """
+      Page Lang: Default
+
+      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:
+      """
+      Page Lang: Spanish
+
+      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 "source/localizable/post.en.html.erb" with:
+      """
+      Page Lang: English
+
+      Current: <%= url_for "/post.html" %>
+      Other: <%= url_for "/post.html", locale: :es %>
+      Current with anchor: <%= url_for "/post.html", :anchor => "test-anchor" %>
+      """
+    And a file named "source/localizable/post.es.html.erb" with:
+      """
+      Page Lang: Spanish
+
+      Current: <%= url_for "/post.html" %>
+      Other: <%= url_for "/post.html", locale: :en %>
+      Current with anchor: <%= url_for "/post.html", :anchor => "test-anchor" %>
+      """
+    And a file named "config.rb" with:
+      """
+      activate :i18n, mount_at_root: false
+      """
+    Given the Server is running
+    When I go to "/en/hello.html"
+    Then I should see "Page: Hello"
+    Then I should see 'Current: /en/hello.html'
+    Then I should see 'Other: /es/hola.html'
+    When I go to "/es/hola.html"
+    Then I should see "Page: Hola"
+    Then I should see 'Current: /es/hola.html'
+    Then I should see 'Other: /en/hello.html'
+    When I go to "/en/article.html"
+    Then I should see "Page Lang: Default"
+    Then I should see 'Current: /en/article.html'
+    Then I should see 'Other: /es/article.html'
+    Then I should see 'Current with anchor: /en/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: /en/article.html'
+    Then I should see 'Current with anchor: /es/article.html#test-anchor'
+    When I go to "/en/post.html"
+    Then I should see "Page Lang: English"
+    Then I should see 'Current: /en/post.html'
+    Then I should see 'Other: /es/post.html'
+    Then I should see 'Current with anchor: /en/post.html#test-anchor'
+    When I go to "/es/post.html"
+    Then I should see "Page Lang: Spanish"
+    Then I should see 'Current: /es/post.html'
+    Then I should see 'Other: /en/post.html'
+    Then I should see 'Current with anchor: /es/post.html#test-anchor'

data/fixtures/content-for-app/source/content_for_haml.html.haml

@@ -1,4 +1,4 @@
-= content_for :from_template do
-  = "I am the yielded content haml <s>with html tags</s>"
+- content_for :from_template do
+  != "I am the yielded content haml <s>with html tags</s>"
 
 %p I am in the template

data/fixtures/i18n-test-app/locales/en.yml

@@ -1,4 +1,5 @@
 ---
 en:
   greetings: "Howdy"
-  hi: "Hello"
+  hi: "Hello"
+  fallback: "Fallback"

data/fixtures/i18n-test-app/source/localizable/fallback.html.erb

@@ -0,0 +1 @@
+<%= I18n.t(:fallback) %>

data/lib/middleman-core/builder.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'pathname'
 require 'fileutils'
 require 'tempfile'
@@ -229,7 +230,7 @@ module Middleman
           if resource.binary?
             export_file!(output_file, resource.file_descriptor[:full_path])
           else
-            response = @rack.get(::WEBrick::HTTPUtils.escape(resource.request_path))
+            response = @rack.get(Addressable::URI.encode(resource.request_path))
 
             # If we get a response, save it to a tempfile.
             if response.status == 200

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

@@ -151,7 +151,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     new_resources = []
 
     file_extension_resources = resources.select do |resource|
-      parse_locale_extension(resource.path)
+      # Ignore resources which are outside of the localizable directory
+      File.fnmatch?(File.join(options[:templates_dir], '**'), resource.path) &&
+        parse_locale_extension(resource.path)
     end
 
     localizable_folder_resources = resources.select do |resource|
@@ -190,10 +192,61 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       resource.ignore!
     end
 
-    @lookup = new_resources.each_with_object({}) do |desc, sum|
-      abs_path = desc.source_path.sub(options[:templates_dir], '')
-      sum[abs_path] ||= {}
-      sum[abs_path][desc.locale] = '/' + desc.path
+    # This generates a lookup hash that maps the real path (as seen by the web
+    # page user) to the paths of the localized versions. The lookup is later
+    # used by `url_for '/some/page.html', :locale => :en` and other url
+    # helpers.
+    #
+    # For example (given :mount_at_root => :es) and localized paths:
+    #
+    # @lookup['/en/magic/stuff.html'] = {:en => '/en/magic/stuff.html', :de => '/de/magisches/zeug.html', :es => '/magico/cosas.html'}
+    # @lookup['/de/index.html'] = {:en => '/en/index.html', :de => '/de/index.html', :es => '/index.html'}
+    # @lookup['/en/index.html'] = {:en => '/en/index.html', :de => '/de/index.html', :es => '/index.html'}
+    # @lookup['/index.html'] = {:en => '/en/index.html', :de => '/de/index.html', :es => '/index.html'}
+    #
+    # We do this by grouping by the source paths with the locales removed. All
+    # the localized pages with the same content in different languages get the
+    # same key.
+    #
+    @source_path_group = new_resources.group_by do |resource|
+      # Try to get source path without extension
+      _locale, path, _page_id = parse_locale_extension(resource.source_path)
+
+      # If that fails, there is no extension, so we use the original path. We
+      # can not use resource.path here, because .path may be translated, so the
+      # file names do not match up.
+      path ||= resource.source_path
+
+      # This will contain the localizable/ directory, but that does not matter,
+      # because it will be contained in both alternatives above, so the
+      # grouping key will be correct.
+      path
+    end
+
+    # Then we walk this grouped hash and generate the lookup table as given
+    # above.
+    @lookup = {}
+    @source_path_group.each do |src_path, resources|
+      # For each group we generate a list of the paths the user really sees
+      # (e.g. ['/en/index.html', '/de/index.html', '/index.html'])
+      exposed_paths = resources.map(&:path)
+
+      # We also generate a map with the same infos, but with the locales as keys.
+      # e.g. {:en => '/en/index.html', :de => '/de/index.html', :es => '/index.html'}
+      locale_map = resources.each_with_object({}) do |resource, map|
+        map[resource.locale] = '/' + resource.path
+      end
+
+      # Then we add those to the lookup table, so every path has a
+      # cross-reference to any other path in other locales.
+      exposed_paths.each do |path|
+        @lookup['/' + path] = locale_map
+      end
+
+      if @mount_at_root == false
+        src_path = src_path.sub(options[:templates_dir] + '/', '')
+        @lookup["/#{src_path}"] = locale_map
+      end
     end
 
     new_resources.reduce(resources) do |sum, r|
@@ -236,7 +289,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # Reset fallbacks to fall back to our new default
     if ::I18n.respond_to?(:fallbacks)
-      ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new(@mount_at_root)
+      ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new(::I18n.default_locale)
     end
   end
 

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

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'middleman-core/util'
 require 'middleman-core/rack'
 
@@ -87,7 +88,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     else
       # Render through the Rack interface so middleware and mounted apps get a shot
       response = @rack_client.get(
-        ::WEBrick::HTTPUtils.escape(resource.destination_path),
+        Addressable::URI.encode(resource.destination_path),
         'bypass_inline_url_rewriter_asset_hash' => 'true'
       )
 

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

@@ -6,6 +6,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   option :source, nil, 'Path to merge into sitemap', required: true
   option :latency, 0.25, 'Latency between refreshes of source'
   option :disable_background_execution, false, "Don't run the command in a separate background thread"
+  option :ignore_exit_code, false, 'Ignore exit code for restart or stop of a command'
 
   def initialize(app, config={}, &block)
     super
@@ -65,7 +66,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
 
       @current_thread.wait
 
-      if !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
+      if !options[:ignore_exit_code] && !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
         logger.error '== External: Command failed with non-zero exit status'
         exit(1)
       end

data/lib/middleman-core/rack.rb

@@ -3,7 +3,7 @@ require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
 require 'rack/utils'
-require 'webrick'
+require 'addressable/uri'
 
 require 'middleman-core/util'
 require 'middleman-core/logger'
@@ -87,7 +87,7 @@ module Middleman
     def process_request(env, req, res)
       start_time = Time.now
 
-      request_path = WEBrick::HTTPUtils.unescape(env['PATH_INFO'].dup)
+      request_path = Addressable::URI.unencode(env['PATH_INFO'].dup)
       if request_path.respond_to? :force_encoding
         request_path.force_encoding('UTF-8')
       end

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

@@ -29,12 +29,18 @@ module Middleman
       def prepare; end
 
       def evaluate(scope, locals, &block)
-        options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)
+        options = {}.merge!(@options).merge!(context: @context || scope)
         if options.include?(:outvar)
           options[:buffer] = options.delete(:outvar)
           options[:save_buffer] = true
         end
-        @engine = ::Haml::Engine.new(data, options)
+        if Object.const_defined?('::Haml::Template') # haml 6+
+          @engine = ::Haml::Template.new(eval_file, line, options) { data }
+        else
+          options[:filename] = eval_file
+          options[:line] = line
+          @engine = ::Haml::Engine.new(data, options)
+        end
         output = @engine.render(scope, locals, &block)
 
         output
@@ -46,8 +52,12 @@ module Middleman
       def initialize(app, options={}, &block)
         super
 
-        ::Haml::Options.defaults[:context] = nil
-        ::Haml::Options.send :attr_accessor, :context
+        if Object.const_defined?('::Haml::Options') # Haml 5 and older
+          ::Haml::Options.defaults[:context] = nil
+          ::Haml::Options.send :attr_accessor, :context
+        else # Haml 6+
+          ::Haml::Engine.define_options context: nil
+        end
         if defined?(::Haml::TempleEngine)
           ::Haml::TempleEngine.define_options context: nil
         end
@@ -55,12 +65,31 @@ module Middleman
         # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
-            def self.render_with_options(text, compiler_options)
-              modified_options = options.dup
-              modified_options[:context] = compiler_options[:context]
-
-              text = template_class.new(nil, 1, modified_options) { text }.render
-              super(text, compiler_options)
+            if respond_to?(:template_class) # Haml 5 and older
+              def self.render_with_options(text, compiler_options)
+                modified_options = options.dup
+                modified_options[:context] = compiler_options[:context]
+
+                text = template_class.new(nil, 1, modified_options) { text }.render
+                super(text, compiler_options)
+              end
+            else # Haml 6+
+              def initialize(options = {})
+                super
+                @context = options[:context]
+              end
+
+              def compile_with_tilt(node, name, indent_width: 0)
+                options = { context: @context }
+                source = node.value[:text]
+                result = ::Tilt["t.#{name}"].new(nil, 1, options) { source }.render
+
+                temple = [:multi, [:static, result.gsub(/^/, ' ' * indent_width)]]
+                source.lines.size.times do
+                  temple << [:newline]
+                end
+                temple
+              end
             end
           end
         end

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -1,7 +1,7 @@
 require 'middleman-core/rack'
 require 'rspec/expectations'
 require 'capybara/cucumber'
-require 'webrick'
+require 'addressable/uri'
 
 Given /^a clean server$/ do
   @initialize_commands = []
@@ -73,11 +73,11 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string|
 end
 
 When /^I go to "([^\"]*)"$/ do |url|
-  visit(WEBrick::HTTPUtils.escape(url))
+  visit(Addressable::URI.encode(url))
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  expect{ visit(WEBrick::HTTPUtils.escape(url)) }.to_not raise_exception
+  expect { visit(Addressable::URI.encode(url)) }.to_not raise_exception
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|

data/lib/middleman-core/util/data.rb

@@ -118,9 +118,17 @@ module Middleman
       # @return [Hash]
       Contract String, Pathname => Hash
       def parse_yaml(content, full_path)
+        permitted_classes = [Date, Symbol]
         c = begin
           ::Middleman::Util.instrument 'parse.yaml' do
-            ::YAML.load(content)
+            allowed_parameters = ::YAML.method(:safe_load).parameters
+            if allowed_parameters.include? [:key, :permitted_classes]
+              ::YAML.safe_load(content, permitted_classes: permitted_classes)
+            elsif allowed_parameters.include? [:key, :whitelist_classes]
+              ::YAML.safe_load(content, whitelist_classes: permitted_classes)
+            else
+              ::YAML.safe_load(content, permitted_classes)
+            end
           end
         rescue StandardError, ::Psych::SyntaxError => error
           warn "YAML Exception parsing #{full_path}: #{error.message}"

data/lib/middleman-core/util/paths.rb

@@ -4,7 +4,6 @@ require 'uri'
 require 'addressable/uri'
 require 'memoist'
 require 'tilt'
-require 'webrick'
 
 require 'middleman-core/contracts'
 
@@ -34,7 +33,7 @@ module Middleman
     Contract String => String
     def normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      WEBrick::HTTPUtils.unescape(path).sub(%r{^/}, '').tr('', '')
+      Addressable::URI.unencode(path).sub(%r{^/}, '').tr('', '')
     end
     memoize :normalize_path
 

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.authors     = ['Thomas Reynolds', 'Ben Hollis', 'Karl Freeman']
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
-  s.homepage    = 'http://middlemanapp.com'
+  s.homepage    = 'https://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
   s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
-# SimpleCov.start
+SimpleCov.start
 
 require 'aruba/api'
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.5.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -873,6 +873,7 @@ files:
 - fixtures/i18n-test-app/source/layouts/layout.erb
 - fixtures/i18n-test-app/source/localizable/_state.en.erb
 - fixtures/i18n-test-app/source/localizable/_state.es.erb
+- fixtures/i18n-test-app/source/localizable/fallback.html.erb
 - fixtures/i18n-test-app/source/localizable/hello.html.erb
 - fixtures/i18n-test-app/source/localizable/images/flag.en.svg
 - fixtures/i18n-test-app/source/localizable/images/flag.es.svg
@@ -1570,7 +1571,7 @@ files:
 - spec/middleman-core/util_spec.rb
 - spec/spec_helper.rb
 - spec/support/given.rb
-homepage: http://middlemanapp.com
+homepage: https://middlemanapp.com
 licenses:
 - MIT
 metadata: {}
@@ -1589,7 +1590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development