middleman 2.0.7 → 2.0.8

data/.gitignore

@@ -8,5 +8,6 @@ pkg
 Gemfile.lock
 docs
 .rvmrc
+.rbenv-version
 fixtures/test-app/build
 .*.swp

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - jruby
 script: "bundle exec rake test"

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.0.8
+=====
+- Support accessing variables and data objects in ERb Sprockets files (library.js.coffee.erb)
+- Make :markdown_engine support simple symbol names (:maruku instead of ::Tilt::MarkukuTemplate)
+- Update Padrino deps to 0.10.2
+- Include therubyracer on *nix
+- Enable frontmatter for Liquid templates
+
 2.0.7
 =====
 - Updated HTML5 Boilerplate to v2

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://www.rubygems.org"
+source :rubygems
  
 gemspec

data/features/data.feature

@@ -4,4 +4,9 @@ Feature: Local Data API
   Scenario: Rendering html
     Given the Server is running at "test-app"
     When I go to "/data.html"
-    Then I should see "One:Two"
+    Then I should see "One:Two"
+  
+  Scenario: Rendering liquid
+    Given the Server is running at "test-app"
+    When I go to "/data2.html"
+    Then I should see "OneTwo"

data/features/markdown.feature

@@ -0,0 +1,7 @@
+Feature: Markdown support
+  In order to test included Maruku support
+
+  Scenario: Rendering html
+    Given the Server is running at "test-app"
+    When I go to "/markdown.html"
+    Then I should see "<p>Hello World</p>"

data/features/sprockets.feature

@@ -8,4 +8,14 @@ Feature: Sprockets
   Scenario: Sprockets require with custom :js_dir
     Given the Server is running at "sprockets-app"
     When I go to "/library/javascripts/sprockets_base.js"
-    Then I should see "sprockets_sub_function"
+    Then I should see "sprockets_sub_function"
+    
+  Scenario: Sprockets should have access to yaml data
+    Given the Server is running at "test-app"
+    When I go to "/javascripts/multiple_engines.js"
+    Then I should see "Hello One"
+    
+  Scenario: Multiple engine files should build correctly
+    Given a built app at "test-app"
+    Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
+    And cleanup built app at "test-app"

data/features/sprockets_gems.feature

@@ -2,6 +2,6 @@
 Feature: Sprockets Gems
 
   Scenario: Sprockets can pull jQuery from gem
-    Given the Server is running at "test-app"
-    When I go to "/javascripts/jquery_base.js"
-    # Then I should see "sprockets_sub_function"
+    Given the Server is running at "sprockets-app"
+    When I go to "/javascripts/jquery_include.js"
+    Then I should see "var jQuery ="

data/fixtures/sprockets-app/source/jquery_include.js

@@ -0,0 +1 @@
+//= require "jquery"

data/fixtures/test-app/config.rb

@@ -11,6 +11,7 @@ page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => tru
 end
 
 with_layout false do
+  page "/markdown.html"
   page "/relative_image.html"
   page "/inline-css.html"
   page "/inline-js.html"
@@ -18,6 +19,7 @@ with_layout false do
   page "/spaces in file.html"
   page "/slim.html"
   page "/data.html"
+  page "/data2.html"
   page "/page-classes.html"
   page "/sub1/page-classes.html"
   page "/sub1/sub2/page-classes.html"

data/fixtures/test-app/source/data2.html.liquid

@@ -0,0 +1 @@
+{% for item in data.test %}{{item.title}}{% endfor %}

data/fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb

@@ -0,0 +1 @@
+alert "Hello <%= data.test[0].title %>"

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

@@ -0,0 +1 @@
+Hello World

data/lib/middleman.rb

@@ -55,12 +55,6 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-padrino_core_path = File.join(libdir, "middleman", "vendor", "padrino-core-0.10.0", "lib")
-$LOAD_PATH.unshift(padrino_core_path) unless $LOAD_PATH.include?(padrino_core_path)
-
-padrino_helpers_path = File.join(libdir, "middleman", "vendor", "padrino-helpers-0.10.0", "lib")
-$LOAD_PATH.unshift(padrino_helpers_path) unless $LOAD_PATH.include?(padrino_helpers_path)
-
 # We're riding on Sinatra, so let's include it.
 require "sinatra/base"
 

data/lib/middleman/base.rb

@@ -172,7 +172,12 @@ module Middleman::Base
       render_options = { :layout => layout }
       render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
       request_path = request.path_info.gsub("%20", " ")
-      result = render(request_path, render_options)
+      path, engine = resolve_template(request_path)
+      
+      locals = {}
+      locals[:data] = data.to_h if engine == :liquid
+      
+      result = render(engine, path, render_options, locals)
       settings.set :layout, old_layout
 
       if result

data/lib/middleman/builder.rb

@@ -18,11 +18,13 @@ module Middleman
       
       begin        
         destination, request_page = SHARED_SERVER.reroute_builder(destination, request_path)
-      
+        
+        request_path.gsub!(/\s/, "%20")
+        response = Middleman::Builder.shared_rack.get(request_path)
+        
         create_file destination, nil, config do
-          Middleman::Builder.shared_rack.get(request_path.gsub(/\s/, "%20"))
-          Middleman::Builder.shared_rack.last_response.body
-        end
+          response.body
+        end if response.status == 200
       rescue
       end
     end

data/lib/middleman/core_extensions/data.rb

@@ -13,7 +13,7 @@ module Middleman::CoreExtensions::Data
   
   module Helpers
     def data
-      @@data ||= DataObject.new(self)
+      self.class.data
     end
   end
   
@@ -22,7 +22,7 @@ module Middleman::CoreExtensions::Data
       @app = app
     end
     
-    def method_missing(path)
+    def data_for_path(path)
       response = nil
       
       @@local_sources ||= {}
@@ -33,16 +33,42 @@ module Middleman::CoreExtensions::Data
       elsif @@callback_sources.has_key?(path.to_s)
         response = @@callback_sources[path.to_s].call()
       else
-        file_path = File.join(@app.class.root, @app.class.data_dir, "#{path}.yml")
+        file_path = File.join(@app.root, @app.data_dir, "#{path}.yml")
         if File.exists? file_path
           response = YAML.load_file(file_path)
         end
       end
+    end
+    
+    def method_missing(path)
+      result = data_for_path(path)
       
-      if response
-        recursively_enhance(response)
+      if result
+        recursively_enhance(result)
+      else
+        super
       end
     end
+    
+    def to_h
+      data = {}
+      
+      (@@local_sources || {}).each do |k, v|
+        data[k] = data_for_path(k)
+      end
+      
+      (@@callback_sources || {}).each do |k, v|
+        data[k] = data_for_path(k)
+      end
+      
+      yaml_path = File.join(@app.root, @app.data_dir, "*.yml")
+      Dir[yaml_path].each do |f|
+        p = f.split("/").last.gsub(".yml", "")
+        data[p] = data_for_path(p)
+      end
+      
+      data
+    end
 
     def self.data_content(name, content)
       @@local_sources ||= {}
@@ -74,6 +100,10 @@ module Middleman::CoreExtensions::Data
   end
   
   module ClassMethods
+    def data
+      @data ||= DataObject.new(self)
+    end
+    
     # Makes a hash available on the data var with a given name
     def data_content(name, content)
       DataObject.data_content(name, content)

data/lib/middleman/core_extensions/front_matter.rb

@@ -10,7 +10,7 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
-      app.set :markdown_engine, MarukuTemplate
+      app.set :markdown_engine_prefix, ::Middleman::CoreExtensions::FrontMatter
       
       ::Tilt::register RedClothTemplate,  'textile'
       ::Tilt.prefer(RedClothTemplate)
@@ -18,6 +18,9 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register ERBTemplate,       'erb', 'rhtml'
       ::Tilt.prefer(ERBTemplate)
       
+      ::Tilt::register LiquidTemplate,    'liquid'
+      ::Tilt.prefer(LiquidTemplate)
+      
       ::Tilt::register SlimTemplate,      'slim'
       ::Tilt.prefer(SlimTemplate)
       
@@ -77,7 +80,7 @@ module Middleman::CoreExtensions::FrontMatter
   
   module YamlAware
     def prepare
-      options, @data = Middleman::CoreExtensions::FrontMatter.parse_front_matter(@data)
+      @frontmatter, @data = Middleman::CoreExtensions::FrontMatter.parse_front_matter(@data)
       super
     end
   end
@@ -102,6 +105,10 @@ module Middleman::CoreExtensions::FrontMatter
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
 
+  class LiquidTemplate < ::Tilt::LiquidTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
+
   class HamlTemplate < ::Tilt::HamlTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end

data/lib/middleman/core_extensions/sprockets.rb

@@ -6,7 +6,19 @@ module Middleman::CoreExtensions::Sprockets
   class << self
     def registered(app)
       app.set :js_compressor, false
-
+      
+      # Cut off every extension after .js (which sprockets eats up)
+      app.build_reroute do |destination, request_path|
+        if !request_path.match(/\.js\./i)
+          false
+        else
+          [
+            destination.gsub(/\.js(\..*)$/, ".js"),
+            request_path.gsub(/\.js(\..*)$/, ".js")
+          ]
+        end
+      end
+      
       app.after_configuration do
         js_env = Middleman::CoreExtensions::Sprockets::JavascriptEnvironment.new(app)
         
@@ -36,6 +48,18 @@ module Middleman::CoreExtensions::Sprockets
       full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
       
       super File.expand_path(full_path)
+      
+      # Make the app context available to Sprockets
+      context_class.send(:define_method, :app) { app }
+      context_class.class_eval do
+        def method_missing(name)
+          if app.respond_to?(name)
+            app.send(name)
+          else
+            super
+          end
+        end
+      end
     end
   end
     

data/lib/middleman/renderers/markdown.rb

@@ -1,11 +1,34 @@
+require "tilt"
+
 module Middleman::Renderers::Markdown
   class << self
     def registered(app)
-      app.set :markdown_engine, ::Tilt::MarukuTemplate
+      app.extend ClassMethods
+      
+      app.set :markdown_engine, :maruku
+      
+      if !app.respond_to? :markdown_engine_prefix
+        app.set :markdown_engine_prefix, ::Tilt
+      end
+      
       app.after_configuration do
-        ::Tilt.prefer(app.settings.markdown_engine)
+        engine = app.settings.markdown_engine
+        
+        if engine.is_a? Symbol
+          engine = app.tilt_template_from_symbol(engine)
+        end
+        
+        ::Tilt.prefer(engine)
       end
     end
     alias :included :registered
   end
+  
+  module ClassMethods
+    def tilt_template_from_symbol(engine)
+      engine = engine.to_s
+      engine = engine == "rdiscount" ? "RDiscount" : engine.camelize
+      settings.markdown_engine_prefix.const_get("#{engine}Template")
+    end
+  end
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

data/middleman.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
 eos
 
   s.add_dependency("rack", ["~> 1.3.0"])
+  # s.add_dependency("eventmachine", ["1.0.0.beta.3"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
@@ -51,12 +52,8 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  
-  # Padrino deps
-  s.add_dependency("activesupport", "~> 3.0.0")
-  
-  # Only in Padrino-helpers
-  s.add_dependency("i18n", "~> 0.5.0")
+  s.add_dependency("padrino-core", ["~> 0.10.2"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.2"])
   
   case Config::CONFIG['host_os'].downcase
   when %r{mswin|mingw}
@@ -67,13 +64,17 @@ eos
     s.add_dependency("rb-fchange")
   when %r{darwin}  
     s.add_dependency("rb-fsevent", ["~> 0.4.2"])
+  when %r{linux}
+    s.add_dependency("therubyracer", ["~> 0.9.4"])
   end
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
   
   # Development and test
+  # s.add_development_dependency("jquery-rails")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
+  s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-06 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thin
+  name: rack
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +46,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
+  name: thin
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +62,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: tilt
+  name: thor
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +78,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: maruku
+  name: tilt
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +94,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: maruku
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +110,11 @@ dependencies:
         - 2
         - 6
         version: 1.2.6
-  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: sinatra
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +126,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: uglifier
+  name: rack-test
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +142,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: slim
+  name: uglifier
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +158,11 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: haml
+  name: slim
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,11 +174,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sass
+  name: haml
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -191,11 +190,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: compass
+  name: sass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -207,11 +206,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  type: :runtime
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
+  name: compass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +222,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: coffee-script
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -239,43 +238,43 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: sprockets
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 51
         segments: 
-        - 3
         - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
+        - 10
+        - 2
+        version: 0.10.2
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: i18n
+  name: padrino-core
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 51
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :runtime
+        - 10
+        - 2
+        version: 0.10.2
   version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
+  name: padrino-helpers
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -287,11 +286,11 @@ dependencies:
         - 4
         - 2
         version: 0.4.2
-  type: :runtime
   version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: guard
+  name: rb-fsevent
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -303,11 +302,11 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  type: :runtime
   version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: middleman-livereload
+  name: guard
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -319,11 +318,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  type: :runtime
   version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: coffee-filter
+  name: middleman-livereload
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -335,12 +334,28 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :development
   version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: coffee-filter
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  version_requirements: *id021
+  name: liquid
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -351,12 +366,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+  version_requirements: *id022
+  name: cucumber
+  prerelease: false
   type: :development
-  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -367,12 +382,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  version_requirements: *id023
+  name: rake
+  prerelease: false
   type: :development
-  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -383,8 +398,10 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  version_requirements: *id024
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id023
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
@@ -423,6 +440,7 @@ files:
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
+- features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
@@ -449,6 +467,7 @@ files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
+- fixtures/sprockets-app/source/jquery_include.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
@@ -469,6 +488,7 @@ files:
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
+- fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
 - fixtures/test-app/source/images/Read me (example).txt
@@ -486,10 +506,12 @@ files:
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/jquery_base.js
+- fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/markdown.html.markdown
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml
@@ -582,175 +604,9 @@ files:
 - lib/middleman/templates/shared/Gemfile.tt
 - lib/middleman/templates/shared/config.ru
 - lib/middleman/templates/shared/config.tt
-- lib/middleman/vendor/padrino-core-0.10.0/.document
-- lib/middleman/vendor/padrino-core-0.10.0/.gitignore
-- lib/middleman/vendor/padrino-core-0.10.0/LICENSE
-- lib/middleman/vendor/padrino-core-0.10.0/README.rdoc
-- lib/middleman/vendor/padrino-core-0.10.0/Rakefile
-- lib/middleman/vendor/padrino-core-0.10.0/bin/padrino
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/application.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/application/rendering.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/application/routing.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/application/showexceptions.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/caller.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/cli/adapter.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/cli/base.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/cli/console.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/cli/rake.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/cli/rake_tasks.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/command.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/images/404.png
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/images/500.png
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/loader.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/cz.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/da.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/de.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/en.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/es.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/fr.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/hu.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/it.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/ja.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/nl.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/no.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/pl.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/pt_br.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/ru.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/tr.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/uk.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/zh_cn.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/locale/zh_tw.yml
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/logger.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/mounter.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/reloader.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/router.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/server.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/support_lite.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/tasks.rb
-- lib/middleman/vendor/padrino-core-0.10.0/lib/padrino-core/version.rb
-- lib/middleman/vendor/padrino-core-0.10.0/padrino-core.gemspec
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/apps/.components
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/apps/.gitignore
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/apps/complex.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/apps/simple.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/a.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/b.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/c.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/circular/e.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/circular/f.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/circular/g.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/fixtures/dependencies/d.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/helper.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_application.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_core.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_dependencies.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_filters.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_logger.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_mounter.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_reloader_complex.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_reloader_simple.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_rendering.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_router.rb
-- lib/middleman/vendor/padrino-core-0.10.0/test/test_routing.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/.document
-- lib/middleman/vendor/padrino-helpers-0.10.0/.gitignore
-- lib/middleman/vendor/padrino-helpers-0.10.0/LICENSE
-- lib/middleman/vendor/padrino-helpers-0.10.0/README.rdoc
-- lib/middleman/vendor/padrino-helpers-0.10.0/Rakefile
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/asset_tag_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/form_builder/abstract_form_builder.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/form_builder/standard_form_builder.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/form_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/format_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/cz.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/da.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/de.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/en.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/es.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/fr.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/hu.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/it.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/ja.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/nl.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/no.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/pl.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/pt_br.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/ru.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/tr.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/uk.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/zh_cn.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/locale/zh_tw.yml
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/number_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/output_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/output_helpers/abstract_handler.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/output_helpers/erb_handler.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/output_helpers/haml_handler.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/output_helpers/slim_handler.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/render_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/tag_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/lib/padrino-helpers/translation_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/padrino-helpers.gemspec
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/app.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/capture_concat.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/capture_concat.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/capture_concat.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_for.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_for.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_for.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_tag.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_tag.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/content_tag.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/current_engine.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/current_engine.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/current_engine.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/fields_for.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/fields_for.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/fields_for.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_for.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_for.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_for.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_tag.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_tag.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/form_tag.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/link_to.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/link_to.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/link_to.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/mail_to.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/mail_to.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/mail_to.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/meta_tag.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/meta_tag.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/meta_tag.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/partials/_erb.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/partials/_haml.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/partials/_slim.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/simple_partial.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/simple_partial.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/markup_app/views/simple_partial.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/app.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/current_engine.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/current_engines/_erb.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/current_engines/_haml.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/current_engines/_slim.slim
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/erb/test.erb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/explicit_engine.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/haml/test.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/template/_user.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/template/haml_template.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/fixtures/render_app/views/template/some_template.haml
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/helper.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_asset_tag_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_form_builder.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_form_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_format_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_number_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_output_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_render_helpers.rb
-- lib/middleman/vendor/padrino-helpers-0.10.0/test/test_tag_helpers.rb
 - lib/middleman/version.rb
 - middleman.gemspec
+has_rdoc: true
 homepage: http://middlemanapp.com
 licenses: 
 - MIT
@@ -794,7 +650,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
@@ -812,6 +668,7 @@ test_files:
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
+- features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
@@ -838,6 +695,7 @@ test_files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
+- fixtures/sprockets-app/source/jquery_include.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
@@ -858,6 +716,7 @@ test_files:
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
+- fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
 - fixtures/test-app/source/images/Read me (example).txt
@@ -875,10 +734,12 @@ test_files:
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/jquery_base.js
+- fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/markdown.html.markdown
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml