middleman 2.0.0.beta5 → 2.0.0.beta6

data/features/scss-support.feature

@@ -4,4 +4,9 @@ Feature: Support SCSS Syntax
  Scenario: Rendering scss
    Given the Server is running
    When I go to "/stylesheets/site_scss.css"
+   Then I should see "html"
+
+ Scenario: Rendering scss
+   Given the Server is running
+   When I go to "/stylesheets/layout.css"
    Then I should see "html"

data/fixtures/test-app/source/stylesheets/layout.css.sass

@@ -0,0 +1,2 @@
+html
+  test: value

data/lib/middleman.rb

@@ -68,6 +68,8 @@ module Middleman
     autoload :Haml, "middleman/renderers/haml"
     autoload :Sass, "middleman/renderers/sass"
     autoload :Slim, "middleman/renderers/slim"
+    autoload :Markdown, "middleman/renderers/markdown"
+    autoload :CoffeeScript, "middleman/renderers/coffee_script"
   end
 
   # Features API

data/lib/middleman/builder.rb

@@ -85,10 +85,8 @@ module Middleman
       lookup = File.join(lookup, '*')
       
       results = Dir[lookup].sort do |a, b|
-        simple_a = a.gsub(Middleman::Server.root + "/", '')
-                    .gsub(Middleman::Server.views + "/", '') 
-        simple_b = b.gsub(Middleman::Server.root + "/", '')
-                    .gsub(Middleman::Server.views + "/", '')
+        simple_a = a.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '') 
+        simple_b = b.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
         
         a_dir = simple_a.split("/").first
         b_dir = simple_b.split("/").first
@@ -108,7 +106,7 @@ module Middleman
           next
         end
         
-        next if file_source.include?('layout')
+        next if file_source.include?('layout') && !file_source.include?('.css')
         
         # Skip partials prefixed with an underscore
         next unless file_source.gsub(Middleman::Server.root, '').split('/').select { |p| p[0,1] == '_' }.empty?

data/lib/middleman/features/blog.rb

@@ -4,23 +4,27 @@ module Middleman
   module Features
     module Blog
       class << self
-        def registered(app)          
+        def registered(app)
           # Include helpers
           app.helpers Middleman::Features::Blog::Helpers
-          
+
           app.after_feature_init do
             if !app.settings.respond_to? :blog_permalink
               app.set :blog_permalink, "/:year/:month/:day/:title.html"
             end
-            
+
+            if !app.settings.respond_to? :blog_taglink
+              app.set :blog_taglink, "/tags/:tag.html"
+            end
+
             if !app.settings.respond_to? :blog_layout
               app.set :blog_layout, "layout"
             end
-            
+
             if !app.settings.respond_to? :blog_summary_separator
               app.set :blog_summary_separator, /READMORE/
             end
-            
+
             if !app.settings.respond_to? :blog_summary_length
               app.set :blog_summary_length, 250
             end
@@ -32,44 +36,60 @@ module Middleman
             if !app.settings.respond_to? :blog_index_template
               app.set :blog_index_template, "index_template"
             end
-            
+
             if !app.settings.respond_to? :blog_article_template
               app.set :blog_article_template, "article_template"
             end
-            
+
             $stderr.puts "== Blog: #{app.settings.blog_permalink}"
-            
+
             articles_glob = File.join(app.views, app.settings.blog_permalink.gsub(/(:\w+)/, "*") + ".*")
-            
+
             articles = Dir[articles_glob].map do |article|
               template_content = File.read(article)
               data, content = parse_front_matter(template_content)
               data["date"] = Date.parse(data["date"])
-              
+
               yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
               data["raw"]  = template_content.split(yaml_regex).last
               data["url"] = article.gsub(app.views, "").split(".html").first + ".html"
-              
-              all_content = Tilt.new(article).render              
+
+              all_content = Tilt.new(article).render
               data["body"] = all_content.gsub!(app.settings.blog_summary_separator, "")
-              
+
               sum = if data["raw"] =~ app.settings.blog_summary_separator
                 data["raw"].split(app.settings.blog_summary_separator).first
-              else                data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
+              else
+                data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
               end
-              
+
               engine = RDiscount.new(sum)
               data["summary"] = engine.to_html
               data
-            end.sort { |a, b| b["date"] <=> a["date"] }  
-            
-            app.data_content("blog", { :articles => articles })
-            
+            end.sort { |a, b| b["date"] <=> a["date"] }
+
+            tags = {}
+            articles.each do |article|
+              article["tags"] ||= ""
+              if !article["tags"].empty?
+                tags_array = article["tags"].split(',').map{|t| t.strip}
+                tags_array.each do |tag_title|
+                  tag_key = tag_title.parameterize
+                  tag_path = blog_taglink.gsub(/(:\w+)/, tag_key)
+                  (tags[tag_path] ||= {})["title"] = tag_title
+                  tags[tag_path]["ident"] = tag_key
+                  (tags[tag_path]["pages"] ||= {})[article["title"]] = article["url"]
+                end
+              end
+            end
+
+            app.data_content("blog", { :articles => articles, :tags => tags })
+
             app.get(app.settings.blog_permalink) do
               options = {}
               options[:layout] = settings.blog_layout
               options[:layout_engine] = settings.blog_layout_engine
-              
+
               extensionless_path, template_engine = resolve_template(request.path)
 
               full_file_path = "#{extensionless_path}.#{template_engine}"
@@ -78,40 +98,70 @@ module Middleman
 
               # Forward remaining data to helpers
               self.class.data_content("page", data)
-              
+
               output = render(request.path, options)
-              
+
               # No need for separator on permalink page
               output.gsub!(settings.blog_summary_separator, "")
-              
+
               status 200
               output
             end
+
           end
-          
         end
         alias :included :registered
       end
-      
+
       module Helpers
         def is_blog_article?
           !current_article_title.blank?
         end
-        
+
         def blog_title
         end
-        
+
         def current_article_date
           DateTime.parse(current_article_metadata.date)
         end
-        
+
         def current_article_title
           current_article_metadata.title
         end
-        
+
         def current_article_metadata
           data.page
         end
+
+        def current_article_tags
+          article_tags_hash = {}
+          if is_blog_article? && current_article_metadata.tags
+            article_tags = current_article_metadata.tags.split(',').map{|t| t.strip}
+            article_tags.each do |tag_title|
+              article_tags_hash[tag_title] = self.class.blog_taglink.gsub(/(:\w+)/, tag_title.parameterize)
+            end
+          end
+          article_tags_hash
+        end
+
+        def blog_tags
+          data.blog.tags
+        end
+
+        def current_tag_data
+          data.blog.tags[request.path]
+        end
+
+        def current_tag_articles
+          data.blog.articles.map do |article|
+            article if current_tag_data.pages.has_value?(article.url)
+          end.compact
+        end
+
+        def current_tag_title
+          current_tag_data[:title]
+        end
+
       end
     end
   end

data/lib/middleman/features/front_matter.rb

@@ -6,15 +6,10 @@ 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'
+      ::Tilt::register RedClothTemplate,  'textile'
+      ::Tilt::register ERBTemplate,       'erb', 'rhtml'
+      ::Tilt::register ErubisTemplate,    'erb', 'rhtml', 'erubis'
     end
     alias :included :registered
   end
@@ -45,22 +40,6 @@ module Middleman::Features::FrontMatter
   end
 
   # MARKDOWN
-  class MarukuTemplate < ::Tilt::MarukuTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class KramdownTemplate < ::Tilt::KramdownTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class BlueClothTemplate < ::Tilt::BlueClothTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
   class RDiscountTemplate < ::Tilt::RDiscountTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end

data/lib/middleman/renderers/coffee_script.rb

@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module CoffeeScript
+      class << self
+        def registered(app)
+          require "coffee_script"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

data/lib/middleman/renderers/markdown.rb

@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module Markdown
+      class << self
+        def registered(app)
+          require "rdiscount"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end

data/lib/middleman/server.rb

@@ -78,6 +78,8 @@ module Middleman
     register Middleman::Renderers::Slim
     register Middleman::Renderers::Haml
     register Middleman::Renderers::Sass
+    register Middleman::Renderers::Markdown
+    register Middleman::Renderers::CoffeeScript
     
     # Rack helper for adding mime-types during local preview
     def self.mime(ext, type)
@@ -186,8 +188,12 @@ module Middleman
       
       status 404
     rescue Padrino::Rendering::TemplateNotFound
-      $stderr.puts "File not found: #{request.path}"
-      status 404
+      if settings.environment == :development
+        raise $!
+      else
+        $stderr.puts "File not found: #{request.path}"
+        status 404
+      end
     end
   end
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta5"
+  VERSION = "2.0.0.beta6"
 end

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -07:00
+date: 2011-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -335,6 +335,7 @@ files:
 - fixtures/test-app/source/stylesheets/auto-css/auto-css.css
 - fixtures/test-app/source/stylesheets/auto-css/index.css
 - fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
+- fixtures/test-app/source/stylesheets/layout.css.sass
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
@@ -363,7 +364,9 @@ files:
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/tiny_src.rb
 - lib/middleman/features/ugly_haml.rb
+- lib/middleman/renderers/coffee_script.rb
 - lib/middleman/renderers/haml.rb
+- lib/middleman/renderers/markdown.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/renderers/slim.rb
 - lib/middleman/server.rb
@@ -489,6 +492,7 @@ test_files:
 - fixtures/test-app/source/stylesheets/auto-css/auto-css.css
 - fixtures/test-app/source/stylesheets/auto-css/index.css
 - fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
+- fixtures/test-app/source/stylesheets/layout.css.sass
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss