middleman-core 4.0.0.alpha.6 → 4.0.0.beta.1

data/lib/middleman-core/util.rb

@@ -1,9 +1,6 @@
 # For instrumenting
 require 'active_support/notifications'
 
-# Indifferent hash access
-require 'middleman-core/util/hash_with_indifferent_access'
-
 # Core Pathname library used for traversal
 require 'pathname'
 
@@ -14,7 +11,11 @@ require 'rack/mime'
 # DbC
 require 'middleman-core/contracts'
 
+# Immutable Data
+require 'hamster'
+
 # For URI templating
+require 'addressable/uri'
 require 'addressable/template'
 require 'active_support/inflector'
 require 'active_support/inflector/transliterate'
@@ -75,22 +76,56 @@ module Middleman
       end
     end
 
-    # Recursively convert a normal Hash into a HashWithIndifferentAccess
+    class IndifferentHash < ::Hamster::Hash
+      def [](key)
+        if key?(key.to_sym)
+          super(key.to_sym)
+        elsif key?(key.to_s)
+          super(key.to_s)
+        else
+          super
+        end
+      end
+
+      def method_missing(key, *_args)
+        if key?(key.to_sym)
+          self[key.to_sym]
+        elsif key?(key.to_s)
+          self[key.to_s]
+        end
+      end
+    end
+
+    # Recursively convert a normal Hash into a IndifferentHash
     #
     # @private
     # @param [Hash] data Normal hash
-    # @return [Middleman::Util::HashWithIndifferentAccess]
-    FrozenDataStructure = Frozen[Or[HashWithIndifferentAccess, Array]]
-    Contract Maybe[Or[Array, Hash, HashWithIndifferentAccess]] => Maybe[FrozenDataStructure]
-    def recursively_enhance(data)
-      if data.is_a? HashWithIndifferentAccess
-        data
-      elsif data.is_a? Hash
-        HashWithIndifferentAccess.new(data)
-      elsif data.is_a? Array
-        data.map(&method(:recursively_enhance)).freeze
+    # @return [Middleman::Util::IndifferentHash]
+    FrozenDataStructure = Frozen[Or[IndifferentHash, Array, String, TrueClass, FalseClass, Fixnum, NilClass]]
+    Contract Maybe[Or[String, Array, Hash, IndifferentHash]] => Maybe[FrozenDataStructure]
+    def recursively_enhance(obj)
+      case obj
+      when ::Hash
+        res = obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] }
+        IndifferentHash.new(res)
+      when IndifferentHash
+        obj.map { |key, value| [recursively_enhance(key), recursively_enhance(value)] }
+      when ::Array
+        res = obj.map { |element| recursively_enhance(element) }
+        Hamster::Vector.new(res)
+      when ::SortedSet
+        # This clause must go before ::Set clause, since ::SortedSet is a ::Set.
+        res = obj.map { |element| recursively_enhance(element) }
+        Hamster::SortedSet.new(res)
+      when ::Set
+        res = obj.map { |element| recursively_enhance(element) }
+        Hamster::Set.new(res)
+      when Hamster::Vector, Hamster::Set, Hamster::SortedSet
+        obj.map { |element| recursively_enhance(element) }
+      when ::TrueClass, ::FalseClass, ::Fixnum, ::Symbol, ::NilClass
+        obj
       else
-        nil
+        obj.dup.freeze
       end
     end
 
@@ -100,7 +135,7 @@ module Middleman
     Contract String => String
     def normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      path.sub(%r{^/}, '').tr('', '')
+      URI.decode(path).sub(%r{^/}, '').tr('', '')
     end
 
     # This is a separate method from normalize_path in case we
@@ -223,7 +258,7 @@ module Middleman
         path_or_resource.url
       else
         path_or_resource.dup
-      end.gsub(' ', '%20')
+      end
 
       # Try to parse URL
       begin
@@ -248,7 +283,7 @@ module Middleman
       if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
         resource = path_or_resource
         resource_url = url
-      elsif this_resource && uri.path
+      elsif this_resource && uri.path && !uri.host
         # Handle relative urls
         url_path = Pathname(uri.path)
         current_source_dir = Pathname('/' + this_resource.path).dirname
@@ -264,14 +299,14 @@ module Middleman
           resource = app.sitemap.find_resource_by_destination_path(url_path.to_s)
           resource_url = resource.url if resource
         end
-      elsif options[:find_resource] && uri.path
+      elsif options[:find_resource] && uri.path && !uri.host
         resource = app.sitemap.find_resource_by_path(uri.path)
         resource_url = resource.url if resource
       end
 
       if resource
         uri.path = if this_resource
-          relative_path_from_resource(this_resource, resource_url, effective_relative)
+          URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
         else
           resource_url
         end
@@ -321,7 +356,8 @@ module Middleman
         opening_character = $1
         asset_path = $2
 
-        if result = yield(asset_path)
+        uri = ::Addressable::URI.parse(asset_path)
+        if uri.relative? && result = yield(asset_path)
           "#{opening_character}#{result}"
         else
           match

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.0.0.alpha.6' unless const_defined?(:VERSION)
+  VERSION = '4.0.0.beta.1' unless const_defined?(:VERSION)
 end

data/lib/middleman-core.rb

@@ -8,9 +8,10 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 module Middleman
   # Backwards compatibility namespace
   module Features; end
+
+  autoload :Application, 'middleman-core/application'
 end
 
 require 'middleman-core/version'
 require 'middleman-core/util'
 require 'middleman-core/extensions'
-require 'middleman-core/application'

data/middleman-core.gemspec

@@ -51,5 +51,8 @@ Gem::Specification.new do |s|
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.4'])
+  s.add_dependency('contracts', ['~> 0.9.0'])
+
+  # Immutability
+  s.add_dependency('hamster', ['~> 1.0'])
 end

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'middleman-core/core_extensions'
+require 'middleman-core/core_extensions/data'
+
+describe Middleman::CoreExtensions::Data do
+end
+
+describe Middleman::CoreExtensions::Data::DataStore do
+
+  describe "#key?" do
+
+    it "returns true if key included in local_data, local_sources, or callback_sources" do
+      subject = described_class.new instance_double("Middleman::Application"), Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+      subject.store :"foo-store", { foo: "bar" }
+      subject.callbacks :"foo-callback", Proc.new { "bar" }
+      subject.instance_variable_get(:@local_data)["foo-local"] = "bar"
+
+      expect( subject.key?("foo-store") ).to be_truthy
+      expect( subject.key?("foo-callback") ).to be_truthy
+      expect( subject.key?("foo-local") ).to be_truthy
+    end
+
+    it "returns false if key not in local_data, local_sources, or callback_sources" do
+      subject = described_class.new instance_double("Middleman::Application"), Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+
+      expect( subject.key?("foo-store") ).to be_falsy
+      expect( subject.key?("foo-callback") ).to be_falsy
+      expect( subject.key?("foo-local") ).to be_falsy
+    end
+
+    it "doesn't raise a stack error if missing the given key" do
+      subject = described_class.new instance_double("Middleman::Application"), Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+
+      expect{
+        subject.respond_to? :test
+      }.not_to raise_error
+    end
+
+  end
+
+end

data/spec/middleman-core/util_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+require 'middleman-core/util'
+
+describe Middleman::Util do
+
+  describe "::path_match" do
+    it "matches a literal string" do
+      expect(Middleman::Util.path_match '/index.html', '/index.html').to be true
+    end
+
+    it "won't match a wrong string" do
+      expect(Middleman::Util.path_match '/foo.html', '/index.html').to be false
+    end
+
+    it "won't match a partial string" do
+      expect(Middleman::Util.path_match 'ind', '/index.html').to be false
+    end
+
+    it "works with a regex" do
+      expect(Middleman::Util.path_match /\.html$/, '/index.html').to be true
+      expect(Middleman::Util.path_match /\.js$/, '/index.html').to be false
+    end
+
+    it "works with a proc" do
+      matcher = lambda {|p| p.length > 5 }
+
+      expect(Middleman::Util.path_match matcher, '/index.html').to be true
+      expect(Middleman::Util.path_match matcher, '/i').to be false
+    end
+
+    it "works with globs" do
+      expect(Middleman::Util.path_match '/foo/*.html', '/foo/index.html').to be true
+      expect(Middleman::Util.path_match '/foo/*.html', '/foo/index.js').to be false
+      expect(Middleman::Util.path_match '/bar/*.html', '/foo/index.js').to be false
+
+      expect(Middleman::Util.path_match '/foo/*', '/foo/bar/index.html').to be true
+      expect(Middleman::Util.path_match '/foo/**/*', '/foo/bar/index.html').to be true
+      expect(Middleman::Util.path_match '/foo/**', '/foo/bar/index.html').to be true
+    end
+  end
+
+  describe "::binary?" do
+    %w(plain.txt unicode.txt unicode).each do |file|
+      it "recognizes #{file} as not binary" do
+        expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be false
+      end
+    end
+
+    %w(middleman.png middleman stars.svgz).each do |file|
+      it "recognizes #{file} as binary" do
+        expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be true
+      end
+    end
+  end
+
+  describe "::recursively_enhance" do
+    it "returns IndifferentHash if given one" do
+      input   = Middleman::Util::IndifferentHash.new({test: "subject"})
+      subject = Middleman::Util.recursively_enhance input
+
+      expect( subject ).to be_a Middleman::Util::IndifferentHash
+      expect( subject.test ).to eq "subject"
+    end
+
+    it "returns IndifferentHash if given a hash" do
+      input   = {test: "subject"}
+      subject = Middleman::Util.recursively_enhance input
+
+      expect( subject ).to be_a Middleman::Util::IndifferentHash
+      expect( subject.test ).to eq "subject"
+    end
+
+    it "returns Array with strings, or IndifferentHash, true, false" do
+      indifferent_hash = Middleman::Util::IndifferentHash.new({test: "subject"})
+      regular_hash     = {regular: "hash"}
+      input   = [ indifferent_hash, regular_hash, true, false ]
+      subject = Middleman::Util.recursively_enhance input
+
+      expect( subject[0] ).to be_a Middleman::Util::IndifferentHash
+      expect( subject[1] ).to be_a Middleman::Util::IndifferentHash
+      expect( subject[1].regular ).to eq "hash"
+      expect( subject[2] ).to eq true
+      expect( subject[3] ).to eq false
+    end
+
+    it "returns duplicated & frozen original object if not special cased" do
+      input   = "foo"
+      subject = Middleman::Util.recursively_enhance input
+
+      expect( subject ).to eq input
+      expect( subject.object_id ).not_to eq input.object_id
+      expect( subject ).to be_frozen
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.6
+  version: 4.0.0.beta.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,14 +254,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -324,6 +338,7 @@ files:
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
+- features/image_srcset_paths.feature
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
@@ -379,6 +394,7 @@ files:
 - fixtures/asset-hash-app/source/layout.erb
 - fixtures/asset-hash-app/source/other.html.erb
 - fixtures/asset-hash-app/source/partials.html.erb
+- fixtures/asset-hash-app/source/slim.html.slim
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
@@ -696,6 +712,8 @@ files:
 - fixtures/ignore-app/source/plain.html
 - fixtures/ignore-app/source/reports/another.html
 - fixtures/ignore-app/source/reports/index.html
+- fixtures/image-srcset-paths-app/image-srcset-paths.html.erb
+- fixtures/image-srcset-paths-app/images/blank.gif
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/.htaccess
 - fixtures/indexable-app/source/.htpasswd
@@ -867,6 +885,9 @@ files:
 - fixtures/multiple-sources-app/source1/override-in-one.html.erb
 - fixtures/multiple-sources-app/source2/index2.html.erb
 - fixtures/multiple-sources-app/source2/override-in-two.html.erb
+- fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
+- fixtures/multiple-sources-with-duplicate-file-names-app/source/index.html.erb
+- fixtures/multiple-sources-with-duplicate-file-names-app/source2/index.html.erb
 - fixtures/nested-data-app/config.rb
 - fixtures/nested-data-app/data/examples/deeper/stuff.yml
 - fixtures/nested-data-app/data/examples/more.yml
@@ -991,6 +1012,7 @@ files:
 - fixtures/stylus-preview-app/source/stylesheets/main2.css.styl
 - fixtures/stylus-preview-app/source/stylesheets/plain.css.styl
 - fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/.htaccess
 - fixtures/traversal-app/source/directory-indexed.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling2.html.erb
@@ -1107,6 +1129,7 @@ files:
 - lib/middleman-core.rb
 - lib/middleman-core/application.rb
 - lib/middleman-core/builder.rb
+- lib/middleman-core/cli/server.rb
 - lib/middleman-core/config_context.rb
 - lib/middleman-core/configuration.rb
 - lib/middleman-core/contracts.rb
@@ -1190,18 +1213,17 @@ files:
 - lib/middleman-core/template_context.rb
 - lib/middleman-core/template_renderer.rb
 - lib/middleman-core/util.rb
-- lib/middleman-core/util/hash_with_indifferent_access.rb
 - lib/middleman-core/version.rb
 - lib/middleman/rack.rb
 - middleman-core.gemspec
-- spec/middleman-core/binary_spec.rb
 - spec/middleman-core/binary_spec/middleman
 - spec/middleman-core/binary_spec/middleman.png
 - spec/middleman-core/binary_spec/plain.txt
 - spec/middleman-core/binary_spec/stars.svgz
 - spec/middleman-core/binary_spec/unicode
 - spec/middleman-core/binary_spec/unicode.txt
-- spec/middleman-core/path_match_spec.rb
+- spec/middleman-core/core_extensions/data_spec.rb
+- spec/middleman-core/util_spec.rb
 - spec/spec_helper.rb
 homepage: http://middlemanapp.com
 licenses:
@@ -1223,7 +1245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1275,6 +1297,7 @@ test_files:
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
+- features/image_srcset_paths.feature
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
@@ -1330,6 +1353,7 @@ test_files:
 - fixtures/asset-hash-app/source/layout.erb
 - fixtures/asset-hash-app/source/other.html.erb
 - fixtures/asset-hash-app/source/partials.html.erb
+- fixtures/asset-hash-app/source/slim.html.slim
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
@@ -1647,6 +1671,8 @@ test_files:
 - fixtures/ignore-app/source/plain.html
 - fixtures/ignore-app/source/reports/another.html
 - fixtures/ignore-app/source/reports/index.html
+- fixtures/image-srcset-paths-app/image-srcset-paths.html.erb
+- fixtures/image-srcset-paths-app/images/blank.gif
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/.htaccess
 - fixtures/indexable-app/source/.htpasswd
@@ -1818,6 +1844,9 @@ test_files:
 - fixtures/multiple-sources-app/source1/override-in-one.html.erb
 - fixtures/multiple-sources-app/source2/index2.html.erb
 - fixtures/multiple-sources-app/source2/override-in-two.html.erb
+- fixtures/multiple-sources-with-duplicate-file-names-app/config.rb
+- fixtures/multiple-sources-with-duplicate-file-names-app/source/index.html.erb
+- fixtures/multiple-sources-with-duplicate-file-names-app/source2/index.html.erb
 - fixtures/nested-data-app/config.rb
 - fixtures/nested-data-app/data/examples/deeper/stuff.yml
 - fixtures/nested-data-app/data/examples/more.yml
@@ -1942,6 +1971,7 @@ test_files:
 - fixtures/stylus-preview-app/source/stylesheets/main2.css.styl
 - fixtures/stylus-preview-app/source/stylesheets/plain.css.styl
 - fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/.htaccess
 - fixtures/traversal-app/source/directory-indexed.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling2.html.erb

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

@@ -1,103 +0,0 @@
-require 'middleman-core/contracts'
-
-module Middleman
-  module Util
-    # A hash with indifferent access and magic predicates.
-    # Copied from Thor
-    #
-    #   hash = Middleman::Util::HashWithIndifferentAccess.new 'foo' => 'bar', 'baz' => 'bee', 'force' => true
-    #
-    #   hash[:foo]  #=> 'bar'
-    #   hash['foo'] #=> 'bar'
-    #   hash.foo?   #=> true
-    #
-    class HashWithIndifferentAccess < ::Hash #:nodoc:
-      include Contracts
-
-      Contract Hash => Any
-      def initialize(hash={})
-        super()
-
-        hash.each do |key, val|
-          self[key] = recursively_enhance(val)
-        end
-
-        freeze
-      end
-
-      def [](key)
-        super(convert_key(key))
-      end
-
-      def []=(key, value)
-        super(convert_key(key), value)
-      end
-
-      def delete(key)
-        super(convert_key(key))
-      end
-
-      def values_at(*indices)
-        indices.map { |key| self[convert_key(key)] }
-      end
-
-      def merge(other)
-        dup.merge!(other)
-      end
-
-      def merge!(other)
-        other.each do |key, value|
-          self[convert_key(key)] = value
-        end
-        self
-      end
-
-      # Convert to a Hash with String keys.
-      def to_hash
-        Hash.new(default).merge!(self)
-      end
-
-      protected
-
-      def convert_key(key)
-        key.is_a?(Symbol) ? key.to_s : key
-      end
-
-      # Magic predicates. For instance:
-      #
-      #   options.force?                  # => !!options['force']
-      #   options.shebang                 # => "/usr/lib/local/ruby"
-      #   options.test_framework?(:rspec) # => options[:test_framework] == :rspec
-      # rubocop:disable DoubleNegation
-      def method_missing(method, *args)
-        method = method.to_s
-        if method =~ /^(\w+)\?$/
-          if args.empty?
-            !!self[$1]
-          else
-            self[$1] == args.first
-          end
-        else
-          self[method]
-        end
-      end
-
-      private
-
-      Contract Any => Frozen[Any]
-      def recursively_enhance(data)
-        if data.is_a? HashWithIndifferentAccess
-          data
-        elsif data.is_a? Hash
-          self.class.new(data)
-        elsif data.is_a? Array
-          data.map(&method(:recursively_enhance)).freeze
-        elsif data.frozen? || data.nil? || [::TrueClass, ::FalseClass, ::Fixnum].include?(data.class)
-          data
-        else
-          data.dup.freeze
-        end
-      end
-    end
-  end
-end

data/spec/middleman-core/binary_spec.rb

@@ -1,15 +0,0 @@
-require 'middleman-core/util'
-
-describe "Middleman::Util#binary?" do
-  %w(plain.txt unicode.txt unicode).each do |file|
-    it "recognizes #{file} as not binary" do
-      expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be false
-    end
-  end
-
-  %w(middleman.png middleman stars.svgz).each do |file|
-    it "recognizes #{file} as binary" do
-      expect(Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}"))).to be true
-    end
-  end
-end

data/spec/middleman-core/path_match_spec.rb

@@ -1,37 +0,0 @@
-require 'middleman-core/util'
-
-describe "Middleman::Util#path_match" do
-  it "matches a literal string" do
-    expect(Middleman::Util.path_match '/index.html', '/index.html').to be true
-  end
-
-  it "won't match a wrong string" do
-    expect(Middleman::Util.path_match '/foo.html', '/index.html').to be false
-  end
-
-  it "won't match a partial string" do
-    expect(Middleman::Util.path_match 'ind', '/index.html').to be false
-  end
-
-  it "works with a regex" do
-    expect(Middleman::Util.path_match /\.html$/, '/index.html').to be true
-    expect(Middleman::Util.path_match /\.js$/, '/index.html').to be false
-  end
-
-  it "works with a proc" do
-    matcher = lambda {|p| p.length > 5 }
-
-    expect(Middleman::Util.path_match matcher, '/index.html').to be true
-    expect(Middleman::Util.path_match matcher, '/i').to be false
-  end
-
-  it "works with globs" do
-    expect(Middleman::Util.path_match '/foo/*.html', '/foo/index.html').to be true
-    expect(Middleman::Util.path_match '/foo/*.html', '/foo/index.js').to be false
-    expect(Middleman::Util.path_match '/bar/*.html', '/foo/index.js').to be false
-
-    expect(Middleman::Util.path_match '/foo/*', '/foo/bar/index.html').to be true
-    expect(Middleman::Util.path_match '/foo/**/*', '/foo/bar/index.html').to be true
-    expect(Middleman::Util.path_match '/foo/**', '/foo/bar/index.html').to be true
-  end
-end