middleman 1.1.0.beta.0 → 1.1.0.beta.1

data/bin/mm-build

@@ -9,7 +9,5 @@ require 'middleman/builder'
 # Initialize server once so features are loaded
 Middleman::Server.new
 
-# Middleman::Server.init!
-Middleman::Builder.init!
-
-Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))
+# Middleman::ThorBuilder.source_root(Dir.pwd)
+Middleman::Builder.start

data/lib/middleman/builder.rb

@@ -1,59 +1,95 @@
 require 'middleman/server'
-require 'templater'
-require 'middleman/templater+dynamic_renderer.rb'
+require "thor"
+require "thor/group"
+require 'rack/test'
 
-# Placeholder for any methods the builder needs to abstract to allow feature integration
-module Middleman
-  class Builder < ::Templater::Generator
-    
-    # Define source and desintation
-    def self.source_root; Dir.pwd; end
-    def destination_root; File.join(Dir.pwd, Middleman::Server.build_dir); end
+module Middleman  
+  module ThorActions
+    def tilt_template(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
 
-    # Override template to ask middleman for the correct extension to output
-    def self.template(name, *args, &block)
-      return if args[0].include?('layout')
+      source  = File.expand_path(find_in_source_paths(source.to_s))
+      context = instance_eval('binding')
 
-      args.first.split('/').each do |part|
-        return if part[0,1] == '_'
-      end
+      @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server))
 
-      if (args[0] === args[1])
-        args[1] = args[0].gsub("#{File.basename(Middleman::Server.views)}/", "").gsub("#{File.basename(Middleman::Server.public)}/", "")
-        if File.extname(args[1]) != ".js"
-          args[1] = args[1].gsub!(File.extname(args[1]), "") if File.basename(args[1]).split('.').length > 2
-        end
+      create_file destination, nil, config do
+        # The default render just requests the page over Rack and writes the response
+        request_path = destination.gsub(Middleman::Server.build_dir, "")
+        @@rack_test.get(request_path)
+        @@rack_test.last_response.body
       end
-
-      super(name, *args, &block)
     end
-
-    def self.file(name, *args, &block)
-      file_ext = File.extname(args[0])
-      
-      return unless ::Tilt[file_ext].nil?
-      
-      if (args[0] === args[1])
-        args[1] = args[0].gsub("#{File.basename(Middleman::Server.views)}/", "").gsub("#{File.basename(Middleman::Server.public)}/", "")
-      end
-      super(name, *args, &block)
+  end
+  
+  class Builder < Thor::Group
+    include Thor::Actions
+    include Middleman::ThorActions
+    
+    def initialize(*args)
+      ::Tilt.mappings.keys << "js"
+      super
     end
-
-    def self.init!
-      # Support all Tilt-enabled templates and treat js like a template
-      @@template_extensions ||= ::Tilt.mappings.keys << "js"
-      glob! File.basename(Middleman::Server.public),  @@template_extensions
-      glob! File.basename(Middleman::Server.views),   @@template_extensions
+    
+    def source_paths
+      [
+        Middleman::Server.public,
+        Middleman::Server.views
+      ]
     end
     
-    def after_run
+    def build_static_files
+      action Directory.new(self, Middleman::Server.public, Middleman::Server.build_dir)
+    end
+    
+    def build_dynamic_files
+      action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir)
     end
   end
   
-  module Generators
-    extend ::Templater::Manifold
-    desc "Build a static site"
+  class Directory < ::Thor::Actions::EmptyDirectory
+    attr_reader :source
+
+    def initialize(base, source, destination=nil, config={}, &block)
+      @source = File.expand_path(base.find_in_source_paths(source.to_s))
+      @block  = block
+      super(base, destination, { :recursive => true }.merge(config))
+    end
+
+    def invoke!
+      base.empty_directory given_destination, config
+      execute!
+    end
+
+    def revoke!
+      execute!
+    end
+
+    protected
+
+      def execute!
+        lookup = config[:recursive] ? File.join(source, '**') : source
+        lookup = File.join(lookup, '{*,.[a-z]*}')
+        
+        Dir[lookup].sort.each do |file_source|
+          next if File.directory?(file_source)
+          next if file_source.include?('layout')
+          next unless file_source.split('/').select { |p| p[0,1] == '_' }.empty?
+          
+          file_extension = File.extname(file_source)
+          file_destination = File.join(given_destination, file_source.gsub(source, '.'))
+          file_destination.gsub!('/./', '/')
+          
+          handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
+          if handled_by_tilt
+            file_destination.gsub!(file_extension, "")
+            destination = base.tilt_template(file_source, file_destination, config, &@block)
+          else  
+            destination = base.copy_file(file_source, file_destination, config, &@block)
+          end
+        end
+      end
 
-    add :build, ::Middleman::Builder
   end
-end
+end

data/lib/middleman/features.rb

@@ -10,6 +10,7 @@ module Middleman::Features
   autoload :Slickmap,            "middleman/features/slickmap"
   autoload :SmushPNGs,           "middleman/features/smush_pngs"
   autoload :CodeRay,             "middleman/features/code_ray"
+  autoload :Lorem,               "middleman/features/lorem"
   # autoload :LiveReload,          "middleman/features/live_reload"
   
   class << self
@@ -33,4 +34,4 @@ module Middleman::Features
       super(feature_name)
     end
   end
-end
+end

data/lib/middleman/features/lorem.rb

@@ -0,0 +1,104 @@
+module Middleman::Features::Lorem
+  class << self
+    def registered(app)
+      app.helpers Middleman::Features::Lorem::Helpers
+    end
+    alias :included :registered
+  end
+  
+  module Helpers
+    def lorem
+      @@lorem ||= Middleman::Features::Lorem::LoremObject.new
+    end
+  end
+
+  # Adapted from Frank:
+  # https://github.com/blahed/frank/
+  class LoremObject
+    WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
+
+    def word
+      words(1)
+    end
+
+    def words(total)
+      (1..total).map do
+        randm(WORDS)
+      end.join(' ')
+    end
+
+    def sentence
+      sentences(1)
+    end
+
+    def sentences(total)
+      (1..total).map do
+        words(randm(4..15)).capitalize
+      end.join('. ')
+    end
+
+    def paragraph
+      paragraphs(1)
+    end
+
+    def paragraphs(total)
+      (1..total).map do
+        sentences(randm(3..7)).capitalize
+      end.join("\n\n")
+    end
+
+    def date(fmt = '%a %b %d, %Y')
+      y = rand(20) + 1990
+      m = rand(12) + 1
+      d = rand(31) + 1
+      Time.local(y,m,d).strftime(fmt)
+    end
+
+    def name
+      "#{first_name} #{last_name}"
+    end
+
+    def first_name
+      names = "Judith Angelo Margarita Kerry Elaine Lorenzo Justice Doris Raul Liliana Kerry Elise Ciaran Johnny Moses Davion Penny Mohammed Harvey Sheryl Hudson Brendan Brooklynn Denis Sadie Trisha Jacquelyn Virgil Cindy Alexa Marianne Giselle Casey Alondra Angela Katherine Skyler Kyleigh Carly Abel Adrianna Luis Dominick Eoin Noel Ciara Roberto Skylar Brock Earl Dwayne Jackie Hamish Sienna Nolan Daren Jean Shirley Connor Geraldine Niall Kristi Monty Yvonne Tammie Zachariah Fatima Ruby Nadia Anahi Calum Peggy Alfredo Marybeth Bonnie Gordon Cara John Staci Samuel Carmen Rylee Yehudi Colm Beth Dulce Darius inley Javon Jason Perla Wayne Laila Kaleigh Maggie Don Quinn Collin Aniya Zoe Isabel Clint Leland Esmeralda Emma Madeline Byron Courtney Vanessa Terry Antoinette George Constance Preston Rolando Caleb Kenneth Lynette Carley Francesca Johnnie Jordyn Arturo Camila Skye Guy Ana Kaylin Nia Colton Bart Brendon Alvin Daryl Dirk Mya Pete Joann Uriel Alonzo Agnes Chris Alyson Paola Dora Elias Allen Jackie Eric Bonita Kelvin Emiliano Ashton Kyra Kailey Sonja Alberto Ty Summer Brayden Lori Kelly Tomas Joey Billie Katie Stephanie Danielle Alexis Jamal Kieran Lucinda Eliza Allyson Melinda Alma Piper Deana Harriet Bryce Eli Jadyn Rogelio Orlaith Janet Randal Toby Carla Lorie Caitlyn Annika Isabelle inn Ewan Maisie Michelle Grady Ida Reid Emely Tricia Beau Reese Vance Dalton Lexi Rafael Makenzie Mitzi Clinton Xena Angelina Kendrick Leslie Teddy Jerald Noelle Neil Marsha Gayle Omar Abigail Alexandra Phil Andre Billy Brenden Bianca Jared Gretchen Patrick Antonio Josephine Kyla Manuel Freya Kellie Tonia Jamie Sydney Andres Ruben Harrison Hector Clyde Wendell Kaden Ian Tracy Cathleen Shawn".split(" ")
+      names[rand(names.size)]
+    end
+
+    def last_name
+      names = "Chung Chen Melton Hill Puckett Song Hamilton Bender Wagner McLaughlin McNamara Raynor Moon Woodard Desai Wallace Lawrence Griffin Dougherty Powers May Steele Teague Vick Gallagher Solomon Walsh Monroe Connolly Hawkins Middleton Goldstein Watts Johnston Weeks Wilkerson Barton Walton Hall Ross Chung Bender Woods Mangum Joseph Rosenthal Bowden Barton Underwood Jones Baker Merritt Cross Cooper Holmes Sharpe Morgan Hoyle Allen Rich Rich Grant Proctor Diaz Graham Watkins Hinton Marsh Hewitt Branch Walton O'Brien Case Watts Christensen Parks Hardin Lucas Eason Davidson Whitehead Rose Sparks Moore Pearson Rodgers Graves Scarborough Sutton Sinclair Bowman Olsen Love McLean Christian Lamb James Chandler Stout Cowan Golden Bowling Beasley Clapp Abrams Tilley Morse Boykin Sumner Cassidy Davidson Heath Blanchard McAllister McKenzie Byrne Schroeder Griffin Gross Perkins Robertson Palmer Brady Rowe Zhang Hodge Li Bowling Justice Glass Willis Hester Floyd Graves Fischer Norman Chan Hunt Byrd Lane Kaplan Heller May Jennings Hanna Locklear Holloway Jones Glover Vick O'Donnell Goldman McKenna Starr Stone McClure Watson Monroe Abbott Singer Hall Farrell Lucas Norman Atkins Monroe Robertson Sykes Reid Chandler Finch Hobbs Adkins Kinney Whitaker Alexander Conner Waters Becker Rollins Love Adkins Black Fox Hatcher Wu Lloyd Joyce Welch Matthews Chappell MacDonald Kane Butler Pickett Bowman Barton Kennedy Branch Thornton McNeill Weinstein Middleton Moss Lucas Rich Carlton Brady Schultz Nichols Harvey Stevenson Houston Dunn West O'Brien Barr Snyder Cain Heath Boswell Olsen Pittman Weiner Petersen Davis Coleman Terrell Norman Burch Weiner Parrott Henry Gray Chang McLean Eason Weeks Siegel Puckett Heath Hoyle Garrett Neal Baker Goldman Shaffer Choi Carver".split(" ")
+      names[rand(names.size)]
+    end
+
+    def email
+      delimiters = [ '_', '-', '' ]
+      domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
+      username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
+      "#{username}@#{domains[rand(domains.size)]}".downcase
+    end
+
+    def image(size, options={})
+      src              = "http://placehold.it/#{size}"
+      hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+      background_color = options[:background_color]
+      color            = options[:color]
+
+      if options[:random_color]
+        background_color = hex.shuffle[0...6].join
+        color = hex.shuffle[0...6].join
+      end
+
+      src << "/#{background_color.sub(/^#/, '')}" if background_color
+      src << "/ccc" if background_color.nil? && color
+      src << "/#{color.sub(/^#/, '')}" if color
+      src << "&text=#{Rack::Utils::escape(options[:text])}" if options[:text]
+
+      src
+    end
+
+    private
+
+    def randm(range)
+      a = range.to_a
+      a[rand(a.length)]
+    end
+  end
+end

data/lib/middleman/server.rb

@@ -40,6 +40,9 @@ module Middleman
     # Activate built-in helpers
     register Middleman::Features::DefaultHelpers
     
+    # Activate Lorem helpers
+    register Middleman::Features::Lorem
+    
     # Tilt-aware renderer
     register Padrino::Rendering
     

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.0.beta.0"
+  VERSION = "1.1.0.beta.1"
 end

data/middleman.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("rack", ["~> 1.0"])
   s.add_runtime_dependency("thin", ["~> 1.2.0"])
   s.add_runtime_dependency("shotgun", ["~> 0.8.0"])
-  s.add_runtime_dependency("templater", ["~> 1.0.0"])
+  s.add_runtime_dependency("thor", ["~> 0.14.0"])
   s.add_runtime_dependency("tilt", ["~> 1.1"])
   s.add_runtime_dependency("sinatra", ["~> 1.0"])
   s.add_runtime_dependency("padrino-core", ["~> 0.9.0"])
@@ -29,8 +29,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
   s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["~> 3.0"])
-  s.add_runtime_dependency("sass", ["3.1.0.alpha.214"])
-  s.add_runtime_dependency("compass", ["0.11.0.beta.0"])
+  s.add_runtime_dependency("sass", ["3.1.0.alpha.218"])
+  s.add_runtime_dependency("compass", ["0.11.beta.1"])
+  s.add_runtime_dependency("oily_png")
   s.add_runtime_dependency("json_pure", ["~> 1.4.0"])
   s.add_runtime_dependency("smusher", ["~> 0.4.5"])
   s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 62196371
+  hash: 62196369
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 0
-  version: 1.1.0.beta.0
+  - 1
+  version: 1.1.0.beta.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -08:00
+date: 2011-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,19 +68,19 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: templater
+  name: thor
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 39
         segments: 
-        - 1
         - 0
+        - 14
         - 0
-        version: 1.0.0
+        version: 0.14.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -200,14 +200,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -3702664576
+        hash: -3702664552
         segments: 
         - 3
         - 1
         - 0
         - alpha
-        - 214
-        version: 3.1.0.alpha.214
+        - 218
+        version: 3.1.0.alpha.218
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -218,20 +218,33 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196243
+        hash: 62196233
         segments: 
         - 0
         - 11
-        - 0
         - beta
-        - 0
-        version: 0.11.0.beta.0
+        - 1
+        version: 0.11.beta.1
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: oily_png
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,11 +256,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: smusher
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -259,11 +272,11 @@ dependencies:
         - 5
         version: 0.4.5
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: compass-slickmap
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -275,11 +288,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -291,11 +304,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -307,11 +320,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -321,11 +334,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -335,7 +348,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 description: 
 email: 
 - tdreyno@gmail.com
@@ -417,6 +430,7 @@ files:
 - lib/middleman/features/code_ray.rb
 - lib/middleman/features/default_helpers.rb
 - lib/middleman/features/live_reload.rb
+- lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/minify_javascript/rack.rb
@@ -432,7 +446,6 @@ files:
 - lib/middleman/template/views/index.html.haml
 - lib/middleman/template/views/layout.haml
 - lib/middleman/template/views/stylesheets/site.css.sass
-- lib/middleman/templater+dynamic_renderer.rb
 - lib/middleman/version.rb
 - middleman.gemspec
 has_rdoc: true
@@ -471,5 +484,52 @@ rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
-test_files: []
-
+test_files: 
+- features/builder.feature
+- features/coffee-script.feature
+- features/generator.feature
+- features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_page_classes.feature
+- features/less-css.feature
+- features/minify_css.feature
+- features/minify_javascript.feature
+- features/padrino_helpers.feature
+- features/page_alias_and_layouts.feature
+- features/scss-support.feature
+- features/step_definitions/asset_host_steps.rb
+- features/step_definitions/builder_steps.rb
+- features/step_definitions/env.rb
+- features/step_definitions/generator_steps.rb
+- features/step_definitions/middleman_steps.rb
+- features/step_definitions/page_layout_steps.rb
+- features/w_asset_host.feature
+- features/x_automatic_image_sizes.feature
+- features/y_cache_buster.feature
+- features/z_relative_assets.feature
+- fixtures/test-app/config.rb
+- fixtures/test-app/public/images/blank.gif
+- fixtures/test-app/public/static.html
+- fixtures/test-app/public/stylesheets/auto-css.css
+- fixtures/test-app/public/stylesheets/static.css
+- fixtures/test-app/public/stylesheets/sub1/auto-css.css
+- fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css
+- fixtures/test-app/views/_partial.haml
+- fixtures/test-app/views/asset_host.html.haml
+- fixtures/test-app/views/auto-css.html.haml
+- fixtures/test-app/views/auto-image-sizes.html.haml
+- fixtures/test-app/views/cache-buster.html.haml
+- fixtures/test-app/views/custom-layout.html.haml
+- fixtures/test-app/views/index.html.haml
+- fixtures/test-app/views/inline-css.html.haml
+- fixtures/test-app/views/inline-js.html.haml
+- fixtures/test-app/views/javascripts/coffee_test.js.coffee
+- fixtures/test-app/views/layout.haml
+- fixtures/test-app/views/layouts/custom.haml
+- fixtures/test-app/views/padrino_test.html.haml
+- fixtures/test-app/views/page-classes.html.haml
+- fixtures/test-app/views/services/index.html.haml
+- fixtures/test-app/views/stylesheets/asset_host.css.sass
+- fixtures/test-app/views/stylesheets/relative_assets.css.sass
+- fixtures/test-app/views/stylesheets/site.css.sass
+- fixtures/test-app/views/stylesheets/site_scss.css.scss
+- fixtures/test-app/views/stylesheets/test_less.css.less

data/lib/middleman/templater+dynamic_renderer.rb

@@ -1,26 +0,0 @@
-require 'rack/test' # Use Rack::Test to access Sinatra without starting up a full server
-
-# Monkey-patch to use a dynamic renderer
-class Templater::Actions::File
-  def identical?
-    if exists?
-      return true if File.mtime(source) < File.mtime(destination)
-      FileUtils.identical?(source, destination)
-    else
-      false
-    end
-  end
-end
-
-class Templater::Actions::Template
-  def render
-    @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server))
-    
-    @render_cache ||= begin
-      # The default render just requests the page over Rack and writes the response
-      request_path = destination.gsub(File.join(Dir.pwd, Middleman::Server.build_dir), "")
-      @@rack_test.get(request_path)
-      @@rack_test.last_response.body
-    end
-  end
-end