middleman 2.0.0.rc8 → 2.0.0.rc91

data/lib/middleman/core_extensions/compass.rb

@@ -12,31 +12,60 @@ module Middleman::CoreExtensions::Compass
       end
 
       app.after_feature_init do
-        views_root = File.basename(app.views)
+        # Support a stand-alone compass config file
+        # Many options are overwritten by Middleman, but the config is a good
+        # place to add:
+        # * output_style
+        # * disable_warnings
+        # * sass_options
+        # * line_comments
+        # * sprite_engine
+        # * chunky_png_options
+        compass_config_file = File.join(app.root, "compass.config")
+        if File.exists?(compass_config_file)
+          ::Compass.add_project_configuration(compass_config_file)
+        end
+        
         ::Compass.configuration do |config|
-          # config.cache            = false # For sassc files
-          config.cache_path            = File.join(app.root, ".sass-cache")
           config.project_path          = app.root
+          config.environment           = :development
+          config.cache_path            = File.join(app.root, ".sass-cache")
+          
+          views_root = File.basename(app.views)
           config.sass_dir              = File.join(views_root, app.css_dir)
-          config.output_style          = :nested
-          config.fonts_dir             = File.join(views_root, app.fonts_dir)
           config.css_dir               = File.join(views_root, app.css_dir)
-          config.images_dir            = File.join(views_root, app.images_dir)      
-          config.http_images_path      = app.http_images_path rescue File.join(app.http_prefix || "/", app.images_dir)
-          config.http_stylesheets_path = app.http_css_path rescue File.join(app.http_prefix || "/", app.css_dir)
+          config.javascripts_dir       = File.join(views_root, app.js_dir)
+          config.fonts_dir             = File.join(views_root, app.fonts_dir)
+          config.images_dir            = File.join(views_root, app.images_dir)
+          
+          if app.respond_to? :http_images_path
+            config.http_images_path = app.http_images_path
+          end
+          
+          if app.respond_to? :http_css_path
+            config.http_stylesheets_path = app.http_css_path
+          end
+          
+          if app.respond_to? :http_js_path
+            config.http_javascripts_path = app.http_js_path
+          end
+          
           config.asset_cache_buster :none
+          config.output_style = :nested
 
           config.add_import_path(config.sass_dir)
         end
         
         # Required for relative paths
         configure :build do
-           build_root = File.basename(self.build_dir)
-           ::Compass.configuration do |config|
-             config.css_dir    = File.join(build_root, self.css_dir)
-             config.images_dir = File.join(build_root, self.images_dir)
-           end
-         end
+          ::Compass.configuration do |config|
+            config.environment = :production
+             
+            build_root = File.basename(self.build_dir)
+            config.css_dir     = File.join(build_root, self.css_dir)
+            config.images_dir  = File.join(build_root, self.images_dir)
+          end
+        end
         
         app.execute_after_compass_init!
         
@@ -48,14 +77,14 @@ module Middleman::CoreExtensions::Compass
   
   module ClassMethods
     # Add a block/proc to be run after features have been setup
-    def after_compass_init(&block)
+    def compass_config(&block)
       @run_after_compass ||= []
       @run_after_compass << block
     end
     
     def execute_after_compass_init!
       @run_after_compass ||= []
-      @run_after_compass.each { |block| class_eval(&block) }
+      @run_after_compass.each { |block| block.call(::Compass.configuration) }
     end
   end
 end

data/lib/middleman/core_extensions/front_matter.rb

@@ -24,7 +24,8 @@ module Middleman::CoreExtensions::FrontMatter
       
       app.after_feature_init do
         app.before_processing do
-          result = resolve_template(request.path_info, :raise_exceptions => false)
+          request_path = request.path_info.gsub("%20", " ")
+          result = resolve_template(request_path, :raise_exceptions => false)
         
           if result && Tilt.mappings.has_key?(result[1].to_s)
             extensionless_path, template_engine = result

data/lib/middleman/core_extensions/routing.rb

@@ -3,6 +3,8 @@ module Middleman::CoreExtensions::Routing
     def registered(app)
       app.extend ClassMethods
       
+      app.set :proxied_paths, {}
+      
       # Normalize the path and add index if we're looking at a directory
       app.before_processing do
         request.path_info = self.class.path_to_index(request.path)
@@ -35,23 +37,33 @@ module Middleman::CoreExtensions::Routing
       set :layout, old_layout
     end
   
-    # The page method allows the layout to be set on a specific path
-    # page "/about.html", :layout => false
-    # page "/", :layout => :homepage_layout
-    def page(url, options={}, &block)
+    def paths_for_url(url)
       url = url.gsub(%r{#{settings.index_file}$}, "")
       url = url.gsub(%r{(\/)$}, "") if url.length > 1
     
       paths = [url]
       paths << "#{url}/" if url.length > 1 && url.split("/").last.split('.').length <= 1
       paths << "/#{path_to_index(url)}"
-
-      options[:layout] = settings.layout if options[:layout].nil?
-
+      paths
+    end
+  
+    # The page method allows the layout to be set on a specific path
+    # page "/about.html", :layout => false
+    # page "/", :layout => :homepage_layout
+    def page(url, options={}, &block)
       has_block = block_given?
-
-      paths.each do |p|
+      options[:layout] = settings.layout if options[:layout].nil?
+      
+      if options.has_key?(:proxy)
+        settings.proxied_paths[url] = options[:proxy]
+      end
+    
+      paths_for_url(url).each do |p|
         get(p) do
+          if settings.proxied_paths.has_key?(url)
+            request.path_info = settings.proxied_paths[url]
+          end
+          
           instance_eval(&block) if has_block
           process_request(options)
         end

data/lib/middleman/features/asset_host.rb

@@ -1,9 +1,9 @@
 module Middleman::Features::AssetHost
   class << self
     def registered(app)
-      app.after_compass_init do
+      app.compass_config do |config|
         if app.asset_host.is_a?(Proc)
-          ::Compass.configuration.asset_host(&app.asset_host)
+          config.asset_host(&app.asset_host)
         end
       end
 

data/lib/middleman/features/blog.rb

@@ -41,16 +41,19 @@ module Middleman
               app.set :blog_article_template, "article_template"
             end
 
-            $stderr.puts "== Blog: #{app.settings.blog_permalink}"
+            if !app.build?
+              $stderr.puts "== Blog: #{app.settings.blog_permalink}"
+            end
             
-            app.get(app.settings.blog_permalink) do
+            app.get("/#{app.blog_permalink}") do
+              $stderr.puts "*" * 500
               process_request({
-                :layout        => settings.blog_layout,
-                :layout_engine => settings.blog_layout_engine
+                :layout        => app.blog_layout,
+                :layout_engine => app.blog_layout_engine
               })
 
               # No need for separator on permalink page
-              body body.gsub!(settings.blog_summary_separator, "")
+              body body.gsub!(app.blog_summary_separator, "")
             end
           end
           

data/lib/middleman/features/cache_buster.rb

@@ -25,16 +25,14 @@ module Middleman::Features::CacheBuster
         end
       end
 
-      app.after_compass_init do 
-        ::Compass.configuration do |config|
-          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(app.root, app.build_dir), app.views)
-            if File.readable?(real_path)
-              File.mtime(real_path).strftime("%s") 
-            else
-              $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
-            end
+      app.compass_config do |config|
+        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(app.root, app.build_dir), app.views)
+          if File.readable?(real_path)
+            File.mtime(real_path).strftime("%s") 
+          else
+            $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
           end
         end
       end

data/lib/middleman/features/minify_css.rb

@@ -1,8 +1,8 @@
 module Middleman::Features::MinifyCss
   class << self
     def registered(app)
-      app.after_compass_init do
-        ::Compass.configuration.output_style = :compressed
+      app.compass_config do |config|
+        config.output_style = :compressed
       end
     end
     alias :included :registered

data/lib/middleman/guard.rb

@@ -1,6 +1,7 @@
 require "guard"
 require "guard/guard"
 require "guard/livereload"
+require "webrick"
 
 module Middleman::Guard
   def self.start(options={}, livereload={})
@@ -53,12 +54,17 @@ module Guard
 
   private
     def server_start
-      puts "== The Middleman is standing watch on port #{@options[:port]}"
-      @server_options = { :Port => @options[:port], :AccessLog => [] }
+      @server_options = { 
+        :Port => @options[:port],
+        :Logger => ::WEBrick::Log.new('/dev/null'),
+        :AccessLog => ::WEBrick::Log.new('/dev/null')
+      }
       @server_job = fork do
         @server_options[:app] = ::Middleman.server.new
         ::Rack::Server.new(@server_options).start
       end
+
+      puts "== The Middleman is standing watch on port #{@options[:port]}"
     end
   
     def server_stop

data/lib/middleman/templates.rb

@@ -29,14 +29,11 @@ end
 # Default template
 require "middleman/templates/default"
 
-# XHMTL template
-require "middleman/templates/xhtml"
+# Blog template
+require "middleman/templates/blog"
 
 # HTML5 template
 require "middleman/templates/html5"
 
 # Local templates
-require "middleman/templates/local"
-
-# Compass templates
-# require "middleman/templates/compass"
+require "middleman/templates/local"

data/lib/middleman/templates/blog.rb

@@ -0,0 +1,17 @@
+class Middleman::Templates::Blog < Middleman::Templates::Base
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+  
+  def build_scaffold
+    template "blog/config.tt", File.join(location, "config.rb")
+    template "blog/config.ru", File.join(location, "config.ru")
+    directory "blog/source", File.join(location, "source")
+    
+    empty_directory File.join(location, "source", options[:css_dir])
+    empty_directory File.join(location, "source", options[:js_dir])
+    empty_directory File.join(location, "source", options[:images_dir])
+  end
+end
+
+Middleman::Templates.register(:blog, Middleman::Templates::Blog)

data/lib/middleman/templates/blog/config.ru

@@ -0,0 +1,9 @@
+# Rack config
+
+# Look for index files in folders like Apache
+require "rack/contrib/try_static"
+use Rack::TryStatic, :root => "build", :urls => %w[/], :try => ['.html', 'index.html', '/index.html']
+
+# Cache static assets
+require "rack/contrib/static_cache"
+use Rack::StaticCache, :urls => ['/'], :root => 'build'

data/lib/middleman/templates/blog/config.tt

@@ -0,0 +1,18 @@
+activate :blog
+# set :blog_permalink, ":year/:month/:day/:title.html"
+# set :blog_summary_separator, /READMORE/
+# set :blog_summary_length, 500
+
+page "/feed.xml", :layout => false
+
+# Build-specific configuration
+configure :build do
+  # For example, change the Compass output style for deployment
+  # activate :minify_css
+  
+  # Minify Javascript on build
+  # activate :minify_javascript
+  
+  # Enable cache buster
+  # activate :cache_buster
+end

data/lib/middleman/templates/blog/source/2011/01/01/new-article.html.markdown

@@ -0,0 +1,6 @@
+--- 
+title: "New Article title"
+date: 01/01/2011
+---
+
+Content of my article

data/lib/middleman/templates/blog/source/archives/index.html.erb

@@ -0,0 +1,10 @@
+<h1>Archive: <%# @path %></h1>
+<ul class="archives">
+  <% for entry in data.blog.articles %>
+    <li>
+      <a href="<%= entry.url %>"><%= entry.title %></a>
+      <span><%= entry.date.strftime('%b %e') %></span>
+    </li>
+  <% end %>
+</ul>
+

data/lib/middleman/templates/blog/source/feed.xml.builder

@@ -0,0 +1,23 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title "Blog Name"
+  xml.subtitle "Blog subtitle"
+  xml.id "http://blog.url.com/"
+  xml.link "href" => "http://blog.url.com/"
+  xml.link "href" => "http://blog.url.com/feed.xml", "rel" => "self"
+  xml.updated data.blog.articles.first.date.to_time.iso8601
+  xml.author { xml.name "Blog Author" }
+
+  data.blog.articles.each do |article|
+    xml.entry do
+      xml.title article.title
+      xml.link "rel" => "alternate", "href" => article.url
+      xml.id article.url
+      xml.published article.date.to_time.iso8601
+      xml.updated article.date.to_time.iso8601
+      xml.author { xml.name "Article Author" }
+      xml.summary article.summary, "type" => "html"
+      xml.content article.body, "type" => "html"
+    end
+  end
+end

data/lib/middleman/templates/blog/source/index.html.erb

@@ -0,0 +1,9 @@
+<% data.blog.articles[0...5].each_with_index do |article, i| %>
+  <article class="<%= (i == 0) ? 'first' : '' %>">
+    <h1><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime('%b %e %Y') %></span></h1>
+    
+    <%= article.summary %>
+    
+    <div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
+  </article>
+<% end %>

data/lib/middleman/templates/blog/source/layout.erb

@@ -0,0 +1,30 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv='X-UA-Compatible' content='IE=edge;chrome=1' />
+  </head>
+  <body>
+    
+    <div id="main" role="main">
+      <% if is_blog_article? %>
+        <% content_for :blog_article, yield %>
+        <%= partial settings.blog_article_template %>
+      <% else %>
+        <%= yield %>
+      <% end %>
+    </div>
+    
+    <aside>
+      <h2>
+        Recent Articles
+        <a href="/archives">Archive</a>
+      </h2>
+      <ol>
+        <% data.blog.articles[0...10].each do |article| %>
+          <li><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime('%b %e') %></span></li>
+        <% end %>
+      </li>
+    </aside>
+  </body>
+</html>

data/lib/middleman/templates/default.rb

@@ -1,13 +1,15 @@
 class Middleman::Templates::Default < Middleman::Templates::Base
   def self.source_root
-    File.join(File.dirname(__FILE__), 'default')
+    File.dirname(__FILE__)
   end
   
   def build_scaffold
-    template "config.tt", File.join(location, "config.rb")
-    template "config.ru", File.join(location, "config.ru")
-    directory "source", File.join(location, "source")
+    template "shared/config.tt", File.join(location, "config.rb")
+    template "shared/config.ru", File.join(location, "config.ru")
+    copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
+    copy_file "default/source/layout.erb", File.join(location, "source/layout.erb")
     empty_directory File.join(location, "source", options[:css_dir])
+    copy_file "default/source/stylesheets/site.css.scss", File.join(location, "source", options[:css_dir], "site.css.scss")
     empty_directory File.join(location, "source", options[:js_dir])
     empty_directory File.join(location, "source", options[:images_dir])
   end  

data/lib/middleman/templates/default/source/index.html.erb

@@ -0,0 +1,5 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end%>
+
+<h1>The Middleman is watching.</h1>