middleman-core 4.3.10 → 4.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6517438bf88fc9e92b57472e4ef3e6d059cd8a44268bb6ac0d19a0e6340a748
-  data.tar.gz: f736d871dd103415828e314fb032936d26eae9b329503b50a38d9b68156df871
+  metadata.gz: 9a6c24e6aadd1825d0b97243b66abcfc1e1e55bd2614d2bb38d16e090eacf93d
+  data.tar.gz: 508ed84f8d68b46a4a8216d5faec3ca534e9c2e26afb8ce5bc0e7caa99bb21d1
 SHA512:
-  metadata.gz: 63ffd61ee8b9d8b79793e651ec98f3561d8ce2aa083022504aad6ce17ca457584e5e4c750d4e4d19cfca9ad6daed1063765028bf53cb3d76540271d1b3f58816
-  data.tar.gz: 1a98606f12923af0a6f1cb9f47792f6ca3ef702839b8c81c72764a05181273723f29650698f71f5282685131898753115f19b1013456e583f4a8bceb63053d1e
+  metadata.gz: 5ee86cb278396a0db2d9d7355cfcc4b48407499f3f24a41c0ab71d8776a89118311a5014ca194ea45dd4bdc0374e67341ac1e25aa8075758fc13d4776a56027f
+  data.tar.gz: 7cc9c4fbc9e0489aab97a206d9687bd5edca75f3e199b9e1d08e547d532e0d8c3abf1983b6abeaa52bb82826a28d632ebfe318571c73c6a52db602c1d0704f93

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/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/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.10'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.3.11'.freeze unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.3.10
+  version: 4.3.11
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler