middleman 2.0.16.1 → 3.0.0.alpha.2

data/lib/middleman/features/directory_indexes.rb

@@ -1,53 +1,56 @@
 module Middleman::Features::DirectoryIndexes
   class << self
     def registered(app)
-      app.set :ignored_directory_indexes, []
-      app.extend ClassMethods
+      app.send :include, InstanceMethods
+      app.before do
+        prefix         = @original_path.sub(/\/$/, "")
+        indexed_path   = prefix + "/" + self.index_file
+        indexed_exists = resolve_template(indexed_path)
+              
+        extensioned_path = prefix + File.extname(self.index_file)
+        is_ignored = self.ignored_directory_indexes.include?(extensioned_path)
+        
+        if !indexed_exists && !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(app.settings.index_file)
-        new_index_path = "/#{app.settings.index_file}"
+        index_ext      = File.extname(self.index_file)
+        new_index_path = "/#{self.index_file}"
       
-        indexed_path = request_path.gsub(/\/$/, "") + index_ext
+        indexed_path = request_path.sub(/\/$/, "") + index_ext
         
-        if app.settings.ignored_directory_indexes.include?(request_path)
+        if self.ignored_directory_indexes.include?(request_path)
           false
         elsif request_path =~ /#{new_index_path}$/
           false
         else
           [
-            destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
+            destination.sub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
             request_path
           ]
         end
       end
-      
-      app.before do
-        indexed_path = request.path_info.gsub(/\/$/, "") + "/" + app.settings.index_file
-        indexed_exists = resolve_template(indexed_path, :raise_exceptions => false)
-
-        extensioned_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)
-        is_ingored = settings.ignored_directory_indexes.include?(extensioned_path)
-        
-        if !indexed_exists && !is_ingored
-          parts = request.path_info.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_info = extensioned_path
-          end
-        end
-      end
     end
     alias :included :registered
   end
   
-  module ClassMethods
+  module InstanceMethods
+    def ignored_directory_indexes
+      @_ignored_directory_indexes ||= []
+    end
+    
     def page(url, options={}, &block)
       if options.has_key?(:directory_index) && !options["directory_index"]
-        settings.ignored_directory_indexes << url
+        ignored_directory_indexes << url
       else
         super
       end

data/lib/middleman/features/minify_css.rb

@@ -1,8 +1,9 @@
 module Middleman::Features::MinifyCss
   class << self
     def registered(app)
-      app.compass_config do |config|
-        config.output_style = :compressed
+      require "middleman/features/minify_css/cssmin"
+      app.after_configuration do
+        set :css_compressor, ::CSSMin
       end
     end
     alias :included :registered

data/lib/middleman/features/minify_css/cssmin.rb

@@ -0,0 +1,55 @@
+#--
+# Copyright (c) 2008 Ryan Grove <ryan@wonko.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#   * Neither the name of this project nor the names of its contributors may be
+#     used to endorse or promote products derived from this software without
+#     specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#++
+
+module CSSMin
+  def self.compress(input)
+    css = input.is_a?(IO) ? input.read : input.dup.to_s
+    css.gsub!(/\/\*[\s\S]*?\*\//, '')
+    css.gsub!(/\s+/, ' ')
+    css.gsub!(/"\\"\}\\""/, '___BMH___')
+    css.gsub!(/(?:^|\})[^\{:]+\s+:+[^\{]*\{/) do |match|
+      match.gsub(':', '___PSEUDOCLASSCOLON___')
+    end
+    css.gsub!(/\s+([!\{\};:>+\(\)\],])/, '\1')
+    css.gsub!('___PSEUDOCLASSCOLON___', ':')
+    css.gsub!(/([!\{\}:;>+\(\[,])\s+/, '\1')
+    css.gsub!(/([^;\}])\}/, '\1;}')
+    css.gsub!(/([\s:])([+-]?0)(?:%|em|ex|px|in|cm|mm|pt|pc)/i, '\1\2')
+    css.gsub!(/:(?:0 )+0;/, ':0;')
+    css.gsub!('background-position:0;', 'background-position:0 0;')
+    css.gsub!(/(:|\s)0+\.(\d+)/, '\1.\2')
+    css.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
+      '#' << $1.scan(/\d+/).map{|n| n.to_i.to_s(16).rjust(2, '0') }.join
+    end
+    css.gsub!(/([^"'=\s])\s*#([0-9a-f])\2([0-9a-f])\3([0-9a-f])\4/i, '\1 #\2\3\4')
+    css.gsub!(/[^\}]+\{;\}\n/, '')
+    css.gsub!('___BMH___', '"\"}\""')
+    css.gsub!(/;;+/, ';')
+    css.strip
+  end
+end

data/lib/middleman/features/minify_javascript.rb

@@ -2,7 +2,9 @@ module Middleman::Features::MinifyJavascript
   class << self
     def registered(app)
       require 'uglifier'
-      app.set :js_compressor, ::Uglifier.new
+      app.after_configuration do
+        set :js_compressor, ::Uglifier.new
+      end
       app.use InlineJavascriptRack
     end
     alias :included :registered
@@ -19,10 +21,15 @@ module Middleman::Features::MinifyJavascript
       if env["PATH_INFO"].match(/\.html$/)
         compressor = ::Uglifier.new
 
-        if response.is_a?(::Rack::File)# or response.is_a?(::Sinatra::Helpers::StaticFile)
-          uncompressed_source = File.read(response.path)
-        else
-          uncompressed_source = response.join
+        uncompressed_source = case(response)
+          when String
+            response
+          when Array
+            response.join
+          when Rack::Response
+            response.body.join
+          when Rack::File
+            File.read(response.path)
         end
 
         minified = uncompressed_source.gsub(/(<scri.*?\/\/<!\[CDATA\[\n)(.*?)(\/\/\]\].*?<\/script>)/m) do |m|

data/lib/middleman/features/relative_assets.rb

@@ -4,36 +4,39 @@ module Middleman::Features::RelativeAssets
       app.compass_config do |config|
         config.relative_assets = true
       end
+      
+      app.send :include, InstanceMethods
+    end
+    alias :included :registered
+  end
+  
+  module InstanceMethods
+    def asset_url(path, prefix="")
+      begin
+        prefix = self.images_dir if prefix == self.http_images_path
+      rescue
+      end
 
-      app.register_asset_handler :relative_assets do |path, prefix, request|
-        begin
-          prefix = app.images_dir if prefix == app.http_images_path
-        rescue
-        end
+      if path.include?("://")
+        super(path, prefix)
+      elsif path[0,1] == "/"
+        path
+      else
+        path = File.join(prefix, path) if prefix.length > 0
+        request_path = @request_path.dup
+        request_path << self.index_file if path.match(%r{/$})
+        request_path.gsub!(%r{^/}, '')
+        parts = request_path.split('/')
 
-        if path.include?("://")
-          app.before_asset_handler(:relative_assets, path, prefix, request)
-        elsif path[0,1] == "/"
-          path
+        if parts.length > 1
+          arry = []
+          (parts.length - 1).times { arry << ".." }
+          arry << path
+          File.join(*arry)
         else
-          path = app.before_asset_handler(:relative_assets, path, prefix, request).sub(%r{^/}, '')
-          # path = File.join(prefix, path) if prefix.length > 0
-          request_path = request.path_info.dup
-          request_path << app.index_file if path.match(%r{/$})
-          request_path.gsub!(%r{^/}, '')
-          parts = request_path.split('/')
-
-          if parts.length > 1
-            arry = []
-            (parts.length - 1).times { arry << ".." }
-            arry << path
-            File.join(*arry)
-          else
-            path
-          end
+          path
         end
       end
     end
-    alias :included :registered
   end
 end

data/lib/middleman/features/sitemap_tree.rb

@@ -0,0 +1,34 @@
+module Middleman::Features::SitemapTree
+  class << self
+    def registered(app)
+      app.helpers Helpers
+    end
+    alias :included :registered
+  end
+  
+  module Helpers
+    def sitemap_tree(regex=nil)
+      @sitemap_tree_cache = {}
+      
+      key = regex.nil? ? "all" : regex
+      
+      if !@sitemap_tree_cache.has_key?(key)
+        auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
+
+        app.sitemap.all_paths.each do |path|
+          next if !regex.nil? && !path.match(regex)
+          sub = auto_hash
+          path.split( "/" ).each{ |dir| sub[dir]; sub = sub[dir] }
+        end
+      
+        @sitemap_tree_cache[key] = auto_hash
+      end
+      
+      @sitemap_tree_cache[key]
+    end
+    
+    def html_sitemap
+      sitemap_tree(/\.html$/)
+    end
+  end
+end

data/lib/middleman/guard.rb

@@ -2,40 +2,30 @@ require "guard"
 require "guard/guard"
 require "rbconfig"
 
-if RbConfig::CONFIG['host_os'].downcase =~ %r{mingw}
+if Config::CONFIG['host_os'].downcase =~ %r{mingw}
   require "win32/process"
 end
-  
+
 module Middleman
   module Guard
     def self.add_guard(&block)
-      @additional_guards ||= []
-      @additional_guards << block
+      # Deprecation Warning
+      puts "== Middleman::Guard.add_guard has been removed. Update your extensions to versions which support this change."
     end
   
-    def self.start(options={}, livereload={})
+    def self.start(options={})
       options_hash = ""
       options.each do |k,v|
         options_hash << ", :#{k} => '#{v}'"
       end
-    
+      
       guardfile_contents = %Q{
         guard 'middleman'#{options_hash} do 
-          watch("config.rb")
-          watch(%r{^lib/^[^\.](.*)\.rb$})
+          watch(%r{(.*)})
         end
       }
-    
-      (@additional_guards || []).each do |block|
-        result = block.call(options, livereload)
-        guardfile_contents << result unless result.nil?
-      end
-    
-      begin
-        ::Guard.start({ :guardfile_contents => guardfile_contents })
-      rescue Interrupt
-        ::Guard.stop
-      end
+
+      ::Guard.start({ :guardfile_contents => guardfile_contents })
     end
   end
 end
@@ -50,16 +40,60 @@ module Guard
     def start
       server_start
     end
-  
-    def run_on_changes(paths)
+    
+    def reload
       server_stop
       server_start
     end
+  
+    def run_on_change(paths)
+      needs_to_restart = false
+      
+      paths.each do |path|
+        if path.match(%{^config\.rb}) || path.match(%r{^lib/^[^\.](.*)\.rb$})
+          needs_to_restart = true
+          break
+        end
+      end
+      
+      if needs_to_restart
+        reload
+      elsif !@app.nil?
+        paths.each do |path|
+          @app.logger.debug :file_change, Time.now, path if @app.settings.logging?
+          @app.file_did_change(path)
+        end
+      end
+    end
 
+    def run_on_deletion(paths)
+      if !@app.nil?
+        paths.each do |path|
+          @app.logger.debug :file_remove, Time.now, path if @app.settings.logging?
+          @app.file_did_delete(path)
+        end
+      end
+    end
+    
   private
     def server_start
+      # Quiet down Guard
+      # ENV['GUARD_ENV'] = 'test' if @options[:debug] == "true"
+      
+      env = (@options[:environment] || "development").to_sym
+      is_logging = @options.has_key?(:debug) && (@options[:debug] == "true")
+      @app = ::Middleman.server.inst do
+        set :environment, env
+        set :logging, is_logging
+      end
+      
+      app_rack = @app.class.to_rack_app
+
       @server_job = fork do
-        ::Middleman.start_server(@options)
+        opts = @options.dup
+        opts[:app] = app_rack
+        puts "== The Middleman is standing watch on port #{opts[:Port]||4567}"
+        ::Middleman.start_server(opts)
       end
     end
   
@@ -68,7 +102,7 @@ module Guard
       Process.kill("KILL", @server_job)
       Process.wait @server_job
       @server_job = nil
-      # @server_options[:app] = nil
+      @app = nil
     end
   end
 end

data/lib/middleman/renderers/erb.rb

@@ -0,0 +1,29 @@
+require "tilt"
+
+module Middleman::Renderers::ERb
+  class << self
+    def registered(app)
+      app.send :include, InstanceMethods
+      
+      app.set :erb_engine, :erb
+      app.set :erb_engine_prefix, ::Tilt
+      
+      app.after_configuration do
+        if erb_engine.is_a? Symbol
+          erb_engine = erb_tilt_template_from_symbol(erb_engine)
+        end
+        
+        ::Tilt.prefer(erb_engine)
+      end
+    end
+    alias :included :registered
+  end
+  
+  module InstanceMethods
+    def erb_tilt_template_from_symbol(engine)
+      engine = engine.to_s
+      engine = engine == "erb" ? "ERB" : engine.camelize
+      erb_engine_prefix.const_get("#{engine}Template")
+    end
+  end
+end

data/lib/middleman/renderers/liquid.rb

@@ -7,19 +7,10 @@ module Middleman::Renderers::Liquid
         require "liquid"
         
         app.after_configuration do
-          full_path = app.views
-          full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
-          
-          Liquid::Template.file_system = Liquid::LocalFileSystem.new(full_path)
+          Liquid::Template.file_system = Liquid::LocalFileSystem.new(self.source_dir)
             
-          app.before_processing(:liquid) do |result|
-            if result && result[1] == :liquid
-              request['custom_locals'] ||= {}
-              request['custom_locals'][:data] = data.to_h
-              # request['custom_locals'].merge(data.to_h)
-            end
-
-            true
+          provides_metadata %r{\.liquid$} do |path|
+            @locals.merge!(:data => data.to_h)
           end
         end
       rescue LoadError