middleman-more 3.0.4 → 3.0.5

data/features/asset_hash.feature

@@ -84,4 +84,23 @@ Feature: Assets get a file hash appended to their and references to them are upd
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
+    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
+
+  Scenario: The asset hash should change when a Rack-based filter changes
+    Given a fixture app "asset-hash-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_hash
+      activate :relative_assets
+      activate :directory_indexes
+      require 'lib/middleware.rb'
+      use Middleware
+      """
+    Given the Server is running at "asset-hash-app"
+    When I go to "/"
+    Then I should see 'href="stylesheets/site-5770af52.css'
+    When I go to "stylesheets/site-5770af52.css"
+    Then I should see 'background-image'
+    Then I should see 'Added by Rack filter'
+    When I go to "stylesheets/site-50eaa978.css"
+    Then I should see 'Not Found'

data/fixtures/asset-hash-app/lib/middleware.rb

@@ -0,0 +1,16 @@
+class Middleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    body = ''
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
+      body += "\n/* Added by Rack filter */"
+      status, headers, response = Rack::Response.new(body, status, headers).finish
+    end
+    [status, headers, response]
+  end
+end

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

@@ -29,20 +29,18 @@ module Middleman
       module Helpers
         # Output a stylesheet link tag based on the current path
         #
-        # @param [String] separator How to break up path in parts
         # @return [String]
-        def auto_stylesheet_link_tag(separator="/")
-          auto_tag(:css, separator) do |path|
+        def auto_stylesheet_link_tag
+          auto_tag(:css) do |path|
             stylesheet_link_tag path
           end
         end
 
         # Output a javascript tag based on the current path
         #
-        # @param [String] separator How to break up path in parts
         # @return [String]
-        def auto_javascript_include_tag(separator="/")
-          auto_tag(:js, separator) do |path|
+        def auto_javascript_include_tag
+          auto_tag(:js) do |path|
             javascript_include_tag path
           end
         end
@@ -53,7 +51,7 @@ module Middleman
         # @param [String] separator How to break up path in parts
         # @param [String] asset_dir Where to look for assets
         # @return [void]
-        def auto_tag(asset_ext, separator="/", asset_dir=nil)
+        def auto_tag(asset_ext, asset_dir=nil)
           if asset_dir.nil?
             asset_dir = case asset_ext
               when :js  then js_dir
@@ -63,12 +61,10 @@ module Middleman
 
           # If the basename of the request as no extension, assume we are serving a
           # directory and join index_file to the path.
-          path = full_path(current_path.dup)
-          path = path.sub(%r{^/}, '')
+          path = File.join(asset_dir, current_path)
           path = path.gsub(File.extname(path), ".#{asset_ext}")
-          path = path.gsub("/", separator)
 
-          yield path if sitemap.find_resource_by_path(File.join(asset_dir, path))
+          yield path if sitemap.find_resource_by_path(path)
         end
 
         # Generate body css classes based on the current path
@@ -130,7 +126,7 @@ module Middleman
               args[url_arg_index] = url.url
             elsif url.include? '://'
               raise "Can't use the relative option with an external URL" if relative
-            else
+            elsif current_resource
               # Handle relative urls
               current_source_dir = Pathname('/' + current_resource.path).dirname
 

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

@@ -14,6 +14,7 @@ module Middleman
               :asset_hash,
               AssetHashManager.new(self, exts, ignore)
             )
+
             use Middleware, :exts => exts, :middleman_app => self, :ignore => ignore
           end
         end
@@ -36,7 +37,12 @@ module Middleman
             next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
 
             if resource.template? # if it's a template, render it out
-              digest = Digest::SHA1.hexdigest(resource.render)[0..7]
+              # Render through the Rack interface so middleware and mounted apps get a shot
+              rack_client = ::Rack::Test::Session.new(@app.class)
+              response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => true })
+              raise "#{resource.path} should be in the sitemap!" unless response.status == 200
+
+              digest = Digest::SHA1.hexdigest(response.body)[0..7]
             else # if it's a static file, just hash it
               digest = Digest::SHA1.file(resource.source_file).hexdigest[0..7]
             end
@@ -60,6 +66,9 @@ module Middleman
         def call(env)
           status, headers, response = @rack_app.call(env)
 
+          # We don't want to use this middleware when rendering files to figure out their hash!
+          return [status, headers, response] if env["bypass_asset_hash"]
+
           path = @middleman_app.full_path(env["PATH_INFO"])
           dirpath = Pathname.new(File.dirname(path))
 

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

@@ -10,7 +10,7 @@ module Middleman
 
         # Once registered
         def registered(app)
-          app.ready do
+          app.after_configuration do
             sitemap.register_resource_list_manipulator(
               :directory_indexes,
               DirectoryIndexManager.new(self)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - features/twitter-bootstrap-compile.feature
 - features/wildcard_page_helper.feature
 - fixtures/asset-hash-app/config.rb
+- fixtures/asset-hash-app/lib/middleware.rb
 - fixtures/asset-hash-app/source/apple-touch-icon.png
 - fixtures/asset-hash-app/source/favicon.ico
 - fixtures/asset-hash-app/source/images/100px.gif
@@ -631,7 +632,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1858392272674889223
+      hash: 4494710196171968679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -640,10 +641,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1858392272674889223
+      hash: 4494710196171968679
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
@@ -692,6 +693,7 @@ test_files:
 - features/twitter-bootstrap-compile.feature
 - features/wildcard_page_helper.feature
 - fixtures/asset-hash-app/config.rb
+- fixtures/asset-hash-app/lib/middleware.rb
 - fixtures/asset-hash-app/source/apple-touch-icon.png
 - fixtures/asset-hash-app/source/favicon.ico
 - fixtures/asset-hash-app/source/images/100px.gif