middleman-core 3.0.0 → 3.0.1.pre

data/lib/middleman-core/core_extensions/rendering.rb

@@ -10,15 +10,15 @@ end
 module Middleman
   module CoreExtensions
     module Rendering
-  
+
       # Setup extension
       class << self
-    
+
         # Once registered
         def registered(app)
           # Include methods
           app.send :include, InstanceMethods
-      
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb
@@ -61,7 +61,7 @@ module Middleman
             app.register Middleman::Renderers::Slim
           rescue LoadError
           end
-          
+
           # Less Support
           begin
             require "middleman-core/renderers/less"
@@ -69,17 +69,17 @@ module Middleman
           rescue LoadError
           end
         end
-    
+
         alias :included :registered
       end
-  
+
       # Custom error class for handling
       class TemplateNotFound < RuntimeError
       end
-  
+
       # Rendering instance methods
       module InstanceMethods
-    
+
         # Add or overwrite a default template extension
         #
         # @param [Hash] extension_map
@@ -89,24 +89,27 @@ module Middleman
           @_template_extensions.merge!(extension_map) if extension_map
           @_template_extensions
         end
-    
+
         # Render a template, with layout, given a path
         #
         # @param [String] path
         # @param [Hash] locs
         # @param [Hash] opts
         # @return [String]
-        def render_template(path, locs={}, opts={})
+        def render_template(path, locs={}, opts={}, blocks=[])
           # Detect the remdering engine from the extension
           extension = File.extname(path)
           engine = extension[1..-1].to_sym
 
           # Store last engine for later (could be inside nested renders)
           @current_engine, engine_was = engine, @current_engine
-      
-          # Use a dup of self as a context so that instance variables set within 
+
+          # Use a dup of self as a context so that instance variables set within
           # the template don't persist for other templates.
           context = self.dup
+          blocks.each do |block|
+            context.instance_eval(&block)
+          end
 
           # Store current locs/opts for later
           @current_locs = locs, @current_opts = opts
@@ -123,26 +126,26 @@ module Middleman
               raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/layouts."
             end
           end
-      
+
           # Certain output file types don't use layouts
           needs_layout = !%w(.js .json .css .txt).include?(File.extname(path))
-      
+
           # If we need a layout and have a layout, use it
           if needs_layout && layout_path = fetch_layout(engine, opts)
             content = render_individual_file(layout_path, locs, opts, context) { content }
           end
-        
+
           # Return result
           content
         ensure
-          # Pop all the saved variables from earlier as we may be returning to a 
+          # Pop all the saved variables from earlier as we may be returning to a
           # previous render (layouts, partials, nested layouts).
           @current_engine = engine_was
           @content_blocks = nil
           @current_locs = nil
           @current_opts = nil
         end
-    
+
         # Sinatra/Padrino compatible render method signature referenced by some view
         # helpers. Especially partials.
         #
@@ -176,7 +179,7 @@ module Middleman
               end
             end
           end
-      
+
           # Look in the root for the partial with the current engine
           if !found_partial && !engine.nil?
             found_partial, found_engine = resolve_template(data, :preferred_engine => engine, :try_without_underscore => true)
@@ -204,17 +207,17 @@ module Middleman
         # @return [String]
         def render_individual_file(path, locs = {}, opts = {}, context = self, &block)
           path = path.to_s
-      
+
           # Save current buffer for later
           @_out_buf, _buf_was = "", @_out_buf
-      
+
           # Read from disk or cache the contents of the file
           body = if opts[:template_body]
             opts.delete(:template_body)
           else
             template_data_for_file(path)
           end
-      
+
           # Merge per-extension options from config
           extension = File.extname(path)
           options = opts.merge(options_for_ext(extension))
@@ -231,15 +234,15 @@ module Middleman
           # Reset stored buffer
           @_out_buf = _buf_was
         end
-    
+
         # Get the template data from a path
         # @param [String] path
         # @return [String]
         def template_data_for_file(path)
           File.read(File.expand_path(path, source_dir))
         end
-    
-        # Get a hash of configuration options for a given file extension, from 
+
+        # Get a hash of configuration options for a given file extension, from
         # config.rb
         #
         # @param [String] ext
@@ -249,7 +252,7 @@ module Middleman
           cache.fetch(:options_for_ext, ext) do
             options = {}
 
-            # Find all the engines which handle this extension in tilt. Look for 
+            # Find all the engines which handle this extension in tilt. Look for
             # config variables of that name and merge it
             extension_class = ::Tilt[ext]
             ::Tilt.mappings.each do |ext, engines|
@@ -261,7 +264,7 @@ module Middleman
             options
           end
         end
-  
+
         # Find a layout for a given engine
         #
         # @param [Symbol] engine
@@ -271,7 +274,7 @@ module Middleman
           # The layout name comes from either the system default or the options
           local_layout = opts.has_key?(:layout) ? opts[:layout] : layout
           return false unless local_layout
-    
+
           # Look for engine-specific options
           engine_options = respond_to?(engine) ? send(engine) : {}
 
@@ -300,7 +303,7 @@ module Middleman
             end
           end
         end
-  
+
         # Find a layout on-disk, optionally using a specific engine
         # @param [String] name
         # @param [Symbol] preferred_engine
@@ -308,47 +311,47 @@ module Middleman
         def locate_layout(name, preferred_engine=nil)
           # Whether we've found the layout
           layout_path = false
-      
+
           # If we prefer a specific engine
           if !preferred_engine.nil?
             # Check root
             layout_path, layout_engine = resolve_template(name, :preferred_engine => preferred_engine)
-        
+
             # Check layouts folder
             if !layout_path
               layout_path, layout_engine = resolve_template(File.join("layouts", name.to_s), :preferred_engine => preferred_engine)
             end
           end
-    
+
           # Check root, no preference
           if !layout_path
             layout_path, layout_engine = resolve_template(name)
           end
-    
+
           # Check layouts folder, no preference
           if !layout_path
             layout_path, layout_engine = resolve_template(File.join("layouts", name.to_s))
           end
-    
+
           # Return the path
           layout_path
         end
-    
+
         # Allow layouts to be wrapped in the contents of other layouts
         # @param [String, Symbol] layout_name
         # @return [void]
         def wrap_layout(layout_name, &block)
           # Save current buffer for later
           @_out_buf, _buf_was = "", @_out_buf
-          
+
           layout_path = locate_layout(layout_name, current_engine)
-          
+
           extension = File.extname(layout_path)
           engine = extension[1..-1].to_sym
-          
+
           # Store last engine for later (could be inside nested renders)
           @current_engine, engine_was = engine, @current_engine
-            
+
           begin
             content = if block_given?
               capture_html(&block)
@@ -359,18 +362,18 @@ module Middleman
             # Reset stored buffer
             @_out_buf = _buf_was
           end
-          
+
           concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
         ensure
           @current_engine = engine_was
         end
-    
+
         # The currently rendering engine
         # @return [Symbol, nil]
         def current_engine
           @current_engine ||= nil
         end
-    
+
         # Find a template on disk given a output path
         # @param [String] request_path
         # @param [Hash] options
@@ -384,7 +387,7 @@ module Middleman
 
             # By default, any engine will do
             preferred_engine = "*"
-      
+
             # Unless we're specifically looking for a preferred engine
             if options.has_key?(:preferred_engine)
               extension_class = ::Tilt[options[:preferred_engine]]
@@ -407,12 +410,12 @@ module Middleman
 
             # Look for files that match
             path_with_ext = on_disk_path + "." + preferred_engine
-        
+
             found_path = Dir[path_with_ext].find do |path|
               ::Tilt[path]
             end
-        
-            if !found_path && options[:try_without_underscore] && 
+
+            if !found_path && options[:try_without_underscore] &&
               path_no_underscore = path_with_ext.
                 sub(relative_path, relative_path.sub(/^_/, "").
                 sub(/\/_/, "/"))
@@ -420,7 +423,7 @@ module Middleman
                 ::Tilt[path]
               end
             end
-        
+
             # If we found one, return it and the found engine
             if found_path || (File.exists?(on_disk_path) && !File.directory?(on_disk_path))
               engine = found_path ? File.extname(found_path)[1..-1].to_sym : nil

data/lib/middleman-core/core_extensions/request.rb

@@ -4,33 +4,33 @@ require "rack/file"
 
 module Middleman
   module CoreExtensions
-    
+
     # Base helper to manipulate asset paths
     module Request
-  
+
       # Extension registered
       class << self
         # @private
         def registered(app)
-          
+
           # CSSPIE HTC File
           ::Rack::Mime::MIME_TYPES['.htc'] = 'text/x-component'
 
           # Let's serve all HTML as UTF-8
           ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=utf-8'
           ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=utf-8'
-          
+
           app.extend ClassMethods
           app.extend ServerMethods
-          
+
           Middleman.extend CompatibleClassMethods
-      
+
           # Include instance methods
           app.send :include, InstanceMethods
         end
         alias :included :registered
       end
-    
+
       module ClassMethods
         # Reset Rack setup
         #
@@ -39,7 +39,7 @@ module Middleman
           @app = nil
           @prototype = nil
         end
-  
+
         # The shared Rack instance being build
         #
         # @private
@@ -47,7 +47,7 @@ module Middleman
         def app
           @app ||= ::Rack::Builder.new
         end
-  
+
         # Get the static instance
         #
         # @private
@@ -59,7 +59,7 @@ module Middleman
             mm
           end
         end
-  
+
         # Set the shared instance
         #
         # @private
@@ -68,27 +68,27 @@ module Middleman
         def inst=(inst)
           @inst = inst
         end
-  
+
         # Return built Rack app
         #
         # @private
         # @return [Rack::Builder]
         def to_rack_app(&block)
           inner_app = inst(&block)
-    
+
           (@middleware || []).each do |m|
             app.use(m[0], *m[1], &m[2])
           end
-    
+
           app.map("/") { run inner_app }
-    
+
           (@mappings || []).each do |m|
             app.map(m[0], &m[1])
           end
-    
+
           app
         end
-  
+
         # Prototype app. Used in config.ru
         #
         # @private
@@ -103,7 +103,7 @@ module Middleman
         def call(env)
           prototype.call(env)
         end
-  
+
         # Use Rack middleware
         #
         # @param [Class] middleware Middleware module
@@ -112,7 +112,7 @@ module Middleman
           @middleware ||= []
           @middleware << [middleware, args, block]
         end
-  
+
         # Add Rack App mapped to specific path
         #
         # @param [String] map Path to map
@@ -122,7 +122,7 @@ module Middleman
           @mappings << [map, block]
         end
       end
-  
+
       module ServerMethods
         # Create a new Class which is based on Middleman::Application
         # Used to create a safe sandbox into which extensions and
@@ -136,7 +136,7 @@ module Middleman
           const_set("MiddlemanApplication#{@@servercounter}", Class.new(Middleman::Application))
         end
       end
-      
+
       module CompatibleClassMethods
         # Create a new Class which is based on Middleman::Application
         # Used to create a safe sandbox into which extensions and
@@ -145,7 +145,7 @@ module Middleman
         #
         # @return [Class]
         def server(&block)
-          ::Middleman::Application.server(&block)
+          ::Middleman::Application.server
         end
       end
 
@@ -164,15 +164,15 @@ module Middleman
         # @return [void]
         def current_path=(path)
           @current_path = path
-          @request = ::Thor::CoreExt::HashWithIndifferentAccess.new({ 
-            :path   => path, 
-            :params => req ? ::Thor::CoreExt::HashWithIndifferentAccess.new(req.params) : {} 
+          @request = ::Thor::CoreExt::HashWithIndifferentAccess.new({
+            :path   => path,
+            :params => req ? ::Thor::CoreExt::HashWithIndifferentAccess.new(req.params) : {}
           })
         end
-        
+
         def use(*args, &block); self.class.use(*args, &block); end
         def map(*args, &block); self.class.map(*args, &block); end
-        
+
         # Rack env
         attr_accessor :env
 
@@ -187,7 +187,7 @@ module Middleman
         def call(env)
           dup.call!(env)
         end
-        
+
         # Rack Interface
         #
         # @param env Rack environment
@@ -197,13 +197,14 @@ module Middleman
           self.req = req = ::Rack::Request.new(env)
           self.res = res = ::Rack::Response.new
 
-          puts "== Request: #{env["PATH_INFO"]}" if logging?
+          logger.debug "== Request: #{env["PATH_INFO"]}"
 
           # Catch :halt exceptions and use that response if given
           catch(:halt) do
             process_request(env, req, res)
 
             res.status = 404
+
             res.finish
           end
         end
@@ -214,8 +215,8 @@ module Middleman
         def halt(response)
           throw :halt, response
         end
-        
-        # Core response method. We process the request, check with 
+
+        # Core response method. We process the request, check with
         # the sitemap, and return the correct file, response or status
         # message.
         #
@@ -251,7 +252,7 @@ module Middleman
           return send_file(resource.source_file, env, res) unless resource.template?
 
           current_path = request_path.dup
-          
+
           # Set a HTTP content type based on the request's extensions
           content_type(res, resource.mime_type)
 
@@ -271,10 +272,10 @@ module Middleman
           end
 
           # End the request
-          puts "== Finishing Request: #{request_path} (#{(Time.now - start_time).round(2)}s)" if logging?
+          logger.debug "== Finishing Request: #{request_path} (#{(Time.now - start_time).round(2)}s)"
           halt res.finish
         end
-      
+
         # Add a new mime-type for a specific extension
         #
         # @param [Symbol] type File extension