Merge remote branch 'upstream/master'

.gitignore

@@ -8,3 +8,4 @@ pkg
 Gemfile.lock
 docs
 .rvmrc
+fixtures/test-app/build

CHANGELOG

@@ -3,4 +3,5 @@
 
 - Combine views/ and public/ into a single source/ folder.
 - Support YAML front-matter
-- Blog-aware
+- Blog-aware
+- Replaced Blueprint CSS templates with Susy

lib/middleman.rb

@@ -19,7 +19,7 @@
 # * Sass                       (.sass)
 # * Scss                       (.scss)
 # * Haml                       (.haml)
-# * Sass                       (.sass)
+# * Slim                       (.slim)
 # * Less CSS                   (.less)
 # * Builder                    (.builder)
 # * Liquid                     (.liquid)

lib/middleman/features/blog.rb

@@ -4,10 +4,7 @@ module Middleman
   module Features
     module Blog
       class << self
-        def registered(app)
-          # Depend on FrontMatter
-          app.activate Middleman::Features::FrontMatter
-          
+        def registered(app)          
           # Include helpers
           app.helpers Middleman::Features::Blog::Helpers
           

lib/middleman/features/default_helpers.rb

@@ -50,7 +50,7 @@ module Middleman::Features::DefaultHelpers
          else kind.to_s
        end
        source = source.to_s.gsub(/\s/, '')
-       ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
+       ignore_extension = (kind == :images) # don't append extension
        source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
        result_path   = source if source =~ %r{^/} # absolute path
        result_path ||= asset_url(source, asset_folder)

lib/middleman/features/front_matter.rb

@@ -6,12 +6,15 @@ module Middleman::Features::FrontMatter
     def registered(app)
       app.extend ClassMethods
       
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register BlueClothTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedClothTemplate, 'textile'
+      ::Tilt::register ERBTemplate,    'erb', 'rhtml'
+      ::Tilt::register ErubisTemplate, 'erb', 'rhtml', 'erubis'
     end
     alias :included :registered
   end
@@ -66,4 +69,13 @@ module Middleman::Features::FrontMatter
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end
+
+  # ERb
+  class ERBTemplate < ::Tilt::ERBTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class ErubisTemplate < ::Tilt::ErubisTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
 end

lib/middleman/renderers/sass.rb

@@ -1,6 +1,7 @@
 require "sass"
 require "sass/plugin"
 require "compass"
+require "susy"
 
 module Middleman
   module Renderers

lib/middleman/server.rb

@@ -49,6 +49,8 @@ module Middleman
     # Activate Webservices Proxy package
     # register Middleman::Features::Proxy
     
+    register Middleman::Features::FrontMatter
+    
     # Activate Lorem helpers
     register Middleman::Features::Lorem
     

lib/middleman/templates/default/source/stylesheets/site.css.sass

@@ -1,27 +1,34 @@
 @import "compass"
-@import "blueprint"
+@import "susy"
 
-$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
+$link-focus-color:   false
+$link-active-color:  false
+$link-visited-color: false
 
-$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
+$font-color:  #2a2a2a
+$font-family: 'Helvetica Neue', sans-serif
+$base-font-size:   12px
+$base-line-height: 18px
+
+$total-cols: 12
+$col-width: 4em
+$gutter-width: 1em
+$side-gutter-width: $gutter-width
 
 +global-reset
 
-+blueprint-typography
++establish-baseline
+
+body
+  font-family: $font-family
+  color: $font-color
 
 a
   +link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
 
 #main
   padding: 50px
-  text-align: center
   +container
+  +susy-grid-background

lib/middleman/templates/xhtml/source/stylesheets/site.css.sass

@@ -1,27 +1,34 @@
 @import "compass"
-@import "blueprint"
+@import "susy"
 
-$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
+$link-focus-color:   false
+$link-active-color:  false
+$link-visited-color: false
 
-$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
+$font-color:  #2a2a2a
+$font-family: 'Helvetica Neue', sans-serif
+$base-font-size:   12px
+$base-line-height: 18px
+
+$total-cols: 12
+$col-width: 4em
+$gutter-width: 1em
+$side-gutter-width: $gutter-width
 
 +global-reset
 
-+blueprint-typography
++establish-baseline
+
+body
+  font-family: $font-family
+  color: $font-color
 
 a
   +link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
 
-#frame
+#main
   padding: 50px
-  text-align: center
   +container
+  +susy-grid-background

lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta1"
+  VERSION = "2.0.0.beta3"
 end

middleman.gemspec

@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
-  s.add_runtime_dependency("compass", ["~> 0.11.1"])
+  s.add_runtime_dependency("compass", ["0.11.2"])
+  s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])