middleman-more 3.0.0.beta.2 → 3.0.0.beta.3

data/features/slim.feature

@@ -2,6 +2,20 @@ Feature: Support slim templating language
   In order to offer an alternative to Haml
 
   Scenario: Rendering Slim
-    Given the Server is running at "slim-app"
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/slim.html.slim" with:
+      """
+      doctype 5
+      html lang='en'
+        head
+          meta charset="utf-8"
+
+        body
+          h1 Welcome to Slim
+      """
+    And the Server is running at "empty_app"
     When I go to "/slim.html"
     Then I should see "<h1>Welcome to Slim</h1>"

data/fixtures/markdown-app/config.rb

@@ -1,9 +0,0 @@
-set :markdown, :smartypants => true,
-               :no_intra_emphasis => true,
-               :tables => true,
-               :fenced_code_blocks => true,
-               :autolink => true,
-               :strikethrough => true,
-               :lax_html_blocks => true,
-               :space_after_headers => true,
-               :superscript => true

data/lib/middleman-more.rb

@@ -3,77 +3,4 @@ libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require "middleman-core"
-
-# Top-level Middleman object
-module Middleman
-  
-  # Custom Renderers
-  module Renderers
-    autoload :Haml,         "middleman-more/renderers/haml"
-    autoload :Sass,         "middleman-more/renderers/sass"
-    autoload :Markdown,     "middleman-more/renderers/markdown"
-    autoload :Liquid,       "middleman-more/renderers/liquid"
-    autoload :Slim,         "middleman-more/renderers/slim"
-  end
-  
-  # Core (automatic) extensions
-  module CoreExtensions
-    # Compass framework for Sass
-    autoload :Compass,      "middleman-more/core_extensions/compass"
-    
-    # Sprockets 2
-    autoload :Sprockets,    "middleman-more/core_extensions/sprockets"
-  end
-  
-  # User-activatable extensions
-  module Extensions
-    # RelativeAssets allow any asset path in dynamic templates to be either
-    # relative to the root of the project or use an absolute URL.
-    autoload :RelativeAssets,      "middleman-more/extensions/relative_assets"
-
-    # CacheBuster adds a query string to assets in dynamic templates to avoid
-    # browser caches failing to update to your new content.
-    autoload :CacheBuster,         "middleman-more/extensions/cache_buster"
-
-    # AssetHash appends a hash of the file contents to the assets filename
-    # to avoid browser caches failing to update to your new content.
-    autoload :AssetHash,           "middleman-more/extensions/asset_hash"
-
-    # MinifyCss uses the YUI compressor to shrink CSS files
-    autoload :MinifyCss,           "middleman-more/extensions/minify_css"
-
-    # MinifyJavascript uses the YUI compressor to shrink JS files
-    autoload :MinifyJavascript,    "middleman-more/extensions/minify_javascript"
-
-    # GZIP assets and pages during build
-    autoload :Gzip,    "middleman-more/extensions/gzip"
-  end
-  
-  # Setup renderers
-  require "coffee_script"
-  Application.register Middleman::Renderers::Haml
-  Application.register Middleman::Renderers::Sass
-  Application.register Middleman::Renderers::Markdown
-  Application.register Middleman::Renderers::Liquid
-  Application.register Middleman::Renderers::Slim
-
-  # Compass framework
-  Application.register Middleman::CoreExtensions::Compass
-
-  # Sprockets asset handling
-  Application.register Middleman::CoreExtensions::Sprockets
-  
-  # Register the optional extensions
-  Extensions.register(:cache_buster) { 
-    ::Middleman::Extensions::CacheBuster }
-  Extensions.register(:minify_css) { 
-    ::Middleman::Extensions::MinifyCss }
-  Extensions.register(:minify_javascript) {
-    ::Middleman::Extensions::MinifyJavascript }
-  Extensions.register(:relative_assets) {
-    ::Middleman::Extensions::RelativeAssets }
-  Extensions.register(:gzip) {
-    ::Middleman::Extensions::Gzip }
-  Extensions.register(:asset_hash) {
-    ::Middleman::Extensions::AssetHash }
-end
+require "middleman-more/register_extensions"

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

@@ -1,60 +1,61 @@
-# Forward the settings on config.rb and the result of registered extensions
-# to Compass
-module Middleman::CoreExtensions::Compass
+module Middleman
+  module CoreExtensions
+    
+    # Forward the settings on config.rb and the result of registered 
+    # extensions to Compass
+    module Compass
   
-  # Extension registered
-  class << self
+      # Extension registered
+      class << self
     
-    # Once registered
-    def registered(app)
-      require "compass"
+        # Once registered
+        def registered(app)
+          # Require the library
+          require "compass"
+      
+          # Where to look for fonts
+          app.set :fonts_dir, "fonts"
       
-      # Where to look for fonts
-      app.set :fonts_dir, "fonts"
-      app.define_hook :compass_config
-      app.define_hook :after_compass_config
+          # Hooks to manually update the compass config after we're 
+          # done with it
+          app.define_hook :compass_config
 
-      app.after_configuration do
-        ::Compass.configuration do |config|
-          config.project_path    = source_dir
-          config.environment     = :development
-          config.cache_path      = File.join(root, ".sass-cache")
-          config.sass_dir        = css_dir
-          config.css_dir         = css_dir
-          config.javascripts_dir = js_dir
-          config.fonts_dir       = fonts_dir
-          config.images_dir      = images_dir
-          config.http_path       = http_prefix
-          
-          # Correctly support HTTP paths with generated sprites
-          # if config.respond_to? :http_generated_images_path
-          #   config.http_generated_images_path = if app.respond_to? :http_generated_images_path
-          #     app.http_generated_images_path
-          #   else
-          #     File.join(app.http_prefix || "/", app.images_dir)
-          #   end
-          # end
+          app.after_configuration do
+            ::Compass.configuration do |config|
+              config.project_path    = source_dir
+              config.environment     = :development
+              config.cache_path      = File.join(root, ".sass-cache")
+              config.sass_dir        = css_dir
+              config.css_dir         = css_dir
+              config.javascripts_dir = js_dir
+              config.fonts_dir       = fonts_dir
+              config.images_dir      = images_dir
+              config.http_path       = http_prefix
 
-          config.asset_cache_buster :none
-          config.relative_assets = false
-          config.output_style = :nested
+              # Disable this initially, the cache_buster extension will
+              # re-enable it if requested.
+              config.asset_cache_buster :none
+              
+              # Disable this initially, the relative_assets extension will
+              # re-enable it if requested.
+              config.relative_assets = false
+              
+              # Default output style
+              config.output_style = :nested
 
-          if respond_to?(:asset_host) && asset_host.is_a?(Proc)
-            config.asset_host(&asset_host)
+              if respond_to?(:asset_host) && asset_host.is_a?(Proc)
+                config.asset_host(&asset_host)
+              end
+            end
+              
+            # Call hook
+            run_hook :compass_config, ::Compass.configuration
           end
         end
-        
-        # if build?
-        #   ::Compass.configuration do |config|
-        #     config.environment  = :production
-        #     config.project_path = File.join(root, build_dir)
-        #   end
-        # end
-        
-        run_hook :compass_config, ::Compass.configuration
-        run_hook :after_compass_config
+        alias :included :registered
       end
+
     end
-    alias :included :registered
+    
   end
 end

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

@@ -52,8 +52,6 @@ module Middleman::CoreExtensions::Sprockets
       @app = app
       super app.source_dir
 
-      digest = Digest::SHA1
-
       # Make the app context available to Sprockets
       context_class.send(:define_method, :app) { app }
       context_class.class_eval do
@@ -75,6 +73,16 @@ module Middleman::CoreExtensions::Sprockets
       append_path app.css_dir
     end
 
+    # Override Sprockets' default digest function to *not*
+    # change depending on the exact Sprockets version. It still takes
+    # into account "version" which is a user-suppliable version
+    # number that can be used to force assets to have a new
+    # hash.
+    def digest
+      @digest ||= Digest::SHA1.new.update(version.to_s)
+      @digest.dup
+    end
+
     # During development, don't use the asset cache
     def find_asset(path, options = {})
       expire_index! if @app.development?

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

@@ -3,14 +3,16 @@ module Middleman::Extensions
   module AssetHash
     class << self
       def registered(app, options)
-        exts = options[:exts] || %w(.ico .manifest .jpg .jpeg .png .gif .js .css)
+        exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css)
+
+        # Allow specifying regexes to ignore, plus always ignore apple touch icons
+        ignore = Array(options[:ignore]) << /^apple-touch-icon/
 
         app.ready do
           sitemap.register_resource_list_manipulator(
             :asset_hash, 
-            AssetHashManager.new(self, exts)
+            AssetHashManager.new(self, exts, ignore)
           )
-
           use Middleware, :exts => exts, :middleman_app => self
         end
       end
@@ -18,16 +20,17 @@ module Middleman::Extensions
     end
 
     class AssetHashManager
-      def initialize(app, exts)
+      def initialize(app, exts, ignore)
         @app = app
         @exts = exts
+        @ignore = ignore
       end
       
       # Update the main sitemap resource list
       # @return [void]
       def manipulate_resource_list(resources)
         resources.each do |resource|
-          if @exts.include? resource.ext
+          if @exts.include?(resource.ext) && @ignore.none? {|ignore| resource.path =~ ignore }
             # figure out the path Sprockets would use for this asset
             if resource.ext == '.js'
               sprockets_path = resource.path.sub(@app.js_dir,'').sub(/^\//,'')
@@ -69,7 +72,7 @@ module Middleman::Extensions
         dirpath = Pathname.new(File.dirname(path))
 
         if path =~ /(^\/$)|(\.(htm|html|php|css|js)$)/
-          body = extract_response_text(response)
+          body = ::Middleman::Util.extract_response_text(response)
 
           if body
             # TODO: This regex will change some paths in plan HTML (not in a tag) - is that OK?
@@ -94,23 +97,6 @@ module Middleman::Extensions
         end
         [status, headers, response]
       end
-
-      private
-
-      def extract_response_text(response)
-        case(response)
-        when String
-          response
-        when Array
-          response.join
-        when Rack::Response
-          response.body.join
-        when Rack::File
-          File.read(response.path)
-        else
-          response.to_s
-        end
-      end
     end
   end
   

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

@@ -1,73 +1,71 @@
 # Extension namespace
-module Middleman::Extensions
+module Middleman
+  module Extensions
   
-  # The Cache Buster extension
-  module CacheBuster
+    # The Cache Buster extension
+    module CacheBuster
     
-    # Setup extension
-    class << self
+      # Setup extension
+      class << self
       
-      # Once registered
-      def registered(app)
-        # Add instance methods to context
-        app.send :include, InstanceMethods
+        # Once registered
+        def registered(app)
+          # Add instance methods to context
+          app.send :include, InstanceMethods
       
-        # After compass is setup, make it use the registered cache buster
-        app.compass_config do |config|
-          config.asset_cache_buster do |path, real_path|
-            real_path = real_path.path if real_path.is_a? File
-            real_path = real_path.gsub(File.join(root, build_dir), source)
-            if File.readable?(real_path)
-              File.mtime(real_path).strftime("%s") 
-            else
-              $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+          # After compass is setup, make it use the registered cache buster
+          app.compass_config do |config|
+            config.asset_cache_buster do |path, real_path|
+              real_path = real_path.path if real_path.is_a? File
+              real_path = real_path.gsub(File.join(root, build_dir), source)
+              if File.readable?(real_path)
+                File.mtime(real_path).strftime("%s") 
+              else
+                $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+              end
             end
           end
         end
+        alias :included :registered
       end
-      alias :included :registered
-    end
   
-    # Cache buster instance methods
-    module InstanceMethods
+      # Cache buster instance methods
+      module InstanceMethods
       
-      # asset_url override if we're using cache busting
-      # @param [String] path
-      # @param [String] prefix
-      def asset_url(path, prefix="")
-        http_path = super
+        # asset_url override if we're using cache busting
+        # @param [String] path
+        # @param [String] prefix
+        def asset_url(path, prefix="")
+          http_path = super
 
-        if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
-          http_path
-        else
-          begin
-            prefix = images_dir if prefix == http_images_path
-          rescue
-          end
+          if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
+            http_path
+          else
+            if respond_to?(:http_images_path) && prefix == http_images_path
+              prefix = images_dir
+            end
 
-          real_path_static = File.join(prefix, path)
+            real_path_static = File.join(prefix, path)
         
-          if build?
-            real_path_dynamic = File.join(build_dir, prefix, path)
-            real_path_dynamic = File.expand_path(real_path_dynamic, root)
-            http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
-          elsif resource = sitemap.find_resource_by_path(real_path_static)
-            if !resource.template?
-              http_path << "?" + File.mtime(resource.source_file).strftime("%s")
-            else
-              # It's a template, possible with partials. We can't really know when
-              # it's updated, so generate fresh cache buster every time durin
-              # developement
-              http_path << "?" + Time.now.strftime("%s")
+            if build?
+              real_path_dynamic = File.join(build_dir, prefix, path)
+              real_path_dynamic = File.expand_path(real_path_dynamic, root)
+              http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
+            elsif resource = sitemap.find_resource_by_path(real_path_static)
+              if !resource.template?
+                http_path << "?" + File.mtime(resource.source_file).strftime("%s")
+              else
+                # It's a template, possible with partials. We can't really
+                # know when it's updated, so generate fresh cache buster every
+                # time during developement
+                http_path << "?" + Time.now.strftime("%s")
+              end
             end
-          end
         
-          http_path
+            http_path
+          end
         end
       end
     end
   end
-  
-  # Register the extension
-  # register :cache_buster, CacheBuster
-end
+end

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

@@ -39,12 +39,26 @@ module Middleman::Extensions
       def gzip_file(path, builder)
         input_file = File.open(path, 'r').read
         output_filename = path + '.gz'
+        input_file_time = File.mtime(path)
+
+        # Check if the right file's already there
+        if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
+          return
+        end
+
         File.open(output_filename, 'w') do |f|
           gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+          gz.mtime = input_file_time.to_i
           gz.write input_file
           gz.close
         end
 
+        # Make the file times match, both for Nginx's gzip_static extension
+        # and so we can ID existing files. Also, so even if the GZ files are
+        # wiped out by build --clean and recreated, we won't rsync them over
+        # again because they'll end up with the same mtime.
+        File.utime(File.atime(output_filename), input_file_time, output_filename)
+
         old_size = File.size(path)
         new_size = File.size(output_filename)