middleman-core 3.0.0.beta.2 → 3.0.0.beta.3

data/lib/middleman-core/sitemap/extensions/proxies.rb

@@ -1,97 +1,108 @@
-module Middleman::Sitemap::Extensions
+module Middleman
+
+  module Sitemap
+    
+    module Extensions
   
-  module Proxies
+      module Proxies
     
-    # Setup extension
-    class << self
+        # Setup extension
+        class << self
     
-      # Once registered
-      def registered(app)
-        ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
+          # Once registered
+          def registered(app)
+            ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
       
-        # Include methods
-        app.send :include, InstanceMethods
-      end
+            # Include methods
+            app.send :include, InstanceMethods
+          end
     
-      alias :included :registered
-    end
+          alias :included :registered
+        end
     
-    module ResourceInstanceMethods
-      # Whether this page is a proxy
-      # @return [Boolean]
-      def proxy?
-        !!@proxied_to
-      end
+        module ResourceInstanceMethods
+          # Whether this page is a proxy
+          # @return [Boolean]
+          def proxy?
+            !!@proxied_to
+          end
     
-      # Set this page to proxy to a target path
-      # @param [String] target
-      # @return [void]
-      def proxy_to(target)
-        @proxied_to = target
-      end
+          # Set this page to proxy to a target path
+          # @param [String] target
+          # @return [void]
+          def proxy_to(target)
+            @proxied_to = target
+          end
       
-      # The path of the page this page is proxied to, or nil if it's not proxied.
-      # @return [String]
-      def proxied_to
-        @proxied_to
-      end
+          # The path of the page this page is proxied to, or nil if it's not proxied.
+          # @return [String]
+          def proxied_to
+            @proxied_to
+          end
       
-      # Whether this page has a template file
-      # @return [Boolean]
-      def template?
-        if proxy?
-          store.find_resource_by_path(proxied_to).template?
-        else
-          super
-        end
-      end
+          # Whether this page has a template file
+          # @return [Boolean]
+          def template?
+            if proxy?
+              store.find_resource_by_path(proxied_to).template?
+            else
+              super
+            end
+          end
       
-      def get_source_file
-        if proxy?
-          store.find_resource_by_path(proxied_to).source_file
+          def get_source_file
+            if proxy?
+              proxy_resource = store.find_resource_by_path(proxied_to)
+          
+              unless proxy_resource
+                raise "Path #{path} proxies to unknown file #{proxied_to}"
+              end
+          
+              proxy_resource.source_file
+            end
+          end
         end
-      end
-    end
     
-    module InstanceMethods
-      def proxy_manager
-        @_proxy_manager ||= ProxyManager.new(self)
-      end
+        module InstanceMethods
+          def proxy_manager
+            @_proxy_manager ||= ProxyManager.new(self)
+          end
       
-      def proxy(*args)
-        proxy_manager.proxy(*args)
-      end
-    end
+          def proxy(*args)
+            proxy_manager.proxy(*args)
+          end
+        end
     
-    class ProxyManager
-      def initialize(app)
-        @app = app
+        class ProxyManager
+          def initialize(app)
+            @app = app
         
-        @proxy_paths = {}
-      end
+            @proxy_paths = {}
+          end
       
-      # Setup a proxy from a path to a target
-      # @param [String] path
-      # @param [String] target
-      # @return [void]
-      def proxy(path, target)
-        @proxy_paths[::Middleman::Util.normalize_path(path)] = ::Middleman::Util.normalize_path(target)
-        @app.sitemap.rebuild_resource_list!(:added_proxy)
-      end
+          # Setup a proxy from a path to a target
+          # @param [String] path
+          # @param [String] target
+          # @return [void]
+          def proxy(path, target)
+            @proxy_paths[::Middleman::Util.normalize_path(path)] = ::Middleman::Util.normalize_path(target)
+            @app.sitemap.rebuild_resource_list!(:added_proxy)
+          end
 
-      # Update the main sitemap resource list
-      # @return [void]
-      def manipulate_resource_list(resources)
-        resources + @proxy_paths.map do |key, value|
-          p = ::Middleman::Sitemap::Resource.new(
-            @app.sitemap,
-            key
-          )
-          p.proxy_to(value)
-          p
+          # Update the main sitemap resource list
+          # @return [void]
+          def manipulate_resource_list(resources)
+            resources + @proxy_paths.map do |key, value|
+              p = ::Middleman::Sitemap::Resource.new(
+                @app.sitemap,
+                key
+              )
+              p.proxy_to(value)
+              p
+            end
+          end
         end
       end
     end
   end
-
 end

data/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -1,77 +1,84 @@
-module Middleman::Sitemap::Extensions
-  module Traversal
-    # This resource's parent resource
-    # @return [Middleman::Sitemap::Resource, nil]
-    def parent
-      parts = path.split("/")
-      parts.pop if path.include?(app.index_file)
+module Middleman
+
+  module Sitemap
+    
+    module Extensions
+      
+      module Traversal
+        # This resource's parent resource
+        # @return [Middleman::Sitemap::Resource, nil]
+        def parent
+          parts = path.split("/")
+          parts.pop if path.include?(app.index_file)
   
-      return nil if parts.length < 1
+          return nil if parts.length < 1
   
-      parts.pop
-      parts << app.index_file
+          parts.pop
+          parts << app.index_file
   
-      parent_path = "/" + parts.join("/")
+          parent_path = "/" + parts.join("/")
   
-      store.find_resource_by_destination_path(parent_path)
-    end
+          store.find_resource_by_destination_path(parent_path)
+        end
 
-    # This resource's child resources
-    # @return [Array<Middleman::Sitemap::Resource>]
-    def children
-      return [] unless directory_index?
+        # This resource's child resources
+        # @return [Array<Middleman::Sitemap::Resource>]
+        def children
+          return [] unless directory_index?
 
-      if eponymous_directory?
-        base_path = eponymous_directory_path
-        prefix    = %r|^#{base_path.sub("/", "\\/")}|
-      else
-        base_path = path.sub("#{app.index_file}", "")
-        prefix    = %r|^#{base_path.sub("/", "\\/")}|
-      end
-
-      store.resources.select do |sub_resource|
-        if sub_resource.path == self.path || sub_resource.path !~ prefix
-          false
-        else
-          inner_path = sub_resource.path.sub(prefix, "")
-          parts = inner_path.split("/")
-          if parts.length == 1
-            true
-          elsif parts.length == 2
-            parts.last == app.index_file
+          if eponymous_directory?
+            base_path = eponymous_directory_path
+            prefix    = %r|^#{base_path.sub("/", "\\/")}|
           else
-            false
+            base_path = path.sub("#{app.index_file}", "")
+            prefix    = %r|^#{base_path.sub("/", "\\/")}|
+          end
+
+          store.resources.select do |sub_resource|
+            if sub_resource.path == self.path || sub_resource.path !~ prefix
+              false
+            else
+              inner_path = sub_resource.path.sub(prefix, "")
+              parts = inner_path.split("/")
+              if parts.length == 1
+                true
+              elsif parts.length == 2
+                parts.last == app.index_file
+              else
+                false
+              end
+            end
           end
         end
-      end
-    end
 
-    # This resource's sibling resources
-    # @return [Array<Middleman::Sitemap::Resource>]
-    def siblings
-      return [] unless parent
-      parent.children.reject { |p| p == self }
-    end
+        # This resource's sibling resources
+        # @return [Array<Middleman::Sitemap::Resource>]
+        def siblings
+          return [] unless parent
+          parent.children.reject { |p| p == self }
+        end
     
-    # Whether this resource either a directory index, or has the same name as an existing directory in the source
-    # @return [Boolean]
-    def directory_index?
-      path.include?(app.index_file) || path =~ /\/$/ || eponymous_directory?
-    end
+        # Whether this resource either a directory index, or has the same name as an existing directory in the source
+        # @return [Boolean]
+        def directory_index?
+          path.include?(app.index_file) || path =~ /\/$/ || eponymous_directory?
+        end
     
-    # Whether the resource has the same name as a directory in the source
-    # (e.g., if the resource is named 'gallery.html' and a path exists named 'gallery/', this would return true)
-    # @return [Boolean]
-    def eponymous_directory?
-      full_path = File.join(app.source_dir, eponymous_directory_path)
-      !!(File.exists?(full_path) && File.directory?(full_path))
-    end
+        # Whether the resource has the same name as a directory in the source
+        # (e.g., if the resource is named 'gallery.html' and a path exists named 'gallery/', this would return true)
+        # @return [Boolean]
+        def eponymous_directory?
+          full_path = File.join(app.source_dir, eponymous_directory_path)
+          !!(File.exists?(full_path) && File.directory?(full_path))
+        end
     
-    # The path for this resource if it were a directory, and not a file
-    # (e.g., for 'gallery.html' this would return 'gallery/')
-    # @return [String]
-    def eponymous_directory_path
-      path.sub(ext, '/').sub(/\/$/, "") + "/"
+        # The path for this resource if it were a directory, and not a file
+        # (e.g., for 'gallery.html' this would return 'gallery/')
+        # @return [String]
+        def eponymous_directory_path
+          path.sub(ext, '/').sub(/\/$/, "") + "/"
+        end
+      end
     end
   end
 end

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

@@ -1,126 +1,147 @@
-# Sitemap namespace
-module Middleman::Sitemap
+require "middleman-core/sitemap/extensions/traversal"
+
+module Middleman
+
+  # Sitemap namespace  
+  module Sitemap
   
-  # Sitemap Resource class
-  class Resource
-    include Middleman::Sitemap::Extensions::Traversal
+    # Sitemap Resource class
+    class Resource
+      include Middleman::Sitemap::Extensions::Traversal
         
-    # @return [Middleman::Application]
-    attr_reader :app
+      # @return [Middleman::Application]
+      attr_reader :app
     
-    # @return [Middleman::Sitemap::Store]
-    attr_reader :store
+      # @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
+      # 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
+      # Set the on-disk source file for this resource
+      # @return [String]
+      # attr_reader :source_file
     
-    def source_file
-      @source_file || get_source_file
-    end
+      def source_file
+        @source_file || get_source_file
+      end
     
-    # Initialize resource with parent store and URL
-    # @param [Middleman::Sitemap::Store] store
-    # @param [String] path
-    # @param [String] source_file
-    def initialize(store, path, source_file=nil)
-      @store       = store
-      @app         = @store.app
-      @path        = path
-      @source_file = source_file
+      # Initialize resource with parent store and URL
+      # @param [Middleman::Sitemap::Store] store
+      # @param [String] path
+      # @param [String] source_file
+      def initialize(store, path, source_file=nil)
+        @store       = store
+        @app         = @store.app
+        @path        = path
+        @source_file = source_file
       
-      @destination_paths = [@path]
-    end
-    
-    # Whether this resource has a template file
-    # @return [Boolean]
-    def template?
-      return false if source_file.nil?
-      !::Tilt[source_file].nil?
-    end
+        @destination_paths = [@path]
+
+        @local_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
+      end
     
-    # Get the metadata for both the current source_file and the current path
-    # @return [Hash]
-    def metadata
-      store.metadata_for_file(source_file).deep_merge(
-        store.metadata_for_path(path)
-      )
-    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 output/preview URL for this resource
-    # @return [String]
-    def destination_path
-      @destination_paths.last
-    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
+
+        path_meta = store.metadata_for_path(path).dup
+        if path_meta.has_key?(:blocks)
+          result[:blocks] << path_meta[:blocks]
+          path_meta.delete(:blocks)
+        end
+        result.deep_merge!(path_meta)
+
+        local_meta = @local_metadata.dup
+        if local_meta.has_key?(:blocks)
+          result[:blocks] << local_meta[:blocks]
+          local_meta.delete(:blocks)
+        end
+        result.deep_merge!(local_meta)
+
+        result
+      end
+
+      # Merge in new metadata specific to this resource.
+      # @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)
+        end
+        @local_metadata.deep_merge!(metadata)
+        @local_metadata[:blocks] << block if block_given?
+      end
     
-    # Set the output/preview URL for this resource
-    # @param [String] path
-    # @return [void]
-    def destination_path=(path)
-      @destination_paths << path
-    end
+      # Get the output/preview URL for this resource
+      # @return [String]
+      def destination_path
+        @destination_paths.last
+      end
     
-    # The template instance
-    # @return [Middleman::Sitemap::Template]
-    def template
-      @_template ||= ::Middleman::Sitemap::Template.new(self)
-    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
+      # 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
+      # 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?
+      # Render this resource
+      # @return [String]
+      def render(opts={}, locs={}, &block)
+        return File.open(source_file).read unless template?
       
-      puts "== Render Start: #{source_file}" if app.logging?
+        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)
+        md   = metadata.dup
+        opts = md[:options].deep_merge(opts)
+        locs = md[:locals].deep_merge(locs)
 
-      # Forward remaining data to helpers
-      if md.has_key?(:page)
-        app.data.store("page", md[:page])
-      end
+        # Forward remaining data to helpers
+        if md.has_key?(:page)
+          app.data.store("page", md[:page])
+        end
 
-      md[:blocks].flatten.compact.each do |block|
-        app.instance_eval(&block)
-      end
-
-      app.instance_eval(&block) if block_given?
-      result = app.render_template(source_file, locs, opts)
+        md[:blocks].flatten.compact.each do |block|
+          app.instance_eval(&block)
+        end
+      
+        app.instance_eval(&block) if block_given?
+        result = app.render_template(source_file, locs, opts)
 
-      puts "== Render End: #{source_file}" if app.logging?
-      result
-    end
+        puts "== Render End: #{source_file} (#{(Time.now - start_time).round(2)}s)" if app.logging?
+        result
+      end
     
-    # A path without the directory index - so foo/index.html becomes
-    # just foo. Best for linking.
-    # @return [String]
-    def url
-      '/' + destination_path.sub(/#{Regexp.escape(app.index_file)}$/, '')
-    end
-
-    # Get the relative path from the source
-    # @return [String]
-    def relative_path
-      source_file ? source_file.sub(app.source_dir, '') : nil
+      # A path without the directory index - so foo/index.html becomes
+      # just foo. Best for linking.
+      # @return [String]
+      def url
+        ('/' + destination_path).sub(/\/#{Regexp.escape(app.index_file)}$/, '/')
+      end
     end
   end
 end