middleman 0.14.1 → 0.99.0.pre

data/Rakefile

@@ -13,24 +13,20 @@ begin
     gem.authors = ["Thomas Reynolds"]
     gem.rubyforge_project = "middleman"
     gem.executables = %w(mm-init mm-build mm-server)
-    gem.add_dependency("rack")
-    gem.add_dependency("thin")
-    
-    gem.add_dependency("shotgun", ">=0.8")
-    gem.add_dependency("templater")
-    gem.add_dependency("sprockets")
-    gem.add_dependency("sinatra", ">=1.0")
-    gem.add_dependency("sinatra-content-for")
-    gem.add_dependency("less")
-    gem.add_dependency("builder")
-    gem.add_dependency("rack-test")
-    gem.add_dependency("yui-compressor")
-    gem.add_dependency("haml", ">=3.0")
-    gem.add_dependency("compass", ">=0.10")
-    gem.add_dependency("fancy-buttons")
-    gem.add_dependency("json_pure")
-    gem.add_dependency("smusher")
-    gem.add_dependency("compass-slickmap")
+    gem.add_dependency("rack",                "~>1.0")
+    gem.add_dependency("thin",                "~>1.2.0")
+    gem.add_dependency("shotgun",             "~>0.8.0")
+    gem.add_dependency("templater",           "~>1.0.0")
+    gem.add_dependency("sinatra",             "~>1.0")
+    gem.add_dependency("sinatra-content-for", "~>0.2.0")
+    gem.add_dependency("rack-test",           "~>0.5.0")
+    gem.add_dependency("yui-compressor",      "~>0.9.0")
+    gem.add_dependency("haml",                "~>3.0")
+    gem.add_dependency("compass",             "~>0.10.0")
+    gem.add_dependency("json_pure",           "~>1.4.0")
+    gem.add_dependency("smusher",             "~>0.4.5")
+    gem.add_dependency("compass-slickmap",    "~>0.3.0")
+    # gem.add_dependency("livereload",          "~>1.4.0")
     
     gem.add_development_dependency("rspec")
     gem.add_development_dependency("cucumber")

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.99.0.pre

data/features/automatic_image_sizes.feature

@@ -1,14 +1,14 @@
 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 enabled
-    Given "automatic_image_sizes" feature is "enabled"
-    When I go to "/auto-image-sizes.html"
-    Then I should see "width="
-    And I should see "height="
 
   Scenario: Rendering an image with the feature disabled
     Given "automatic_image_sizes" feature is "disabled"
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
-    And I should not see "height="
+    And I should not see "height="
+  
+  Scenario: Rendering an image with the feature enabled
+    Given "automatic_image_sizes" feature is "enabled"
+    When I go to "/auto-image-sizes.html"
+    Then I should see "width="
+    And I should see "height="

data/features/cache_buster.feature

@@ -1,15 +1,5 @@
 Feature: Generate mtime-based query string for busting browser caches
   In order to display the most recent content for IE & CDNs and appease YSlow
-  
-  Scenario: Rendering css with the feature enabled
-    Given "cache_buster" feature is "enabled"
-    When I go to "/stylesheets/relative_assets.css"
-    Then I should see "?"
-
-  Scenario: Rendering html with the feature enabled
-    Given "cache_buster" feature is "enabled"
-    When I go to "/cache-buster.html"
-    Then I should not see "?"
     
   Scenario: Rendering css with the feature disabled
     Given "cache_buster" feature is "disabled"
@@ -19,4 +9,14 @@ Feature: Generate mtime-based query string for busting browser caches
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"
     When I go to "/cache-buster.html"
+    Then I should not see "?"
+
+  Scenario: Rendering css with the feature enabled
+    Given "cache_buster" feature is "enabled"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see "?"
+
+  Scenario: Rendering html with the feature enabled
+    Given "cache_buster" feature is "enabled"
+    When I go to "/cache-buster.html"
     Then I should not see "?"

data/features/minify_css.feature

@@ -1,22 +1,22 @@
 Feature: Minify CSS
   In order reduce bytes sent to client and appease YSlow
-  
-  Scenario: Rendering inline css with the feature enabled
-    Given "minify_css" feature is "enabled"
-    When I go to "/inline-css.html"
-    Then I should see "1" lines
     
   Scenario: Rendering inline css with the feature disabled
     Given "minify_css" feature is "disabled"
     When I go to "/inline-css.html"
     Then I should see "4" lines
     
-  Scenario: Rendering external css with the feature enabled
-    Given "minify_css" feature is "enabled"
+  Scenario: Rendering external css with the feature disabled
+    Given "minify_css" feature is "disabled"
     When I go to "/stylesheets/site.css"
+    Then I should see "51" lines
+
+  Scenario: Rendering inline css with the feature enabled
+    Given "minify_css" feature is "enabled"
+    When I go to "/inline-css.html"
     Then I should see "1" lines
     
-  Scenario: Rendering external css with the feature disabled
-    Given "minify_css" feature is "disabled"
+  Scenario: Rendering external css with the feature enabled
+    Given "minify_css" feature is "enabled"
     When I go to "/stylesheets/site.css"
-    Then I should see "51" lines
+    Then I should see "1" lines

data/features/minify_javascript.feature

@@ -1,12 +1,12 @@
 Feature: Minify Javascript
   In order reduce bytes sent to client and appease YSlow
   
-  Scenario: Rendering inline js with the feature enabled
-    Given "minify_javascript" feature is "enabled"
-    When I go to "/inline-js.html"
-    Then I should see "1" lines
-    
   Scenario: Rendering inline js with the feature disabled
     Given "minify_javascript" feature is "disabled"
     When I go to "/inline-js.html"
-    Then I should see "10" lines
+    Then I should see "10" lines
+  
+  Scenario: Rendering inline js with the feature enabled
+    Given "minify_javascript" feature is "enabled"
+    When I go to "/inline-js.html"
+    Then I should see "1" lines

data/features/step_definitions/asset_host_steps.rb

@@ -1,4 +1,5 @@
 Given /^I am using an asset host$/ do
+  Middleman::Base.enable :asset_host
   Middleman::Base.set :asset_host do |asset|
     "http://assets%d.example.com" % (asset.hash % 4)
   end

data/features/step_definitions/middleman_steps.rb

@@ -23,6 +23,6 @@ Then /^I should not see "([^\"]*)"$/ do |expected|
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  puts @browser.last_response.body
+  $stderr.puts @browser.last_response.body
   @browser.last_response.body.chomp.split($/).length.should == lines.to_i
 end

data/lib/middleman.rb

@@ -4,22 +4,5 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'rubygems'
 
 module Middleman
-  
-  module Rack
-    autoload :Sprockets, "middleman/rack/sprockets"
-    autoload :MinifyJavascript, "middleman/rack/minify_javascript"
-    autoload :MinifyCSS, "middleman/rack/minify_css"
-  end
-
-  module Renderers
-    autoload :ERb,     "middleman/renderers/erb"
-    autoload :Builder, "middleman/renderers/builder"
-    autoload :Less,    "middleman/renderers/less"
-  end
-  
-  autoload :Base,    "middleman/base"
-  autoload :Haml,    "middleman/renderers/haml"
-  autoload :Sass,    "middleman/renderers/sass"
-  autoload :Helpers, "middleman/helpers"
-  
+  autoload :Base, "middleman/base"  
 end

data/lib/middleman/assets.rb

@@ -0,0 +1,33 @@
+module Middleman
+  module Assets
+    @@asset_handler_map   = []
+    @@asset_handler_stack = []
+    
+    def self.register(handler_name, &block)
+      if block_given?
+        @@asset_handler_stack << block
+        @@asset_handler_map   << handler_name
+      end
+    end
+    
+    def self.get_url(path, prefix="", request=nil)
+      @@asset_handler_stack.last.call(path, prefix, request)
+    end
+    
+    def self.before(position, *args)
+      current_index = @@asset_handler_map.index(position)
+      return nil unless current_index
+
+      previous = current_index - 1
+      if (previous >= 0) && (previous < @@asset_handler_map.length)
+        @@asset_handler_stack[previous].call(*args)
+      else
+        nil
+      end
+    end
+  end
+end
+
+Middleman::Assets.register :base do |path, prefix, request|
+  path.include?("://") ? path : File.join(Middleman::Base.http_prefix || "/", prefix, path)
+end

data/lib/middleman/base.rb

@@ -7,7 +7,6 @@ class Sinatra::Request
 end
 
 module Middleman
-  module Rack; end
   class Base < Sinatra::Base
     set :app_file, __FILE__
     set :root, ENV["MM_DIR"] || Dir.pwd
@@ -15,7 +14,6 @@ module Middleman
     set :sessions, false
     set :logging, false
     set :environment, ENV['MM_ENV'] || :development
-    set :supported_formats, %w(erb)
     set :index_file, "index.html"
     set :js_dir, "javascripts"
     set :css_dir, "stylesheets"
@@ -42,10 +40,9 @@ module Middleman
     def self.set(option, value=self, &block)
       if block_given?
         value = Proc.new { block }
-        super(option, value, &nil)
-      else
-        super
       end
+      
+      super(option, value, &nil)
     end
     
     @@afters = []
@@ -58,22 +55,6 @@ module Middleman
       ext = ".#{ext}" unless ext.to_s[0] == ?.
       ::Rack::Mime::MIME_TYPES[ext.to_s] = type
     end
-
-    # Convenience function to discover if a template exists for the requested renderer (haml, sass, etc)
-    def template_exists?(path, renderer=nil)
-      template_path = path.dup
-      template_path << ".#{renderer}" if renderer
-      File.readable? File.join(settings.views, template_path)
-    end
-
-    # Base case renderer (do nothing), Should be over-ridden
-    module StaticRender
-      def render_path(path, layout)
-        return false if !template_exists?(path, :erb)
-        erb(path.to_sym, :layout => layout)
-      end
-    end
-    include StaticRender
     
     @@layout = nil
     def self.page(url, options={}, &block)
@@ -106,7 +87,7 @@ module Middleman
     not_found do
       process_request
     end
-
+    
   private
     def process_request(layout = :layout)
       # Normalize the path and add index if we're looking at a directory
@@ -114,44 +95,33 @@ module Middleman
       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)
+      template_path = locate_template_file(path)
+      if template_path
         content_type mime_type(File.extname(path)), :charset => 'utf-8'
-        status 200
-        content
-      else
-        status 404
+        
+        renderer = Middleman::Renderers.get_method(template_path)
+        if respond_to? renderer
+          status 200
+          return send(renderer, path.to_sym, { :layout => layout })
+        end
       end
+      
+      status 404
+    end
+    
+    def locate_template_file(path)
+      template_path = File.join(settings.views, "#{path}.*")
+      Dir.glob(template_path).first
     end
   end
 end
 
-require "middleman/renderers/erb"
-require "middleman/renderers/haml"
-require "middleman/renderers/sass"
-require "middleman/renderers/less"
-require "middleman/renderers/builder"
+require "middleman/assets"
+require "middleman/renderers"
+require "middleman/features"
 
+# The Rack App
 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 :smush_pngs
-  disable :automatic_image_sizes
-  disable :relative_assets
-  disable :cache_buster
-  disable :ugly_haml
-  
-  # Default build features
-  configure :build do
-  end
-  
   def self.new(*args, &block)
     # Check for and evaluate local configuration
     local_config = File.join(self.root, "init.rb")
@@ -164,22 +134,11 @@ class Middleman::Base
     # loop over enabled feature
     features.flatten.each do |feature_name|
       next unless send(:"#{feature_name}?")
-      
-      feature_path = "features/#{feature_name}"
-      if File.exists? File.join(File.dirname(__FILE__), "#{feature_path}.rb")
-        puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
-        require "middleman/#{feature_path}"
-      end
+      $stderr.puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
+      Middleman::Features.run(feature_name, self)
     end
     
-    use ::Rack::ConditionalGet            if environment == :development
-    use Middleman::Rack::MinifyJavascript if minify_javascript?
-    use Middleman::Rack::MinifyCSS        if minify_css?
-    
-    # Built-in javascript combination
-    use Middleman::Rack::Sprockets, :root      => Middleman::Base.root, 
-                                    :load_path => [ File.join("public", Middleman::Base.js_dir),
-                                                    File.join("views",  Middleman::Base.js_dir) ]
+    use ::Rack::ConditionalGet if environment == :development
     
     @@afters.each { |block| class_eval(&block) }
     

data/lib/middleman/builder.rb

@@ -1,9 +1,13 @@
+require 'middleman/base'
 require 'templater'
 require 'middleman/templater+dynamic_renderer.rb'
 
 # Placeholder for any methods the builder needs to abstract to allow feature integration
 module Middleman
   class Builder < ::Templater::Generator
+    
+    @@template_extensions = ::Tilt.mappings.keys << "js"
+    
     # Define source and desintation
     def self.source_root; Dir.pwd; end
     def destination_root; File.join(Dir.pwd, Middleman::Base.build_dir); end
@@ -28,7 +32,8 @@ module Middleman
 
     def self.file(name, *args, &block)
       file_ext = File.extname(args[0])
-      return if Middleman::Base.supported_formats.include? file_ext[1..file_ext.length]
+      
+      return unless ::Tilt[file_ext].nil?
       
       if (args[0] === args[1])
         args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "").gsub("#{File.basename(Middleman::Base.public)}/", "")
@@ -37,9 +42,8 @@ module Middleman
     end
 
     def self.init!
-      glob! File.basename(Middleman::Base.public), Middleman::Base.supported_formats
-      glob! File.basename(Middleman::Base.views),  %w(sass js)
-      glob! File.basename(Middleman::Base.views),  Middleman::Base.supported_formats - %w(sass js)
+      glob! File.basename(Middleman::Base.public),  @@template_extensions
+      glob! File.basename(Middleman::Base.views),   @@template_extensions
     end
     
     def after_run

data/lib/middleman/features.rb

@@ -0,0 +1,39 @@
+module Middleman
+  module Features
+    # Top-level method to register a new feature
+    @@features = {}
+    def self.register(feature_name, feature_class=nil, options={})
+      @@features[feature_name] = feature_class
+    
+      # Default to disabled, unless the class asks to auto-enable
+      activate_method = (options.has_key?(:auto_enable) && options[:auto_enable]) ? :enable : :disable
+      Middleman::Base.send(activate_method, feature_name)
+    end
+    
+    def self.run(feature_name, scope)
+      feature_class = @@features[feature_name]
+      feature_class.new(scope) unless feature_class.nil?
+    end
+
+    def self.all
+      @@features
+    end
+
+  end
+end
+
+# livereload
+%w(asset_host 
+   automatic_image_sizes
+   cache_buster
+   default_helpers
+   minify_css
+   minify_javascript
+   relative_assets
+   slickmap
+   smush_pngs
+   ugly_haml).each do |feature| 
+     
+  require File.join("middleman/features", feature)
+
+end