middleman-core 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 030311fff277fca785018355eae0d3e841af713f
-  data.tar.gz: 7bb366e4fd42e9ca58e05fb7c28c16dfb04fdf10
+  metadata.gz: 99765b41dbcadb0a1fe8e9017ce95171fe5e7877
+  data.tar.gz: 972fcfba7e09229dc557444eba1434d6d42a0346
 SHA512:
-  metadata.gz: 36442dc7b91a3e5f0f2cc0d55ee56c9a799b9e37598f42fa9c4a3531905baf55d7bd0771d68969f21dc345dfdf832df8dc0ae0584eecdec1921bad8e73f7ee8a
-  data.tar.gz: d0cfb1e50a0e23f4c73aaa3bd8995209d5b42dc78af1674429a21c99a98508bdca64d16245f4030dd475cfca9532f41e0bc19cdcffdf130b02d456e8a27da7e0
+  metadata.gz: 52e4d9adb600ebb0a3003902d97e349df96d73c4c679c11885f6d867ce178dbe4905b16ae051b5cece2f3fffdee729fd689b8698fbc32fbcbd3067aaa3462dab
+  data.tar.gz: cbbe75c5a1fc93a1c201cb2db174be431e766eb519f7bba08ba6ff06ccd4e693c7a4707c1602625fc7ac09337e4ddb0cf73e0b55ac1e6d24eae71ece75e69671

data/features/collections.feature

@@ -144,6 +144,33 @@ Feature: Collections
     And I should see 'Article: Blog3 Another Article'
     And I should see 'Article: Blog2 Yet Another Article'
 
+  Scenario: Work with local helpers
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      module TestHelper
+        def help_me
+          "ok"
+        end
+      end
+
+      include TestHelper
+
+      data.articles.each_with_index do |a, i|
+        proxy "/#{i}-#{help_me}.html", a
+      end
+      """
+    And a file named "data/articles.yaml" with:
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-02-another-article.html"
+      """
+    Given the Server is running at "collections-app"
+    When I go to "0-ok.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1-ok.html"
+    Then I should see 'Another Article Content'
 
   Scenario: Collected data update with file changes
     Given a fixture app "collections-app"

data/features/i18n_link_to.feature

@@ -4,7 +4,7 @@ Feature: i18n Paths
     Given a fixture app "empty-app"
     And a file named "data/pages.yml" with:
       """
-      - hello.html 
+      - hello.html
       """
     And a file named "locales/en.yml" with:
       """
@@ -50,24 +50,24 @@ Feature: i18n Paths
     Given the Server is running at "empty-app"
     When I go to "/hello.html"
     Then I should see "Page: Hello"
-    Then I should see '<a class="current" href="/index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="/es/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="/index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="/es/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="/hello.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="/es/hola.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="/hello.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="/es/hola.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/index.html" class="current">Current Home</a>'
+    Then I should see '<a href="/es/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="/index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="/es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="/hello.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
-    Then I should see '<a class="current" href="/es/index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="/es/index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="/es/hola.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="/hello.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="/es/hola.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="/hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
+    Then I should see '<a href="/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="/es/index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="/es/hola.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
 
   Scenario: link_to is i18n aware and supports relative_links
     Given a fixture app "empty-app"
@@ -124,30 +124,30 @@ Feature: i18n Paths
     Then I should see "assets/css/main.css"
     When I go to "/hello.html"
     Then I should see "Page: Hello"
-    Then I should see '<a class="current" href="index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="es/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="es/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="hello.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="es/hola.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="hello.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="es/hola.html"><span>Other Block</span></a>'
+    Then I should see '<a href="index.html" class="current">Current Home</a>'
+    Then I should see '<a href="es/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="hello.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="es/hola.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="hello.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
-    Then I should see '<a class="current" href="index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="../index.html">Other Home</a>'
-    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="../index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="hola.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="../hello.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="hola.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="../hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="index.html" class="current">Current Home</a>'
+    Then I should see '<a href="../index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="../index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="hola.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="../hello.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="hola.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="../hello.html" title="Other hello.html"><span>Other Block</span></a>'
 
   Scenario: url_for is i18n aware
     Given a fixture app "empty-app"
     And a file named "data/pages.yml" with:
       """
-      - hello.html 
+      - hello.html
       - article.html
       """
     And a file named "locales/en.yml" with:

data/features/relative_assets.feature

@@ -120,7 +120,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="../img/blank.gif" />'
+    Then I should see '<img src="../img/blank.gif"'
 
   Scenario: Relative assets should not break data URIs in image_tag
     Given a fixture app "relative-assets-app"

data/features/relative_assets_helpers_only.feature

@@ -0,0 +1,123 @@
+Feature: Relative Assets (Helpers Only)
+
+  Scenario: Rendering css with the feature enabled
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+      """
+      h1
+        background: url("<%= asset_url('images/blank.gif') %>")
+      h2
+        background: url("<%= asset_url('/images/blank2.gif') %>")
+      """
+    And a file named "source/javascripts/application.js.erb" with:
+      """
+      function foo() {
+        var img = document.createElement('img');
+        img.src = '<%= asset_url("images/100px.jpg") %>';
+        var body = document.getElementsByTagName('body')[0];
+        body.insertBefore(img, body.firstChild);
+      }
+
+      window.onload = foo;
+      """
+    And a file named "source/stylesheets/fonts3.css.erb" with:
+      """
+      @font-face {
+        font-family: 'Roboto2';
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see 'url("../images/blank.gif'
+    And I should see 'url("../images/blank2.gif'
+    When I go to "/javascripts/application.js"
+    Then I should not see "../"
+    When I go to "/stylesheets/fonts3.css"
+    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
+
+  Scenario: Relative css reference with directory indexes
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      activate :relative_assets, helpers_only: true
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/relative_image/index.html"
+    Then I should see "../stylesheets/relative_assets.css"
+
+  Scenario: Relative assets via image_tag
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/sub/image_tag.html.erb" with:
+      """
+      <%= image_tag '/img/blank.gif' %>
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/sub/image_tag.html"
+    Then I should see '<img src="../img/blank.gif"'
+
+  Scenario: Relative assets should not break data URIs in image_tag
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/sub/image_tag.html.erb" with:
+      """
+      <%= image_tag "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" %>
+      """
+    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" />'
+
+  Scenario: URLs are not rewritten for rewrite ignored paths
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, rewrite_ignore: [
+        '/stylesheets/fonts3.css',
+      ], helpers_only: true
+      """
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+      """
+      h1
+        background: url("<%= asset_url('images/blank.gif') %>")
+      h2
+        background: url("<%= asset_url('/images/blank2.gif') %>")
+      """
+    And a file named "source/stylesheets/fonts3.css.erb" with:
+      """
+      @font-face {
+        font-family: 'Roboto2';
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see 'url("../images/blank.gif'
+    When I go to "/stylesheets/fonts3.css"
+    Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'

data/features/template-key-collision.feature

@@ -0,0 +1,26 @@
+Feature: Don't allow template locals to overwrite template helpers
+
+  Scenario: Normal Template
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      class TestExt < ::Middleman::Extension
+        expose_to_template foo: :foo
+
+        def foo
+          "bar"
+        end
+      end
+
+      ::Middleman::Extensions.register :test, TestExt
+
+      activate :test
+
+      page "/index.html", locals: { foo: false }
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      <%= foo %>
+      """
+    Given a built app at "empty_app"
+    Then the exit status should be 1

data/lib/middleman-core/config_context.rb

@@ -8,7 +8,7 @@ module Middleman
     attr_reader :app
 
     # Whitelist methods that can reach out.
-    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?
+    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?, :extensions
     def_delegator :"@app.extensions", :activate
 
     def initialize(app, template_context_class)
@@ -23,7 +23,7 @@ module Middleman
     end
 
     def include(mod)
-      self.extend(mod)
+      extend(mod)
     end
 
     def helpers(*helper_modules, &block)

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

@@ -12,17 +12,20 @@ module Middleman
 
         attr_reader :descriptors
 
-        def initialize
+        def initialize(app)
+          @app = app
           @descriptors = []
         end
 
         def method_missing(name, *args, &block)
           internal = :"_internal_#{name}"
 
-          return super unless respond_to?(internal)
-
-          send(internal, *args, &block).tap do |r|
-            @descriptors << r if r.respond_to?(:execute_descriptor)
+          if respond_to?(internal)
+            send(internal, *args, &block).tap do |r|
+              @descriptors << r if r.respond_to?(:execute_descriptor)
+            end
+          else
+            @app.config_context.send(name, *args, &block)
           end
         end
       end

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

@@ -90,7 +90,7 @@ module Middleman
               pair[:root].realize!(dataset)
             end
 
-            ctx = StepContext.new
+            ctx = StepContext.new(app)
             StepContext.current = ctx
 
             leaves = @leaves.dup

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

@@ -1,4 +1,5 @@
 require 'padrino-helpers'
+require 'middleman-core/contracts'
 
 # Don't fail on invalid locale, that's not what our current
 # users expect.

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

@@ -73,18 +73,20 @@ module Middleman::CoreExtensions
 
       return [{}, nil] unless file
 
-      return @cache[file[:full_path]] if @cache.key?(file[:full_path])
+      file_path = file[:full_path].to_s
 
-      @cache[file[:full_path]] = ::Middleman::Util::Data.parse(
-        file,
-        app.config[:frontmatter_delims]
-      )
+      @cache[file_path] ||= begin
+        ::Middleman::Util::Data.parse(
+          file,
+          app.config[:frontmatter_delims]
+        )
+      end
     end
 
     Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any
     def clear_data(updated_files, removed_files)
       (updated_files + removed_files).each do |file|
-        @cache.delete(file[:full_path])
+        @cache.delete(file[:full_path].to_s)
       end
     end
   end

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

@@ -1,6 +1,6 @@
 require 'rack'
 require 'rack/response'
-require 'addressable/uri'
+require 'memoist'
 require 'middleman-core/util'
 require 'middleman-core/contracts'
 
@@ -11,13 +11,12 @@ module Middleman
 
       expose_to_application rewrite_inline_urls: :add
 
-      IGNORE_DESCRIPTOR = Or[Regexp, RespondTo[:call], String]
       REWRITER_DESCRIPTOR = {
         id: Symbol,
         proc: Or[Proc, Method],
         url_extensions: ArrayOf[String],
         source_extensions: ArrayOf[String],
-        ignore: ArrayOf[IGNORE_DESCRIPTOR],
+        ignore: ArrayOf[::Middleman::Util::IGNORE_DESCRIPTOR],
         after: Maybe[Symbol]
       }.freeze
 
@@ -33,6 +32,8 @@ module Middleman
       end
 
       def after_configuration
+        return if @rewriters.empty?
+
         rewriters = @rewriters.values.sort do |a, b|
           if b[:after] && b[:after] == a[:id]
             1
@@ -45,6 +46,7 @@ module Middleman
       end
 
       class Rack
+        extend Memoist
         include Contracts
 
         Contract RespondTo[:call], {
@@ -55,6 +57,17 @@ module Middleman
           @rack_app = app
           @middleman_app = options.fetch(:middleman_app)
           @rewriters = options.fetch(:rewriters)
+
+          all_source_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
+                            .flatten
+                            .uniq
+          @source_exts_regex_text = Regexp.union(all_source_exts).to_s
+
+          @all_asset_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
+                            .flatten
+                            .uniq
         end
 
         def call(env)
@@ -63,27 +76,16 @@ module Middleman
           # Allow configuration or upstream request to skip all rewriting
           return [status, headers, response] if env['bypass_inline_url_rewriter'] == 'true'
 
-          all_source_exts = @rewriters
-                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
-                            .flatten
-                            .uniq
-          source_exts_regex_text = Regexp.union(all_source_exts).to_s
-
-          all_asset_exts = @rewriters
-                           .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
-                           .flatten
-                           .uniq
-
           path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
-          return [status, headers, response] unless path =~ /(^\/$)|(#{source_exts_regex_text}$)/
+          return [status, headers, response] unless path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
           return [status, headers, response] unless body = ::Middleman::Util.extract_response_text(response)
 
           dirpath = ::Pathname.new(File.dirname(path))
 
           rewritten = ::Middleman::Util.instrument 'inline_url_rewriter', path: path do
-            ::Middleman::Util.rewrite_paths(body, path, all_asset_exts, @middleman_app) do |asset_path|
-              uri = ::Addressable::URI.parse(asset_path)
+            ::Middleman::Util.rewrite_paths(body, path, @all_asset_exts, @middleman_app) do |asset_path|
+              uri = ::Middleman::Util.parse_uri(asset_path)
 
               relative_path = uri.host.nil?
 
@@ -106,7 +108,7 @@ module Middleman
                 next unless source_exts.include?(::File.extname(path))
 
                 ignore = rewriter.fetch(:ignore)
-                next if ignore.any? { |r| should_ignore?(r, full_asset_path) }
+                next if ignore.any? { |r| ::Middleman::Util.should_ignore?(r, full_asset_path) }
 
                 rewrite_ignore = Array(rewriter[:rewrite_ignore] || [])
                 next if rewrite_ignore.any? { |i| ::Middleman::Util.path_match(i, path) }
@@ -127,23 +129,6 @@ module Middleman
             headers
           ).finish
         end
-
-        Contract IGNORE_DESCRIPTOR, String => Bool
-        def should_ignore?(validator, value)
-          if validator.is_a? Regexp
-            # Treat as Regexp
-            !!(value =~ validator)
-          elsif validator.respond_to? :call
-            # Treat as proc
-            validator.call(value)
-          elsif validator.is_a? String
-            # Treat as glob
-            File.fnmatch(value, validator)
-          else
-            # If some unknown thing, don't ignore
-            false
-          end
-        end
       end
     end
   end

data/lib/middleman-core/extension.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'memoist'
 require 'active_support/core_ext/class/attribute'
 require 'middleman-core/configuration'
 require 'middleman-core/contracts'
@@ -66,6 +67,8 @@ module Middleman
   # @see http://middlemanapp.com/advanced/custom/ Middleman Custom Extensions Documentation
   class Extension
     extend Forwardable
+    extend Memoist
+
     include Contracts
 
     def_delegator :@app, :logger
@@ -510,7 +513,7 @@ module Middleman
       self.class.exposed_to_config.each do |k, v|
         ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k) do |*args, &b|
           r = context.method(:"__original_#{v}").call(*args, &b)
-          self.descriptors << r if r.respond_to?(:execute_descriptor)
+          descriptors << r if r.respond_to?(:execute_descriptor)
         end
       end
     end

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

@@ -32,7 +32,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path

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

@@ -20,7 +20,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => String
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
@@ -37,4 +37,5 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
     File.join(asset_prefix, full_asset_path)
   end
+  memoize :rewrite_url
 end

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+require 'memoist'
 require 'middleman-core/contracts'
 
 # Minify CSS Extension
@@ -30,6 +32,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
 
   # Rack middleware to look for CSS and compress it
   class Rack
+    extend Memoist
     include Contracts
     INLINE_CSS_REGEX = /(<style[^>]*>\s*(?:\/\*<!\[CDATA\[\*\/\n)?)(.*?)((?:(?:\n\s*)?\/\*\]\]>\*\/)?\s*<\/style>)/m
 
@@ -82,8 +85,9 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # @param [String] path
     # @return [Boolean]
     def ignore?(path)
-      @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
+      @ignore.any? { |ignore| ::Middleman::Util.path_match(ignore, path) }
     end
+    memoize :ignore?
 
     # Whether this type of content can be minified
     # @param [String, nil] content_type
@@ -91,6 +95,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable?(content_type)
       @content_types.include?(content_type)
     end
+    memoize :minifiable?
 
     # Whether this type of content contains inline content that can be minified
     # @param [String, nil] content_type
@@ -98,6 +103,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable_inline?(content_type)
       @inline_content_types.include?(content_type)
     end
+    memoize :minifiable_inline?
 
     # Minify the content
     # @param [String] content
@@ -105,6 +111,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minify(content)
       @compressor.compress(content)
     end
+    memoize :minify
 
     # Detect and minify inline content
     # @param [String] content
@@ -114,5 +121,6 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
         $1 + minify($2) + $3
       end
     end
+    memoize :minify_inline
   end
 end