middleman-core 4.4.3 → 4.5.1

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 = []
@@ -34,7 +34,7 @@ end
 Given /^the Server is running$/ do
   root_dir = File.expand_path(expand_path("."))
 
-  if File.exists?(File.join(root_dir, 'source'))
+  if File.exist?(File.join(root_dir, 'source'))
     ENV['MM_SOURCE'] = 'source'
   else
     ENV['MM_SOURCE'] = ''
@@ -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|