middleman-core 4.1.0.rc.2 → 4.1.0

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

@@ -0,0 +1,52 @@
+require 'middleman-core/contracts'
+
+module Middleman
+  module Util
+    include Contracts
+
+    module_function
+
+    # Extract the text of a Rack response as a string.
+    # Useful for extensions implemented as Rack middleware.
+    # @param response The response from #call
+    # @return [String] The whole response as a string.
+    Contract RespondTo[:each] => String
+    def extract_response_text(response)
+      # The rack spec states all response bodies must respond to each
+      result = ''
+      response.each do |part, _|
+        result << part
+      end
+      result
+    end
+
+    Contract String, String, ArrayOf[String], Proc => String
+    def rewrite_paths(body, _path, exts, &_block)
+      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
+
+      url_fn_prefix = 'url('
+
+      body.dup.gsub(matcher) do |match|
+        opening_character = $1
+        asset_path = $2
+
+        if asset_path.start_with?(url_fn_prefix)
+          opening_character << url_fn_prefix
+          asset_path = asset_path[url_fn_prefix.length..-1]
+        end
+
+        begin
+          uri = ::Addressable::URI.parse(asset_path)
+
+          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
+            "#{opening_character}#{result}"
+          else
+            match
+          end
+        rescue ::Addressable::URI::InvalidURIError
+          match
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+# For URI templating
+require 'addressable/uri'
+require 'addressable/template'
+require 'active_support/inflector'
+require 'active_support/inflector/transliterate'
+
+module Middleman
+  module Util
+    # Handy methods for dealing with URI templates. Mix into whatever class.
+    module UriTemplates
+      module_function
+
+      # Given a URI template string, make an Addressable::Template
+      # This supports the legacy middleman-blog/Sinatra style :colon
+      # URI templates as well as RFC6570 templates.
+      #
+      # @param [String] tmpl_src URI template source
+      # @return [Addressable::Template] a URI template
+      def uri_template(tmpl_src)
+        # Support the RFC6470 templates directly if people use them
+        if tmpl_src.include?(':')
+          tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
+        end
+
+        ::Addressable::Template.new(::Middleman::Util.normalize_path(tmpl_src))
+      end
+
+      # Apply a URI template with the given data, producing a normalized
+      # Middleman path.
+      #
+      # @param [Addressable::Template] template
+      # @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)
+      end
+
+      # Use a template to extract parameters from a path, and validate some special (date)
+      # keys. Returns nil if the special keys don't match.
+      #
+      # @param [Addressable::Template] template
+      # @param [String] path
+      def extract_params(template, path)
+        template.extract(path, BlogTemplateProcessor)
+      end
+
+      # Parameterize a string preserving any multibyte characters
+      def safe_parameterize(str)
+        sep = '-'
+
+        # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
+        parameterized_string = ::ActiveSupport::Inflector.transliterate(str.to_s).downcase
+        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
+
+        parameterized_string.chars.to_a.each_with_index do |char, i|
+          next unless char == '?' && str[i].bytes.count != 1
+          parameterized_string[i] = str[i]
+        end
+
+        re_sep = ::Regexp.escape(sep)
+        # No more than one of the separator in a row.
+        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
+        # Remove leading/trailing separator.
+        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
+
+        parameterized_string
+      end
+
+      # Convert a date into a hash of components to strings
+      # suitable for using in a URL template.
+      # @param [DateTime] date
+      # @return [Hash] parameters
+      def date_to_params(date)
+        {
+          year: date.year.to_s,
+          month: date.month.to_s.rjust(2, '0'),
+          day: date.day.to_s.rjust(2, '0')
+        }
+      end
+    end
+
+    # A special template processor that validates date fields
+    # and has an extra-permissive default regex.
+    #
+    # See https://github.com/sporkmonger/addressable/blob/master/lib/addressable/template.rb#L279
+    class BlogTemplateProcessor
+      def self.match(name)
+        case name
+        when 'year' then '\d{4}'
+        when 'month' then '\d{2}'
+        when 'day' then '\d{2}'
+        else '.*?'
+        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.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.0'.freeze unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('tilt', ['~> 1.4.1'])
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')
+  s.add_dependency('parallel')
 
   # 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.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  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
@@ -436,6 +450,7 @@ files:
 - fixtures/asset-host-app/source/.htaccess
 - fixtures/asset-host-app/source/asset_host.html.erb
 - fixtures/asset-host-app/source/images/blank.gif
+- fixtures/asset-host-app/source/javascripts/asset_host.js
 - fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
 - fixtures/auto-css-app/config.rb
 - fixtures/auto-css-app/source/auto-css.html.erb
@@ -1390,7 +1405,12 @@ files:
 - lib/middleman-core/template_context.rb
 - lib/middleman-core/template_renderer.rb
 - lib/middleman-core/util.rb
+- lib/middleman-core/util/binary.rb
 - lib/middleman-core/util/data.rb
+- lib/middleman-core/util/files.rb
+- lib/middleman-core/util/paths.rb
+- lib/middleman-core/util/rack.rb
+- lib/middleman-core/util/uri_templates.rb
 - lib/middleman-core/version.rb
 - lib/middleman/rack.rb
 - middleman-core.gemspec
@@ -1423,9 +1443,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -1568,6 +1588,7 @@ test_files:
 - fixtures/asset-host-app/source/.htaccess
 - fixtures/asset-host-app/source/asset_host.html.erb
 - fixtures/asset-host-app/source/images/blank.gif
+- fixtures/asset-host-app/source/javascripts/asset_host.js
 - fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
 - fixtures/auto-css-app/config.rb
 - fixtures/auto-css-app/source/auto-css.html.erb