middleman 0.11.5 → 0.12.0.pre

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://gemcutter.org"
-bin_path "vendor/bin"
-# disable_rubygems
+bundle_path "lib/middleman/vendor/gems"
+bin_path "lib/middleman/vendor/bin"
+disable_rubygems
 # disable_system_gems
 
 gem "shotgun"
@@ -12,13 +12,6 @@ gem "rack-test"
 gem "yui-compressor"
 gem "haml"
 gem "compass"
+gem "json_pure"
 gem "smusher"
-gem "compass-slickmap"
-gem "maruku"
-gem "markaby"
-
-gem "jeweler"
-gem "rspec"
-gem "rdoc"
-gem "sdoc"
-gem "cucumber"
+gem "compass-slickmap"

data/README.rdoc

@@ -2,6 +2,10 @@
 
 The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml and Sass producing only the cleanest and efficient markup.
 
+== Getting Started
+
+Everything you need to know is on the wiki: http://wiki.github.com/tdreyno/middleman
+
 == Copyright
 
 Copyright (c) 2009 Thomas Reynolds. See LICENSE for details.

data/Rakefile

@@ -1,5 +1,6 @@
 require 'lib/middleman'
 require 'rake'
+require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 begin
@@ -13,23 +14,8 @@ begin
     gem.rubyforge_project = "middleman"
     gem.executables = %w(mm-init mm-build mm-server)
     gem.add_dependency("thin")
-    # gem.add_dependency("shotgun")
-    # gem.add_dependency("templater")
-    # gem.add_dependency("sprockets")
-    # gem.add_dependency("sinatra")
-    # gem.add_dependency("sinatra-content-for")
-    # gem.add_dependency("rack-test")
-    # gem.add_dependency("yui-compressor")
-    # gem.add_dependency("smusher")
-    # gem.add_dependency("haml", ">=2.1.0")
-    # gem.add_dependency("compass")
-    # gem.add_development_dependency("rdoc")
-    # gem.add_development_dependency("rspec")
-    # gem.add_development_dependency("sdoc")
-    # gem.add_development_dependency("cucumber")
-    
-    # Ignore vendored files
-    gem.files = gem.files.exclude("vendor/*")
+    gem.add_development_dependency("rspec")
+    gem.add_development_dependency("cucumber")
   end
   
   Jeweler::GemcutterTasks.new
@@ -37,51 +23,15 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
+  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 task :spec => :check_dependencies
 
-task :default => :spec
-
-require 'rake/rdoctask'
-require 'sdoc'
-
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  # rdoc.template = 'direct'
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "middleman #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
-  rdoc.rdoc_files.exclude('lib/middleman/templater+dynamic_renderer.rb')
-end
-
-desc "Build and publish documentation using GitHub Pages."
-task :pages do
-  if !`git status`.include?('nothing to commit')
-    abort "dirty index - not publishing!"
-  end
-
-  Rake::Task[:rerdoc].invoke
-  `git checkout gh-pages`
-  `ls -1 | grep -v rdoc | xargs rm -rf; mv rdoc/* .; rm -rf rdoc`
-  `git commit -a -m "update docs"; git push origin gh-pages`
-  `git checkout master`
-end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.12.0.pre

data/features/automatic_image_sizes.feature

@@ -0,0 +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="

data/features/cache_buster.feature

@@ -0,0 +1,22 @@
+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"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should not see "?"
+    
+  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 "?"

data/features/minify_css.feature

@@ -0,0 +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 "3" lines
+    
+  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 "1" lines
+    
+  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 "47" lines

data/features/minify_javascript.feature

@@ -0,0 +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

data/features/page_alias_and_layouts.feature

@@ -0,0 +1,12 @@
+Feature: Custom layouts
+  In order easily switch between relative and absolute paths
+  
+  Scenario: Using custom :layout attribute
+    Given page "/custom-layout.html" has layout "custom"
+    When I go to "/custom-layout.html"
+    Then I should see "Custom Layout"
+    
+  Scenario: Using with_layout block
+    Given "/custom-layout.html" with_layout block has layout "custom"
+    When I go to "/custom-layout.html"
+    Then I should see "Custom Layout"

data/features/relative_assets.feature

@@ -0,0 +1,12 @@
+Feature: Relative Assets
+  In order easily switch between relative and absolute paths
+    
+  Scenario: Rendering css with the feature disabled
+    Given "relative_assets" feature is "disabled"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should not see "../"
+
+  Scenario: Rendering css with the feature enabled
+    Given "relative_assets" feature is "enabled"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see "../"

data/features/step_definitions/env.rb

@@ -0,0 +1,2 @@
+require File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'lib', 'middleman')
+require "rack/test"

data/features/step_definitions/middleman_steps.rb

@@ -0,0 +1,22 @@
+Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
+  enable_or_disable = (state == "enabled") ? :enable : :disable
+  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Base.send(enable_or_disable, feature.to_sym)
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+end
+
+When /^I go to "([^\"]*)"$/ do |url|
+  @browser.get(url)
+end
+
+Then /^I should see "([^\"]*)"$/ do |expected|
+  @browser.last_response.body.should include(expected)
+end
+
+Then /^I should not see "([^\"]*)"$/ do |expected|
+  @browser.last_response.body.should_not include(expected)
+end
+
+Then /^I should see "([^\"]*)" lines$/ do |lines|
+  @browser.last_response.body.chomp.split($/).length.should == lines.to_i
+end

data/features/step_definitions/page_layout_steps.rb

@@ -0,0 +1,13 @@
+Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
+  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Base.page(url, :layout => layout.to_sym)
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+end
+
+Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
+  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Base.with_layout(:layout => layout.to_sym) do
+    page(url)
+  end
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
+end

data/lib/middleman.rb

@@ -1,6 +1,5 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# Bundler
-require File.join(File.dirname(libdir), "vendor", "gems", "environment")# if ENV["RUN_CODE_RUN"]
+require 'middleman/vendor/gems/environment'
 require 'middleman/base'

data/lib/middleman/base.rb

@@ -1,5 +1,6 @@
 # We're riding on Sinatra, so let's include it
-require 'sinatra/base'
+require "sinatra/base"
+require "sinatra/content_for"
 
 class Sinatra::Request
   attr_accessor :layout
@@ -21,6 +22,7 @@ module Middleman
     set :http_prefix, nil
     
     use Rack::ConditionalGet if environment == :development
+    helpers Sinatra::ContentFor
     
     @@features = []
     
@@ -45,11 +47,11 @@ module Middleman
       ::Rack::Mime::MIME_TYPES[ext.to_s] = type
     end
 
-    # Convenience function to discover if a tempalte exists for the requested renderer (haml, sass, etc)
+    # 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.exists? File.join(options.views, template_path)
+      File.readable? File.join(options.views, template_path)
     end
 
     # Base case renderer (do nothing), Should be over-ridden
@@ -63,24 +65,6 @@ module Middleman
       end
     end
     include StaticRender
-
-    def process_request
-      # 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.gsub!(%r{^/}, '')
-
-      # layout(:"layout.html") # Insert the .html into the layout name like the rest of the templates
-
-      # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
-      if content = render_path(path, (request.layout || :layout))
-        content_type media_type(File.extname(path)), :charset => 'utf-8'
-        status 200
-        content
-      else
-        status 404
-      end
-    end
     
     def self.page(url, options={}, &block)
       get(url) do
@@ -106,19 +90,34 @@ module Middleman
     not_found do
       process_request
     end
+
+  private
+    def process_request
+      # 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.gsub!(%r{^/}, '')
+
+      # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
+      if content = render_path(path, (request.layout || :layout))
+        content_type media_type(File.extname(path)), :charset => 'utf-8'
+        status 200
+        content
+      else
+        status 404
+      end
+    end
   end
 end
 
 # Haml is required & includes helpers
 require "middleman/haml"
 require "middleman/sass"
-require "sinatra/content_for"
 require "middleman/helpers"
 require "middleman/rack/static"
 require "middleman/rack/sprockets"
 
 class Middleman::Base
-  helpers Sinatra::ContentFor
   helpers Middleman::Helpers
   
   use Middleman::Rack::Static

data/lib/middleman/builder.rb

@@ -37,7 +37,7 @@ module Middleman
     end
 
     def self.init!
-      glob! File.basename(Middleman::Base.public), []
+      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)
     end

data/lib/middleman/features/automatic_image_sizes.rb

@@ -4,10 +4,14 @@ 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?
+        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
-        
+
         begin
           real_path = File.join(options.public, options.images_dir, path)
           if File.exists? real_path
@@ -18,9 +22,7 @@ class Middleman::Base
         rescue
         end
 
-        params = params.merge(:src => asset_url(path, http_prefix))
-        params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
-        "<img #{params} />"
+        capture_haml { haml_tag(:img, params.merge(:src => asset_url(path, http_prefix))) }
       else
         pre_automatic_image_tag(path, params)
       end

data/lib/middleman/features/minify_css.rb

@@ -1,9 +1,18 @@
-class Middleman::Base
-  after_feature_init do
-    ::Compass.configuration do |config|
-      config.output_style = :compressed
-    end
+module Middleman
+  module Minified
+    module Sass
+      include ::Haml::Filters::Base
 
-    ::Compass.configure_sass_plugin!
+      def render(text)
+        result = ::Sass::Engine.new(text, ::Sass::Plugin.engine_options).render
+        
+        if Middleman::Base.respond_to?(:minify_css?) && Middleman::Base.minify_css?
+          compressor = YUI::CssCompressor.new
+          compressor.compress(result)
+        else
+          result
+        end
+      end
+    end
   end
 end

data/lib/middleman/features/minify_javascript.rb

@@ -1,18 +1,22 @@
-require "middleman/builder"
-
 module Middleman
   module Minified
     module Javascript
       include ::Haml::Filters::Base
       def render_with_options(text, options)
-        compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-        data = compressor.compress(text)
-        <<END
-<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>
+        if Middleman::Base.respond_to?(:minify_javascript?) && Middleman::Base.minify_javascript?
+          compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+          data = compressor.compress(text)
+          %Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
+        else
+          <<END
+<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>
+  //<![CDATA[
+    #{text.rstrip.gsub("\n", "\n    ")}
+  //]]>
+</script>
 END
+        end
       end
     end
   end
-end
-
-Middleman::Base.supported_formats << "js"
+end