middleman-core 3.0.0 → 3.0.1.pre

data/lib/middleman-core/renderers/slim.rb

@@ -3,28 +3,36 @@ require "slim"
 
 module Middleman
   module Renderers
-    
+
     # Slim renderer
     module Slim
-  
+
       # Setup extension
       class << self
-    
+
         # Once registered
         def registered(app)
           app.before_configuration do
             template_extensions :slim => :html
           end
-      
+
           # Setup Slim options to work with partials
           ::Slim::Engine.set_default_options(
-            :buffer    => '@_out_buf', 
+            :buffer    => '@_out_buf',
             :generator => ::Temple::Generators::StringBuffer
           )
+          
+          app.after_configuration do
+            sass_context_hack = {
+              :context => self
+            }
+            ::Slim::EmbeddedEngine.default_options[:sass] = sass_context_hack
+            ::Slim::EmbeddedEngine.default_options[:scss] = sass_context_hack
+          end
         end
-    
+
         alias :included :registered
       end
     end
   end
-end
+end

data/lib/middleman-core/sitemap.rb

@@ -7,75 +7,72 @@ require "middleman-core/sitemap/extensions/ignores"
 
 # Core Sitemap Extensions
 module Middleman
-  
+
   module Sitemap
-  
+
     # Setup Extension
     class << self
-    
+
       # Once registered
       def registered(app)
-      
+
         app.register Middleman::Sitemap::Extensions::Proxies
         app.register Middleman::Sitemap::Extensions::Ignores
-      
+
         # Set to automatically convert some characters into a directory
         app.set :automatic_directory_matcher, nil
-      
+
         # Setup callbacks which can exclude paths from the sitemap
         app.set :ignored_sitemap_matchers, {
           # dotfiles and folders in the root
-          :root_dotfiles => proc { |file, path| file.match(/^\./) },
-        
+          :root_dotfiles => proc { |file| file.match(%r{^\.}) },
+
           # Files starting with an dot, but not .htaccess
-          :source_dotfiles => proc { |file, path| 
-            (file.match(/\/\./) && !file.match(/\/\.htaccess/)) 
+          :source_dotfiles => proc { |file|
+            file.match(%r{/\.}) && !file.match(%r{/\.htaccess})
           },
-        
+
           # Files starting with an underscore, but not a double-underscore
-          :partials => proc { |file, path| (file.match(/\/_/) && !file.match(/\/__/)) },
-        
-          :layout => proc { |file, path| 
-            file.match(/^source\/layout\./) || file.match(/^source\/layouts\//)
-          },
-        
-          # Files without any output extension (layouts, partials)
-          # :extensionless => proc { |file, path| !path.match(/\./) },
+          :partials => proc { |file| file.match(%r{/_}) && !file.match(%r{/__}) },
+
+          :layout => proc { |file|
+            file.match(%r{^source/layout\.}) || file.match(%r{^source/layouts/})
+          }
         }
-      
+
         # Include instance methods
         app.send :include, InstanceMethods
-      
+
         # Initialize Sitemap
         app.before_configuration do
           sitemap
         end
       end
       alias :included :registered
-  
+
     end
-  
+
     # Sitemap instance methods
     module InstanceMethods
-    
+
       # Get the sitemap class instance
       # @return [Middleman::Sitemap::Store]
       def sitemap
         @_sitemap ||= Store.new(self)
       end
-    
+
       # Get the resource object for the current path
       # @return [Middleman::Sitemap::Resource]
       def current_page
         current_resource
       end
-    
+
       # Get the resource object for the current path
       # @return [Middleman::Sitemap::Resource]
       def current_resource
         sitemap.find_resource_by_destination_path(current_path)
       end
-    
+
     end
   end
-end
+end

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

@@ -3,42 +3,42 @@ module Middleman
   module Sitemap
 
     module Extensions
-  
+
       module Ignores
-    
+
         # Setup extension
         class << self
-    
+
           # Once registered
           def registered(app)
             # Include methods
             app.send :include, InstanceMethods
-        
+
             ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
           end
-    
+
           alias :included :registered
         end
-    
+
         # Helpers methods for Resources
         module ResourceInstanceMethods
-      
+
           # Whether the Resource is ignored
           # @return [Boolean]
           def ignored?
-            @app.ignore_manager.ignored?(path) || 
+            @app.ignore_manager.ignored?(path) ||
             (!proxy? &&
               @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ""))
             )
           end
         end
-    
+
         # Ignore-related instance methods
         module InstanceMethods
           def ignore_manager
             @_ignore_manager ||= IgnoreManager.new(self)
           end
-      
+
           # Ignore a path or add an ignore callback
           # @param [String, Regexp] path Path glob expression, or path regex
           # @return [void]
@@ -46,7 +46,7 @@ module Middleman
             ignore_manager.ignore(path, &block)
           end
         end
-    
+
         # Class to handle managing ignores
         class IgnoreManager
           def initialize(app)
@@ -55,7 +55,7 @@ module Middleman
             # Array of callbacks which can ass ignored
             @ignored_callbacks = []
           end
-      
+
           # Ignore a path or add an ignore callback
           # @param [String, Regexp] path Path glob expression, or path regex
           # @return [void]
@@ -88,4 +88,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -1,11 +1,11 @@
 require 'set'
 
 module Middleman
-  
+
   module Sitemap
-    
+
     module Extensions
-      
+
       class OnDisk
 
         attr_accessor :sitemap
@@ -14,22 +14,22 @@ module Middleman
         def initialize(sitemap)
           @sitemap = sitemap
           @app     = @sitemap.app
-      
+
           @file_paths_on_disk = Set.new
 
           scoped_self = self
           @waiting_for_ready = true
-      
+
           # Register file change callback
           @app.files.changed do |file|
             scoped_self.touch_file(file, !scoped_self.waiting_for_ready)
           end
-      
+
           # Register file delete callback
           @app.files.deleted do |file|
             scoped_self.remove_file(file, !scoped_self.waiting_for_ready)
           end
-      
+
           @app.ready do
             scoped_self.waiting_for_ready = false
             scoped_self.sitemap.rebuild_resource_list!(:on_disk_ready)
@@ -40,13 +40,13 @@ module Middleman
         # @param [String] file
         # @return [Boolean]
         def touch_file(file, rebuild=true)
-          return false if file == @app.source_dir || File.directory?(file)
+          return false if File.directory?(file)
 
           path = @sitemap.file_to_path(file)
           return false unless path
 
           ignored = @app.ignored_sitemap_matchers.any? do |name, callback|
-            callback.call(file, path)
+            callback.call(file)
           end
 
           @file_paths_on_disk << file unless ignored
@@ -57,7 +57,7 @@ module Middleman
           # whether or not it belongs in the sitemap (like a partial)
           @sitemap.rebuild_resource_list!(:touched_file) if rebuild
         end
-    
+
         # Remove a file from the store
         # @param [String] file
         # @return [void]
@@ -66,7 +66,7 @@ module Middleman
             @sitemap.rebuild_resource_list!(:removed_file) if rebuild
           end
         end
-   
+
         # Update the main sitemap resource list
         # @return [void]
         def manipulate_resource_list(resources)
@@ -81,4 +81,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -1,45 +1,47 @@
 module Middleman
 
   module Sitemap
-    
+
     module Extensions
-  
+
       module Proxies
-    
+
         # Setup extension
         class << self
-    
+
           # Once registered
           def registered(app)
             ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
-      
+
             # Include methods
             app.send :include, InstanceMethods
           end
-    
+
           alias :included :registered
         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)
+            target = ::Middleman::Util.normalize_path(target)
+            raise "You can't proxy #{path} to itself!" if target == path
             @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
-      
+
           # Whether this page has a template file
           # @return [Boolean]
           def template?
@@ -49,37 +51,41 @@ module Middleman
               super
             end
           end
-      
+
           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}"
+                raise "Path #{path} proxies to unknown file #{proxied_to}:#{store.resources.map(&:path)}"
               end
-          
+
+              if proxy_resource.proxy?
+                raise "You can't proxy #{path} to #{proxied_to} which is itself a proxy."
+              end
+
               proxy_resource.source_file
             end
           end
         end
-    
+
         module InstanceMethods
           def proxy_manager
             @_proxy_manager ||= ProxyManager.new(self)
           end
-      
+
           def proxy(*args)
             proxy_manager.proxy(*args)
           end
         end
-    
+
         class ProxyManager
           def initialize(app)
             @app = app
-        
+
             @proxy_paths = {}
           end
-      
+
           # Setup a proxy from a path to a target
           # @param [String] path
           # @param [String] target
@@ -105,4 +111,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -1,23 +1,23 @@
 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
-  
+
           parts.pop
           parts << app.index_file
-  
+
           parent_path = "/" + parts.join("/")
-  
+
           store.find_resource_by_destination_path(parent_path)
         end
 
@@ -57,13 +57,13 @@ module Middleman
           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 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]
@@ -71,7 +71,7 @@ module Middleman
           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]
@@ -81,4 +81,4 @@ module Middleman
       end
     end
   end
-end
+end