middleman 0.5.5 → 0.9.0.pre

data/lib/middleman/template/init.rbt

@@ -0,0 +1,57 @@
+# Automatic sitemaps
+# enable :slickmap
+
+# Automatic image dimension calculations
+# enable :automatic_image_sizes
+
+# Per-page layout changes
+# With no layout
+# page "/path/to/file.html", :layout => false
+# With alternative layout
+# page "/path/to/file.html", :layout => :otherlayout
+
+# Helpers
+helpers do
+  def some_helper(*args)
+    "Helping"
+  end
+end
+
+<% if css_dir %>
+set :css_dir, "<%= css_dir -%>"
+<% else %>
+# Change the CSS directory
+# set :css_dir, "alternative_css_directory"
+<% end %>
+
+<% if js_dir %>
+set :js_dir, "<%= js_dir -%>"
+<% else %>
+# Change the JS directory
+# set :js_dir, "alternative_js_directory"
+<% end %>
+
+<% if images_dir %>
+set :images_dir, "<%= images_dir -%>"
+<% else %>
+# Change the images directory
+# set :images_dir, "alternative_image_directory"
+<% end %>
+
+# Build-specific configuration
+configure :build do
+  # For example, change the Compass output style for deployment
+  # enable :minify_css
+  
+  # Minify Javascript on build
+  # enable :minify_javascript
+  
+  # Shrink/smush PNG/JPEGs on build
+  # enable :smush_pngs
+  
+  # Enable cache buster
+  # enable :cache_buster
+  
+  # Or use a different image path
+  # set :http_path, "/Content/images/"
+end

data/lib/middleman/template/views/index.html.haml

@@ -0,0 +1,4 @@
+- content_for :head do
+  %title The Middleman!
+
+%h1 The Middleman is watching.

data/lib/middleman/template/views/layout.haml

@@ -1,6 +1,13 @@
-%html
+!!! Strict
+%html{ :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en" }
   %head
-    %title The Middleman!
+    %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
+    / Comment in layout
+    = stylesheet_link_tag "site.css"
+    :javascript
+      // Comment in javascript
+    = yield_content :head
     
-  %body
-    = yield
+  %body{ :class => page_classes }
+    #frame
+      = yield

data/lib/middleman/template/views/stylesheets/site.css.sass

@@ -0,0 +1,27 @@
+@import "compass"
+@import "blueprint"
+
+$font-color:         #2a2a2a
+$link-color:         #0388a6
+$link-hover-color:   #009ce0
+$link-focus-color:   $link-color
+$link-active-color:  $link-color
+$link-visited-color: $link-color
+
+$blueprint-font-family:  'Century Gothic', 'Apple Gothic', 'Helvetica Neue', arial, sans-serif
+$blueprint-font-size:    13px
+$blueprint-grid-columns: 12
+$blueprint-grid-width:   60px
+$blueprint-grid-margin:  20px
+
++global-reset
+
++blueprint-typography
+
+a
+  +link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
+
+#frame
+  padding: 50px
+  text-align: center
+  +container

data/lib/middleman/templater+dynamic_renderer.rb

@@ -0,0 +1,26 @@
+require 'rack/test' # Use Rack::Test to access Sinatra without starting up a full server
+
+# Monkey-patch to use a dynamic renderer
+class Templater::Actions::File
+  def identical?
+    if exists?
+      return true if File.mtime(source) < File.mtime(destination)
+      FileUtils.identical?(source, destination)
+    else
+      false
+    end
+  end
+end
+
+class Templater::Actions::Template
+  def render
+    @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base))
+    
+    @render_cache ||= begin
+      # The default render just requests the page over Rack and writes the response
+      request_path = destination.gsub(File.join(Dir.pwd, Middleman::Base.build_dir), "")
+      @@rack_test.get(request_path)
+      @@rack_test.last_response.body
+    end
+  end
+end

data/middleman.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.5.5"
+  s.version = "0.9.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2010-09-04}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -26,99 +26,88 @@ Gem::Specification.new do |s|
      "bin/mm-build",
      "bin/mm-init",
      "bin/mm-server",
+     "features/asset_host.feature",
+     "features/automatic_image_sizes.feature",
+     "features/cache_buster.feature",
+     "features/generator.feature",
+     "features/minify_css.feature",
+     "features/minify_javascript.feature",
+     "features/page_alias_and_layouts.feature",
+     "features/relative_assets.feature",
+     "features/step_definitions/asset_host_steps.rb",
+     "features/step_definitions/env.rb",
+     "features/step_definitions/generator_steps.rb",
+     "features/step_definitions/middleman_steps.rb",
+     "features/step_definitions/page_layout_steps.rb",
      "lib/middleman.rb",
-     "lib/middleman/helpers.rb",
-     "lib/middleman/markaby.rb",
-     "lib/middleman/maruku.rb",
-     "lib/middleman/sprockets_ext.rb",
-     "lib/middleman/template/init.rb",
-     "lib/middleman/template/views/index.haml",
+     "lib/middleman/assets.rb",
+     "lib/middleman/base.rb",
+     "lib/middleman/builder.rb",
+     "lib/middleman/config.ru",
+     "lib/middleman/features.rb",
+     "lib/middleman/features/asset_host.rb",
+     "lib/middleman/features/automatic_image_sizes.rb",
+     "lib/middleman/features/automatic_image_sizes/fastimage.rb",
+     "lib/middleman/features/cache_buster.rb",
+     "lib/middleman/features/default_helpers.rb",
+     "lib/middleman/features/livereload.rb",
+     "lib/middleman/features/minify_css.rb",
+     "lib/middleman/features/minify_javascript.rb",
+     "lib/middleman/features/minify_javascript/rack.rb",
+     "lib/middleman/features/relative_assets.rb",
+     "lib/middleman/features/slickmap.rb",
+     "lib/middleman/features/smush_pngs.rb",
+     "lib/middleman/features/ugly_haml.rb",
+     "lib/middleman/renderers.rb",
+     "lib/middleman/renderers/coffee.rb",
+     "lib/middleman/renderers/haml.rb",
+     "lib/middleman/renderers/sass.rb",
+     "lib/middleman/template/init.rbt",
+     "lib/middleman/template/views/index.html.haml",
      "lib/middleman/template/views/layout.haml",
-     "lib/middleman/template/views/stylesheets/site.sass",
+     "lib/middleman/template/views/stylesheets/site.css.sass",
+     "lib/middleman/templater+dynamic_renderer.rb",
      "middleman.gemspec",
      "spec/builder_spec.rb",
      "spec/fixtures/sample/init.rb",
+     "spec/fixtures/sample/public/images/blank.gif",
      "spec/fixtures/sample/public/static.html",
+     "spec/fixtures/sample/public/stylesheets/auto-css.css",
      "spec/fixtures/sample/public/stylesheets/static.css",
+     "spec/fixtures/sample/public/stylesheets/sub1/auto-css.css",
+     "spec/fixtures/sample/public/stylesheets/sub1/sub2/auto-css.css",
      "spec/fixtures/sample/views/_partial.haml",
-     "spec/fixtures/sample/views/index.haml",
-     "spec/fixtures/sample/views/inline-js.haml",
+     "spec/fixtures/sample/views/asset_host.html.haml",
+     "spec/fixtures/sample/views/auto-css.html.haml",
+     "spec/fixtures/sample/views/auto-image-sizes.html.haml",
+     "spec/fixtures/sample/views/cache-buster.html.haml",
+     "spec/fixtures/sample/views/custom-layout.html.haml",
+     "spec/fixtures/sample/views/custom.haml",
+     "spec/fixtures/sample/views/index.html.haml",
+     "spec/fixtures/sample/views/inline-css.html.haml",
+     "spec/fixtures/sample/views/inline-js.html.haml",
      "spec/fixtures/sample/views/layout.haml",
-     "spec/fixtures/sample/views/markaby.mab",
-     "spec/fixtures/sample/views/maruku.maruku",
-     "spec/fixtures/sample/views/services/index.haml",
-     "spec/fixtures/sample/views/stylesheets/site.sass",
-     "spec/generator_spec.rb",
-     "spec/spec_helper.rb",
-     "vendor/rack-test/History.txt",
-     "vendor/rack-test/MIT-LICENSE.txt",
-     "vendor/rack-test/README.rdoc",
-     "vendor/rack-test/Rakefile",
-     "vendor/rack-test/lib/rack/mock_session.rb",
-     "vendor/rack-test/lib/rack/test.rb",
-     "vendor/rack-test/lib/rack/test/cookie_jar.rb",
-     "vendor/rack-test/lib/rack/test/methods.rb",
-     "vendor/rack-test/lib/rack/test/mock_digest_request.rb",
-     "vendor/rack-test/lib/rack/test/uploaded_file.rb",
-     "vendor/rack-test/lib/rack/test/utils.rb",
-     "vendor/rack-test/spec/fixtures/config.ru",
-     "vendor/rack-test/spec/fixtures/fake_app.rb",
-     "vendor/rack-test/spec/fixtures/foo.txt",
-     "vendor/rack-test/spec/rack/test/cookie_spec.rb",
-     "vendor/rack-test/spec/rack/test/digest_auth_spec.rb",
-     "vendor/rack-test/spec/rack/test/multipart_spec.rb",
-     "vendor/rack-test/spec/rack/test/utils_spec.rb",
-     "vendor/rack-test/spec/rack/test_spec.rb",
-     "vendor/rack-test/spec/rcov.opts",
-     "vendor/rack-test/spec/spec.opts",
-     "vendor/rack-test/spec/spec_helper.rb",
-     "vendor/sinatra-content-for/LICENSE",
-     "vendor/sinatra-content-for/README.rdoc",
-     "vendor/sinatra-content-for/Rakefile",
-     "vendor/sinatra-content-for/lib/sinatra/content_for.rb",
-     "vendor/sinatra-content-for/sinatra-content-for.gemspec",
-     "vendor/sinatra-content-for/test/content_for_test.rb",
-     "vendor/sinatra-markaby/CHANGES",
-     "vendor/sinatra-markaby/LICENSE",
-     "vendor/sinatra-markaby/README.rdoc",
-     "vendor/sinatra-markaby/Rakefile",
-     "vendor/sinatra-markaby/TODO",
-     "vendor/sinatra-markaby/VERSION.yml",
-     "vendor/sinatra-markaby/lib/sinatra/markaby.rb",
-     "vendor/sinatra-markaby/sinatra-markaby.gemspec",
-     "vendor/sinatra-markaby/test/sinatra_markaby_test.rb",
-     "vendor/sinatra-markaby/test/test_helper.rb",
-     "vendor/sinatra-markaby/test/views/hello.mab",
-     "vendor/sinatra-markaby/test/views/html.mab",
-     "vendor/sinatra-maruku/LICENSE",
-     "vendor/sinatra-maruku/README.markdown",
-     "vendor/sinatra-maruku/Rakefile",
-     "vendor/sinatra-maruku/VERSION.yml",
-     "vendor/sinatra-maruku/examples/app.rb",
-     "vendor/sinatra-maruku/examples/config.ru",
-     "vendor/sinatra-maruku/examples/mapp.rb",
-     "vendor/sinatra-maruku/examples/public/javascripts/application.js",
-     "vendor/sinatra-maruku/examples/public/stylesheets/application.css",
-     "vendor/sinatra-maruku/examples/public/stylesheets/print.css",
-     "vendor/sinatra-maruku/examples/views/index.maruku",
-     "vendor/sinatra-maruku/examples/views/layout.maruku",
-     "vendor/sinatra-maruku/lib/sinatra/maruku.rb",
-     "vendor/sinatra-maruku/sinatra-maruku.gemspec",
-     "vendor/sinatra-maruku/test/sinatra_maruku_test.rb",
-     "vendor/sinatra-maruku/test/test_helper.rb",
-     "vendor/sinatra-maruku/test/views/hello.maruku",
-     "vendor/sinatra-maruku/test/views/layout2.maruku"
+     "spec/fixtures/sample/views/maruku.html.maruku",
+     "spec/fixtures/sample/views/page-classes.html.haml",
+     "spec/fixtures/sample/views/services/index.html.haml",
+     "spec/fixtures/sample/views/stylesheets/asset_host.css.sass",
+     "spec/fixtures/sample/views/stylesheets/relative_assets.css.sass",
+     "spec/fixtures/sample/views/stylesheets/site.css.sass",
+     "spec/fixtures/sample/views/stylesheets/site_scss.css.scss",
+     "spec/fixtures/sample/views/stylesheets/test_less.css.less",
+     "spec/helpers_spec.rb",
+     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/tdreyno/middleman}
+  s.homepage = %q{http://wiki.github.com/tdreyno/middleman}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{middleman}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A static site generator utilizing Haml and Sass}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
   s.test_files = [
     "spec/builder_spec.rb",
      "spec/fixtures/sample/init.rb",
-     "spec/generator_spec.rb",
+     "spec/helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -126,33 +115,58 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<templater>, [">= 0"])
-      s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<markaby>, [">= 0"])
-      s.add_runtime_dependency(%q<maruku>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<chriseppstein-compass>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<thin>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<shotgun>, ["~> 0.8.0"])
+      s.add_runtime_dependency(%q<templater>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<compass>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_runtime_dependency(%q<smusher>, ["~> 0.4.5"])
+      s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<templater>, [">= 0"])
-      s.add_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<markaby>, [">= 0"])
-      s.add_dependency(%q<maruku>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 2.1.0"])
-      s.add_dependency(%q<chriseppstein-compass>, [">= 0"])
+      s.add_dependency(%q<rack>, ["~> 1.0"])
+      s.add_dependency(%q<thin>, ["~> 1.2.0"])
+      s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
+      s.add_dependency(%q<templater>, ["~> 1.0.0"])
+      s.add_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+      s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+      s.add_dependency(%q<haml>, ["~> 3.0"])
+      s.add_dependency(%q<compass>, ["~> 0.10.0"])
+      s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_dependency(%q<smusher>, ["~> 0.4.5"])
+      s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<templater>, [">= 0"])
-    s.add_dependency(%q<yui-compressor>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<markaby>, [">= 0"])
-    s.add_dependency(%q<maruku>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 2.1.0"])
-    s.add_dependency(%q<chriseppstein-compass>, [">= 0"])
+    s.add_dependency(%q<rack>, ["~> 1.0"])
+    s.add_dependency(%q<thin>, ["~> 1.2.0"])
+    s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
+    s.add_dependency(%q<templater>, ["~> 1.0.0"])
+    s.add_dependency(%q<sinatra>, ["~> 1.0"])
+    s.add_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+    s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+    s.add_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+    s.add_dependency(%q<haml>, ["~> 3.0"])
+    s.add_dependency(%q<compass>, ["~> 0.10.0"])
+    s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+    s.add_dependency(%q<smusher>, ["~> 0.4.5"])
+    s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
+

data/spec/builder_spec.rb

@@ -9,18 +9,18 @@ describe "Builder" do
     @root_dir = project_file("spec", "fixtures", "sample")
   end
 
-  before :each do    
+  before :each do
     build_cmd = project_file("bin", "mm-build")
-    `cd #{@root_dir} && #{build_cmd}`
+    `cd #{@root_dir} && MM_DIR="#{@root_dir}" #{build_cmd}`
   end
-  
+
   after :each do
     FileUtils.rm_rf(File.join(@root_dir, "build"))
   end
   
-  xit "should build markaby files" do
-    File.exists?("#{@root_dir}/build/markaby.html").should be_true
-    File.read("#{@root_dir}/build/markaby.html").should include("<title>Hi Markaby</title>")
+  it "should use layout" do
+    File.exists?("#{@root_dir}/build/index.html").should be_true
+    File.read("#{@root_dir}/build/index.html").should include("Comment in layout")
   end
   
   it "should build haml files" do
@@ -28,11 +28,6 @@ describe "Builder" do
     File.read("#{@root_dir}/build/index.html").should include("<h1>Welcome</h1>")
   end
   
-  it "should build maruku files" do
-    File.exists?("#{@root_dir}/build/maruku.html").should be_true
-    File.read("#{@root_dir}/build/maruku.html").should include("<h1 class='header' id='hello_maruku'>Hello Maruku</h1>")
-  end
-  
   it "should build static files" do
     File.exists?("#{@root_dir}/build/static.html").should be_true
     File.read("#{@root_dir}/build/static.html").should include("Static, no code!")
@@ -44,7 +39,17 @@ describe "Builder" do
 
   it "should build sass files" do
     File.exists?("#{@root_dir}/build/stylesheets/site.css").should be_true
-    File.read("#{@root_dir}/build/stylesheets/site.css").should include("html, body, div, span, applet, object, iframe")
+    File.read("#{@root_dir}/build/stylesheets/site.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
+  end
+
+  it "should build less files" do
+    File.exists?("#{@root_dir}/build/stylesheets/test_less.css").should be_true
+    File.read("#{@root_dir}/build/stylesheets/test_less.css").should include("666")
+  end
+
+  it "should build scss files" do
+    File.exists?("#{@root_dir}/build/stylesheets/site_scss.css").should be_true
+    File.read("#{@root_dir}/build/stylesheets/site_scss.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
   end
 
   it "should build static css files" do
@@ -54,8 +59,4 @@ describe "Builder" do
   it "should not build partial files" do
     File.exists?("#{@root_dir}/build/_partial.html").should be_false
   end
-  
-  it "should minify inline javascript" do
-    File.readlines("#{@root_dir}/build/inline-js.html").length.should == 9
-  end
 end