middleman-core 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf6cdbd67953b3d7195092beb23c4c05881a64a
-  data.tar.gz: 9cd56c0edca32368b9a5571cf2eee67a5b4538b0
+  metadata.gz: 56d4346f7e637375c81e78637eb685379d71afdc
+  data.tar.gz: 49168cf55df8f81be1c53ccff538bd36916089a4
 SHA512:
-  metadata.gz: 7d09604286c7f77eaa0afe637a9ced84bc130ba4cd7e83816c83015097988cb4f83f2cebc18da59471b8d88e26878a7f94535225e8d5c8ddeaf49ae144f36cf3
-  data.tar.gz: 251ce00d297f8c3b92f80fd7660febdafa81cfcd7b40958b96136296fe1fe6a8ad482b3fc33430f28dc7c1f540b5861fc0b1a8ba9608696c65b6c5a45681841e
+  metadata.gz: 3b13b9ee36f2d9e64a56569d167d81d5b4fc8cfd3fb71d653640cd9ec59ef352ba80f01ed6bb353a413d96ea96b747b1a2fe7a258491ef81174228ef3a0d0f2b
+  data.tar.gz: af98ca1aa0717fa1d25258324e42a3cafc38e8f4d813ae9286321b24fed8a18a0a884d6738de5db9b1a692a0753da725468f6d4490403d9e9a3c2136f5f2daf7

data/features/asset_hash.feature

@@ -285,3 +285,17 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/jquery.min-276c87ff.js |
     And the following files should not exist:
       | javascripts/jquery.min.js |
+
+  Scenario: Source map paths include the hash
+    Given a successfully built app at "asset-hash-source-map"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | javascripts/application-4553338c.js |
+      | javascripts/application.js-22cc2b5f.map |
+      | index.html |
+    And the following files should not exist:
+      | javascripts/application.js |
+      | javascripts/application.js.map |
+
+    And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map"

data/features/builder.feature

@@ -20,13 +20,13 @@ Feature: Builder
       | layout                                        |
       | layouts/custom                                |
       | layouts/content_for                           |
-      
+
     And the file "index.html" should contain "Comment in layout"
     And the file "index.html" should contain "<h1>Welcome</h1>"
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
     And the file "stylesheets/static.css" should contain "body"
-    
+
   Scenario: Build glob
     Given a successfully built app at "glob-app" with flags "--glob '*.css'"
     When I cd to "build"
@@ -34,15 +34,19 @@ Feature: Builder
       | index.html                                    |
     Then the following files should exist:
       | stylesheets/site.css                          |
-  
+
   Scenario: Build with errors
     Given a built app at "build-with-errors-app"
     Then the exit status should be 1
-  
+
   Scenario: Build empty errors
     Given a built app at "empty-app"
     Then the exit status should be 1
 
+  Scenario: Build external_pipeline errors
+    Given a built app at "external-pipeline-error"
+    Then the exit status should be 1
+
   Scenario: Build alias (b)
     Given a fixture app "large-build-app"
     When I run `middleman b`

data/features/custom_layouts.feature

@@ -11,6 +11,22 @@ Feature: Custom layouts
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
 
+  Scenario: Using custom :layout attribute with proxy
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/test/*', layout: :custom
+      proxy "/test/me.html", "/custom-layout.html"
+      live { %w(you) }.each do |who|
+        proxy "/test/#{who}.html", "/custom-layout.html"
+      end
+      """
+    And the Server is running at "custom-layout-app2"
+    When I go to "/test/me.html"
+    Then I should see "Custom Layout"
+    When I go to "/test/you.html"
+    Then I should see "Custom Layout"
+
   Scenario: Using custom :layout attribute with folders
     Given a fixture app "custom-layout-app2"
     And a file named "config.rb" with:
@@ -65,4 +81,4 @@ Feature: Custom layouts
     When I go to "/path/index.html"
     Then I should see "Alt"
     And I should see "Monde"
-    And I should not see "Hello"
+    And I should not see "Hello"

data/features/page-id.feature

@@ -0,0 +1,26 @@
+Feature: Page IDs
+
+  Scenario: link_to works with blocks (erb)
+    Given the Server is running at "page-id-app"
+    When I go to "/index.html"
+    Then I should see "I am: index.html"
+    And I should see "URL1: /fm.html"
+    And I should see "URL2: /2.html"
+    And I should see 'URL3: <a href="/3.html">Hi</a>'
+    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+
+    When I go to "/fm.html"
+    Then I should see "I am: frontmatter"
+
+    When I go to "/1.html"
+    Then I should see "I am: page1"
+    When I go to "/2.html"
+    Then I should see "I am: page2"
+    When I go to "/3.html"
+    Then I should see "I am: page3"
+
+    When I go to "/overwrites/from-default.html"
+    Then I should see "I am: something-else"
+
+    When I go to "/overwrites/from-frontmatter.html"
+    Then I should see "I am: from_frontmatter"

data/features/partials.feature

@@ -50,3 +50,10 @@ Feature: Provide Sane Defaults for Partial Behavior
     Then I should see "File Not Found"
     When I go to "/_code_snippet.html"
     Then I should see "File Not Found"
+
+Scenario: Works with blocks
+    Given the Server is running at "partials-app"
+    When I go to "/block.html"
+    Then I should see "Start"
+    And I should see "Contents"
+    And I should see "End"

data/fixtures/asset-hash-source-map/config.rb

@@ -0,0 +1,6 @@
+
+activate :asset_hash
+
+activate :relative_assets
+
+activate :directory_indexes

data/fixtures/asset-hash-source-map/lib/middleware.rb

@@ -0,0 +1,16 @@
+class Middleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    body = ''
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
+      body += "\n/* Added by Rack filter */"
+      status, headers, response = Rack::Response.new(body, status, headers).finish
+    end
+    [status, headers, response]
+  end
+end

data/fixtures/asset-hash-source-map/source/index.html.erb

@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+
+<h1>Testing the sitemap hashing</h1>
+<br /><br /><br />

data/fixtures/asset-hash-source-map/source/javascripts/application.js

@@ -0,0 +1,2 @@
+function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
+//# sourceMappingURL=application.js.map

data/fixtures/asset-hash-source-map/source/javascripts/application.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}

data/fixtures/asset-hash-source-map/source/layout.erb

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+
+    <%= javascript_include_tag "application" %>
+    <%= yield_content :head %>
+  </head>
+
+  <body class="<%= page_classes %>">
+
+    <div id="main" role="main">
+      <%= yield %>
+    </div>
+
+  </body>
+</html>

data/fixtures/external-pipeline-error/config.rb

@@ -0,0 +1,5 @@
+activate :external_pipeline,
+  name: :failing,
+  command: "mv does-not-exist tmp/file.js",
+  source: "tmp",
+  latency: 2

data/fixtures/page-id-app/config.rb

@@ -0,0 +1,5 @@
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+end
+
+page "/overwrites/*", id: :"something-else"

data/fixtures/page-id-app/source/fm.html.erb

@@ -0,0 +1,5 @@
+---
+id: frontmatter
+---
+
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/index.html.erb

@@ -0,0 +1,6 @@
+I am: <%= current_resource.page_id %>
+
+URL1: <%= url_for "frontmatter" %>
+URL2: <%= url_for "page2" %>
+URL3: <%= link_to "Hi", "page3" %>
+URL4: <%= link_to "Sym", :"something-else" %>

data/fixtures/page-id-app/source/overwrites/from-default.html.erb

@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb

@@ -0,0 +1,5 @@
+---
+id: from_frontmatter
+---
+
+I am: <%= current_resource.page_id %>

data/fixtures/partials-app/source/_block.erb

@@ -0,0 +1,3 @@
+Start
+<%= yield %>
+End

data/fixtures/partials-app/source/block.html.erb

@@ -0,0 +1,3 @@
+<% partial "block" do %>
+Contents 
+<% end %>

data/lib/middleman-core/application.rb

@@ -183,8 +183,8 @@ module Middleman
         ignored
       end,
 
-      layout: proc do |file, _sitemap_app|
-        file[:relative_path].to_s.start_with?('layout.', 'layouts/')
+      layout: proc do |file, app|
+        file[:relative_path].to_s.start_with?('layout.', app.config[:layouts_dir] + '/')
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 

data/lib/middleman-core/builder.rb

@@ -97,7 +97,7 @@ module Middleman
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
         # Double-check for compass sprites
-        if @app.files.find_new_files!.length > 0
+        unless @app.files.find_new_files!.empty?
           logger.debug '== Checking for Compass sprites'
           @app.sitemap.ensure_resource_list_updated!
         end

data/lib/middleman-core/configuration.rb

@@ -40,7 +40,7 @@ module Middleman
 
       # Allow configuration settings to be read and written via methods
       def method_missing(method, *args)
-        if defines_setting?(method) && args.size == 0
+        if defines_setting?(method) && args.empty?
           self[method]
         elsif method.to_s =~ /^(\w+)=$/ && args.size == 1
           self[$1.to_sym] = args[0]

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

@@ -67,7 +67,7 @@ module Middleman
         # @param [Symbol] name Name of the data, used for namespacing
         # @param [Hash] content The content for this data
         # @return [Hash]
-        Contract Symbol, Hash => Hash
+        Contract Symbol, Or[Hash, Array] => Hash
         def store(name=nil, content=nil)
           @local_sources[name.to_s] = content unless name.nil? || content.nil?
           @local_sources
@@ -148,7 +148,7 @@ module Middleman
         #
         # @param [String, Symbol] path The name of the data namespace
         # @return [Hash, nil]
-        Contract Or[String, Symbol] => Maybe[Hash]
+        Contract Or[String, Symbol] => Maybe[Or[Array, IsA['Middleman::Util::EnhancedHash']]]
         def data_for_path(path)
           response = if store.key?(path.to_s)
             store[path.to_s]

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

@@ -102,7 +102,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       locale_suffix = ::I18n.locale
 
       extname = File.extname(partial_name)
-      maybe_static = extname.length > 0
+      maybe_static = !extname.empty?
       suffixed_partial_name = if maybe_static
         partial_name.sub(extname, ".#{locale_suffix}#{extname}")
       else

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

@@ -4,7 +4,7 @@ module Middleman
     class Routing < ConfigExtension
       # This should always run late, but not as late as :directory_indexes,
       # so it can add metadata to any pages generated by other extensions
-      self.resource_list_manipulator_priority = 10
+      self.resource_list_manipulator_priority = [10, 130]
 
       # Expose the `page` method to config.
       expose_to_config :page
@@ -25,7 +25,7 @@ module Middleman
 
           resources
             .select { |r| ::Middleman::Util.path_match(normalized_path, "/#{r.path}") }
-            .each { |r| r.add_metadata(metadata) }
+            .each { |r| r.add_metadata(metadata, true) }
 
           resources
         end
@@ -52,10 +52,13 @@ module Middleman
       def page(path, opts={})
         options = opts.dup
 
+        page_data = options.delete(:data) || {}
+        page_data[:id] = options.delete(:id) if options.key?(:id)
+
         # Default layout
         metadata = {
           locals: options.delete(:locals) || {},
-          page: options.delete(:data) || {},
+          page: page_data,
           options: options
         }
 

data/lib/middleman-core/extension.rb

@@ -402,11 +402,11 @@ module Middleman
         ext.after_configuration if ext.respond_to?(:after_configuration)
 
         if ext.respond_to?(:manipulate_resource_list)
-          ext.app.sitemap.register_resource_list_manipulator(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
+          ext.app.sitemap.register_resource_list_manipulators(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
         end
 
         if ext.class.resources_generators && !ext.class.resources_generators.empty?
-          ext.app.sitemap.register_resource_list_manipulator(
+          ext.app.sitemap.register_resource_list_manipulators(
             :"#{ext.class.ext_name}_generator",
             ext,
             ext.class.resource_list_manipulator_priority,

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

@@ -3,7 +3,7 @@ require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz .map), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 

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

@@ -30,10 +30,15 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     ::IO.popen(options[:command], 'r') do |pipe|
       while buf = pipe.gets
         without_newline = buf.sub(/\n$/, '')
-        logger.info "== External: #{without_newline}" if without_newline.length > 0
+        logger.info "== External: #{without_newline}" unless without_newline.empty?
       end
     end
 
+    unless $?.success?
+      logger.error '== External: Command failed with non-zero exit status'
+      exit(1)
+    end
+
     @watcher.poll_once!
   rescue ::Errno::ENOENT => e
     logger.error "== External: Command failed with message: #{e.message}"

data/lib/middleman-core/load_paths.rb

@@ -22,7 +22,9 @@ module Middleman
 
     # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
     def setup_bundler
-      ENV['BUNDLE_GEMFILE'] ||= File.join(findup('Gemfile', ENV['MM_ROOT']), 'Gemfile')
+      if found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
+        ENV['BUNDLE_GEMFILE'] ||= File.join(found_gemfile_root, 'Gemfile')
+      end
 
       unless File.exist?(ENV['BUNDLE_GEMFILE'])
         ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)

data/lib/middleman-core/logger.rb

@@ -7,7 +7,7 @@ module Middleman
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
     def self.singleton(*args)
-      if !@_logger || args.length > 0
+      if !@_logger || !args.empty?
         if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
           args = [0, false, args.first]
         end

data/lib/middleman-core/meta_pages/templates/index.html.erb

@@ -10,7 +10,9 @@
     <div class="container">
       <article id="main">
         <h1>Middleman Information</h1>
-
+        <p>
+          Middleman version <%= Middleman::VERSION %>
+        </p>
         <ul class="nav-list">
           <li>
             <a href="/__middleman/sitemap/">Sitemap</a>

data/lib/middleman-core/rack.rb

@@ -2,6 +2,7 @@ require 'rack'
 require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
+require 'rack/utils'
 
 require 'middleman-core/util'
 require 'middleman-core/logger'
@@ -124,6 +125,7 @@ module Middleman
 
     # Halt request and return 404
     def not_found(res, path)
+      path = ::Rack::Utils.escape_html(path)
       res.status = 404
       res.write "<html><head></head><body><h1>File Not Found</h1><p>#{path}</p></body></html>"
       res.finish

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

@@ -76,7 +76,7 @@ module Middleman
           scope.image_tag(link, title: title, alt: alt_text)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "![#{alt_text}](#{link_string})"
         end
       end
@@ -89,7 +89,7 @@ module Middleman
           scope.link_to(content, link, attributes)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "[#{content}](#{link_string})"
         end
       end

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

@@ -36,10 +36,13 @@ module Middleman
           md = metadata.dup
           should_ignore = md.delete(:ignore)
 
+          page_data = md.delete(:data) || {}
+          page_data[:id] = md.delete(:id) if md.key?(:id)
+
           r = ProxyResource.new(app.sitemap, path, target)
           r.add_metadata(
             locals: md.delete(:locals) || {},
-            page: md.delete(:data) || {},
+            page: page_data || {},
             options: md
           )
 

data/lib/middleman-core/sitemap/resource.rb

@@ -85,16 +85,26 @@ module Middleman
         file_descriptor && file_descriptor[:full_path].to_s
       end
 
+      Contract Or[Symbol, String]
+      def page_id
+        metadata[:page][:id] || destination_path
+      end
+
       # Merge in new metadata specific to this resource.
       # @param [Hash] meta A metadata block with keys :options, :locals, :page.
       #   Options are generally rendering/sitemap options
       #   Locals are local variables for rendering this resource's template
       #   Page are data that is exposed through this resource's data member.
       #   Note: It is named 'page' for backwards compatibility with older MM.
-      Contract METADATA_HASH => METADATA_HASH
-      def add_metadata(meta={})
+      Contract METADATA_HASH, Maybe[Bool] => METADATA_HASH
+      def add_metadata(meta={}, reverse=false)
         @page_data = nil
-        @metadata.deep_merge!(meta)
+
+        @metadata = if reverse
+          meta.deep_merge(@metadata)
+        else
+          @metadata.deep_merge(meta)
+        end
       end
 
       # Data about this resource, populated from frontmatter or extensions.

data/lib/middleman-core/sitemap/store.rb

@@ -87,6 +87,13 @@ module Middleman
         @app.config_context.class.send :def_delegator, :app, :sitemap
       end
 
+      Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Or[Num, ArrayOf[Num]]], Maybe[Symbol] => Any
+      def register_resource_list_manipulators(name, manipulator, priority=50, custom_name=nil)
+        Array(priority || 50).each do |p|
+          register_resource_list_manipulator(name, manipulator, p, custom_name)
+        end
+      end
+
       # Register an object which can transform the sitemap resource list. Best to register
       # these in a `before_configuration` or `after_configuration` hook.
       #
@@ -149,6 +156,17 @@ module Middleman
         end
       end
 
+      # Find a resource given its page id
+      # @param [String] page_id The page id.
+      # @return [Middleman::Sitemap::Resource]
+      Contract Or[String, Symbol] => Maybe[IsA['Middleman::Sitemap::Resource']]
+      def find_resource_by_page_id(page_id)
+        @lock.synchronize do
+          ensure_resource_list_updated!
+          @_lookup_by_page_id[page_id.to_sym]
+        end
+      end
+
       # Get the array of all resources
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
@@ -210,7 +228,7 @@ module Middleman
 
             @resource_list_manipulators.each do |m|
               ::Middleman::Util.instrument 'sitemap.manipulator', name: m[:name] do
-                @app.logger.debug "== Running manipulator: #{m[:name]}"
+                @app.logger.debug "== Running manipulator: #{m[:name]} (#{m[:priority]})"
                 @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
 
                 # Reset lookup cache
@@ -220,6 +238,7 @@ module Middleman
                 @resources.each do |resource|
                   @_lookup_by_path[resource.path] = resource
                   @_lookup_by_destination_path[resource.destination_path] = resource
+                  @_lookup_by_page_id[resource.page_id.to_sym] = resource
                 end
 
                 invalidate_resources_not_ignored_cache!
@@ -239,6 +258,7 @@ module Middleman
         @lock.synchronize do
           @_lookup_by_path = {}
           @_lookup_by_destination_path = {}
+          @_lookup_by_page_id = {}
         end
       end
 

data/lib/middleman-core/template_context.rb

@@ -96,8 +96,9 @@ module Middleman
     #
     # @param [String, Symbol] name The partial to render.
     # @param [Hash] options
+    # @param [Proc] block A block will be evaluated to return internal contents.
     # @return [String]
-    Contract Any, Or[Symbol, String], Hash => String
+    Contract Any, Or[Symbol, String], Hash => String, Maybe[Proc] => String
     def render(_, name, options={}, &block)
       name = name.to_s
 

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

@@ -29,7 +29,7 @@ module Middleman
       if obj.is_a? ::Array
         obj.map { |e| recursively_enhance(e) }
       elsif obj.is_a? ::Hash
-        ::Hashie::Mash.new(obj)
+        EnhancedHash.new(obj)
       else
         obj
       end

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

@@ -104,30 +104,19 @@ module Middleman
       sass_type_aliasing = ['.scss', '.sass']
       erb_type_aliasing = ['.erb', '.haml', '.slim']
 
-      if (all_extensions & sass_type_aliasing).length > 0
-        all_extensions |= sass_type_aliasing
-      end
-
-      if (all_extensions & erb_type_aliasing).length > 0
-        all_extensions |= erb_type_aliasing
-      end
+      all_extensions |= sass_type_aliasing unless (all_extensions & sass_type_aliasing).empty?
+      all_extensions |= erb_type_aliasing unless (all_extensions & erb_type_aliasing).empty?
 
       all_extensions.uniq!
 
       app.sitemap.resources.select(&:file_descriptor).select { |r|
         local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
-
-        if (local_extensions & sass_type_aliasing).length > 0
-          local_extensions |= sass_type_aliasing
-        end
-
-        if (local_extensions & erb_type_aliasing).length > 0
-          local_extensions |= erb_type_aliasing
-        end
+        local_extensions |= sass_type_aliasing unless (local_extensions & sass_type_aliasing).empty?
+        local_extensions |= erb_type_aliasing unless (local_extensions & erb_type_aliasing).empty?
 
         local_extensions.uniq!
 
-        ((all_extensions & local_extensions).length > 0) && files.none? { |f| f == r.file_descriptor[:full_path] }
+        !(all_extensions & local_extensions).empty? && files.none? { |f| f == r.file_descriptor[:full_path] }
       }.map(&:file_descriptor)
     end
   end

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

@@ -99,8 +99,13 @@ module Middleman
     # Given a source path (referenced either absolutely or relatively)
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
-    Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
+    Contract ::Middleman::Application, Or[String, Symbol, ::Middleman::Sitemap::Resource], Hash => String
     def url_for(app, path_or_resource, options={})
+      if path_or_resource.is_a?(String) || path_or_resource.is_a?(Symbol)
+        r = app.sitemap.find_resource_by_page_id(path_or_resource)
+        path_or_resource = r if r
+      end
+
       # Handle Resources and other things which define their own url method
       url = if path_or_resource.respond_to?(:url)
         path_or_resource.url

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

@@ -22,7 +22,7 @@ module Middleman
 
     Contract String, String, ArrayOf[String], Proc => String
     def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
+      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
 
       url_fn_prefix = 'url('
 

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -51,10 +51,10 @@ Gem::Specification.new do |s|
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.12.0'])
+  s.add_dependency('contracts', ['~> 0.13.0'])
 
   # Hash stuff
   s.add_dependency('hashie', ['~> 3.4'])
-  s.add_dependency('hamster', ['~> 2.0'])
+  s.add_dependency('hamster', ['~> 3.0'])
   s.add_dependency('backports', ['~> 3.6'])
 end

data/spec/middleman-core/core_extensions/data_spec.rb

@@ -7,6 +7,112 @@ end
 
 describe Middleman::CoreExtensions::Data::DataStore do
 
+  describe "#store" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "when given a name and data" do
+      it "adds data at the given name" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        @subject.store :baz, [:wu, :tang]
+
+        expect( @subject.store['foo'] ).to eq({ 'bar' => 'baz' })
+        expect( @subject.store['baz'] ).to match_array [:wu, :tang]
+      end
+
+      it "overwrites previous keys if given the same key" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        @subject.store :foo, [:wu, :tang]
+
+        expect( @subject.store['foo'] ).to match_array [:wu, :tang]
+      end
+    end
+
+    context "when given no args" do
+      it "returns @local_sources instance var" do
+        @subject.instance_variable_set :"@local_sources", { foo: 'bar' }
+        expect( @subject.store ).to eq({ foo: 'bar' })
+      end
+    end
+  end
+
+  describe "#callbacks" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "when given a name and proc" do
+      it "adds a callback at the given name" do
+        @subject.callbacks :foo, lambda { "bar" }
+        callback = @subject.instance_variable_get(:@callback_sources)['foo']
+
+        expect( callback.call ).to eq "bar"
+      end
+
+      it "overwrites previous keys if given the same key" do
+        @subject.callbacks :foo, lambda { "bar" }
+        @subject.callbacks :foo, lambda { "baz" }
+        callback = @subject.instance_variable_get(:@callback_sources)['foo']
+
+        expect( callback.call ).to eq "baz"
+      end
+    end
+
+    context "when given no args" do
+      it "returns @callback_sources instance var" do
+        @subject.instance_variable_set :"@callback_sources", { foo: 'bar' }
+        expect( @subject.callbacks ).to eq({ foo: 'bar' })
+      end
+    end
+  end
+
+  describe "#data_for_path" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "given path matches local data" do
+      it "returns hash for key" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        expect( @subject.data_for_path(:foo) ).to eq({ 'bar' => 'baz' })
+      end
+
+      it "returns array for key" do
+        @subject.store :foo, [:bar, :baz]
+        expect( @subject.data_for_path(:foo) ).to match_array [:bar, :baz]
+      end
+    end
+
+    context "given path matches callback data" do
+      it "returns value of calback lambda" do
+        @subject.callbacks :foo, lambda { { 'bar' => 'baz' } }
+        @subject.callbacks :wu, lambda { [:tang, :clan] }
+
+        expect( @subject.data_for_path(:foo) ).to eq({ 'bar' => 'baz' })
+        expect( @subject.data_for_path(:wu) ).to match_array [:tang, :clan]
+      end
+    end
+
+    context "given path matches both sources" do
+      it "returns match from local data" do
+        @subject.store :foo, { 'local' => 'data' }
+        @subject.callbacks :foo, lambda { { 'callback' => 'data' } }
+
+        expect( @subject.data_for_path(:foo) ).to eq({ 'local' => 'data' })
+      end
+    end
+
+    context "given path matches no sources" do
+      it "returns nil" do
+        expect( @subject.data_for_path(:missing) ).to be_nil
+      end
+    end
+  end
+
   describe "#key?" do
 
     it "returns true if key included in local_data, local_sources, or callback_sources" do
@@ -38,4 +144,4 @@ describe Middleman::CoreExtensions::Data::DataStore do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,14 +248,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -276,14 +276,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +390,7 @@ files:
 - features/move_files.feature
 - features/multiple-sources.feature
 - features/nested_layouts.feature
+- features/page-id.feature
 - features/paginate.feature
 - features/partials.feature
 - features/preview_changes.feature
@@ -446,6 +447,12 @@ files:
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
 - fixtures/asset-hash-minified-app/config.rb
 - fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js
+- fixtures/asset-hash-source-map/config.rb
+- fixtures/asset-hash-source-map/lib/middleware.rb
+- fixtures/asset-hash-source-map/source/index.html.erb
+- fixtures/asset-hash-source-map/source/javascripts/application.js
+- fixtures/asset-hash-source-map/source/javascripts/application.js.map
+- fixtures/asset-hash-source-map/source/layout.erb
 - fixtures/asset-host-app/config.rb
 - fixtures/asset-host-app/source/.htaccess
 - fixtures/asset-host-app/source/asset_host.html.erb
@@ -644,6 +651,8 @@ files:
 - fixtures/external-helpers/lib/hello_helper.rb
 - fixtures/external-helpers/source/automatic.html.erb
 - fixtures/external-helpers/source/index.html.erb
+- fixtures/external-pipeline-error/config.rb
+- fixtures/external-pipeline-error/source/javascripts/file.js
 - fixtures/feature-params-app/config.rb
 - fixtures/feature-params-app/source/index.html.erb
 - fixtures/fonts-app/config.rb
@@ -1167,6 +1176,11 @@ files:
 - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
 - fixtures/page-helper-layout-block-app/source/path/child.html.erb
 - fixtures/page-helper-layout-block-app/source/path/index.html.erb
+- fixtures/page-id-app/config.rb
+- fixtures/page-id-app/source/fm.html.erb
+- fixtures/page-id-app/source/index.html.erb
+- fixtures/page-id-app/source/overwrites/from-default.html.erb
+- fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
 - fixtures/paginate-app/config.rb
 - fixtures/paginate-app/source/archive/2011/index.html.erb
 - fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
@@ -1180,10 +1194,12 @@ files:
 - fixtures/paginate-app/source/tag.html.erb
 - fixtures/partial-chained_templates-app/config.rb
 - fixtures/partials-app/config.rb
+- fixtures/partials-app/source/_block.erb
 - fixtures/partials-app/source/_code_snippet.html
 - fixtures/partials-app/source/_locals.erb
 - fixtures/partials-app/source/_main.erb
 - fixtures/partials-app/source/_main.str
+- fixtures/partials-app/source/block.html.erb
 - fixtures/partials-app/source/images/tiger.svg
 - fixtures/partials-app/source/index.html.erb
 - fixtures/partials-app/source/locals.html.erb
@@ -1528,6 +1544,7 @@ test_files:
 - features/move_files.feature
 - features/multiple-sources.feature
 - features/nested_layouts.feature
+- features/page-id.feature
 - features/paginate.feature
 - features/partials.feature
 - features/preview_changes.feature
@@ -1584,6 +1601,12 @@ test_files:
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
 - fixtures/asset-hash-minified-app/config.rb
 - fixtures/asset-hash-minified-app/source/javascripts/jquery.min.js
+- fixtures/asset-hash-source-map/config.rb
+- fixtures/asset-hash-source-map/lib/middleware.rb
+- fixtures/asset-hash-source-map/source/index.html.erb
+- fixtures/asset-hash-source-map/source/javascripts/application.js
+- fixtures/asset-hash-source-map/source/javascripts/application.js.map
+- fixtures/asset-hash-source-map/source/layout.erb
 - fixtures/asset-host-app/config.rb
 - fixtures/asset-host-app/source/.htaccess
 - fixtures/asset-host-app/source/asset_host.html.erb
@@ -1782,6 +1805,8 @@ test_files:
 - fixtures/external-helpers/lib/hello_helper.rb
 - fixtures/external-helpers/source/automatic.html.erb
 - fixtures/external-helpers/source/index.html.erb
+- fixtures/external-pipeline-error/config.rb
+- fixtures/external-pipeline-error/source/javascripts/file.js
 - fixtures/feature-params-app/config.rb
 - fixtures/feature-params-app/source/index.html.erb
 - fixtures/fonts-app/config.rb
@@ -2305,6 +2330,11 @@ test_files:
 - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
 - fixtures/page-helper-layout-block-app/source/path/child.html.erb
 - fixtures/page-helper-layout-block-app/source/path/index.html.erb
+- fixtures/page-id-app/config.rb
+- fixtures/page-id-app/source/fm.html.erb
+- fixtures/page-id-app/source/index.html.erb
+- fixtures/page-id-app/source/overwrites/from-default.html.erb
+- fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
 - fixtures/paginate-app/config.rb
 - fixtures/paginate-app/source/archive/2011/index.html.erb
 - fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
@@ -2318,10 +2348,12 @@ test_files:
 - fixtures/paginate-app/source/tag.html.erb
 - fixtures/partial-chained_templates-app/config.rb
 - fixtures/partials-app/config.rb
+- fixtures/partials-app/source/_block.erb
 - fixtures/partials-app/source/_code_snippet.html
 - fixtures/partials-app/source/_locals.erb
 - fixtures/partials-app/source/_main.erb
 - fixtures/partials-app/source/_main.str
+- fixtures/partials-app/source/block.html.erb
 - fixtures/partials-app/source/images/tiger.svg
 - fixtures/partials-app/source/index.html.erb
 - fixtures/partials-app/source/locals.html.erb