middleman 3.0.0.alpha.2 → 3.0.0.alpha.3

data/lib/middleman/core_extensions/sitemap.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/hash/deep_merge"
 require 'find'
 
 module Middleman::CoreExtensions::Sitemap
@@ -10,6 +11,8 @@ module Middleman::CoreExtensions::Sitemap
   
   module InstanceMethods
     def initialize
+      super
+    
       file_changed do |file|
         sitemap.touch_file(file)
       end
@@ -17,21 +20,19 @@ module Middleman::CoreExtensions::Sitemap
       file_deleted do |file|
         sitemap.remove_file(file)
       end
-      
-      super
     end
     
     def sitemap
-      @sitemap ||= SitemapStore.new(self)
+      @sitemap ||= ::Middleman::Sitemap::Store.new(self)
     end
     
     # Keep a path from building
     def ignore(path)
-      sitemap.ignore_path(path)
+      sitemap.ignore(path)
     end
     
     def reroute(url, target)
-      sitemap.set_path(url, target)
+      sitemap.proxy(url, target)
     end
     
     def provides_metadata(matcher=nil, &block)
@@ -40,190 +41,4 @@ module Middleman::CoreExtensions::Sitemap
       @_provides_metadata
     end
   end
-  
-  class SitemapStore
-    def initialize(app)
-      @app = app
-      @source = File.expand_path(@app.views, @app.root)
-      @map = {}
-      @context_map = {}
-      @source_map = {}
-      @ignored_paths = false
-      @generic_paths = false
-      @proxied_paths = false
-      
-      # build_static_map
-    end
-    
-    # Check to see if we know about a specific path
-    def path_exists?(path)
-      path = path.sub(/^\//, "")
-      @map.has_key?(path)
-    end
-    
-    def path_is_proxy?(path)
-      path = path.sub(/^\//, "")
-      return false if !path_exists?(path)
-      @map[path].is_a?(String)
-    end
-    
-    def path_target(path)
-      path = path.sub(/^\//, "")
-      @map[path]
-    end
-    
-    def path_context(path)
-      path = path.sub(/^\//, "")
-      @context_map[path]
-    end
-    
-    def set_path(path, target=true)
-      path   = path.sub(/^\//, "")
-      target = target.sub(/^\//, "") if target.is_a?(String)
-      
-      @map[path] = target
-      
-      @ignored_paths = false if target === false
-      @generic_paths = false if target === true
-      @proxied_paths = false if target.is_a?(String)
-    end
-    
-    def set_context(path, options={}, block=nil)
-      path = path.sub(/^\//, "")
-      @context_map[path] = {
-        :options => options,
-        :block   => block
-      }
-    end
-    
-    def get_context(path)
-      path = path.sub(/^\//, "")
-      @context_map[path]
-    end
-    
-    def ignore_path(path)
-      set_path(path, false)
-      @ignored_paths = false
-    end
-    
-    def each(&block)
-      @map.each do |k, v|
-        yield(k, v)
-      end
-    end
-    
-    def all_paths
-      @map.keys
-    end
-    
-    def all_values
-      @map.values
-    end
-    
-    def ignored_path?(path)
-      path = path.sub(/^\//, "")
-      ignored_paths.include?(path)
-    end
-    
-    def ignored_paths
-      @ignored_paths ||= begin
-        ignored = []
-        each do |k, v|
-          ignored << k if v === false
-        end
-        ignored
-      end
-    end
-    
-    def generic_path?(path)
-      path = path.sub(/^\//, "")
-      generic_paths.include?(path)
-    end
-    
-    def generic_paths
-      @generic_paths ||= begin
-        generic = []
-        each do |k, v|
-          generic << k if v === true
-        end
-        generic
-      end
-    end
-    
-    def proxied_path?(path)
-      path = path.sub(/^\//, "")
-      proxied_paths.include?(path)
-    end
-    
-    def proxied_paths
-      @proxied_paths ||= begin
-        proxied = []
-        each do |k, v|
-          proxied << k if v.is_a?(String)
-        end
-        proxied
-      end
-    end
-    
-    def touch_file(file)
-      add_file(file)
-    end
-    
-    def remove_file(file)
-      path = file_to_path(file)
-      remove_path(path) if path
-    end
-    
-    def remove_path(path)
-      path = path.sub(/^\//, "")
-      @map.delete(path) if path_exists?(path)
-      @context_map.delete(path) if @context_map.has_key?(path)
-    end
-    
-    def source_map
-      @source_map
-    end
-    
-  protected
-    def build_static_map
-      Find.find(@source) do |file|
-        add_file(file)
-      end
-    end
-    
-    def file_to_path(file)
-      file = File.expand_path(file, @app.root)
-      
-      prefix = @source + "/"
-      return false unless file.include?(prefix)
-      
-      path = file.sub(prefix, "")
-      path = @app.extensionless_path(path)
-      
-      @source_map[path] = file
-      path
-    end
-    
-    def add_file(file)
-      return false if file == @source ||
-                      file.match(/^\./) ||
-                      file.match(/\/\./) ||
-                      (file.match(/\/_/) && !file.match(/\/__/)) ||
-                      File.directory?(file)
-                     
-      path = file_to_path(file)
-      
-      add_path(path) if path && !path_exists?(path)
-    end
-    
-    def add_path(path)
-      return false if path.match(%r{^layout}) ||
-                      path.match(%r{^layouts/})
-    
-      # @app.logger.debug :sitemap_update, Time.now, path if @app.logging?
-      set_path(path)
-      
-      true
-    end
-  end
 end

data/lib/middleman/core_extensions/sprockets.rb

@@ -38,10 +38,11 @@ module Middleman::CoreExtensions::Sprockets
         end
 
         # add paths to js_env (vendor/assets/javascripts)
-        map "/#{self.js_dir}" do
+        map "/#{js_dir}" do
           run js_env
         end
 
+        sass.each { |k, v| ::Sprockets::Sass.options[k] = v }
         css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(self)
          
         vendor_dir = File.join("vendor", "assets", "stylesheets")
@@ -58,7 +59,7 @@ module Middleman::CoreExtensions::Sprockets
           css_env.append_path File.join(spec.full_gem_path, app_dir)
         end
         
-        map("/#{self.css_dir}") do
+        map("/#{css_dir}") do
           run css_env
         end
       end

data/lib/middleman/extensions/asset_host.rb

@@ -0,0 +1,34 @@
+module Middleman::Extensions
+  module AssetHost
+    class << self
+      def registered(app)
+        app.set :asset_host, false
+      
+        app.compass_config do |config|
+          if asset_host.is_a?(Proc)
+            config.asset_host(&asset_host)
+          end
+        end
+      
+        app.send :include, InstanceMethods
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def asset_url(path, prefix="")
+        original_output = super
+
+        valid_extensions = %w(.png .gif .jpg .jpeg .svg .svgz .js .css)
+
+        asset_prefix = if asset_host.is_a?(Proc)
+          asset_host.call(original_output)
+        elsif asset_host.is_a?(String)
+          asset_host
+        end
+
+        File.join(asset_prefix, original_output)
+      end
+    end
+  end
+end

data/lib/middleman/extensions/automatic_image_sizes.rb

@@ -0,0 +1,38 @@
+module Middleman::Extensions
+  module AutomaticImageSizes
+    class << self
+      def registered(app)
+        require "middleman/extensions/automatic_image_sizes/fastimage"
+
+        app.send :include, InstanceMethods
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def image_tag(path, params={})
+        if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
+          params[:alt] ||= ""
+          http_prefix = http_images_path rescue images_dir
+
+          begin
+            real_path = File.join(source, images_dir, path)
+            full_path = File.expand_path(real_path, root)
+            http_prefix = http_images_path rescue images_dir
+            if File.exists? full_path
+              dimensions = ::FastImage.size(full_path, :raise_on_failure => true)
+              params[:width]  = dimensions[0]
+              params[:height] = dimensions[1]
+            end
+          rescue
+            # $stderr.puts params.inspect
+          end
+        end
+      
+        super(path, params)
+      end
+    end
+  end
+  
+  register :automatic_image_sizes, AutomaticImageSizes
+end

data/lib/middleman/extensions/cache_buster.rb

@@ -0,0 +1,59 @@
+module Middleman::Extensions
+  module CacheBuster
+    class << self
+      def registered(app)
+        app.send :include, InstanceMethods
+      
+        app.compass_config do |config|
+          config.asset_cache_buster do |path, real_path|
+            real_path = real_path.path if real_path.is_a? File
+            real_path = real_path.gsub(File.join(root, build_dir), source)
+            if File.readable?(real_path)
+              File.mtime(real_path).strftime("%s") 
+            else
+              $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+            end
+          end
+        end
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def asset_url(path, prefix="")
+        http_path = super
+
+        if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
+          http_path
+        else
+          begin
+            prefix = images_dir if prefix == http_images_path
+          rescue
+          end
+
+          real_path_static = File.join(prefix, path)
+        
+          if build?
+            real_path_dynamic = File.join(build_dir, prefix, path)
+            real_path_dynamic = File.expand_path(real_path_dynamic, root)
+            http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
+          elsif sitemap.exists?(real_path_static)
+            page = sitemap.page(real_path_static)
+            if !page.template?
+              http_path << "?" + File.mtime(result[0]).strftime("%s")
+            else
+              # It's a template, possible with partials. We can't really know when
+              # it's updated, so generate fresh cache buster every time durin
+              # developement
+              http_path << "?" + Time.now.strftime("%s")
+            end
+          end
+        
+          http_path
+        end
+      end
+    end
+  end
+  
+  register :cache_buster, CacheBuster
+end

data/lib/middleman/extensions/directory_indexes.rb

@@ -0,0 +1,62 @@
+module Middleman::Extensions
+  module DirectoryIndexes
+    class << self
+      def registered(app)
+        app.send :include, InstanceMethods
+        app.before do
+          next if sitemap.exists?(@original_path)
+
+          prefix         = @original_path.sub(/\/$/, "")
+          indexed_path   = prefix + "/" + index_file
+        
+          extensioned_path = prefix + File.extname(index_file)
+          is_ignored = ignored_directory_indexes.include?(extensioned_path)
+        
+          if !sitemap.exists?(indexed_path) && !is_ignored
+            parts         = @original_path.split("/")
+            last_part     = parts.last
+            last_part_ext = File.extname(last_part)
+        
+            if last_part_ext.blank?
+              # This is a folder, redirect to index
+              @request_path = extensioned_path
+            end
+          end
+        end
+      
+        app.build_reroute do |destination, request_path|
+          index_ext      = File.extname(index_file)
+          new_index_path = "/#{index_file}"
+
+          if ignored_directory_indexes.include?(request_path)
+            false
+          elsif request_path =~ /#{new_index_path}$/
+            false
+          else
+            [
+              destination.sub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
+              request_path
+            ]
+          end
+        end
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def ignored_directory_indexes
+        @_ignored_directory_indexes ||= []
+      end
+    
+      def page(url, options={}, &block)
+        if options.has_key?(:directory_index) && !options["directory_index"]
+          ignored_directory_indexes << url
+        else
+          super
+        end
+      end
+    end
+  end
+  
+  register :directory_indexes, DirectoryIndexes
+end