middleman-core 4.1.0.rc.1 → 4.1.0.rc.2

data/lib/middleman-core/util.rb

@@ -10,6 +10,9 @@ require 'rack/mime'
 
 # DbC
 require 'middleman-core/contracts'
+require 'middleman-core/application'
+require 'middleman-core/sources'
+require 'middleman-core/sitemap/resource'
 
 # Indifferent Access
 require 'hashie'
@@ -104,7 +107,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('', '')
+      ::URI.decode(path).sub(%r{^/}, '').tr('', '')
     end
 
     # This is a separate method from normalize_path in case we
@@ -150,7 +153,7 @@ module Middleman
           all_files_under(child, &ignore)
         end.compact
       elsif path.file?
-        if block_given? && ignore.call(path)
+        if block_given? && yield(path)
           []
         else
           [path]
@@ -167,7 +170,7 @@ module Middleman
     # @param [String, Symbol] source The path to the file
     # @param [Hash] options Data to pass through.
     # @return [String]
-    Contract IsA['Middleman::Application'], Symbol, Or[String, Symbol], Hash => String
+    Contract ::Middleman::Application, Symbol, Or[String, Symbol], Hash => String
     def asset_path(app, kind, source, options={})
       return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
 
@@ -198,7 +201,7 @@ module Middleman
     # @param [String] prefix The type prefix (such as "images")
     # @param [Hash] options Data to pass through.
     # @return [String] The fully qualified asset url
-    Contract IsA['Middleman::Application'], String, String, Hash => String
+    Contract ::Middleman::Application, String, String, Hash => String
     def asset_url(app, path, prefix='', options={})
       # Don't touch assets which already have a full path
       return path if path.include?('//') || path.start_with?('data:')
@@ -221,7 +224,7 @@ module Middleman
         end
       end
 
-      final_result = URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
+      final_result = ::URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
 
       result_uri = URI(final_result)
       result_uri.query = uri.query
@@ -232,7 +235,7 @@ 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 IsA['Middleman::Application'], Or[String, IsA['Middleman::Sitemap::Resource']], Hash => String
+    Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
     def url_for(app, path_or_resource, options={})
       # Handle Resources and other things which define their own url method
       url = if path_or_resource.respond_to?(:url)
@@ -244,7 +247,7 @@ module Middleman
       # Try to parse URL
       begin
         uri = URI(url)
-      rescue URI::InvalidURIError
+      rescue ::URI::InvalidURIError
         # Nothing we can do with it, it's not really a URI
         return url
       end
@@ -287,7 +290,7 @@ module Middleman
 
       if resource
         uri.path = if this_resource
-          URI.encode(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
@@ -311,7 +314,7 @@ module Middleman
     # @param [String] path Request path/
     # @param [Middleman::Application] app The requesting app.
     # @return [String] Path with index file if necessary.
-    Contract String, IsA['Middleman::Application'] => String
+    Contract String, ::Middleman::Application => String
     def full_path(path, app)
       resource = app.sitemap.find_resource_by_destination_path(path)
 
@@ -346,7 +349,7 @@ module Middleman
         begin
           uri = ::Addressable::URI.parse(asset_path)
 
-          if uri.relative? && uri.host.nil? && (result = yield(asset_path))
+          if uri.relative? && uri.host.nil? && !asset_path.match(/^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
             "#{opening_character}#{result}"
           else
             match
@@ -422,7 +425,7 @@ module Middleman
     # @param [String] resource_url The target url.
     # @param [Boolean] relative If the path should be relative.
     # @return [String]
-    Contract IsA['Middleman::Sitemap::Resource'], String, Bool => String
+    Contract ::Middleman::Sitemap::Resource, String, Bool => String
     def relative_path_from_resource(curr_resource, resource_url, relative)
       # Switch to the relative path between resource and the given resource
       # if we've been asked to.
@@ -480,12 +483,12 @@ module Middleman
     #
     # @param [Pathname] path The path.
     # @return [Middleman::SourceFile]
-    Contract Pathname, Pathname, Symbol, Bool => IsA['Middleman::SourceFile']
+    Contract Pathname, Pathname, Symbol, Bool => ::Middleman::SourceFile
     def path_to_source_file(path, directory, type, destination_dir)
       types = Set.new([type])
 
       relative_path = path.relative_path_from(directory)
-      relative_path   = File.join(destination_dir, relative_path) if destination_dir
+      relative_path = File.join(destination_dir, relative_path) if destination_dir
 
       ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types)
     end
@@ -496,7 +499,7 @@ module Middleman
     # @param [Middleman::Application] app The app.
     # @param [Pathname] files The original touched file paths.
     # @return [Middleman::SourceFile] All related file paths, not including the source file paths.
-    Contract IsA['Middleman::Application'], ArrayOf[Pathname] => ArrayOf[IsA['Middleman::SourceFile']]
+    Contract ::Middleman::Application, ArrayOf[Pathname] => ArrayOf[::Middleman::SourceFile]
     def find_related_files(app, files)
       all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
 
@@ -546,7 +549,7 @@ module Middleman
           tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
         end
 
-        Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
+        ::Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
       end
 
       # Apply a URI template with the given data, producing a normalized
@@ -556,7 +559,7 @@ module Middleman
       # @param [Hash] data
       # @return [String] normalized path
       def apply_uri_template(template, data)
-        ::Middleman::Util.normalize_path Addressable::URI.unencode(template.expand(data)).to_s
+        ::Middleman::Util.normalize_path ::Addressable::URI.unencode(template.expand(data)).to_s
       end
 
       # Use a template to extract parameters from a path, and validate some special (date)

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

@@ -5,98 +5,102 @@ require 'middleman-core/util'
 require 'middleman-core/contracts'
 require 'backports/2.1.0/array/to_h'
 
-module Middleman::Util::Data
-  include Contracts
+module Middleman
+  module Util
+    module Data
+      include Contracts
 
-  module_function
+      module_function
 
-  # Get the frontmatter and plain content from a file
-  # @param [String] path
-  # @return [Array<Hash, String>]
-  Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]]
-  def parse(full_path, frontmatter_delims, known_type=nil)
-    return [{}, nil] if Middleman::Util.binary?(full_path)
+      # Get the frontmatter and plain content from a file
+      # @param [String] path
+      # @return [Array<Hash, String>]
+      Contract Pathname, Maybe[Symbol] => [Hash, Maybe[String]]
+      def parse(full_path, frontmatter_delims, known_type=nil)
+        return [{}, nil] if ::Middleman::Util.binary?(full_path)
 
-    # Avoid weird race condition when a file is renamed
-    begin
-      content = File.read(full_path)
-    rescue EOFError, IOError, Errno::ENOENT
-      return [{}, nil]
-    end
+        # Avoid weird race condition when a file is renamed
+        begin
+          content = File.read(full_path)
+        rescue EOFError, IOError, Errno::ENOENT
+          return [{}, nil]
+        end
 
-    start_delims, stop_delims = frontmatter_delims
-                                .values
-                                .flatten(1)
-                                .transpose
-                                .map(&Regexp.method(:union))
+        start_delims, stop_delims = frontmatter_delims
+                                    .values
+                                    .flatten(1)
+                                    .transpose
+                                    .map(&Regexp.method(:union))
 
-    match = /
-      \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
-      (?<start>#{start_delims})[ ]*\r?\n
-      (?<frontmatter>.*?)[ ]*\r?\n?
-      ^(?<stop>#{stop_delims})[ ]*\r?\n?
-      \r?\n?
-      (?<additional_content>.*)
-    /mx.match(content) || {}
+        match = /
+          \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
+          (?<start>#{start_delims})[ ]*\r?\n
+          (?<frontmatter>.*?)[ ]*\r?\n?
+          ^(?<stop>#{stop_delims})[ ]*\r?\n?
+          \r?\n?
+          (?<additional_content>.*)
+        /mx.match(content) || {}
 
-    unless match[:frontmatter]
-      case known_type
-      when :yaml
-        return [parse_yaml(content, full_path), nil]
-      when :json
-        return [parse_json(content, full_path), nil]
-      end
-    end
+        unless match[:frontmatter]
+          case known_type
+          when :yaml
+            return [parse_yaml(content, full_path), nil]
+          when :json
+            return [parse_json(content, full_path), nil]
+          end
+        end
 
-    case [match[:start], match[:stop]]
-    when *frontmatter_delims[:yaml]
-      [
-        parse_yaml(match[:frontmatter], full_path),
-        match[:additional_content]
-      ]
-    when *frontmatter_delims[:json]
-      [
-        parse_json("{#{match[:frontmatter]}}", full_path),
-        match[:additional_content]
-      ]
-    else
-      [
-        {},
-        content
-      ]
-    end
-  end
+        case [match[:start], match[:stop]]
+        when *frontmatter_delims[:yaml]
+          [
+            parse_yaml(match[:frontmatter], full_path),
+            match[:additional_content]
+          ]
+        when *frontmatter_delims[:json]
+          [
+            parse_json("{#{match[:frontmatter]}}", full_path),
+            match[:additional_content]
+          ]
+        else
+          [
+            {},
+            content
+          ]
+        end
+      end
 
-  # Parse YAML frontmatter out of a string
-  # @param [String] content
-  # @return [Hash]
-  Contract String, Pathname, Bool => Hash
-  def parse_yaml(content, full_path)
-    symbolize_recursive(YAML.load(content) || {})
-  rescue StandardError, Psych::SyntaxError => error
-    warn "YAML Exception parsing #{full_path}: #{error.message}"
-    {}
-  end
+      # Parse YAML frontmatter out of a string
+      # @param [String] content
+      # @return [Hash]
+      Contract String, Pathname, Bool => Hash
+      def parse_yaml(content, full_path)
+        symbolize_recursive(::YAML.load(content) || {})
+      rescue StandardError, ::Psych::SyntaxError => error
+        warn "YAML Exception parsing #{full_path}: #{error.message}"
+        {}
+      end
 
-  # Parse JSON frontmatter out of a string
-  # @param [String] content
-  # @return [Hash]
-  Contract String, Pathname => Hash
-  def parse_json(content, full_path)
-    symbolize_recursive(JSON.parse(content) || {})
-  rescue StandardError => error
-    warn "JSON Exception parsing #{full_path}: #{error.message}"
-    {}
-  end
+      # Parse JSON frontmatter out of a string
+      # @param [String] content
+      # @return [Hash]
+      Contract String, Pathname => Hash
+      def parse_json(content, full_path)
+        symbolize_recursive(::JSON.parse(content) || {})
+      rescue StandardError => error
+        warn "JSON Exception parsing #{full_path}: #{error.message}"
+        {}
+      end
 
-  def symbolize_recursive(value)
-    case value
-    when Hash
-      value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h
-    when Array
-      value.map { |v| symbolize_recursive(v) }
-    else
-      value
+      def symbolize_recursive(value)
+        case value
+        when Hash
+          value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h
+        when Array
+          value.map { |v| symbolize_recursive(v) }
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack', ['>= 1.4.5', '< 2.0'])
   s.add_dependency('tilt', ['~> 1.4.1'])
   s.add_dependency('erubis')
+  s.add_dependency('fast_blank')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc.1
+  version: 4.1.0.rc.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fast_blank
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -298,10 +312,6 @@ files:
 - features/capture_html.feature
 - features/chained_templates.feature
 - features/clean_build.feature
-- features/cli/preview_server-hook.feature
-- features/cli/preview_server.feature
-- features/cli_extension.feature
-- features/cli_init.feature
 - features/coffee-script.feature
 - features/collections.feature
 - features/console.feature
@@ -411,7 +421,6 @@ files:
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
 - fixtures/asset-hash-app/source/subdir/api.json.erb
 - fixtures/asset-hash-app/source/subdir/index.html.erb
-- fixtures/asset-hash-host-app/config.rb
 - fixtures/asset-hash-host-app/source/images/100px.gif
 - fixtures/asset-hash-host-app/source/images/100px.jpg
 - fixtures/asset-hash-host-app/source/images/100px.png
@@ -462,6 +471,7 @@ files:
 - fixtures/automatic-image-size-app/config.rb
 - fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
 - fixtures/automatic-image-size-app/source/images/blank.gif
+- fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -1181,19 +1191,6 @@ files:
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
-- fixtures/preview-server-app/bin/dns_server.rb
-- fixtures/preview-server-app/config.rb
-- fixtures/preview-server-app/source/index.html.erb
-- fixtures/preview-server-app/source/layout.erb
-- fixtures/preview-server-app/source/layouts/custom.erb
-- fixtures/preview-server-app/source/real.html
-- fixtures/preview-server-app/source/real/index.html.erb
-- fixtures/preview-server-app/source/should_be_ignored.html
-- fixtures/preview-server-app/source/should_be_ignored2.html
-- fixtures/preview-server-app/source/should_be_ignored3.html
-- fixtures/preview-server-app/source/static.html
-- fixtures/preview-server-hook-app/config.rb
-- fixtures/preview-server-hook-app/source/index.html.erb
 - fixtures/proxy-pages-app/config.rb
 - fixtures/proxy-pages-app/source/real.html
 - fixtures/proxy-pages-app/source/real/index.html.erb
@@ -1307,6 +1304,7 @@ files:
 - lib/middleman-core/core_extensions/file_watcher.rb
 - lib/middleman-core/core_extensions/front_matter.rb
 - lib/middleman-core/core_extensions/i18n.rb
+- lib/middleman-core/core_extensions/inline_url_rewriter.rb
 - lib/middleman-core/core_extensions/rendering.rb
 - lib/middleman-core/core_extensions/routing.rb
 - lib/middleman-core/core_extensions/show_exceptions.rb
@@ -1347,7 +1345,6 @@ files:
 - lib/middleman-core/meta_pages/templates/config.html.erb
 - lib/middleman-core/meta_pages/templates/index.html.erb
 - lib/middleman-core/meta_pages/templates/sitemap.html.erb
-- lib/middleman-core/middleware/inline_url_rewriter.rb
 - lib/middleman-core/preview_server.rb
 - lib/middleman-core/preview_server/checks.rb
 - lib/middleman-core/preview_server/information.rb
@@ -1447,10 +1444,6 @@ test_files:
 - features/capture_html.feature
 - features/chained_templates.feature
 - features/clean_build.feature
-- features/cli/preview_server-hook.feature
-- features/cli/preview_server.feature
-- features/cli_extension.feature
-- features/cli_init.feature
 - features/coffee-script.feature
 - features/collections.feature
 - features/console.feature
@@ -1560,7 +1553,6 @@ test_files:
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
 - fixtures/asset-hash-app/source/subdir/api.json.erb
 - fixtures/asset-hash-app/source/subdir/index.html.erb
-- fixtures/asset-hash-host-app/config.rb
 - fixtures/asset-hash-host-app/source/images/100px.gif
 - fixtures/asset-hash-host-app/source/images/100px.jpg
 - fixtures/asset-hash-host-app/source/images/100px.png
@@ -1611,6 +1603,7 @@ test_files:
 - fixtures/automatic-image-size-app/config.rb
 - fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
 - fixtures/automatic-image-size-app/source/images/blank.gif
+- fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -2330,19 +2323,6 @@ test_files:
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
-- fixtures/preview-server-app/bin/dns_server.rb
-- fixtures/preview-server-app/config.rb
-- fixtures/preview-server-app/source/index.html.erb
-- fixtures/preview-server-app/source/layout.erb
-- fixtures/preview-server-app/source/layouts/custom.erb
-- fixtures/preview-server-app/source/real.html
-- fixtures/preview-server-app/source/real/index.html.erb
-- fixtures/preview-server-app/source/should_be_ignored.html
-- fixtures/preview-server-app/source/should_be_ignored2.html
-- fixtures/preview-server-app/source/should_be_ignored3.html
-- fixtures/preview-server-app/source/static.html
-- fixtures/preview-server-hook-app/config.rb
-- fixtures/preview-server-hook-app/source/index.html.erb
 - fixtures/proxy-pages-app/config.rb
 - fixtures/proxy-pages-app/source/real.html
 - fixtures/proxy-pages-app/source/real/index.html.erb