middleman-core 3.3.11 → 3.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdee941102d480e0efde57121a8f4158b053579
-  data.tar.gz: 4d51251656f7a673ebe12fa3c3a43ab97a885f1b
+  metadata.gz: 6bfeb7129e9a3c6e06a50e32856e7ec973c597a5
+  data.tar.gz: dbff503bac895a4e4ffa2f734e52144d0ebe3a6b
 SHA512:
-  metadata.gz: 3645d04948555d0cc894ab7ce41b05c854a1b2e2b9c140fc087aca9d159004743a25ed4e684281cc5b99026eab36c6cf643bea374216e1b79c4392dbd657bb51
-  data.tar.gz: 7568e90823fbfa99c5baf7aaf0ee51beb6191c0e0921ac998e5d1ff021a577fd2594e40daccd18ed8e6722cb1856358cff1046e337329bddda4cd3bdc6096bd6
+  metadata.gz: d983aca0f6732cad2fc53273562e67570d36f5cd20d100f756901849f256e55b8ee20583b620e227b5ee4b671b74074ab982d58aa904a3146752c4fe40d798a5
+  data.tar.gz: 1aed9d493d38c379270fff5b2e5da9373c88c1af73e3ea468e824e0333fb0351a0428b07be8347a790d5e328efde579f35782792ae73b40ad98b540e63f6f639

data/features/asset_hash.feature

@@ -76,6 +76,13 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
 
+  Scenario: Hashed assets work with Slim
+    Given the Server is running at "asset-hash-app"
+    When I go to "/slim.html"
+    And I should see 'src="images/300px-59adce76.jpg"'
+    And I should see 'src="images/100px-5fd6fb90.jpg"'
+    And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
+
   Scenario: Enabling an asset host still produces hashed files and references
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"

data/features/content_type.feature

@@ -12,6 +12,8 @@ Feature: Setting the right content type for files
     Then the content type should be "text/css"
     When I go to "/README"
     Then the content type should be "text/plain"
+    When I go to "/index.php"
+    Then the content type should be "text/php"
 
   Scenario: Content type can be set explicitly via page or proxy or frontmatter
     Given a fixture app "content-type-app"
@@ -31,6 +33,7 @@ Feature: Setting the right content type for files
     When I go to "/override.html"
     Then the content type should be "text/neato"
 
+  @preserve_mime_types
   Scenario: Content types can be overridden with mime_type
     Given a fixture app "content-type-app"
     And a file named "config.rb" with:

data/features/minify_css.feature

@@ -26,6 +26,18 @@ Feature: Minify CSS
     When I go to "/stylesheets/report.css"
     Then I should see "p{border:1px solid #ff6600}"
     
+  Scenario: Rendering external css in a proxied resource
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_css
+      proxy '/css-proxy', '/stylesheets/site.css', ignore: true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/css-proxy"
+    Then I should see "1" lines
+    And I should see "only screen and (device-width"
+
   Scenario: Rendering external css with passthrough compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -124,4 +136,54 @@ Feature: Minify CSS
     <style>
       body{test:style;good:deal}
     </style>
-    """
+    """
+
+  Scenario: Rendering inline css in a PHP document
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_css, :inline => true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css.php"
+    Then I should see:
+    """
+    <?='Hello'?>
+
+    <style>
+      body{test:style;good:deal}
+    </style>
+    """
+
+  Scenario: Rendering inline css in a proxied resource
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_css, :inline => true
+      proxy '/inline-css-proxy', '/inline-css.html', ignore: true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css-proxy"
+    Then I should see:
+    """
+    <style>
+      body{test:style;good:deal}
+    </style>
+    """
+
+  @preserve_mime_types
+  Scenario: Configuring content types of resources to be minified
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      mime_type('.xcss', 'text/x-css')
+      activate :minify_css, content_types: ['text/x-css'],
+                            inline: true,
+                            inline_content_types: ['text/html']
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/stylesheets/site.xcss"
+    Then I should see "1" lines
+    And I should see "only screen and (device-width"
+    When I go to "/inline-css.php"
+    Then I should see "8" lines

data/features/minify_javascript.feature

@@ -88,7 +88,7 @@ Feature: Minify Javascript
     </script>
     """
 
-  Scenario: Rendering inline css with a passthrough minifier using activate-style compressor
+  Scenario: Rendering inline JS with a passthrough minifier using activate-style compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
@@ -148,6 +148,42 @@ Feature: Minify Javascript
     </script>
     """
 
+  Scenario: Rendering inline js in a PHP document
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript, :inline => true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/inline-js.php"
+    Then I should see:
+    """
+    <?='Hello'?>
+
+    <script>
+      !function(){should(),all.be(),on={one:line}}();
+    </script>
+    <script type='text/javascript'>
+      //<!--
+    !function(){one,line(),here()}();
+      //-->
+    </script>
+    <script type='text/html'>
+      I'm a jQuery {{template}}.
+    </script>
+    """
+
+  Scenario: Rendering inline js in a proxied resource
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript, :inline => true
+      proxy '/inline-js-proxy', '/inline-js.html', ignore: true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/inline-js-proxy"
+    Then I should see "14" lines
+
   Scenario: Rendering external js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -160,6 +196,17 @@ Feature: Minify Javascript
     When I go to "/more-js/other.js"
     Then I should see "1" lines
     
+  Scenario: Rendering external js in a proxied resource
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript
+      proxy '/js-proxy', '/javascripts/js_test.js', ignore: true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/js-proxy"
+    Then I should see "1" lines
+
   Scenario: Rendering external js with a passthrough minifier
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/js_test.js"

data/features/support/preserve_mime_types.rb

@@ -0,0 +1,7 @@
+Around('@preserve_mime_types') do |_scenario, block|
+  mime_types = ::Rack::Mime::MIME_TYPES.clone
+
+  block.call
+
+  ::Rack::Mime::MIME_TYPES.replace mime_types
+end

data/fixtures/asset-hash-app/source/slim.html.slim

@@ -0,0 +1,8 @@
+---
+directory_index: false
+layout: false
+---
+
+= image_tag '100px.jpg', srcset: "100px.jpg 1x, 200px.jpg 2x, 300px.jpg 3x"
+
+= image_tag "300px.jpg"

data/fixtures/content-type-app/source/index.php

@@ -0,0 +1 @@
+<?="I'm a PHP file!"?>

data/fixtures/minify-css-app/source/inline-css.php

@@ -0,0 +1,8 @@
+<?='Hello'?>
+
+<style>
+  body {
+    test: style;
+    good: deal;
+  }
+</style>

data/fixtures/minify-css-app/source/stylesheets/site.xcss.sass

@@ -0,0 +1,5 @@
+@import "compass/reset"
+
+@media handheld, only screen and (device-width: 768px)
+  body
+    display: block

data/fixtures/minify-js-app/source/inline-js.php

@@ -0,0 +1,22 @@
+<?='Hello'?>
+
+<script>
+  ;(function() {
+    this;
+    should();
+    all.be();
+    on = { one: line };
+  })();
+</script>
+<script type='text/javascript'>
+  //<!--
+  ;(function() {
+    one;
+    line();
+    here();
+  })();
+  //-->
+</script>
+<script type='text/html'>
+  I'm a jQuery {{template}}.
+</script>

data/fixtures/minify-js-app/source/javascripts/js_test.xjs

@@ -0,0 +1,8 @@
+var race;
+var __slice = Array.prototype.slice;
+
+race = function() {
+  var runners, winner;
+  winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+  return print(winner, runners);
+};

data/lib/middleman-core/application.rb

@@ -67,14 +67,22 @@ module Middleman
     end
     delegate :root_path, to: :"self.class"
 
-    # Which host preview should start on.
-    # @return [Fixnum]
-    config.define_setting :host, '0.0.0.0', 'The preview server host'
-
     # Which port preview should start on.
     # @return [Fixnum]
     config.define_setting :port, 4567, 'The preview server port'
 
+    # Whether to serve the preview server over HTTPS.
+    # @return [Boolean]
+    config.define_setting :https, false, 'Serve the preview server over SSL/TLS'
+
+    # The (optional) path to the SSL cert to use for the preview server.
+    # @return [String]
+    config.define_setting :ssl_certificate, nil, 'Path to an X.509 certificate to use for the preview server'
+
+    # The (optional) private key for the certificate in :ssl_certificate.
+    # @return [String]
+    config.define_setting :ssl_private_key, nil, "Path to an RSA private key for the preview server's certificate"
+
     # Name of the source directory
     # @return [String]
     config.define_setting :source,      'source', 'Name of the source directory'

data/lib/middleman-core/cli/server.rb

@@ -11,13 +11,16 @@ module Middleman::Cli
                   aliases: '-e',
                   default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
                   desc: 'The environment Middleman will run under'
-    method_option :host,
-                  type: :string,
-                  aliases: '-h',
-                  desc: 'Bind to HOST address'
     method_option :port,
                   aliases: '-p',
                   desc: 'The port Middleman will listen on'
+    method_option :https,
+                  type: :boolean,
+                  desc: 'Serve the preview server over SSL/TLS'
+    method_option :ssl_certificate,
+                  desc: 'Path to an X.509 certificate to use for the preview server'
+    method_option :ssl_private_key,
+                  desc: "Path to an RSA private key for the preview server's certificate"
     method_option :verbose,
                   type: :boolean,
                   default: false,
@@ -62,7 +65,9 @@ module Middleman::Cli
 
       params = {
         port: options['port'],
-        host: options['host'],
+        https: options['https'],
+        ssl_certificate: options['ssl_certificate'],
+        ssl_private_key: options['ssl_private_key'],
         environment: options['environment'],
         debug: options['verbose'],
         instrumenting: options['instrument'],

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

@@ -25,6 +25,9 @@ module Middleman
           # Sourcemap format
           ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=utf-8'
 
+          # Create a MIME type for PHP files (for detection by extensions)
+          ::Rack::Mime::MIME_TYPES['.php'] = 'text/php'
+
           app.extend ClassMethods
           app.extend ServerMethods
 

data/lib/middleman-core/preview_server.rb

@@ -1,4 +1,7 @@
 require 'webrick'
+require 'webrick/https'
+require 'openssl'
+require 'socket'
 require 'middleman-core/meta_pages'
 require 'middleman-core/logger'
 
@@ -6,17 +9,21 @@ require 'middleman-core/logger'
 module Middleman
   module PreviewServer
     class << self
-      attr_reader :app, :host, :port
+      attr_reader :app, :host, :port, :ssl_certificate, :ssl_private_key
       delegate :logger, to: :app
 
+      def https?
+        @https
+      end
+
       # Start an instance of Middleman::Application
       # @return [void]
       def start(opts={})
         @options = opts
 
         mount_instance(new_app)
-        logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
-        logger.info "== Inspect your site configuration at http://#{host}:#{port}/__middleman/"
+        logger.info "== The Middleman is standing watch at #{uri} (#{uri(public_ip)})"
+        logger.info "== Inspect your site configuration at #{uri + '__middleman'}"
 
         @initialized ||= false
         return if @initialized
@@ -104,12 +111,17 @@ module Middleman
           )
 
           config[:environment] = opts[:environment].to_sym if opts[:environment]
-          config[:host] = opts[:host] if opts[:host]
           config[:port] = opts[:port] if opts[:port]
+          config[:https] = opts[:https] unless opts[:https].nil?
+          config[:ssl_certificate] = opts[:ssl_certificate] if opts[:ssl_certificate]
+          config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
         end
 
-        @host = @app.config[:host]
         @port = @app.config[:port]
+        @https = @app.config[:https]
+
+        @ssl_certificate = @app.config[:ssl_certificate]
+        @ssl_private_key = @app.config[:ssl_private_key]
 
         @app
       end
@@ -167,12 +179,27 @@ module Middleman
       # @return [void]
       def setup_webrick(is_logging)
         http_opts = {
-          BindAddress: host,
           Port: port,
           AccessLog: [],
           DoNotReverseLookup: true
         }
 
+        if https?
+          http_opts[:SSLEnable] = true
+
+          if ssl_certificate || ssl_private_key
+            raise "You must provide both :ssl_certificate and :ssl_private_key" unless ssl_private_key && ssl_certificate
+            http_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new File.read ssl_certificate
+            http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new File.read ssl_private_key
+          else
+            # use a generated self-signed cert
+            http_opts[:SSLCertName] = [
+                                       %w(CN localhost),
+                                       %w(CN #{Socket.gethostname})
+                                      ].uniq
+          end
+        end
+
         if is_logging
           http_opts[:Logger] = FilteredWebrickLog.new
         else
@@ -234,6 +261,21 @@ module Middleman
           end
         end
       end
+
+      # Returns the URI the preview server will run on
+      # @return [URI]
+      def uri(host = Socket.gethostname)
+        scheme = https? ? 'https' : 'http'
+        URI("#{scheme}://#{host}:#{@port}/")
+      end
+
+      # An IPv4 address on this machine which should be externally addressable.
+      # @return [String]
+      def public_ip
+        ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
+        ip ? ip.ip_address : '127.0.0.1'
+      end
+
     end
 
     class FilteredWebrickLog < ::WEBrick::Log

data/lib/middleman-core/templates/default/source/layouts/layout.erb

@@ -2,18 +2,18 @@
 <html>
   <head>
     <meta charset="utf-8">
-    
+
     <!-- Always force latest IE rendering engine or request Chrome Frame -->
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-    
+
     <!-- Use title if it's in the page YAML frontmatter -->
     <title><%= current_page.data.title || "The Middleman" %></title>
-    
+
     <%= stylesheet_link_tag "normalize", "all" %>
     <%= javascript_include_tag  "all" %>
   </head>
-  
+
   <body class="<%= page_classes %>">
     <%= yield %>
   </body>
-</html>
+</html>

data/lib/middleman-core/version.rb

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

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

@@ -262,8 +262,16 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       params.symbolize_keys!
       
       if params.key?(:srcset)
-        images = params[:srcset].split(',').map {|size| (size.include?('//') ? size : asset_url("images/#{size.strip}")) }
-        params[:srcset] = images.join(', ')
+        images_sources = params[:srcset].split(',').map do |src_def|
+          if src_def.include?('//')
+            src_def
+          else
+            image_def, size_def = src_def.strip.split(/\s+/)
+            asset_path(:images, image_def) + ' ' + size_def
+          end
+        end
+
+        params[:srcset] = images_sources.join(', ')
       end
 
       super(path, params)

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

@@ -3,6 +3,8 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   option :compressor, nil, 'Set the CSS compressor to use.'
   option :inline, false, 'Whether to minify CSS inline within HTML files'
   option :ignore, [], 'Patterns to avoid minifying'
+  option :content_types, %w(text/css), 'Content types of resources that contain CSS'
+  option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline CSS'
 
   def initialize(app, options_hash={}, &block)
     super
@@ -16,7 +18,9 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # Setup Rack middleware to minify CSS
     app.use Rack, compressor: chosen_compressor,
                   ignore: Array(options[:ignore]) + [/\.min\./],
-                  inline: options[:inline]
+                  inline: options[:inline],
+                  content_types: options[:content_types],
+                  inline_content_types: options[:inline_content_types]
   end
 
   class SassCompressor
@@ -39,6 +43,8 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
       @compressor = options[:compressor]
       @ignore = options[:ignore]
       @inline = options[:inline]
+      @content_types = options[:content_types]
+      @inline_content_types = options[:inline_content_types]
     end
 
     # Rack interface
@@ -47,19 +53,18 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def call(env)
       status, headers, response = @app.call(env)
 
-      if inline_html_content?(env['PATH_INFO'])
-        minified = ::Middleman::Util.extract_response_text(response)
-        minified.gsub!(INLINE_CSS_REGEX) do
-          $1 << @compressor.compress($2) << $3
-        end
+      content_type = headers['Content-Type'].try(:slice, /^[^;]*/)
+      path = env['PATH_INFO']
 
+      minified = if @inline && minifiable_inline?(content_type)
+        minify_inline(::Middleman::Util.extract_response_text(response))
+      elsif minifiable?(content_type) && !ignore?(path)
+        minify(::Middleman::Util.extract_response_text(response))
+      end
+
+      if minified
         headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
         response = [minified]
-      elsif standalone_css_content?(env['PATH_INFO'])
-        minified_css = @compressor.compress(::Middleman::Util.extract_response_text(response))
-
-        headers['Content-Length'] = ::Rack::Utils.bytesize(minified_css).to_s
-        response = [minified_css]
       end
 
       [status, headers, response]
@@ -67,12 +72,41 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
 
     private
 
-    def inline_html_content?(path)
-      (path.end_with?('.html') || path.end_with?('.php')) && @inline
+    # Whether the path should be ignored
+    # @param [String] path
+    # @return [Boolean]
+    def ignore?(path)
+      @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
+    end
+
+    # Whether this type of content can be minified
+    # @param [String, nil] content_type
+    # @return [Boolean]
+    def minifiable?(content_type)
+      @content_types.include?(content_type)
     end
 
-    def standalone_css_content?(path)
-      path.end_with?('.css') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) }
+    # Whether this type of content contains inline content that can be minified
+    # @param [String, nil] content_type
+    # @return [Boolean]
+    def minifiable_inline?(content_type)
+      @inline_content_types.include?(content_type)
+    end
+
+    # Minify the content
+    # @param [String] content
+    # @return [String]
+    def minify(content)
+      @compressor.compress(content)
+    end
+
+    # Detect and minify inline content
+    # @param [String] content
+    # @return [String]
+    def minify_inline(content)
+      content.gsub(INLINE_CSS_REGEX) do
+        $1 + minify($2) + $3
+      end
     end
   end
 end

data/lib/middleman-more/extensions/minify_javascript.rb

@@ -3,6 +3,8 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
   option :compressor, nil, 'Set the JS compressor to use.'
   option :inline, false, 'Whether to minify JS inline within HTML files'
   option :ignore, [], 'Patterns to avoid minifying'
+  option :content_types, %w(application/javascript), 'Content types of resources that contain JS'
+  option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline JS'
 
   def initialize(app, options_hash={}, &block)
     super
@@ -16,14 +18,18 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       ::Uglifier.new
     end
 
-    # Setup Rack middleware to minify CSS
+    # Setup Rack middleware to minify JS
     app.use Rack, compressor: chosen_compressor,
                   ignore: Array(options[:ignore]) + [/\.min\./],
-                  inline: options[:inline]
+                  inline: options[:inline],
+                  content_types: options[:content_types],
+                  inline_content_types: options[:inline_content_types]
   end
 
   # Rack middleware to look for JS and compress it
   class Rack
+    INLINE_JS_REGEX = /(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m
+
     # Init
     # @param [Class] app
     # @param [Hash] options
@@ -32,6 +38,8 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       @compressor = options[:compressor]
       @ignore = options[:ignore]
       @inline = options[:inline]
+      @content_types = options[:content_types]
+      @inline_content_types = options[:inline_content_types]
     end
 
     # Rack interface
@@ -40,25 +48,18 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def call(env)
       status, headers, response = @app.call(env)
 
+      type = headers['Content-Type'].try(:slice, /^[^;]*/)
       path = env['PATH_INFO']
 
-      begin
-        if @inline && (path.end_with?('.html') || path.end_with?('.php'))
-          uncompressed_source = ::Middleman::Util.extract_response_text(response)
-
-          minified = minify_inline_content(uncompressed_source)
-
-          headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
-          response = [minified]
-        elsif path.end_with?('.js') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) }
-          uncompressed_source = ::Middleman::Util.extract_response_text(response)
-          minified = @compressor.compress(uncompressed_source)
+      minified = if @inline && minifiable_inline?(type)
+        minify_inline(::Middleman::Util.extract_response_text(response))
+      elsif minifiable?(type) && !ignore?(path)
+        minify(::Middleman::Util.extract_response_text(response))
+      end
 
-          headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
-          response = [minified]
-        end
-      rescue ExecJS::ProgramError => e
-        warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
+      if minified
+        headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
+        response = [minified]
       end
 
       [status, headers, response]
@@ -66,19 +67,48 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
     private
 
-    def minify_inline_content(uncompressed_source)
-      uncompressed_source.gsub(/(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m) do |match|
-        first = $1
-        javascript = $2
-        last = $3
+    # Whether the path should be ignored
+    # @param [String] path
+    # @return [Boolean]
+    def ignore?(path)
+      @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
+    end
 
-        # Only compress script tags that contain JavaScript (as opposed
-        # to something like jQuery templates, identified with a "text/html"
-        # type.
-        if first =~ /<script>/ || first.include?('text/javascript')
-          minified_js = @compressor.compress(javascript)
+    # Whether this type of content can be minified
+    # @param [String, nil] content_type
+    # @return [Boolean]
+    def minifiable?(content_type)
+      @content_types.include?(content_type)
+    end
+
+    # Whether this type of content contains inline content that can be minified
+    # @param [String, nil] content_type
+    # @return [Boolean]
+    def minifiable_inline?(content_type)
+      @inline_content_types.include?(content_type)
+    end
+
+    # Minify the content
+    # @param [String] content
+    # @return [String]
+    def minify(content)
+      @compressor.compress(content)
+    rescue ExecJS::ProgramError => e
+      warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
+      content
+    end
 
-          first << minified_js << last
+    # Detect and minify inline content
+    # @param [String] content
+    # @return [String]
+    def minify_inline(content)
+      content.gsub(INLINE_JS_REGEX) do |match|
+        first, inline_content, last = $1, $2, $3
+
+        # Only compress script tags that contain JavaScript (as opposed to
+        # something like jQuery templates, identified with a "text/html" type).
+        if first.include?('<script>') || first.include?('text/javascript')
+          first + minify(inline_content) + last
         else
           match
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.11
+  version: 3.3.12
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -300,6 +300,7 @@ files:
 - features/strip_url.feature
 - features/stylus.feature
 - features/support/env.rb
+- features/support/preserve_mime_types.rb
 - features/tilde_directories.feature
 - features/twitter-bootstrap-compile.feature
 - features/unicode_filecontents.feature
@@ -336,6 +337,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
@@ -447,6 +449,7 @@ files:
 - fixtures/content-type-app/source/README
 - fixtures/content-type-app/source/images/blank.gif
 - fixtures/content-type-app/source/index.html
+- fixtures/content-type-app/source/index.php
 - fixtures/content-type-app/source/javascripts/app.js
 - fixtures/content-type-app/source/override.html
 - fixtures/content-type-app/source/stylesheets/site.css
@@ -725,14 +728,18 @@ files:
 - fixtures/markdown-in-haml-app/source/images/blank.gif
 - fixtures/markdown-in-haml-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
+- fixtures/minify-css-app/source/inline-css.php
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
 - fixtures/minify-css-app/source/stylesheets/site.css.sass
+- fixtures/minify-css-app/source/stylesheets/site.xcss.sass
 - fixtures/minify-js-app/config.rb
 - fixtures/minify-js-app/source/inline-coffeescript.html.haml
 - fixtures/minify-js-app/source/inline-js.html.haml
+- fixtures/minify-js-app/source/inline-js.php
 - fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
 - fixtures/minify-js-app/source/javascripts/js_test.js
+- fixtures/minify-js-app/source/javascripts/js_test.xjs
 - fixtures/minify-js-app/source/more-js/other.js
 - fixtures/missing-tilt-library-app/config.rb
 - fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki
@@ -1376,6 +1383,7 @@ test_files:
 - features/strip_url.feature
 - features/stylus.feature
 - features/support/env.rb
+- features/support/preserve_mime_types.rb
 - features/tilde_directories.feature
 - features/twitter-bootstrap-compile.feature
 - features/unicode_filecontents.feature
@@ -1412,6 +1420,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
@@ -1523,6 +1532,7 @@ test_files:
 - fixtures/content-type-app/source/README
 - fixtures/content-type-app/source/images/blank.gif
 - fixtures/content-type-app/source/index.html
+- fixtures/content-type-app/source/index.php
 - fixtures/content-type-app/source/javascripts/app.js
 - fixtures/content-type-app/source/override.html
 - fixtures/content-type-app/source/stylesheets/site.css
@@ -1801,14 +1811,18 @@ test_files:
 - fixtures/markdown-in-haml-app/source/images/blank.gif
 - fixtures/markdown-in-haml-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
+- fixtures/minify-css-app/source/inline-css.php
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
 - fixtures/minify-css-app/source/stylesheets/site.css.sass
+- fixtures/minify-css-app/source/stylesheets/site.xcss.sass
 - fixtures/minify-js-app/config.rb
 - fixtures/minify-js-app/source/inline-coffeescript.html.haml
 - fixtures/minify-js-app/source/inline-js.html.haml
+- fixtures/minify-js-app/source/inline-js.php
 - fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee
 - fixtures/minify-js-app/source/javascripts/js_test.js
+- fixtures/minify-js-app/source/javascripts/js_test.xjs
 - fixtures/minify-js-app/source/more-js/other.js
 - fixtures/missing-tilt-library-app/config.rb
 - fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki