middleman 2.0.16.1 → 3.0.0.alpha.2

data/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/render_app/app')
+
+describe "RenderHelpers" do
+  def app
+    RenderDemo.tap { |app| app.set :environment, :test }
+  end
+
+  context 'for #partial method and object' do
+    setup { visit '/partial/object' }
+    should "render partial html with object" do
+      assert_have_selector "h1", :content => "User name is John"
+    end
+    should "have no counter index for single item" do
+      assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+    end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
+  end
+
+  context 'for #partial method and collection' do
+    setup { visit '/partial/collection' }
+    should "render partial html with collection" do
+      assert_have_selector "h1", :content => "User name is John"
+      assert_have_selector "h1", :content => "User name is Billy"
+    end
+    should "include counter which contains item index" do
+      assert_have_selector "p", :content => "My counter is 1"
+      assert_have_selector "p", :content => "My counter is 2"
+    end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
+  end
+
+  context 'for #partial method and locals' do
+    setup { visit '/partial/locals' }
+    should "render partial html with locals" do
+      assert_have_selector "h1", :content => "User name is John"
+    end
+    should "have no counter index for single item" do
+      assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+    end
+    should "include extra locals information" do
+      assert_have_selector 'p', :content => "Extra is bar"
+    end
+  end
+
+  context 'for #partial method taking a path starting with forward slash' do
+    setup { visit '/partial/foward_slash' }
+    should "render partial without throwing an error" do
+      assert_have_selector "h1", :content => "User name is John"
+    end
+  end
+
+  context 'for #current_engine method' do
+    should 'detect correctly current engine for a padrino application' do
+      visit '/current_engine'
+      assert_have_selector 'p.start', :content => "haml"
+      assert_have_selector 'p.haml span',  :content => "haml"
+      assert_have_selector 'p.erb span',   :content => "erb"
+      assert_have_selector 'p.slim span',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "haml"
+    end
+
+    should "detect correctly current engine for explicit engine on partials" do
+      visit '/explicit_engine'
+      assert_have_selector 'p.start', :content => "haml"
+      assert_have_selector 'p.haml span',  :content => "haml"
+      assert_have_selector 'p.erb span',   :content => "erb"
+      assert_have_selector 'p.slim span',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "haml"
+    end
+  end
+end

data/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb

@@ -0,0 +1,105 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
+
+describe "TagHelpers" do
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
+
+  context 'for #tag method' do
+    should("support tags with no content no attributes") do
+      assert_has_tag(:br) { tag(:br) }
+    end
+
+    should("support tags with no content with attributes") do
+      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow')
+      assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
+    end
+
+    should "support selected attribute by using 'selected' if true" do
+      actual_html = tag(:option, :selected => true)
+      assert_has_tag('option', :selected => 'selected') { actual_html }
+    end
+
+    should "support tags with content no attributes" do
+      assert_has_tag(:p, :content => "Demo String") { tag(:p, :content => "Demo String") }
+    end
+
+    should "support tags with content and attributes" do
+      actual_html = tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
+      assert_has_tag('p#intro.large', :content => "Demo") { actual_html }
+    end
+
+    should "support open tags" do
+      actual_html = tag(:p, :class => 'demo', :open => true)
+      assert_equal "<p class=\"demo\">", actual_html
+    end
+
+    should "escape html" do
+      actual_html = tag(:br, :class => 'Example "bar"')
+      assert_equal "<br class=\"Example &quot;bar&quot;\" />", actual_html
+    end
+  end
+
+  context 'for #content_tag method' do
+    should "support tags with content as parameter" do
+      actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing')
+      assert_has_tag('p.large#thing', :content => "Demo") { actual_html }
+    end
+
+    should "support tags with content as block" do
+      actual_html = content_tag(:p, :class => 'large', :id => 'star') { "Demo" }
+      assert_has_tag('p.large#star', :content => "Demo") { actual_html }
+    end
+
+    should "support tags with erb" do
+      visit '/erb/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3"
+      assert_have_selector :p, :content => "Test 4"
+    end
+
+    should "support tags with haml" do
+      visit '/haml/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+    end
+
+    should "support tags with slim" do
+      visit '/slim/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+    end
+  end
+
+  context 'for #input_tag method' do
+    should "support field with type" do
+      assert_has_tag('input[type=text]') { input_tag(:text) }
+    end
+
+    should "support field with type and options" do
+      actual_html = input_tag(:text, :class => "first", :id => 'texter')
+      assert_has_tag('input.first#texter[type=text]') { actual_html }
+    end
+
+    should "support checked attribute by using 'checked' if true" do
+      actual_html = input_tag(:checkbox, :checked => true)
+      assert_has_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+    end
+
+    should "remove checked attribute if false" do
+      actual_html = input_tag(:checkbox, :checked => false)
+      assert_has_no_tag('input[type=checkbox][checked=false]') { actual_html }
+    end
+
+    should "support disabled attribute by using 'disabled' if true" do
+      actual_html = input_tag(:checkbox, :disabled => true)
+      assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }
+    end
+  end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.16.1"
+  VERSION = "3.0.0.alpha.2"
 end

data/middleman-x86-mingw32.gemspec

@@ -20,53 +20,36 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # TODO remove for 2.1.x
-  s.post_install_message =<<eos
-********************************************************************************
-
-  Welcome to Middleman 2.0
-  
-  In addition to many new features, some backwards-incompatible
-  changes have been made to the structure of Middleman sites.
-  
-  Before running you old, v1.x project on Middleman 2.0,
-  review the Migration guide:
-  
-  http://middlemanapp.com/guides/migrating
-
-********************************************************************************
-eos
-
   s.add_dependency("rack", ["~> 1.3.5"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
-  s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.3.1"])
+  s.add_dependency("i18n", ["~> 0.6.0"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
-  s.add_dependency("uglifier", ["~> 1.2"])
-  s.add_dependency("slim", ["~> 1.0.2"])
+  s.add_dependency("uglifier", ["~> 1.1.0"])
   s.add_dependency("haml", ["~> 3.1.0"])
-  s.add_dependency("sass", [">= 3.1.7"])
-  s.add_dependency("compass", ["~> 0.11"])
+  s.add_dependency("sass", ["~> 3.1.7"])
+  s.add_dependency("activesupport", ["~> 3.1.0"])
+  s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
-  s.add_dependency("sprockets", ["~> 2.0.3"])
-  s.add_dependency("padrino-core", ["0.10.6"])
-  s.add_dependency("padrino-helpers", ["0.10.6"])
+  s.add_dependency("execjs", ["~> 1.2.7"])
+  s.add_dependency("sprockets", ["~> 2.0"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
+  s.add_dependency("guard", ["~> 0.8.8"])
   
-  s.add_dependency("eventmachine", ["1.0.0.rc.4"])
+  s.add_dependency("eventmachine", ["1.0.0.beta.4.1"])
   s.add_dependency("win32-process", ["~> 0.6.5"])
   s.add_dependency("rb-fchange")
   
-  s.add_dependency("guard", ["~> 1.1.0"])
-  s.add_dependency("middleman-livereload", ["~> 0.2.2"])
-  
   # Development and test
-  # s.add_development_dependency("jquery-rails")
+  s.add_development_dependency("slim")
+  s.add_development_dependency("maruku")
   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("cucumber", ["~> 1.1.0"])
   s.add_development_dependency("rake", ["~> 0.9.2"])
-  s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("rspec", ["~> 2.7.0"])
+  s.add_development_dependency("jquery-rails")
+  s.add_development_dependency("bootstrap-rails")
 end
 

data/middleman.gemspec

@@ -20,50 +20,35 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # TODO remove for 2.1.x
-  s.post_install_message =<<eos
-********************************************************************************
-
-  Welcome to Middleman 2.0
-  
-  In addition to many new features, some backwards-incompatible
-  changes have been made to the structure of Middleman sites.
-  
-  Before running you old, v1.x project on Middleman 2.0,
-  review the Migration guide:
-  
-  http://middlemanapp.com/guides/migrating
-
-********************************************************************************
-eos
-
   s.add_dependency("rack", ["~> 1.3.5"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
-  s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.3.1"])
-  # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
+  s.add_dependency("i18n", ["~> 0.6.0"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
-  s.add_dependency("uglifier", ["~> 1.2"])
-  s.add_dependency("slim", ["~> 1.0.2"])
+  s.add_dependency("uglifier", ["~> 1.1.0"])
   s.add_dependency("haml", ["~> 3.1.0"])
-  s.add_dependency("sass", [">= 3.1.7"])
-  s.add_dependency("compass", ["~> 0.11"])
+  s.add_dependency("sass", ["~> 3.1.7"])
+  s.add_dependency("activesupport", ["~> 3.1.0"])
+  s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
-  s.add_dependency("sprockets", ["~> 2.0.3"])
-  s.add_dependency("padrino-core", ["0.10.6"])
-  s.add_dependency("padrino-helpers", ["0.10.6"])
+  s.add_dependency("sprockets", ["~> 2.0"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
+  s.add_dependency("guard", ["~> 0.8.8"])
   
-  s.add_dependency("guard", ["~> 1.1.0"])
-  s.add_dependency("middleman-livereload", ["~> 0.2.2"])
+  # OSX
+  s.add_dependency("rb-fsevent")
   
   # Development and test
+  s.add_development_dependency("slim")
+  s.add_development_dependency("maruku")
   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("cucumber", ["~> 1.1.0"])
   s.add_development_dependency("rake", ["~> 0.9.2"])
-  s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("rspec", ["~> 2.7.0"])
+  s.add_development_dependency("jquery-rails")
+  s.add_development_dependency("bootstrap-rails")
 end
 

metadata

@@ -1,414 +1,443 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: middleman
-version: !ruby/object:Gem::Version
-  version: 2.0.16.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: -3702664392
+  prerelease: 6
+  segments: 
+  - 3
+  - 0
+  - 0
+  - alpha
+  - 2
+  version: 3.0.0.alpha.2
 platform: ruby
-authors:
+authors: 
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2011-11-19 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 3
+        - 5
         version: 1.3.5
-  type: :runtime
+  version_requirements: *id001
+  name: rack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.11
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 2
+        - 11
         version: 1.2.11
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
+  version_requirements: *id002
+  name: thin
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
+  version_requirements: *id003
+  name: thor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
+  version_requirements: *id004
+  name: tilt
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
+  version_requirements: *id005
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
-  type: :runtime
+  version_requirements: *id006
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  version_requirements: *id007
   name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: slim
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-  type: :runtime
+  version_requirements: *id008
+  name: haml
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 1
+        - 7
         version: 3.1.7
-  type: :runtime
+  version_requirements: *id009
+  name: sass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.7
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.11'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  version_requirements: *id010
+  name: activesupport
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 11
+        - 3
+        version: 0.11.3
+  version_requirements: *id011
+  name: compass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id012
+  name: coffee-script
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
         version: 1.2.7
-  type: :runtime
+  version_requirements: *id013
+  name: execjs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  version_requirements: *id014
   name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: padrino-core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  version_requirements: *id015
+  name: sprockets-sass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-- !ruby/object:Gem::Dependency
-  name: padrino-helpers
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.6
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 8
+        - 8
+        version: 0.8.8
+  version_requirements: *id016
+  name: guard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: middleman-livereload
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.2
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: coffee-filter
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id017
+  name: rb-fsevent
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id018
+  name: slim
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id019
+  name: maruku
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id020
+  name: coffee-filter
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-  type: :development
+  version_requirements: *id021
+  name: liquid
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  version_requirements: *id022
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :development
+  version_requirements: *id023
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  version_requirements: *id024
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id025
+  name: jquery-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-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:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id026
+  name: bootstrap-rails
+  prerelease: false
+  type: :development
+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
-executables:
+executables: 
 - middleman
 - mm-build
 - mm-init
 - mm-server
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemtest
 - .gitignore
 - .travis.yml
@@ -427,10 +456,12 @@ files:
 - features/cache_buster.feature
 - features/clean_build.feature
 - features/coffee-script.feature
+- features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
 - features/fonts.feature
+- features/former_padrino_helpers.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -440,11 +471,9 @@ files:
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
-- features/padrino_helpers.feature
 - features/page_alias_and_layouts.feature
 - features/relative_assets.feature
 - features/scss-support.feature
-- features/sinatra.feature
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
@@ -467,6 +496,9 @@ files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
+- fixtures/custom-layout-app/config.rb
+- fixtures/custom-layout-app/source/index.html.erb
+- fixtures/custom-layout-app/source/layout.haml
 - fixtures/data-app/config.rb
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml
@@ -489,9 +521,15 @@ 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/sprockets-app/source/library/css/bootstrap_include.css.scss
+- fixtures/sprockets-app/source/library/css/plain.css
+- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/js/jquery_include.js
+- fixtures/sprockets-app/source/library/js/plain.js
+- fixtures/sprockets-app/source/library/js/sprockets_base.js
+- fixtures/sprockets-app/source/library/js/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
@@ -514,6 +552,7 @@ files:
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/data3.html.erb
+- fixtures/test-app/source/former_padrino_test.html.haml
 - 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
@@ -539,7 +578,6 @@ files:
 - fixtures/test-app/source/liquid_master.html.liquid
 - 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
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
@@ -560,6 +598,9 @@ files:
 - 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
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
@@ -574,10 +615,11 @@ files:
 - lib/middleman/core_extensions/data.rb
 - lib/middleman/core_extensions/default_helpers.rb
 - lib/middleman/core_extensions/features.rb
+- lib/middleman/core_extensions/file_watcher.rb
 - lib/middleman/core_extensions/front_matter.rb
-- lib/middleman/core_extensions/rack_map.rb
 - lib/middleman/core_extensions/rendering.rb
 - lib/middleman/core_extensions/routing.rb
+- lib/middleman/core_extensions/sitemap.rb
 - lib/middleman/core_extensions/sprockets.rb
 - lib/middleman/features/asset_host.rb
 - lib/middleman/features/automatic_image_sizes.rb
@@ -586,15 +628,15 @@ files:
 - lib/middleman/features/directory_indexes.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
+- lib/middleman/features/minify_css/cssmin.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/relative_assets.rb
+- lib/middleman/features/sitemap_tree.rb
 - lib/middleman/guard.rb
-- lib/middleman/renderers/coffee_script.rb
-- lib/middleman/renderers/haml.rb
+- lib/middleman/renderers/erb.rb
 - lib/middleman/renderers/liquid.rb
 - lib/middleman/renderers/markdown.rb
 - lib/middleman/renderers/sass.rb
-- lib/middleman/renderers/slim.rb
 - lib/middleman/templates.rb
 - lib/middleman/templates/default.rb
 - lib/middleman/templates/default/source/index.html.erb
@@ -700,54 +742,243 @@ files:
 - lib/middleman/templates/shared/Gemfile.tt
 - lib/middleman/templates/shared/config.ru
 - lib/middleman/templates/shared/config.tt
+- lib/middleman/vendor/hooks-0.2.0/CHANGES.textile
+- lib/middleman/vendor/hooks-0.2.0/Gemfile
+- lib/middleman/vendor/hooks-0.2.0/README.rdoc
+- lib/middleman/vendor/hooks-0.2.0/Rakefile
+- lib/middleman/vendor/hooks-0.2.0/hooks.gemspec
+- lib/middleman/vendor/hooks-0.2.0/lib/hooks.rb
+- lib/middleman/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
+- lib/middleman/vendor/hooks-0.2.0/test/hooks_test.rb
+- lib/middleman/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb
+- lib/middleman/vendor/hooks-0.2.0/test/test_helper.rb
+- lib/middleman/vendor/padrino-core-0.10.5/.document
+- lib/middleman/vendor/padrino-core-0.10.5/.gitignore
+- lib/middleman/vendor/padrino-core-0.10.5/.yardopts
+- lib/middleman/vendor/padrino-core-0.10.5/LICENSE.txt
+- lib/middleman/vendor/padrino-core-0.10.5/README.rdoc
+- lib/middleman/vendor/padrino-core-0.10.5/Rakefile
+- lib/middleman/vendor/padrino-core-0.10.5/bin/padrino
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/rendering.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/routing.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/showexceptions.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/caller.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/adapter.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/base.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/console.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake_tasks.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/command.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/404.png
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/500.png
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/loader.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/cs.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/da.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/de.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/en.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/es.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/fr.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/hu.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/it.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ja.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/lv.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/nl.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/no.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pl.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pt_br.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ru.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/tr.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/uk.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_cn.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_tw.yml
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/logger.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/mounter.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/reloader.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/router.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/server.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/tasks.rb
+- lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/version.rb
+- lib/middleman/vendor/padrino-core-0.10.5/padrino-core.gemspec
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.components
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.gitignore
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/complex.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/simple.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/a.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/b.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/c.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/e.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/f.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/g.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/d.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/helper.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/mini_shoulda.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_application.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_core.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_dependencies.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_filters.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_locale.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_logger.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_mounter.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_complex.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_simple.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_rendering.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_restful_routing.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_router.rb
+- lib/middleman/vendor/padrino-core-0.10.5/test/test_routing.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/.document
+- lib/middleman/vendor/padrino-helpers-0.10.5/.gitignore
+- lib/middleman/vendor/padrino-helpers-0.10.5/.yardopts
+- lib/middleman/vendor/padrino-helpers-0.10.5/LICENSE.txt
+- lib/middleman/vendor/padrino-helpers-0.10.5/README.rdoc
+- lib/middleman/vendor/padrino-helpers-0.10.5/Rakefile
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/asset_tag_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/abstract_form_builder.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/standard_form_builder.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/format_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/cs.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/da.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/de.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/en.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/es.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/fr.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/hu.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/it.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ja.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/lv.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/nl.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/no.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pl.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pt_br.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ru.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/tr.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/uk.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_cn.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_tw.yml
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/number_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/abstract_handler.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/erb_handler.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/haml_handler.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/slim_handler.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/render_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/tag_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/translation_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/padrino-helpers.gemspec
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/app.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_erb.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_haml.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_slim.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/app.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engine.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_erb.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_haml.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_slim.slim
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/erb/test.erb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/explicit_engine.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/haml/test.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/_user.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/haml_template.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/some_template.haml
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/helper.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_asset_tag_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_builder.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_format_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_locale.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_number_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb
+- lib/middleman/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb
 - lib/middleman/version.rb
 - middleman-x86-mingw32.gemspec
 - middleman.gemspec
+has_rdoc: true
 homepage: http://middlemanapp.com
-licenses:
+licenses: 
 - MIT
-post_install_message: ! "********************************************************************************\n\n
-  \ Welcome to Middleman 2.0\n  \n  In addition to many new features, some backwards-incompatible\n
-  \ changes have been made to the structure of Middleman sites.\n  \n  Before running
-  you old, v1.x project on Middleman 2.0,\n  review the Migration guide:\n  \n  http://middlemanapp.com/guides/migrating\n\n********************************************************************************\n"
+post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -693467286519028583
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -693467286519028583
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
-test_files:
+test_files: 
 - features/asset_host.feature
 - features/automatic_image_sizes.feature
 - features/builder.feature
 - features/cache_buster.feature
 - features/clean_build.feature
 - features/coffee-script.feature
+- features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
 - features/fonts.feature
+- features/former_padrino_helpers.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -757,11 +988,9 @@ test_files:
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
-- features/padrino_helpers.feature
 - features/page_alias_and_layouts.feature
 - features/relative_assets.feature
 - features/scss-support.feature
-- features/sinatra.feature
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
@@ -784,6 +1013,9 @@ test_files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
+- fixtures/custom-layout-app/config.rb
+- fixtures/custom-layout-app/source/index.html.erb
+- fixtures/custom-layout-app/source/layout.haml
 - fixtures/data-app/config.rb
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml
@@ -806,9 +1038,15 @@ 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/sprockets-app/source/library/css/bootstrap_include.css.scss
+- fixtures/sprockets-app/source/library/css/plain.css
+- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/js/jquery_include.js
+- fixtures/sprockets-app/source/library/js/plain.js
+- fixtures/sprockets-app/source/library/js/sprockets_base.js
+- fixtures/sprockets-app/source/library/js/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
@@ -831,6 +1069,7 @@ test_files:
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/data3.html.erb
+- fixtures/test-app/source/former_padrino_test.html.haml
 - 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
@@ -856,7 +1095,6 @@ test_files:
 - fixtures/test-app/source/liquid_master.html.liquid
 - 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
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
@@ -877,6 +1115,9 @@ test_files:
 - 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
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml