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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404deb8049bbd24929ef1847e8cd92598db4e61e
-  data.tar.gz: 758e2ac1ab487d3671e66cf3ac01c9fd5cc80f58
+  metadata.gz: d02a12c78f163c9213f8fdfb955ccc033b311e5c
+  data.tar.gz: f832b54139abcf4d4629d436b7007f8f132266a5
 SHA512:
-  metadata.gz: 365df7410bf7945f84b566fc061b6b5aa60eada04c1bc2b28ccd1558ac90b04cd6132588212b601b7c89555d4b1bdcb5fb93bf9e7199cd140a3516338db72c52
-  data.tar.gz: 56a33ca43a78ca4e2078b77fd57c78c25c2d5badfbfb2c75a764e504d7c3150e51cff954852299d71d3cfc2255763c9feec535320a6e0e31f54bc3e5826cf1d5
+  metadata.gz: 437c1700d0578d22e68c6b153fec52f25fa09add4aba8521ce13d60605c32593ad4754e30f58c682c5b3b81af35497ba0061d65cd56ccc5024c639bb0b549389
+  data.tar.gz: 371e370f1e1aab80b8c1ef4ca6fcaba1f091469a56c6506c23244d8b67ec359c33be317b4a4c1d6b28a94da07ad2826c8a31b105b01d14e4bf1c25dc86b9cb1b

data/Rakefile

@@ -1,4 +1,4 @@
 # coding:utf-8
-RAKE_ROOT = __FILE__
+RAKE_ROOT = __FILE__.freeze
 GEM_NAME = ENV['NAME'] || 'middleman-core'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/features/asset_hash.feature

@@ -107,25 +107,63 @@ Feature: Assets get file hashes appended to them and references to them are upda
     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
+  Scenario: Enabling an asset host still produces hashed files and references (hash first)
+    Given a fixture app "asset-hash-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_hash
+      activate :directory_indexes
+      activate :asset_host, host: 'http://middlemanapp.com'
+      """
+    Given the Server is running at "asset-hash-host-app"
+    When I go to "/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+    When I go to "/subdir/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    When I go to "/other/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+    When I go to "/stylesheets/fragment-a772891f.css"
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
+
+  Scenario: Enabling an asset host still produces hashed files and references (host first)
+    Given a fixture app "asset-hash-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_host, host: 'http://middlemanapp.com'
+      activate :directory_indexes
+      activate :asset_hash
+      """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7af0b5ab.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-7af0b5ab.css"
+    When I go to "/stylesheets/fragment-a772891f.css"
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'

data/features/asset_host.feature

@@ -8,6 +8,7 @@ Feature: Alternate between multiple asset hosts
       """
     And the Server is running
     When I go to "/asset_host.html"
+    Then I should see "'.google-analytics.com/ga.js'"
     Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}

data/features/automatic_image_sizes.feature

@@ -2,15 +2,28 @@ Feature: Automatically detect and insert image dimensions into tags
   In order to speed up development and appease YSlow
 
   Scenario: Rendering an image with the feature disabled
-    Given "automatic_image_sizes" feature is "disabled"
+    Given a fixture app "automatic-image-size-app"
+    And a file named "config.rb" with:
+      """
+      """
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
     And I should not see "height="
-  
+    When I go to "/markdown-sizes.html"
+    Then I should not see "width="
+    And I should not see "height="
+
   Scenario: Rendering an image with the feature enabled
-    Given "automatic_image_sizes" feature is "enabled"
+    Given a fixture app "automatic-image-size-app"
+    And a file named "config.rb" with:
+      """
+      activate :automatic_image_sizes
+      """
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
-    Then I should see "width="
-    And I should see "height="
+    Then I should see 'width="1"'
+    And I should see 'height="1"'
+    When I go to "/markdown-sizes.html"
+    Then I should see 'width="1"'
+    And I should see 'height="1"'

data/fixtures/asset-hash-host-app/source/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Image url:</h2>
-<%= image_tag('100px.jpg') %>
+<img src="/images/100px.jpg">
 <%= image_tag('100px.jpg?test') %>
 <%= image_tag('100px.jpg?#test') %>
 <%= image_tag('100px.jpg#test') %>

data/fixtures/asset-host-app/config.rb

@@ -0,0 +1 @@
+      activate :asset_host, host: "http://assets1.example.com"

data/fixtures/asset-host-app/source/asset_host.html.erb

@@ -44,3 +44,12 @@
 <a href="https://github.com/angular/angular.js">Angular.js</a>
 
 <script>(function(a,b,c,d){})(window,document,'script','//www.example.com/script.js');</script>
+
+<script>
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+      '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>

data/fixtures/automatic-image-size-app/source/markdown-sizes.html.markdown

@@ -0,0 +1 @@
+![Alt text](/images/blank.gif)

data/lib/middleman-core/application.rb

@@ -70,27 +70,27 @@ module Middleman
 
     # Which port preview should start on.
     # @return [Fixnum]
-    config.define_setting :port, 4567, 'The preview server port'
+    define_setting :port, 4567, 'The preview server port'
 
     # Which server name should be used
     # @return [NilClass, String]
-    config.define_setting :server_name, nil, 'The server name of preview server'
+    define_setting :server_name, nil, 'The server name of preview server'
 
     # Which bind address the preview server should use
     # @return [NilClass, String]
-    config.define_setting :bind_address, nil, 'The bind address of the preview server'
+    define_setting :bind_address, nil, 'The bind address of the preview server'
 
     # Whether to serve the preview server over HTTPS.
     # @return [Boolean]
-    config.define_setting :https, false, 'Serve the preview server over SSL/TLS'
+    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'
+    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"
+    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]
@@ -170,7 +170,7 @@ module Middleman
         ignored = false
 
         file[:relative_path].ascend do |f|
-          if f.basename.to_s.match %r{^_[^_]}
+          if f.basename.to_s =~ %r{^_[^_]}
             ignored = true
             break
           end
@@ -180,8 +180,7 @@ module Middleman
       end,
 
       layout: proc do |file, _sitemap_app|
-        file[:relative_path].to_s.start_with?('layout.') ||
-          file[:relative_path].to_s.start_with?('layouts/')
+        file[:relative_path].to_s.start_with?('layout.', 'layouts/')
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 
@@ -210,43 +209,51 @@ module Middleman
       # Search the root of the project for required files
       $LOAD_PATH.unshift(root) unless $LOAD_PATH.include?(root)
 
-      @callbacks = ::Middleman::CallbackManager.new
-      @callbacks.install_methods!(self, [
-        :initialized,
-        :configure,
-        :before_sitemap,
-        :before_configuration,
-        :after_configuration,
-        :after_configuration_eval,
-        :ready,
-        :before_build,
-        :after_build,
-        :before_shutdown,
-        :before, # Before Rack requests
-        :before_render,
-        :after_render,
-        :before_server
-      ])
-
-      @middleware = Set.new
-      @mappings = Set.new
-
-      @template_context_class = Class.new(Middleman::TemplateContext)
-      @generic_template_context = @template_context_class.new(self)
-      @config_context = ConfigContext.new(self, @template_context_class)
-
-      # Setup the default values from calls to set before initialization
-      @config = ::Middleman::Configuration::ConfigurationManager.new
-      @config.load_settings(self.class.config.all_settings)
-
-      config[:source] = ENV['MM_SOURCE'] if ENV['MM_SOURCE']
-
-      # TODO, make this less global
-      ::Middleman::FileRenderer.cache.clear
-      ::Middleman::TemplateRenderer.cache.clear
+      ::Middleman::Util.instrument 'application.setup' do
+        @callbacks = ::Middleman::CallbackManager.new
+        @callbacks.install_methods!(self, [
+                                      :initialized,
+                                      :configure,
+                                      :before_extensions,
+                                      :before_instance_block,
+                                      :before_sitemap,
+                                      :before_configuration,
+                                      :after_configuration,
+                                      :after_configuration_eval,
+                                      :ready,
+                                      :before_build,
+                                      :after_build,
+                                      :before_shutdown,
+                                      :before, # Before Rack requests
+                                      :before_render,
+                                      :after_render,
+                                      :before_server
+                                    ])
+
+        @middleware = Set.new
+        @mappings = Set.new
+
+        @template_context_class = Class.new(Middleman::TemplateContext)
+        @generic_template_context = @template_context_class.new(self)
+        @config_context = ConfigContext.new(self, @template_context_class)
+
+        # Setup the default values from calls to set before initialization
+        @config = ::Middleman::Configuration::ConfigurationManager.new
+        @config.load_settings(self.class.config.all_settings)
+
+        config[:source] = ENV['MM_SOURCE'] if ENV['MM_SOURCE']
+
+        # TODO, make this less global
+        ::Middleman::FileRenderer.cache.clear
+        ::Middleman::TemplateRenderer.cache.clear
+      end
+
+      execute_callbacks(:before_extensions)
 
       @extensions = ::Middleman::ExtensionManager.new(self)
 
+      execute_callbacks(:before_instance_block)
+
       # Evaluate a passed block if given
       config_context.instance_exec(&block) if block_given?
 
@@ -257,13 +264,6 @@ module Middleman
 
       ::Middleman::Extension.clear_after_extension_callbacks
 
-      after_configuration_eval(&method(:prune_tilt_templates))
-
-      start_lifecycle
-    end
-
-    # Boot the app.
-    def start_lifecycle
       # Before config is parsed, before extensions get to it.
       execute_callbacks(:initialized)
 
@@ -273,10 +273,6 @@ module Middleman
       # Eval config.
       evaluate_configuration!
 
-      if Object.const_defined?(:Encoding)
-        Encoding.default_external = config[:encoding]
-      end
-
       # Run any `configure` blocks for the current environment.
       execute_callbacks([:configure, config[:environment]])
 
@@ -286,6 +282,12 @@ module Middleman
       # Post parsing, pre-extension callback
       execute_callbacks(:after_configuration_eval)
 
+      if Object.const_defined?(:Encoding)
+        Encoding.default_external = config[:encoding]
+      end
+
+      prune_tilt_templates!
+
       # After extensions have worked after_config
       execute_callbacks(:after_configuration)
 
@@ -317,7 +319,7 @@ module Middleman
     end
 
     # Clean up missing Tilt exts
-    def prune_tilt_templates
+    def prune_tilt_templates!
       ::Tilt.mappings.each do |key, _|
         begin
           ::Tilt[".#{key}"]
@@ -327,18 +329,26 @@ module Middleman
       end
     end
 
+    # Whether we're in a specific mode
+    # @param [Symbol] key
+    # @return [Boolean]
+    Contract Symbol => Bool
+    def mode?(key)
+      config[:mode] == key
+    end
+
     # Whether we're in server mode
     # @return [Boolean] If we're in dev mode
     Contract Bool
     def server?
-      config[:mode] == :server
+      mode?(:server)
     end
 
     # Whether we're in build mode
     # @return [Boolean] If we're in dev mode
     Contract Bool
     def build?
-      config[:mode] == :build
+      mode?(:build)
     end
 
     # Whether we're in a specific environment
@@ -420,6 +430,6 @@ module Middleman
     def to_s
       "#<Middleman::Application:0x#{object_id}>"
     end
-    alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
+    alias inspect to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
   end
 end

data/lib/middleman-core/builder.rb

@@ -20,7 +20,7 @@ module Middleman
     def_delegator :@app, :logger
 
     # Sort order, images, fonts, js/css and finally everything else.
-    SORT_ORDER = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .woff2 .otf .ttf .eot .js .css)
+    SORT_ORDER = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .woff2 .otf .ttf .eot .js .css).freeze
 
     # Create a new Builder instance.
     # @param [Middleman::Application] app The app to build.
@@ -72,13 +72,17 @@ module Middleman
     Contract ResourceList
     def prerender_css
       logger.debug '== Prerendering CSS'
-      css_files = @app.sitemap.resources.select do |resource|
-        resource.ext == '.css'
-      end.each(&method(:output_resource))
-      logger.debug '== Checking for Compass sprites'
+
+      css_files = @app.sitemap.resources
+                      .select { |resource| resource.ext == '.css' }
+                      .each(&method(:output_resource))
+
       # Double-check for compass sprites
-      @app.files.find_new_files!
-      @app.sitemap.ensure_resource_list_updated!
+      if @app.files.find_new_files!.length > 0
+        logger.debug '== Checking for Compass sprites'
+        @app.sitemap.ensure_resource_list_updated!
+      end
+
       css_files
     end
 
@@ -89,10 +93,10 @@ module Middleman
       logger.debug '== Building files'
 
       @app.sitemap.resources
-        .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
-        .reject { |resource| resource.ext == '.css' }
-        .select { |resource| !@glob || File.fnmatch(@glob, resource.destination_path) }
-        .each(&method(:output_resource))
+          .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
+          .reject { |resource| resource.ext == '.css' }
+          .select { |resource| !@glob || File.fnmatch(@glob, resource.destination_path) }
+          .each(&method(:output_resource))
     end
 
     # Figure out the correct event mode.
@@ -115,9 +119,9 @@ module Middleman
     Contract Pathname, String => Tempfile
     def write_tempfile(output_file, contents)
       file = Tempfile.new([
-        File.basename(output_file),
-        File.extname(output_file)
-      ])
+                            File.basename(output_file),
+                            File.extname(output_file)
+                          ])
       file.binmode
       file.write(contents)
       file.close
@@ -131,24 +135,26 @@ module Middleman
     # @return [void]
     Contract Pathname, Or[String, Pathname] => Any
     def export_file!(output_file, source)
+      # ::Middleman::Util.instrument "write_file", output_file: output_file do
       source = write_tempfile(output_file, source.to_s) if source.is_a? String
 
       method, source_path = if source.is_a? Tempfile
-        [FileUtils.method(:mv), source.path]
+        [::FileUtils.method(:mv), source.path]
       else
-        [FileUtils.method(:cp), source.to_s]
+        [::FileUtils.method(:cp), source.to_s]
       end
 
       mode = which_mode(output_file, source_path)
 
       if mode == :created || mode == :updated
-        FileUtils.mkdir_p(output_file.dirname)
+        ::FileUtils.mkdir_p(output_file.dirname)
         method.call(source_path, output_file.to_s)
       end
 
       source.unlink if source.is_a? Tempfile
 
       trigger(mode, output_file)
+      # end
     end
 
     # Try to output a resource and capture errors.
@@ -162,7 +168,7 @@ module Middleman
         if resource.binary?
           export_file!(output_file, resource.file_descriptor[:full_path])
         else
-          response = @rack.get(URI.escape(resource.request_path))
+          response = @rack.get(::URI.escape(resource.request_path))
 
           # If we get a response, save it to a tempfile.
           if response.status == 200