middleman 0.5.5 → 0.9.0.pre

data/.document

@@ -2,5 +2,4 @@ README.rdoc
 lib/**/*.rb
 bin/*
 features/**/*.feature
-LICENSE
-vendor/**/*
+LICENSE

data/.gitignore

@@ -1,6 +1,7 @@
-*.sw?
 .DS_Store
 coverage
 rdoc
 pkg
-.sass-cache
+.sass-cache
+.sassc
+.tmp

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,60 +1,52 @@
-require 'rubygems'
+require 'lib/middleman'
 require 'rake'
+require 'spec/rake/spectask'
+require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "middleman"
-    gem.summary = %Q{A static site generator utilizing Haml and Sass}
+    gem.summary = %Q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
     gem.email = "tdreyno@gmail.com"
-    gem.homepage = "http://github.com/tdreyno/middleman"
+    gem.homepage = "http://wiki.github.com/tdreyno/middleman"
     gem.authors = ["Thomas Reynolds"]
     gem.rubyforge_project = "middleman"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.executables = %w(mm-init mm-build mm-server)
-    gem.add_dependency("templater")
-    gem.add_dependency("yui-compressor")
-    gem.add_dependency("sprockets")
-    gem.add_dependency("sinatra")
-    gem.add_dependency("markaby")
-    gem.add_dependency("maruku")
-    gem.add_dependency("haml", ">=2.1.0")
-    gem.add_dependency("chriseppstein-compass")
+    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")
+    gem.add_development_dependency("jeweler")
   end
   
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  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'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "middleman #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => [:cucumber, :spec]

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.9.0.pre

data/bin/mm-build

@@ -1,118 +1,12 @@
 #!/usr/bin/env ruby
 
-# Require app
-require 'templater'
-  
-MIDDLEMAN_BUILDER = true
-require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
-require File.join(File.dirname(__FILE__), '..', 'vendor', 'rack-test', 'lib', 'rack', 'test')
-
-module Generators
-  extend Templater::Manifold
-  desc "Build a staticmatic site"
-
-  class Builder < Templater::Generator
-    # Define source and desintation
-    def self.source_root; Dir.pwd; end
-    def destination_root; File.join(Dir.pwd, 'build'); end
-
-    # Override template to ask middleman for the correct extension to output
-    def self.template(name, *args, &block)
-      return if args.first.include?('layout')
-      args.first.split('/').each do |part|
-        return if part[0,1] == '_'
-      end
-      
-      if (args[0] === args[1])
-        file_name_parts = File.basename(args.first).split('.')
-        
-        if file_name_parts.length > 2
-          # static ext embedded in filename
-          newext = ""
-        else
-          # use defaults
-          newext = case file_name_parts.last
-          when 'haml', 'erb', 'mab', 'maruku'
-            '.html'
-          when 'sass'
-            '.css'
-          end
-        end
-        
-        args[1] = args[0].gsub(".#{file_name_parts.last}", newext).gsub('views/', '')
-      end
-      
-      super(name, *args, &block)
-    end
-
-    def self.file(name, *args, &block)
-      args[1] = args[0].gsub('views/', '') if (args[0] === args[1])
-      super(name, *args, &block)
-    end
-
-    public_files_glob = File.join(source_root, "public", '**/*')
-    Dir[public_files_glob].each do |action|
-      next if File.directory?(action)
-      action = action.sub("#{source_root}/", '')
-      template_sym = action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym
-      
-      if File.extname(action) == '.js' && !action.include?('min')
-        template(template_sym, action, action.gsub('public/', ''))
-      else
-        file(template_sym, action, action.gsub('public/', ''))
-      end
-    end
+ENV['MM_ENV'] = "build"
 
-    glob! "views", (Middleman.supported_formats << "sass")
-  end
-
-  add :build, Builder
-end
-
-class BuildConfig
-  def self.render(source, destination)
-    renderer.render(source, destination)
-  end
-  
-  def self.renderer
-    @@renderer ||= BuildRenderer
-  end
-  
-  def self.renderer=(val)
-    @@renderer = val
-  end
-end
-
-# Monkey-patch to use a dynamic renderer
-class Templater::Actions::Template
-  def render
-    BuildConfig.render(source, destination)
-  end
-end
-
-# Default render through middleman
-class BuildRenderer
-  def self.render(source, destination)
-    request_path = destination.gsub(File.join(Dir.pwd, 'build'), "")
-    browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman))
-    browser.get(request_path)
-    browser.last_response.body
-  end
-end
+# Require app
+require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
+require 'middleman/builder'
 
-class SprocketsRenderer < BuildRenderer
-  def self.render(source, destination)
-    if File.extname(source) == '.js'
-      secretary = Sprockets::Secretary.new( :asset_root   => "public",
-                                          :load_path    => ["public/assets/javascripts/**/*.js"],
-                                          :source_files => [source] )
-      compressor = YUI::JavaScriptCompressor.new(:munge => true)
-      compressor.compress(secretary.concatenation.to_s)
-    else
-      super
-    end
-  end
-end
-BuildConfig.renderer = SprocketsRenderer
+# Middleman::Base.init!
+Middleman::Builder.init!
 
-Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))
+Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/bin/mm-init

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
 require 'templater'
 
 module Generators
@@ -6,8 +7,12 @@ module Generators
   desc "Generator for streamlining staticmatic"
 
   class NewSite < Templater::Generator
-    desc "Creates a new staticmatic scaffold."
+    desc "Creates a new middleman scaffold."
     first_argument :location, :required => true, :desc => "Project location"
+    
+    option :css_dir, :desc => 'The path to the css files'
+    option :js_dir, :desc => 'The path to the javascript files'
+    option :images_dir, :desc => 'The path to the image files'
 
     def destination_root
       File.expand_path(location)
@@ -17,12 +22,13 @@ module Generators
       File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'template')
     end
     
-    file :init, "init.rb"
+    template :init, "init.rb"
     glob! :views
     glob! :public
-    empty_directory :stylesheets, "public/stylesheets"
-    empty_directory :javascripts, "public/javascripts"
-    empty_directory :images,      "public/images"
+    
+    empty_directory :stylesheets, "public/stylesheets"#, File.join("public", css_dir)
+    empty_directory :javascripts, "public/javascripts"#, File.join("public", js_dir)
+    empty_directory :images, "public/images"#,      File.join("public", images_dir)
   end
 
   add :setup, NewSite

data/bin/mm-server

@@ -1,8 +1,61 @@
 #!/usr/bin/env ruby
 
+# Non-blocking site rebuilding
+trap("TSTP") do 
+  fork do
+    require "open3"
+    first_run = true
+    Open3.popen3(%Q{cd "#{Dir.pwd}" && #{File.join(File.dirname(__FILE__), "mm-build")} | grep FORCED}) do |stdin, stdout, stderr|
+      puts "\n== Building the site..."
+      stdout.readlines.each do |l|
+        puts "== Updated:" if first_run
+        puts " " + l.split("[FORCED]").last.chomp
+        first_run = false
+      end
+      puts "== Build complete"
+    end
+  end
+end
+
+require 'optparse'
+
 # Require Middleman
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
-# Start Middleman
-Middleman.set :server, %w[thin webrick]
-Middleman.run!(:root => Dir.pwd)
+env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
+options = { :Port => 4567, :AccessLog => [] }
+
+OptionParser.new { |opts|
+  opts.banner = "Usage: mm-server [rack options]"
+  opts.separator ""
+  opts.separator "Rack options:"
+  opts.on("-p", "--port PORT", "use PORT (default: 4567)") { |port|
+    options[:Port] = port
+  }
+  opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
+    env = e
+  }
+  opts.on("--debug", "Debug mode") {
+    ::Middleman::Base.set :logging, true
+  }
+  
+  opts.parse! ARGV
+}
+
+ENV['RACK_ENV'] = env
+
+class Middleman::Base
+  set :root, Dir.pwd
+end
+
+require 'shotgun'
+config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
+app = Shotgun.new(config, &lambda { |inner_app| Middleman::Base })
+
+require 'rubygems'
+require 'thin'
+Thin::Logging.silent = true
+
+Rack::Handler::Thin.run app, options do |inst|
+  puts "== The Middleman is standing watch on port #{options[:Port]}"
+end

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/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 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="
+  
+  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

@@ -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 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 "?"
+
+  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/generator.feature

@@ -0,0 +1,8 @@
+Feature: Generator
+  In order to generate static assets for client
+
+  Scenario: Copying template files
+    Given generated directory at "generator-test"
+    Then template files should exist at "generator-test"
+    And empty directories should exist at "generator-test"
+    And cleanup at "generator-test"

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 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 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 enabled
+    Given "minify_css" feature is "enabled"
+    When I go to "/stylesheets/site.css"
+    Then I should see "1" 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 disabled
+    Given "minify_javascript" feature is "disabled"
+    When I go to "/inline-js.html"
+    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