middleman 0.12.2 → 0.13.1

data/.gitignore

@@ -2,4 +2,5 @@
 coverage
 rdoc
 pkg
-.sass-cache
+.sass-cache
+.sassc

data/Gemfile

@@ -6,12 +6,12 @@ bin_path "lib/middleman/vendor/bin"
 gem "shotgun"
 gem "templater"
 gem "sprockets"
-gem "sinatra"
+gem "sinatra", "1.0.a"
 gem "sinatra-content-for"
 gem "rack-test"
 gem "yui-compressor"
 gem "haml"
-gem "compass", "0.10.0.pre2"
+gem "compass", "0.10.0.pre5"
 gem "compass-colors"
 gem "fancy-buttons"
 gem "json_pure"

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.13.1

data/features/asset_host.feature

@@ -0,0 +1,12 @@
+Feature: Alternate between multiple asset hosts
+  In order to speed up page loading
+  
+  Scenario: Rendering css with the feature enabled
+    Given I am using an asset host
+    When I go to "/stylesheets/asset_host.css"
+    Then I should see "http://assets"
+    
+  Scenario: Rendering html with the feature enabled
+    Given I am using an asset host
+    When I go to "/asset_host.html"
+    Then I should see "http://assets"

data/features/step_definitions/asset_host_steps.rb

@@ -0,0 +1,6 @@
+Given /^I am using an asset host$/ do
+  Middleman::Base.set :asset_host do |asset|
+    "http://assets%d.example.com" % (asset.hash % 4)
+  end
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+end

data/lib/middleman/base.rb

@@ -7,6 +7,7 @@ class Sinatra::Request
 end
 
 module Middleman
+  module Rack; end
   class Base < Sinatra::Base
     set :app_file, __FILE__
     set :root, ENV["MM_DIR"] || Dir.pwd
@@ -22,7 +23,7 @@ module Middleman
     set :build_dir, "build"
     set :http_prefix, nil
     
-    use Rack::ConditionalGet if environment == :development
+    use ::Rack::ConditionalGet if environment == :development
     helpers Sinatra::ContentFor
     
     set :features, []
@@ -38,6 +39,13 @@ module Middleman
       super
     end
     
+    def self.set(option, value=self, &block)
+      if block_given?
+        value = Proc.new { block }
+      end
+      super(option, value)
+    end
+    
     @@afters = []
     def self.after_feature_init(&block)
       @@afters << block
@@ -53,7 +61,7 @@ module Middleman
     def template_exists?(path, renderer=nil)
       template_path = path.dup
       template_path << ".#{renderer}" if renderer
-      File.readable? File.join(options.views, template_path)
+      File.readable? File.join(settings.views, template_path)
     end
 
     # Base case renderer (do nothing), Should be over-ridden
@@ -74,17 +82,14 @@ module Middleman
       layout = options[:layout] if !options[:layout].nil?
       
       get(url) do
-        if block_given?
-          yield
-        else
-          process_request(layout)
-        end
+        return yield if block_given?
+        process_request(layout)
       end
     end
     
     def self.with_layout(layout, &block)
       @@layout = layout
-      class_eval(&block)
+      class_eval(&block) if block_given?
     ensure
       @@layout = nil
     end
@@ -98,17 +103,21 @@ module Middleman
       name = (name.to_s << "?").to_sym
       self.respond_to?(name) && self.send(name)
     end
+    
+    def enabled?(name)
+      self.class.enabled?(name)
+    end
 
   private
     def process_request(layout = :layout)
       # Normalize the path and add index if we're looking at a directory
       path = request.path
-      path << options.index_file if path.match(%r{/$})
+      path << settings.index_file if path.match(%r{/$})
       path.gsub!(%r{^/}, '')
 
       # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
       if content = render_path(path, layout)
-        content_type media_type(File.extname(path)), :charset => 'utf-8'
+        content_type mime_type(File.extname(path)), :charset => 'utf-8'
         status 200
         content
       else
@@ -132,12 +141,12 @@ class Middleman::Base
   helpers Middleman::Helpers
   
   # Features disabled by default
+  enable :asset_host
   disable :slickmap
   disable :cache_buster
   disable :minify_css
   disable :minify_javascript
   disable :relative_assets
-  disable :maruku
   disable :smush_pngs
   disable :automatic_image_sizes
   disable :relative_assets
@@ -148,7 +157,7 @@ class Middleman::Base
   end
   
   # Check for and evaluate local configuration
-  local_config = File.join(self.root, "init.rb")  
+  local_config = File.join(self.root, "init.rb")
   if File.exists? local_config
     puts "== Reading:  Local config" if logging?
     Middleman::Base.class_eval File.read(local_config)
@@ -161,7 +170,7 @@ class Middleman::Base
   use Middleman::Rack::MinifyCSS
   use Middleman::Rack::Downstream
   
-  def self.new(*args, &bk)    
+  def self.new(*args, &block)
     # loop over enabled feature
     features.flatten.each do |feature_name|
       next unless send(:"#{feature_name}?")

data/lib/middleman/features/asset_host.rb

@@ -0,0 +1,24 @@
+class Middleman::Base
+  after_feature_init do
+    ::Compass.configuration do |config|
+      config.asset_host(&self.asset_host)
+    end
+  end if self.enabled?(:asset_host) && self.asset_host && self.asset_host.is_a?(Proc)
+end
+
+class << Middleman::Base
+  alias_method :pre_asset_host_asset_url, :asset_url
+  def asset_url(path, prefix="", request=nil)
+    original_output = pre_asset_host_asset_url(path, prefix, request)
+    
+    valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
+    
+    if !self.enabled?(:asset_host) || path.include?("://") || !valid_extensions.include?(File.extname(path)) || !self.asset_host || !self.asset_host.is_a?(Proc) || !self.asset_host.respond_to?(:call)
+      return original_output
+    end
+
+    asset_prefix = self.asset_host.call(original_output)
+    
+    return File.join(asset_prefix, original_output)
+  end
+end

data/lib/middleman/features/automatic_image_sizes.rb

@@ -4,16 +4,16 @@ class Middleman::Base
   alias_method :pre_automatic_image_tag, :image_tag
   helpers do
     def image_tag(path, params={})
-      if !options.respond_to?(:automatic_image_sizes?) || !options.automatic_image_sizes?
+      if !self.enabled?(:automatic_image_sizes)
         return pre_automatic_image_tag(path, params)
       end
 
       if (!params[:width] || !params[:height]) && !path.include?("://")
         params[:alt] ||= ""
-        http_prefix = options.http_images_path rescue options.images_dir
+        http_prefix = settings.http_images_path rescue settings.images_dir
 
         begin
-          real_path = File.join(options.public, options.images_dir, path)
+          real_path = File.join(settings.public, settings.images_dir, path)
           if File.exists? real_path
             dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
             params[:width]  ||= dimensions[0]

data/lib/middleman/features/cache_buster.rb

@@ -1,7 +1,7 @@
 class Middleman::Base  
   after_feature_init do 
     ::Compass.configuration do |config|
-      if self.respond_to?(:cache_buster?) && self.cache_buster?
+      if self.enabled?(:cache_buster)
         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(self.root, self.build_dir), self.public)
@@ -25,7 +25,7 @@ class << Middleman::Base
   def asset_url(path, prefix="", request=nil)
     http_path = pre_cache_buster_asset_url(path, prefix, request)
     
-    return http_path unless self.respond_to?(:cache_buster?) && self.cache_buster?
+    return http_path unless self.enabled?(:cache_buster)
     
     if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
       http_path

data/lib/middleman/features/relative_assets.rb

@@ -2,10 +2,10 @@ class Middleman::Base
   after_feature_init do 
     ::Compass.configuration do |config|
       config.relative_assets = Proc.new do
-        Middleman::Base.respond_to?(:relative_assets?) && Middleman::Base.relative_assets?
+        Middleman::Base.enabled?(:relative_assets)
       end
     end
-    
+
     ::Compass.configure_sass_plugin!
   end
 end
@@ -13,7 +13,7 @@ end
 class << Middleman::Base
   alias_method :pre_relative_asset_url, :asset_url
   def asset_url(path, prefix="", request=nil)
-    if !self.respond_to?(:relative_assets?) || !self.relative_assets?
+    if !self.enabled?(:relative_assets)
       return pre_relative_asset_url(path, prefix, request)
     end
     

data/lib/middleman/helpers.rb

@@ -27,7 +27,7 @@ module Middleman
     
     def page_classes
       path = request.path_info.dup
-      path << options.index_file if path.match(%r{/$})
+      path << settings.index_file if path.match(%r{/$})
       path = path.gsub(%r{^/}, '')
   
       classes = []
@@ -49,21 +49,21 @@ module Middleman
 
     def image_tag(path, params={})
       params[:alt] ||= ""
-      prefix = options.http_images_path rescue options.images_dir
+      prefix = settings.http_images_path rescue settings.images_dir
       params = params.merge(:src => asset_url(path, prefix))
       params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
       "<img #{params} />"
     end
 
     def javascript_include_tag(path, params={})
-      params = params.merge(:src => asset_url(path, options.js_dir), :type => "text/javascript")
+      params = params.merge(:src => asset_url(path, settings.js_dir), :type => "text/javascript")
       params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
       "<script #{params}></script>"
     end
 
     def stylesheet_link_tag(path, params={})
       params[:rel] ||= "stylesheet"
-      params = params.merge(:href => asset_url(path, options.css_dir), :type => "text/css")
+      params = params.merge(:href => asset_url(path, settings.css_dir), :type => "text/css")
       params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
       "<link #{params} />"
     end

data/lib/middleman/rack/downstream.rb

@@ -1,17 +1,9 @@
-module Middleman
-  module Rack
-    class Downstream
-      def initialize(app, options={})
-        @app = app
-      end
+class Middleman::Rack::Downstream
+  def initialize(app, options={})
+    @app = app
+  end
 
-      def call(env)
-        if env["DOWNSTREAM"]
-          env["DOWNSTREAM"]
-        else
-          @app.call(env)
-        end
-      end
-    end
+  def call(env)
+    env["DOWNSTREAM"] || @app.call(env)
   end
 end

data/lib/middleman/rack/minify_css.rb

@@ -3,25 +3,26 @@ begin
 rescue LoadError
   puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
 end
-  
-module Middleman
-  module Rack
-    class MinifyCSS
-      def initialize(app, options={})
-        @app = app
-      end
 
-      def call(env)
-        if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/) && Middleman::Base.enabled?(:minify_css)
-          compressor = ::YUI::CssCompressor.new
-          
-          source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? File.read(env["DOWNSTREAM"][2].path) : env["DOWNSTREAM"][2]
-          env["DOWNSTREAM"][2] = compressor.compress(source)
-          env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
-        end
-        
-        @app.call(env)
-      end
+class Middleman::Rack::MinifyCSS
+  def initialize(app, options={})
+    @app = app
+  end
+
+  def call(env)
+    if Middleman::Base.enabled?(:minify_css) &&
+       env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/)
+
+      compressor = ::YUI::CssCompressor.new
+
+      source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ?
+                 File.read(env["DOWNSTREAM"][2].path) :
+                 env["DOWNSTREAM"][2]
+
+      env["DOWNSTREAM"][2] = compressor.compress(source)
+      env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
     end
+
+    @app.call(env)
   end
 end

data/lib/middleman/rack/minify_javascript.rb

@@ -4,26 +4,25 @@ rescue LoadError
   puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
 end
   
-module Middleman
-  module Rack
-    class MinifyJavascript
-      def initialize(app, options={})
-        @app = app
-      end
+class Middleman::Rack::MinifyJavascript
+  def initialize(app, options={})
+    @app = app
+  end
+
+  def call(env)
+    if Middleman::Base.enabled?(:minify_javascript) &&
+       env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) 
+      
+      compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+      
+      source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ?
+                 File.read(env["DOWNSTREAM"][2].path) :
+                 env["DOWNSTREAM"][2]
 
-      def call(env)
-        if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) && Middleman::Base.enabled?(:minify_javascript)
-          compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-          
-          source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? File.read(env["DOWNSTREAM"][2].path) : env["DOWNSTREAM"][2]
-          env["DOWNSTREAM"][2] = compressor.compress(source)
-          env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
-        end
-        
-        @app.call(env)
-      end
+      env["DOWNSTREAM"][2] = compressor.compress(source)
+      env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
     end
+    
+    @app.call(env)
   end
-end
-
-# Middleman::Base.supported_formats << "js"
+end

data/lib/middleman/rack/sprockets.rb

@@ -1,41 +1,38 @@
 begin
   require 'sprockets'
   require 'middleman/rack/sprockets+ruby19' # Sprockets ruby 1.9 duckpunch
-  
 rescue LoadError
   puts "Sprockets not available. Install it with: gem install sprockets"
 end
   
-module Middleman
-  module Rack
-    class Sprockets
-      def initialize(app, options={})
-        @app = app
-      end
+class Middleman::Rack::Sprockets
+  def initialize(app, options={})
+    @app = app
+  end
 
-      def call(env)
-        path = env["PATH_INFO"]
-        
-        source_pub  = File.join(Middleman::Base.views, path)
-        source_view = File.join(Middleman::Base.views, path)
-        source = "public" if File.exists?(source_pub) 
-        source = "views" if File.exists?(source_view)
-        
-        if env["DOWNSTREAM"] && path.match(/\.js$/) && source
-          source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? env["DOWNSTREAM"][2].path : env["DOWNSTREAM"][2]
-          
-          secretary = ::Sprockets::Secretary.new( :root         => Middleman::Base.root,
-                                                  :source_files => [ source_file ],
-                                                  :load_path    => [ File.join("public", Middleman::Base.js_dir),
-                                                                     File.join("views", Middleman::Base.js_dir) ])
-        
-          env["DOWNSTREAM"][2] = secretary.concatenation.to_s
-          env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
-        end
-        
-        @app.call(env)
+  def call(env)
+    path = env["PATH_INFO"]
+    
+    if env["DOWNSTREAM"] && path.match(/\.js$/)
+      source = "public" if File.exists?(File.join(Middleman::Base.views, path)) 
+      source = "views" if File.exists?(File.join(Middleman::Base.views, path))
+      
+      if source
+        source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? 
+                        env["DOWNSTREAM"][2].path : 
+                        env["DOWNSTREAM"][2]
+      
+        secretary = ::Sprockets::Secretary.new( :root         => Middleman::Base.root,
+                                                :source_files => [ source_file ],
+                                                :load_path    => [ File.join("public", Middleman::Base.js_dir),
+                                                                   File.join("views", Middleman::Base.js_dir) ])
+    
+        env["DOWNSTREAM"][2] = secretary.concatenation.to_s
+        env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
       end
     end
+    
+    @app.call(env)
   end
 end