middleman-core 3.0.0 → 3.0.1.pre

data/lib/middleman-core/sitemap/resource.rb

@@ -2,32 +2,33 @@ require "middleman-core/sitemap/extensions/traversal"
 
 module Middleman
 
-  # Sitemap namespace  
+  # Sitemap namespace
   module Sitemap
-  
+
     # Sitemap Resource class
     class Resource
       include Middleman::Sitemap::Extensions::Traversal
-        
+
       # @return [Middleman::Application]
       attr_reader :app
-    
+      delegate :logger, :instrument, :to => :app
+
       # @return [Middleman::Sitemap::Store]
       attr_reader :store
-    
+
       # The source path of this resource (relative to the source directory,
       # without template extensions)
       # @return [String]
       attr_reader :path
-    
+
       # Set the on-disk source file for this resource
       # @return [String]
       # attr_reader :source_file
-    
+
       def source_file
         @source_file || get_source_file
       end
-    
+
       # Initialize resource with parent store and URL
       # @param [Middleman::Sitemap::Store] store
       # @param [String] path
@@ -37,40 +38,38 @@ module Middleman
         @app         = @store.app
         @path        = path
         @source_file = source_file
-      
+
         @destination_paths = [@path]
 
         @local_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
       end
-    
+
       # Whether this resource has a template file
       # @return [Boolean]
       def template?
         return false if source_file.nil?
         !::Tilt[source_file].nil?
       end
-    
+
       # Get the metadata for both the current source_file and the current path
       # @return [Hash]
       def metadata
-        result = store.metadata_for_file(source_file).dup
+        result = store.metadata_for_path(path).dup
 
-        path_meta = store.metadata_for_path(path).dup
-        if path_meta.has_key?(:blocks)
-          result[:blocks] << path_meta[:blocks]
-          path_meta.delete(:blocks)
+        file_meta = store.metadata_for_file(source_file).dup
+        if file_meta.has_key?(:blocks)
+          result[:blocks] << file_meta.delete(:blocks)
         end
-        result.deep_merge!(path_meta)
+        result.deep_merge!(file_meta)
 
         local_meta = @local_metadata.dup
         if local_meta.has_key?(:blocks)
-          result[:blocks] << local_meta[:blocks]
-          local_meta.delete(:blocks)
+          result[:blocks] << local_meta.delete(:blocks)
         end
         result.deep_merge!(local_meta)
 
         result[:blocks] = result[:blocks].flatten.compact
-        
+
         result
       end
 
@@ -78,74 +77,72 @@ module Middleman
       # @param [Hash] metadata A metadata block like provides_metadata_for_path takes
       def add_metadata(metadata={}, &block)
         if metadata.has_key?(:blocks)
-          @local_metadata[:blocks] << metadata[:blocks]
-          metadata.delete(:blocks)
+          @local_metadata[:blocks] << metadata.delete(:blocks)
         end
         @local_metadata.deep_merge!(metadata)
         @local_metadata[:blocks] << block if block_given?
       end
-    
+
       # Get the output/preview URL for this resource
       # @return [String]
       def destination_path
         @destination_paths.last
       end
-    
+
       # Set the output/preview URL for this resource
       # @param [String] path
       # @return [void]
       def destination_path=(path)
         @destination_paths << path
       end
-    
+
       # Extension of the path (i.e. '.js')
       # @return [String]
       def ext
         File.extname(path)
       end
-    
+
       # Mime type of the path
       # @return [String]
       def mime_type
         app.mime_type ext
       end
-    
+
       # Render this resource
       # @return [String]
       def render(opts={}, locs={}, &block)
         return File.open(source_file).read unless template?
-      
-        start_time = Time.now
-        puts "== Render Start: #{source_file}" if app.logging?
 
-        md   = metadata.dup
-        opts = md[:options].deep_merge(opts)
-        locs = md[:locals].deep_merge(locs)
+        relative_source = Pathname(source_file).relative_path_from(Pathname(app.root))
 
-        # Forward remaining data to helpers
-        if md.has_key?(:page)
-          app.data.store("page", md[:page])
-        end
+        instrument "render.resource", :path => relative_source  do
+          md   = metadata.dup
+          opts = md[:options].deep_merge(opts)
+          locs = md[:locals].deep_merge(locs)
 
-        md[:blocks].each do |aBlock|
-          app.instance_eval(&aBlock)
-        end
-      
-        app.instance_eval(&block) if block_given?
-        
-        app.current_path ||= self.destination_path
-        result = app.render_template(source_file, locs, opts)
+          # Forward remaining data to helpers
+          if md.has_key?(:page)
+            app.data.store("page", md[:page])
+          end
 
-        puts "== Render End: #{source_file} (#{(Time.now - start_time).round(2)}s)" if app.logging?
-        result
+          blocks = md[:blocks].dup rescue []
+          blocks << block if block_given?
+
+          app.current_path ||= self.destination_path
+          app.render_template(source_file, locs, opts, blocks)
+        end
       end
-    
+
       # A path without the directory index - so foo/index.html becomes
       # just foo. Best for linking.
       # @return [String]
       def url
-        File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/',
-          destination_path.sub(/\/#{Regexp.escape(app.index_file)}$/, '/'))
+        url_path = destination_path
+        if app.strip_index_file
+          url_path = url_path.sub(/(^|\/)#{Regexp.escape(app.index_file)}$/,
+                                  app.trailing_slash ? '/' : '')
+        end
+        File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path)
       end
     end
   end

data/lib/middleman-core/sitemap/store.rb

@@ -2,10 +2,10 @@
 require "active_support/core_ext/hash/deep_merge"
 
 module Middleman
-  
+
   # Sitemap namespace
   module Sitemap
-  
+
     # The Store class
     #
     # The Store manages a collection of Resource objects, which represent
@@ -13,10 +13,10 @@ module Middleman
     # which is the path relative to the source directory, minus any template
     # extensions. All "path" parameters used in this class are source paths.
     class Store
-    
+
       # @return [Middleman::Application]
       attr_accessor :app
-    
+
       # Initialize with parent app
       # @param [Middleman::Application] app
       def initialize(app)
@@ -25,10 +25,10 @@ module Middleman
         @_cached_metadata = {}
         @_lookup_cache = { :path => {}, :destination_path => {} }
         @resource_list_manipulators = []
-      
+
         # Register classes which can manipulate the main site map list
         register_resource_list_manipulator(:on_disk, Middleman::Sitemap::Extensions::OnDisk.new(self),  false)
-      
+
         # Proxies
         register_resource_list_manipulator(:proxies, @app.proxy_manager, false)
       end
@@ -42,22 +42,24 @@ module Middleman
         @resource_list_manipulators << [name, inst]
         rebuild_resource_list!(:registered_new) if immediately_rebuild
       end
-    
+
       # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
       def rebuild_resource_list!(reason=nil)
         @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
-          inst.manipulate_resource_list(result)
-        end
-      
-        # Reset lookup cache
-        @_lookup_cache = { :path => {}, :destination_path => {} }
-        @resources.each do |resource|
-          @_lookup_cache[:path][resource.path] = resource
-          @_lookup_cache[:destination_path][resource.destination_path] = resource
+          newres = inst.manipulate_resource_list(result)
+
+          # Reset lookup cache
+          @_lookup_cache = { :path => {}, :destination_path => {} }
+          newres.each do |resource|
+            @_lookup_cache[:path][resource.path] = resource
+            @_lookup_cache[:destination_path][resource.destination_path] = resource
+          end
+
+          newres
         end
       end
-    
+
       # Find a resource given its original path
       # @param [String] request_path The original path of a resource.
       # @return [Middleman::Sitemap::Resource]
@@ -65,7 +67,7 @@ module Middleman
         request_path = ::Middleman::Util.normalize_path(request_path)
         @_lookup_cache[:path][request_path]
       end
-    
+
       # Find a resource given its destination path
       # @param [String] request_path The destination (output) path of a resource.
       # @return [Middleman::Sitemap::Resource]
@@ -73,7 +75,7 @@ module Middleman
         request_path = ::Middleman::Util.normalize_path(request_path)
         @_lookup_cache[:destination_path][request_path]
       end
-    
+
       # Get the array of all resources
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
@@ -84,7 +86,7 @@ module Middleman
           @resources.reject(&:ignored?)
         end
       end
-    
+
       # Register a handler to provide metadata on a file path
       # @param [Regexp] matcher
       # @return [Array<Array<Proc, Regexp>>]
@@ -93,16 +95,16 @@ module Middleman
         @_provides_metadata << [block, matcher] if block_given?
         @_provides_metadata
       end
-    
+
       # Get the metadata for a specific file
       # @param [String] source_file
       # @return [Hash]
       def metadata_for_file(source_file)
         blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
-      
+
         provides_metadata.inject(blank_metadata) do |result, (callback, matcher)|
           next result if !matcher.nil? && !source_file.match(matcher)
-        
+
           metadata = callback.call(source_file)
 
           if metadata.has_key?(:blocks)
@@ -113,10 +115,10 @@ module Middleman
           result.deep_merge(metadata)
         end
       end
-    
+
       # Register a handler to provide metadata on a url path
       # @param [Regexp] matcher
-      # @param [Symbol] origin an indicator of where this metadata came from - only one 
+      # @param [Symbol] origin an indicator of where this metadata came from - only one
       #                        block per [matcher, origin] pair may exist.
       # @return [Array<Array<Proc, Regexp>>]
       def provides_metadata_for_path(matcher=nil, origin=nil, &block)
@@ -136,7 +138,7 @@ module Middleman
         end
         @_provides_metadata_for_path
       end
-    
+
       # Get the metadata for a specific URL
       # @param [String] request_path
       # @return [Hash]
@@ -144,7 +146,7 @@ module Middleman
         return @_cached_metadata[request_path] if @_cached_metadata[request_path]
 
         blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
-      
+
         @_cached_metadata[request_path] = provides_metadata_for_path.inject(blank_metadata) do |result, (callback, matcher)|
           case matcher
           when Regexp
@@ -152,9 +154,9 @@ module Middleman
           when String
             next result unless File.fnmatch("/" + matcher.sub(%r{^/}, ''), "/#{request_path}")
           end
-        
+
           metadata = callback.call(request_path)
-        
+
           if metadata.has_key?(:blocks)
             result[:blocks] << metadata[:blocks]
             metadata.delete(:blocks)
@@ -163,26 +165,26 @@ module Middleman
           result.deep_merge(metadata)
         end
       end
-    
+
       # Get the URL path for an on-disk file
       # @param [String] file
       # @return [String]
       def file_to_path(file)
         file = File.expand_path(file, @app.root)
-  
+
         prefix = @app.source_dir.sub(/\/$/, "") + "/"
-        return false unless file.include?(prefix)
-  
+        return false unless file.start_with?(prefix)
+
         path = file.sub(prefix, "")
-        
+
         # Replace a file name containing automatic_directory_matcher with a folder
         unless @app.automatic_directory_matcher.nil?
           path = path.gsub(@app.automatic_directory_matcher, "/")
         end
-              
+
         extensionless_path(path)
       end
-    
+
       # Get a path without templating extensions
       # @param [String] file
       # @return [String]
@@ -214,4 +216,4 @@ module Middleman
       end
     end
   end
-end
+end

data/lib/middleman-core/step_definitions.rb

@@ -9,4 +9,4 @@ require "middleman-core/step_definitions/server_steps"
 
 Before do
   @aruba_timeout_seconds = 30
-end
+end

data/lib/middleman-core/step_definitions/builder_steps.rb

@@ -21,7 +21,7 @@ Given /^a fixture app "([^\"]*)"$/ do |path|
 
   target_path = File.join(PROJECT_ROOT_PATH, "fixtures", path)
   FileUtils.cp_r(target_path, current_dir)
-  
+
   step %Q{I cd to "#{path}"}
 end
 

data/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -9,9 +9,9 @@ Then /^the file "([^\"]*)" is removed$/ do |path|
 end
 
 Then /^the file "([^\"]*)" did change$/ do |path|
-  @server_inst.files.did_change(@server_inst.root_path + path)
+  @server_inst.files.did_change(path)
 end
 
 Then /^the file "([^\"]*)" did delete$/ do |path|
-  @server_inst.files.did_delete(@server_inst.root_path + path)
-end
+  @server_inst.files.did_delete(path)
+end

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -8,7 +8,7 @@ end
 
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   @initialize_commands ||= []
-  
+
   if state == "enabled"
     @initialize_commands << lambda { activate(feature.to_sym) }
   end
@@ -16,7 +16,7 @@ end
 
 Given /^"([^\"]*)" feature is "enabled" with "([^\"]*)"$/ do |feature, options_str|
   @initialize_commands ||= []
-  
+
   options = eval("{#{options_str}}")
 
   @initialize_commands << lambda { activate(feature.to_sym, options) }
@@ -39,20 +39,20 @@ Given /^the Server is running$/ do
   else
     ENV["MM_SOURCE"] = ""
   end
-  
+
   initialize_commands = @initialize_commands || []
   initialize_commands.unshift lambda {
     set :root, root_dir
     set :environment, @current_env || :development
     set :show_exceptions, false
   }
-  
+
   @server_inst = Middleman::Application.server.inst do
     initialize_commands.each do |p|
       instance_exec(&p)
     end
   end
-  
+
   app_rack = @server_inst.class.to_rack_app
   @browser = ::Rack::Test::Session.new(::Rack::MockSession.new(app_rack))
 end