middleman-core 4.3.7 → 4.4.2

data/lib/middleman-core/builder.rb

@@ -229,7 +229,7 @@ module Middleman
           if resource.binary?
             export_file!(output_file, resource.file_descriptor[:full_path])
           else
-            response = @rack.get(::URI.escape(resource.request_path))
+            response = @rack.get(::WEBrick::HTTPUtils.escape(resource.request_path))
 
             # If we get a response, save it to a tempfile.
             if response.status == 200

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

@@ -17,7 +17,7 @@ module Middleman
       expose_to_template data: :data_store
 
       # The regex which tells Middleman which files are for data
-      DATA_FILE_MATCHER = /^(.*?)[\w-]+\.(yml|yaml|json)$/
+      DATA_FILE_MATCHER = /^(.*?)[\w-]+\.(yml|yaml|json|toml)$/
 
       def initialize(app, config={}, &block)
         super
@@ -102,13 +102,15 @@ module Middleman
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
-          return unless %w(.yaml .yml .json).include?(extension)
+          return unless %w(.yaml .yml .json .toml).include?(extension)
 
           if %w(.yaml .yml).include?(extension)
             data, postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :yaml)
             data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash)
           elsif extension == '.json'
             data, _postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :json)
+          elsif extension == '.toml'
+            data, _postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :toml)
           end
 
           data_branch = @local_data

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

@@ -6,6 +6,7 @@ require 'padrino-helpers/format_helpers'
 require 'padrino-helpers/number_helpers'
 require 'padrino-helpers/output_helpers'
 require 'padrino-helpers/render_helpers'
+require 'active_support/core_ext/array/extract_options'
 require 'middleman-core/contracts'
 
 # Don't fail on invalid locale, that's not what our current

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

@@ -17,6 +17,7 @@ module Middleman::CoreExtensions
     # Set textual delimiters that denote the start and end of frontmatter
     define_setting :frontmatter_delims, {
       json: [%w(;;; ;;;)],
+      toml: [%w(+++ +++)],
       yaml: [%w(--- ---), %w(--- ...)]
     }, 'Allowed frontmatter delimiters'
 

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

@@ -47,9 +47,3 @@ Middleman::Extensions.register :less_renderer, auto_activate: :before_configurat
   require 'middleman-core/renderers/less'
   Middleman::Renderers::Less
 end
-
-# Stylus Support
-Middleman::Extensions.register :stylus_renderer, auto_activate: :before_configuration do
-  require 'middleman-core/renderers/stylus'
-  Middleman::Renderers::Stylus
-end

data/lib/middleman-core/dns_resolver/basic_network_resolver.rb

@@ -43,8 +43,6 @@ module Middleman
       # @param [Integer] value
       #   The timeout value
       def timeouts=(timeouts)
-        return if RUBY_VERSION < '2'
-
         resolver.timeouts = timeouts
       end
     end

data/lib/middleman-core/dns_resolver.rb

@@ -31,10 +31,8 @@ module Middleman
       @resolvers = []
       @resolvers << opts.fetch(:hosts_resolver, HostsResolver.new)
 
-      if RUBY_VERSION >= '2.1'
-        require 'middleman-core/dns_resolver/local_link_resolver'
-        @resolvers << opts.fetch(:local_link_resolver, LocalLinkResolver.new)
-      end
+      require 'middleman-core/dns_resolver/local_link_resolver'
+      @resolvers << opts.fetch(:local_link_resolver, LocalLinkResolver.new)
 
       @resolvers << opts.fetch(:network_resolver, NetworkResolver.new)
     end

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

@@ -87,7 +87,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(
-        ::URI.escape(resource.destination_path),
+        ::WEBrick::HTTPUtils.escape(resource.destination_path),
         'bypass_inline_url_rewriter_asset_hash' => 'true'
       )
 

data/lib/middleman-core/preview_server/server_ip_address.rb

@@ -35,20 +35,11 @@ module Middleman
         format('[%s]', to_s)
       end
 
-      if RUBY_VERSION < '2'
-        def self.match?(str)
-          str = str.to_s.sub(/%.*$/, '')
-          IPAddr.new(str).ipv6?
-        rescue StandardError
-          false
-        end
-      else
-        def self.match?(str)
-          str = str.to_s.sub(/%.*$/, '')
-          IPAddr.new(str).ipv6?
-        rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError
-          false
-        end
+      def self.match?(str)
+        str = str.to_s.sub(/%.*$/, '')
+        IPAddr.new(str).ipv6?
+      rescue IPAddr::InvalidAddressError, IPAddr::AddressFamilyError
+        false
       end
     end
   end

data/lib/middleman-core/rack.rb

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

data/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -26,9 +26,10 @@ module Middleman
           end
 
           test_expr = parts.join('\\/')
+          test_expr = %r{^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$}
           # eponymous reverse-lookup
           found = @store.resources.find do |candidate|
-            candidate.path =~ %r{^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$}
+            candidate.path =~ test_expr
           end
 
           if found

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

@@ -82,7 +82,3 @@ end
 After do
   only_processes.each { |p| p.terminate }
 end
-
-Before '@ruby-2.1' do
-  skip_this_scenario if RUBY_VERSION < '2.1'
-end

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

@@ -35,7 +35,7 @@ Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
 end
 
 Then /^the file "([^\"]*)" is removed$/ do |path|
-  step %Q{I remove the file "#{path}"}
+  FileUtils.rm(expand_path(path))
 
   @server_inst.files.poll_once!
 end

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

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

data/lib/middleman-core/template_context.rb

@@ -99,8 +99,8 @@ module Middleman
     # @param [Hash] options
     # @param [Proc] block A block will be evaluated to return internal contents.
     # @return [String]
-    Contract Any, Or[Symbol, String], Hash => String, Maybe[Proc] => String
-    def render(_, name, options={}, &block)
+    Contract Any, Or[Symbol, String], Hash, Hash, Maybe[Proc] => String
+    def render(_, name, options={}, locals={}, &block)
       name = name.to_s
 
       partial_file = locate_partial(name, false) || locate_partial(name, true)
@@ -114,7 +114,7 @@ module Middleman
         partial_file.read
       else
         opts = options.dup
-        locs = opts.delete(:locals)
+        locs = locals.dup
 
         render_file(partial_file, locs, opts, &block)
       end

data/lib/middleman-core/template_renderer.rb

@@ -132,7 +132,7 @@ module Middleman
       @app.extensions.add_exposed_to_context(context)
 
       locals.each do |k, _|
-        next unless context.respond_to?(k) && ![:current_path, :paginate, :page_articles, :blog_controller, :lang, :locale].include?(k.to_sym)
+        next unless context.respond_to?(k) && ![:current_path, :paginate, :page_articles, :blog_controller, :lang, :locale, :data].include?(k.to_sym)
 
         msg = "Template local `#{k}` tried to overwrite an existing context value. Please rename the key when passing to `locals`"
 

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

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'json'
+require 'toml'
 require 'pathname'
 require 'backports/2.1.0/array/to_h'
 require 'hashie'
@@ -65,6 +66,8 @@ module Middleman
             return [parse_yaml(content, full_path), nil]
           when :json
             return [parse_json(content, full_path), nil]
+          when :toml
+            return [parse_toml(content, full_path), nil]
           end
         end
 
@@ -79,6 +82,11 @@ module Middleman
             parse_json("{#{match[:frontmatter]}}", full_path),
             match[:additional_content]
           ]
+        when *frontmatter_delims[:toml]
+          [
+            parse_toml(match[:frontmatter], full_path),
+            match[:additional_content]
+          ]
         else
           [
             {},
@@ -122,6 +130,26 @@ module Middleman
         c ? symbolize_recursive(c) : {}
       end
       memoize :parse_yaml
+      
+      # Parse TOML frontmatter out of a string
+      # @param [String] content
+      # @return [Hash]
+      Contract String, Pathname => Hash
+      def parse_toml(content, full_path)
+        c = begin
+          ::Middleman::Util.instrument 'parse.toml' do
+            ::TOML.load(content)
+          end
+        rescue StandardError
+          # TOML parser swallows useful error, so we can't warn about it.
+          # https://github.com/jm/toml/issues/47
+          warn "TOML Exception parsing #{full_path}"
+          {}
+        end
+      
+        c ? symbolize_recursive(c) : {}
+      end
+      memoize :parse_yaml
 
       # Parse JSON frontmatter out of a string
       # @param [String] content

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

@@ -4,6 +4,7 @@ require 'uri'
 require 'addressable/uri'
 require 'memoist'
 require 'tilt'
+require 'webrick'
 
 require 'middleman-core/contracts'
 
@@ -33,7 +34,7 @@ module Middleman
     Contract String => String
     def normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      ::URI.decode(path).sub(%r{^/}, '').tr('', '')
+      WEBrick::HTTPUtils.unescape(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.3.7'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.4.2'.freeze unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   # Core
-  s.add_dependency('bundler')
+  s.add_dependency('bundler', '~> 2.0')
   s.add_dependency('rack', ['>= 1.4.5', '< 3'])
   s.add_dependency('tilt', ['~> 2.0.9'])
   s.add_dependency('erubis')
@@ -27,18 +27,20 @@ Gem::Specification.new do |s|
   s.add_dependency('parallel')
   s.add_dependency('servolux')
   s.add_dependency('dotenv')
+  s.add_dependency('toml')
+  s.add_dependency('webrick')
 
   # Helpers
-  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('activesupport', ['>= 6.1', '< 7.0'])
+  s.add_dependency('padrino-helpers', ['~> 0.15.0'])
+  s.add_dependency("addressable", ["~> 2.4"])
   s.add_dependency('memoist', ['~> 0.14'])
 
   # Watcher
   s.add_dependency('listen', ['~> 3.0.0'])
 
   # i18n
-  s.add_dependency('i18n', ['~> 0.9.0'])
+  s.add_dependency('i18n', ['~> 1.6.0'])
 
   # Automatic Image Sizes
   s.add_dependency('fastimage', ['~> 2.0'])

data/spec/middleman-core/dns_resolver_spec.rb

@@ -22,9 +22,7 @@ RSpec.describe Middleman::DnsResolver do
     context 'when hosts resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names)
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).not_to receive(:getnames)
-        end
+        expect(local_link_resolver).not_to receive(:getnames)
         expect(network_resolver).not_to receive(:getnames)
       end
 
@@ -37,12 +35,8 @@ RSpec.describe Middleman::DnsResolver do
     context 'when local link resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return([])
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names)
-          expect(network_resolver).not_to receive(:getnames)
-        else
-          expect(network_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names)
-        end
+        expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names)
+        expect(network_resolver).not_to receive(:getnames)
       end
 
       let(:unresolved_ip) { '127.0.0.1' }
@@ -54,9 +48,7 @@ RSpec.describe Middleman::DnsResolver do
     context 'when network resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getnames).with(unresolved_ip).and_return([])
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return([])
-        end
+        expect(local_link_resolver).to receive(:getnames).with(unresolved_ip).and_return([])
         expect(network_resolver).to receive(:getnames).with(unresolved_ip).and_return(resolved_names)
       end
 
@@ -71,9 +63,7 @@ RSpec.describe Middleman::DnsResolver do
     context 'when hosts resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name)
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).not_to receive(:getaddresses)
-        end
+        expect(local_link_resolver).not_to receive(:getaddresses)
         expect(network_resolver).not_to receive(:getaddresses)
       end
 
@@ -86,12 +76,8 @@ RSpec.describe Middleman::DnsResolver do
     context 'when local link resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([])
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name)
-          expect(network_resolver).not_to receive(:getaddresses)
-        else
-          expect(network_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name)
-        end
+        expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name)
+        expect(network_resolver).not_to receive(:getaddresses)
       end
 
       let(:unresolved_ips) { '127.0.0.1' }
@@ -103,9 +89,7 @@ RSpec.describe Middleman::DnsResolver do
     context 'when network resolver can resolve name' do
       before :each do
         expect(hosts_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([])
-        if RUBY_VERSION >= '2.1'
-          expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([])
-        end
+        expect(local_link_resolver).to receive(:getaddresses).with(unresolved_ips).and_return([])
         expect(network_resolver).to receive(:getaddresses).with(unresolved_ips).and_return(resolved_name)
       end
 

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
 require 'coveralls'
 Coveralls.wear!
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'aruba/api'
 RSpec.configure do |config|
   config.include Aruba::Api