middleman 1.2.8 → 2.0.0.beta2

data/.gitignore

@@ -7,3 +7,4 @@ pkg
 .tmp
 Gemfile.lock
 docs
+.rvmrc

data/CHANGELOG

@@ -0,0 +1,7 @@
+2.0.0
+=====
+
+- Combine views/ and public/ into a single source/ folder.
+- Support YAML front-matter
+- Blog-aware
+- Replaced Blueprint CSS templates with Susy

data/README.rdoc

@@ -8,7 +8,7 @@ Everything you need to know is on the wiki: http://github.com/tdreyno/middleman/
 
 == Mailing List
 
-If you have questions, answers can be found on the mailing list: http://groups.google.com/group/middleman-users
+If you have questions, answers can be found on community forum: https://convore.com/middleman/
 
 == Copyright
 

data/bin/mm-server

@@ -1,22 +1,5 @@
 #!/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 if Signal.list.has_key? "TSTP"
-
 require 'optparse'
 
 # Require Middleman
@@ -25,6 +8,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
 options = { :Port => 4567, :AccessLog => [] }
 
+# TODO: Switch to Thor
 OptionParser.new { |opts|
   opts.banner = "Usage: mm-server [rack options]"
   opts.separator ""
@@ -51,10 +35,9 @@ ENV['RACK_ENV'] = env
 while (!@found_root && (@path_parts.length > 0))
   @current_path = File.join(*@path_parts)
   
-  public_folder = File.join(@current_path, "public")
-  views_folder  = File.join(@current_path, "views")
+  source_folder = File.join(@current_path, "source")
   
-  if File.exists?(public_folder) && File.exists?(views_folder)
+  if File.exists?(source_folder)
     @found_root = true
     next
   end
@@ -67,31 +50,24 @@ if !@found_root
   exit
 end
 
-# If the old init.rb exists, use it, but issue warning
+# If the old init.rb exists, issue warning
 old_config = File.join(@current_path, "init.rb")
 if File.exists? old_config
   $stderr.puts "== Error: The init.rb file (deprecated) needs to be be renamed to config.rb"
   exit
 end
 
+# If the old directories exists, use it, but issue warning
+old_views = File.join(@current_path, "views")
+old_public = File.join(@current_path, "public")
+if File.exists?(old_views) || File.exists?(old_public)
+  $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
+  exit
+end
 
-# require 'shotgun'
-# config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
-# app = Shotgun.new(config, &lambda { |inner_app| Middleman::Server })
 Middleman::Server.root = @current_path
-app = Middleman::Server.new
+options[:app]    = Middleman::Server.new
+# options[:server] = 'webrick'
 
-require 'rubygems'
-
-unless defined?(JRUBY_VERSION)
-  require 'thin'
-  handler = Rack::Handler::Thin
-else
-  require 'kirk'
-  require 'rack/handler/kirk'
-  handler = Rack::Handler::Kirk
-end
-
-handler.run app, options do |inst|
-  puts "== The Middleman is standing watch on port #{options[:Port]}"
-end
+puts "== The Middleman is standing watch on port #{options[:Port]}"
+Rack::Server.new(options).start

data/features/coffee-script.feature

@@ -1,7 +1,12 @@
 Feature: Support coffee-script
   In order to offer an alternative when writing Javascript
-  
+
   Scenario: Rendering coffee script
     Given the Server is running
     When I go to "/javascripts/coffee_test.js"
+    Then I should see "Array.prototype.slice"
+
+  Scenario: Rendering coffee-script with :coffeescript haml-filter
+    Given the Server is running
+    When I go to "/inline-coffeescript.html"
     Then I should see "Array.prototype.slice"

data/features/minify_javascript.feature

@@ -1,12 +1,20 @@
 Feature: Minify Javascript
   In order reduce bytes sent to client and appease YSlow
-  
+
+  Background:
+    Given current environment is "build"
+
   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
+
+  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 "5" lines
+
+  Scenario: Rendering inline js (coffeescript) with the feature enabled
+    Given "minify_javascript" feature is "enabled"
+    When I go to "/inline-coffeescript.html"
+    Then I should see "5" lines

data/features/slim.feature

@@ -0,0 +1,7 @@
+Feature: Support slim templating language
+  In order to offer an alternative to Haml
+
+  Scenario: Rendering Slim
+    Given the Server is running
+    When I go to "/slim.html"
+    Then I should see "<h1>Welcome to Slim</h1>"

data/features/step_definitions/builder_steps.rb

@@ -26,26 +26,4 @@ end
 Then /^"([^"]*)" should not exist$/ do |target_file|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
   File.exists?(target).should be_false
-end
-
-
-
-# require 'fileutils'
-# 
-# describe "Builder" do
-#   def project_file(*parts)
-#     File.expand_path(File.join(File.dirname(__FILE__), "..", *parts))
-#   end
-# 
-#   before :all do
-#     @root_dir = project_file("spec", "fixtures", "sample")
-#   end
-# 
-#   before :each do
-#     build_cmd = project_file("bin", "mm-build")
-#     `cd #{@root_dir} && MM_DIR="#{@root_dir}" #{build_cmd}`
-#   end
-# 
-#   after :each do
-#     FileUtils.rm_rf(File.join(@root_dir, "build"))
-#   end
+end

data/features/step_definitions/env.rb

@@ -1,3 +1,9 @@
 ENV["MM_DIR"] = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
 require File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'lib', 'middleman')
-require "rack/test"
+require "rack/test"
+
+# absolute views path
+# otherwise resolve_template (padrino-core) can't find templates
+Before do
+  Middleman::Server.views = File.join(Middleman::Server.root, "source")
+end

data/features/step_definitions/generator_steps.rb

@@ -19,7 +19,7 @@ end
 Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
   
-  %w(views/stylesheets public/stylesheets public/javascripts public/images).each do |d|
+  %w(source/stylesheets source/javascripts source/images).each do |d|
     File.exists?("#{target}/#{d}").should be_true
   end
 end

data/features/step_definitions/middleman_steps.rb

@@ -2,9 +2,14 @@ Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   if state == "enabled"
     Middleman::Server.activate(feature.to_sym)
   end
+  Middleman::Server.environment = @current_env || :development
   @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
+Given /^current environment is "([^\"]*)"$/ do |env|
+  @current_env = env.to_sym
+end
+
 Given /^the Server is running$/ do
   @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end

data/fixtures/test-app/config.rb

@@ -1,6 +1,8 @@
 with_layout false do
   page "/inline-css.html"
   page "/inline-js.html"
+  page "/inline-coffeescript.html"
+  page "/slim.html"
 end
 
 get "/page-class.html" do

data/fixtures/test-app/source/front-matter.html.erb

@@ -0,0 +1,7 @@
+---
+layout: false
+title: No title
+---
+
+<%= data.page.title %>
+<%= data.page.inspect %>

data/fixtures/test-app/source/inline-coffeescript.html.haml

@@ -0,0 +1,3 @@
+:coffeescript
+  race = (winner, runners...) ->
+    print winner, runners

data/fixtures/test-app/{views → source}/inline-js.html.haml

@@ -4,4 +4,4 @@
     should();
     all.be();
     on = { one: line };
-  });
+  })();

data/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js

@@ -0,0 +1 @@
+// Success

data/fixtures/test-app/source/slim.html.slim

@@ -0,0 +1,7 @@
+doctype 5
+html lang='en'
+  head
+    meta charset="utf-8"
+    
+  body
+    h1 Welcome to Slim

data/lib/middleman.rb

@@ -67,6 +67,7 @@ module Middleman
   module Renderers
     autoload :Haml, "middleman/renderers/haml"
     autoload :Sass, "middleman/renderers/sass"
+    autoload :Slim, "middleman/renderers/slim"
   end
 
   # Features API

data/lib/middleman/builder.rb

@@ -8,7 +8,7 @@ module Middleman
     def tilt_template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
-
+      
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 
@@ -33,6 +33,7 @@ module Middleman
       super
       
       Middleman::Server.new
+      
       if options.has_key?("relative") && options["relative"]
         Middleman::Server.activate :relative_assets
       end
@@ -41,17 +42,12 @@ module Middleman
     
     def source_paths
       @source_paths ||= [
-        Middleman::Server.public,
-        Middleman::Server.views
+        Middleman::Server.root
       ]
     end
     
-    def build_static_files
-      action Directory.new(self, Middleman::Server.public, :public, Middleman::Server.build_dir, { :force => true })
-    end
-    
-    def build_dynamic_files
-      action Directory.new(self, Middleman::Server.views, :dynamic, Middleman::Server.build_dir, { :force => true })
+    def build_all_files
+      action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir, { :force => true })
     end
     
     @@hooks = {}
@@ -69,8 +65,7 @@ module Middleman
   class Directory < ::Thor::Actions::EmptyDirectory
     attr_reader :source
 
-    def initialize(base, source, mode, destination=nil, config={}, &block)
-      @mode = mode
+    def initialize(base, source, destination=nil, config={}, &block)
       @source = File.expand_path(base.find_in_source_paths(source.to_s))
       @block  = block
       super(base, destination, { :recursive => true }.merge(config))
@@ -96,22 +91,20 @@ module Middleman
         end
         
         next if file_source.include?('layout')
-        next unless file_source.split('/').select { |p| p[0,1] == '_' }.empty?
-      
+        
+        # Skip partials prefixed with an underscore
+        next unless file_source.gsub(Middleman::Server.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
+        
         file_extension = File.extname(file_source)
         file_destination = File.join(given_destination, file_source.gsub(source, '.'))
         file_destination.gsub!('/./', '/')
-      
-        handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
-        if handled_by_tilt || (file_extension == ".js")
-          new_file_extension = (file_extension == ".js") ? ".js" : ""
-          next if @mode == :dynamic && file_source.split('/').last.split('.').length < 3
         
-          file_destination.gsub!(file_extension, new_file_extension)
-          destination = base.tilt_template(file_source, file_destination, config, &@block)
-        else  
-          destination = base.copy_file(file_source, file_destination, config, &@block)
+        handled_by_tilt = ::Tilt.mappings.has_key?(file_extension.gsub(/^\./, ""))
+        if handled_by_tilt
+          file_destination.gsub!(file_extension, "")
         end
+        
+        destination = base.tilt_template(file_source, file_destination, config, &@block)
       end
     end
 

data/lib/middleman/features.rb

@@ -71,6 +71,12 @@ module Middleman::Features
   # to dynamic requests.
   autoload :Data,                "middleman/features/data"
 
+  # Parse YAML metadata from templates
+  autoload :FrontMatter,         "middleman/features/front_matter"
+  
+  # Treat project as a blog
+  autoload :Blog,                "middleman/features/blog"
+  
   # Proxy web services requests in dev mode only
   # autoload :Proxy,               "middleman/features/proxy"
   
@@ -79,7 +85,7 @@ module Middleman::Features
 
   # LiveReload will auto-reload browsers with the live reload extension installed after changes
   # Currently disabled and untested.
-  #autoload :LiveReload,          "middleman/features/live_reload"
+  # autoload :LiveReload,          "middleman/features/live_reload"
 
   # The Feature API is itself a Feature. Mind blowing!
   class << self