merge more into core, use gem availability to autoload

middleman-core/lib/middleman-more/extensions/asset_hash.rb

@@ -0,0 +1,114 @@
+class Middleman::Extensions::AssetHash < ::Middleman::Extension
+  option :exts, %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg), "List of extensions that get asset hashes appended to them."
+  option :ignore, [], "Regexes of filenames to skip adding asset hashes to"
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    require 'digest/sha1'
+    require 'rack/test'
+    require 'uri'
+  end
+
+  def after_configuration
+    # Allow specifying regexes to ignore, plus always ignore apple touch icons
+    @ignore = Array(options.ignore) + [/^apple-touch-icon/]
+
+    app.use Middleware, :exts => options.exts, :middleman_app => app, :ignore => @ignore
+  end
+
+  # Update the main sitemap resource list
+  # @return [void]
+  def manipulate_resource_list(resources)
+    # Process resources in order: binary images and fonts, then SVG, then JS/CSS.
+    # This is so by the time we get around to the text files (which may reference
+    # images and fonts) the static assets' hashes are already calculated.
+    rack_client = ::Rack::Test::Session.new(app.class.to_rack_app)
+    resources.sort_by do |a|
+      if %w(.svg).include? a.ext
+        0
+      elsif %w(.js .css).include? a.ext
+        1
+      else
+        -1
+      end
+    end.each do |resource|
+      next unless options.exts.include? resource.ext
+      next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
+
+      # Render through the Rack interface so middleware and mounted apps get a shot
+      response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => "true" })
+      raise "#{resource.path} should be in the sitemap!" unless response.status == 200
+
+      digest = Digest::SHA1.hexdigest(response.body)[0..7]
+
+      resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
+    end
+  end
+
+  # The asset hash middleware is responsible for rewriting references to
+  # assets to include their new, hashed name.
+  class Middleware
+    def initialize(app, options={})
+      @rack_app        = app
+      @exts            = options[:exts]
+      @ignore          = options[:ignore]
+      @exts_regex_text = @exts.map {|e| Regexp.escape(e) }.join('|')
+      @middleman_app   = options[:middleman_app]
+    end
+
+    def call(env)
+      status, headers, response = @rack_app.call(env)
+
+      # We don't want to use this middleware when rendering files to figure out their hash!
+      return [status, headers, response] if env["bypass_asset_hash"] == 'true'
+
+      path = @middleman_app.full_path(env["PATH_INFO"])
+      dirpath = Pathname.new(File.dirname(path))
+
+      if path =~ /(^\/$)|(\.(htm|html|php|css|js)$)/
+        body = ::Middleman::Util.extract_response_text(response)
+
+        if body
+          # TODO: This regex will change some paths in plan HTML (not in a tag) - is that OK?
+          body.gsub!(/([=\'\"\(]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/) do |match|
+            opening_character = $1
+            asset_path = $2
+
+            relative_path = Pathname.new(asset_path).relative?
+
+            asset_path = dirpath.join(asset_path).to_s if relative_path
+
+            if @ignore.any? { |r| asset_path.match(r) }
+              match
+            elsif asset_page = @middleman_app.sitemap.find_resource_by_path(asset_path)
+              replacement_path = "/#{asset_page.destination_path}"
+              replacement_path = Pathname.new(replacement_path).relative_path_from(dirpath).to_s if relative_path
+
+              "#{opening_character}#{replacement_path}"
+            else
+              match
+            end
+          end
+
+          status, headers, response = Rack::Response.new(body, status, headers).finish
+        end
+      end
+      [status, headers, response]
+    end
+  end
+
+end
+
+# =================Temp Generate Test data==============================
+#   ["jpg", "png", "gif"].each do |ext|
+#     [["<p>", "</p>"], ["<p><img src=", " /></p>"], ["<p>background-image:url(", ");</p>"]].each do |outer|
+#       [["",""], ["'", "'"], ['"','"']].each do |inner|
+#         [["", ""], ["/", ""], ["../", ""], ["../../", ""], ["../../../", ""], ["http://example.com/", ""], ["a","a"], ["1","1"], [".", "."], ["-","-"], ["_","_"]].each do |path_parts|
+#           name = 'images/100px.'
+#           puts outer[0] + inner[0] + path_parts[0] + name + ext + path_parts[1] + inner[1] + outer[1]
+#         end
+#       end
+#     end
+#     puts "<br /><br /><br />"
+#   end

middleman-core/lib/middleman-more/extensions/asset_host.rb

@@ -0,0 +1,50 @@
+
+# Asset Host module
+class Middleman::Extensions::AssetHost < ::Middleman::Extension
+  option :host, nil, 'The asset host to use, or false for no asset host, or a Proc to determine asset host'
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # Backwards compatible API
+    app.config.define_setting :asset_host, nil, 'The asset host to use, or false for no asset host, or a Proc to determine asset host'
+
+    app.compass_config do |config|
+      if asset_host = extensions[:asset_host].host
+        if asset_host.is_a?(Proc)
+          config.asset_host(&asset_host)
+        else
+          config.asset_host do |asset|
+            asset_host
+          end
+        end
+      end
+    end if app.respond_to?(:compass_config)
+  end
+
+  def host
+    app.config[:asset_host] || options[:host]
+  end
+
+  helpers do 
+    # Override default asset url helper to include asset hosts
+    #
+    # @param [String] path
+    # @param [String] prefix
+    # @return [String]
+    def asset_url(path, prefix="")
+      controller = extensions[:asset_host]
+
+      original_output = super
+      return original_output unless controller.host
+
+      asset_prefix = if controller.host.is_a?(Proc)
+        controller.host.call(original_output)
+      elsif controller.host.is_a?(String)
+        controller.host
+      end
+
+      File.join(asset_prefix, original_output)
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb

@@ -0,0 +1,42 @@
+# Automatic Image Sizes extension
+class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # Include 3rd-party fastimage library
+    require "middleman-more/extensions/automatic_image_sizes/fastimage"
+  end
+
+  helpers do
+    # Override default image_tag helper to automatically calculate and include
+    # image dimensions.
+    #
+    # @param [String] path
+    # @param [Hash] params
+    # @return [String]
+    def image_tag(path, params={})
+      if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
+        params[:alt] ||= ""
+
+        real_path = path
+        real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
+        full_path = File.join(source_dir, real_path)
+
+        if File.exists?(full_path)
+          begin
+            width, height = ::FastImage.size(full_path, :raise_on_failure => true)
+            params[:width]  = width
+            params[:height] = height
+          rescue FastImage::UnknownImageType
+            # No message, it's just not supported
+          rescue
+            warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
+          end
+        end
+      end
+
+      super(path, params)
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb

@@ -0,0 +1,287 @@
+# FastImage finds the size or type of an image given its uri.
+# It is careful to only fetch and parse as much of the image as is needed to determine the result.
+# It does this by using a feature of Net::HTTP that yields strings from the resource being fetched
+# as soon as the packets arrive.
+#
+# No external libraries such as ImageMagick are used here, this is a very lightweight solution to
+# finding image information.
+#
+# FastImage knows about GIF, JPEG, BMP and PNG files.
+#
+# FastImage can also read files from the local filesystem by supplying the path instead of a uri.
+# In this case FastImage uses the open-uri library to read the file in chunks of 256 bytes until
+# it has enough. This is possibly a useful bandwidth-saving feature if the file is on a network
+# attached disk rather than truly local.
+#
+# === Examples
+#   require 'fastimage'
+#
+#   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
+#   => [266, 56]
+#   FastImage.type("http://stephensykes.com/images/pngimage")
+#   => :png
+#   FastImage.type("/some/local/file.gif")
+#   => :gif
+#
+# === References
+# * http://snippets.dzone.com/posts/show/805
+# * http://www.anttikupila.com/flash/getting-jpg-dimensions-with-as3-without-loading-the-entire-file/
+# * http://pennysmalls.com/2008/08/19/find-jpeg-dimensions-fast-in-ruby/
+# * http://imagesize.rubyforge.org/
+#
+require 'net/https'
+require 'open-uri'
+
+class FastImage
+  attr_reader :size, :type
+
+  class FastImageException < StandardError # :nodoc:
+  end
+  class MoreCharsNeeded < FastImageException # :nodoc:
+  end
+  class UnknownImageType < FastImageException # :nodoc:
+  end
+  class ImageFetchFailure < FastImageException # :nodoc:
+  end
+  class SizeNotFound < FastImageException # :nodoc:
+  end
+
+  DefaultTimeout = 2
+
+  LocalFileChunkSize = 256
+
+  # Returns an array containing the width and height of the image.
+  # It will return nil if the image could not be fetched, or if the image type was not recognised.
+  #
+  # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+  # This can be changed by passing a :timeout => number_of_seconds in the options.
+  #
+  # If you wish FastImage to raise if it cannot size the image for any reason, then pass
+  # :raise_on_failure => true in the options.
+  #
+  # FastImage knows about GIF, JPEG, BMP and PNG files.
+  #
+  # === Example
+  #
+  #   require 'fastimage'
+  #
+  #   FastImage.size("http://stephensykes.com/images/ss.com_x.gif")
+  #   => [266, 56]
+  #   FastImage.size("http://stephensykes.com/images/pngimage")
+  #   => [16, 16]
+  #   FastImage.size("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+  #   => [500, 375]
+  #   FastImage.size("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+  #   => [512, 512]
+  #   FastImage.size("test/fixtures/test.jpg")
+  #   => [882, 470]
+  #   FastImage.size("http://pennysmalls.com/does_not_exist")
+  #   => nil
+  #   FastImage.size("http://pennysmalls.com/does_not_exist", :raise_on_failure=>true)
+  #   => raises FastImage::ImageFetchFailure
+  #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true)
+  #   => raises FastImage::UnknownImageType
+  #   FastImage.size("http://stephensykes.com/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
+  #   => raises FastImage::ImageFetchFailure
+  #   FastImage.size("http://stephensykes.com/images/faulty.jpg", :raise_on_failure=>true)
+  #   => raises FastImage::SizeNotFound
+  #
+  # === Supported options
+  # [:timeout]
+  #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+  # [:raise_on_failure]
+  #   If set to true causes an exception to be raised if the image size cannot be found for any reason.
+  #
+  def self.size(uri, options={})
+    new(uri, options).size
+  end
+
+  # Returns an symbol indicating the image type fetched from a uri.
+  # It will return nil if the image could not be fetched, or if the image type was not recognised.
+  #
+  # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+  # This can be changed by passing a :timeout => number_of_seconds in the options.
+  #
+  # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
+  # :raise_on_failure => true in the options.
+  #
+  # === Example
+  #
+  #   require 'fastimage'
+  #
+  #   FastImage.type("http://stephensykes.com/images/ss.com_x.gif")
+  #   => :gif
+  #   FastImage.type("http://stephensykes.com/images/pngimage")
+  #   => :png
+  #   FastImage.type("http://farm4.static.flickr.com/3023/3047236863_9dce98b836.jpg")
+  #   => :jpeg
+  #   FastImage.type("http://www-ece.rice.edu/~wakin/images/lena512.bmp")
+  #   => :bmp
+  #   FastImage.type("test/fixtures/test.jpg")
+  #   => :jpeg
+  #   FastImage.type("http://pennysmalls.com/does_not_exist")
+  #   => nil
+  #
+  # === Supported options
+  # [:timeout]
+  #   Overrides the default timeout of 2 seconds.  Applies both to reading from and opening the http connection.
+  # [:raise_on_failure]
+  #   If set to true causes an exception to be raised if the image type cannot be found for any reason.
+  #
+  def self.type(uri, options={})
+    new(uri, options.merge(:type_only=>true)).type
+  end
+
+  def initialize(uri, options={})
+    @property = options[:type_only] ? :type : :size
+    @timeout = options[:timeout] || DefaultTimeout
+    @uri = uri
+    begin
+      @parsed_uri = URI.parse(uri)
+    rescue URI::InvalidURIError
+      fetch_using_open_uri
+    else
+      if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
+        fetch_using_http
+      else
+        fetch_using_open_uri
+      end
+    end
+    raise SizeNotFound if options[:raise_on_failure] && @property == :size && !@size
+  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
+    ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT
+    raise ImageFetchFailure if options[:raise_on_failure]
+  rescue NoMethodError  # 1.8.7p248 can raise this due to a net/http bug
+    raise ImageFetchFailure if options[:raise_on_failure]
+  rescue UnknownImageType
+    raise UnknownImageType if options[:raise_on_failure]
+  end
+
+  private
+
+  def fetch_using_http
+    setup_http
+    @http.request_get(@parsed_uri.request_uri) do |res|
+      raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
+      res.read_body do |str|
+        break if parse_packet(str)
+      end
+    end
+  end
+
+  def setup_http
+    @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+    @http.use_ssl = (@parsed_uri.scheme == "https")
+    @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    @http.open_timeout = @timeout
+    @http.read_timeout = @timeout
+  end
+
+  def fetch_using_open_uri
+    open(@uri) do |s|
+      while str = s.read(LocalFileChunkSize)
+        break if parse_packet(str)
+      end
+    end
+  end
+
+  # returns true once result is achieved
+  #
+  def parse_packet(str)
+    @str = (@unused_str || "") + str
+    @strpos = 0
+    begin
+      result = send("parse_#{@property}")
+      if result
+        instance_variable_set("@#{@property}", result)
+        true
+      end
+    rescue MoreCharsNeeded
+      false
+    end
+  end
+
+  def parse_size
+    @type = parse_type unless @type
+    @strpos = 0
+    send("parse_size_for_#{@type}")
+  end
+
+  def get_chars(n)
+    if @strpos + n - 1 >= @str.size
+      @unused_str = @str[@strpos..-1]
+      raise MoreCharsNeeded
+    else
+      result = @str[@strpos..(@strpos + n - 1)]
+      @strpos += n
+      result
+    end
+  end
+
+  def get_byte
+    get_chars(1).unpack("C")[0]
+  end
+
+  def read_int(str)
+    size_bytes = str.unpack("CC")
+    (size_bytes[0] << 8) + size_bytes[1]
+  end
+
+  def parse_type
+    case get_chars(2)
+    when "BM"
+      :bmp
+    when "GI"
+      :gif
+    when 0xff.chr + 0xd8.chr
+      :jpeg
+    when 0x89.chr + "P"
+      :png
+    else
+      raise UnknownImageType
+    end
+  end
+
+  def parse_size_for_gif
+    get_chars(11)[6..10].unpack('SS')
+  end
+
+  def parse_size_for_png
+    get_chars(25)[16..24].unpack('NN')
+  end
+
+  def parse_size_for_jpeg
+    loop do
+      @state = case @state
+      when nil
+        get_chars(2)
+        :started
+      when :started
+        get_byte == 0xFF ? :sof : :started
+      when :sof
+        c = get_byte
+        if (0xe0..0xef).include?(c)
+          :skipframe
+        elsif [0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF].detect {|r| r.include? c}
+          :readsize
+        else
+          :skipframe
+        end
+      when :skipframe
+        @skip_chars = read_int(get_chars(2)) - 2
+        :do_skip
+      when :do_skip
+        get_chars(@skip_chars)
+        :started
+      when :readsize
+        s = get_chars(7)
+        return [read_int(s[5..6]), read_int(s[3..4])]
+      end
+    end
+  end
+
+  def parse_size_for_bmp
+    d = get_chars(29)[14..28]
+    d.unpack("C")[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
+  end
+end

middleman-core/lib/middleman-more/extensions/cache_buster.rb

@@ -0,0 +1,56 @@
+# The Cache Buster extension
+class Middleman::Extensions::CacheBuster < ::Middleman::Extension
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # After compass is setup, make it use the registered cache buster
+    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
+          logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+        end
+      end
+    end if app.respond_to?(:compass_config)
+  end
+
+  helpers do 
+    # asset_url override if we're using cache busting
+    # @param [String] path
+    # @param [String] prefix
+    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
+        if respond_to?(:http_images_path) && prefix == http_images_path
+          prefix = images_dir
+        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 resource = sitemap.find_resource_by_path(real_path_static)
+          if !resource.template?
+            http_path << "?" + File.mtime(resource.source_file).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 during developement
+            http_path << "?" + Time.now.strftime("%s")
+          end
+        end
+
+        http_path
+      end
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/directory_indexes.rb

@@ -0,0 +1,24 @@
+# Directory Indexes extension
+class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
+  # Update the main sitemap resource list
+  # @return [void]
+  def manipulate_resource_list(resources)
+    index_file = app.index_file
+    new_index_path = "/#{index_file}"
+
+    resources.each do |resource|
+      # Check if it would be pointless to reroute
+      next if resource.destination_path == index_file ||
+              resource.destination_path.end_with?(new_index_path) ||
+              File.extname(index_file) != resource.ext
+
+      # Check if frontmatter turns directory_index off
+      next if resource.data[:directory_index] == false
+
+      # Check if file metadata (options set by "page" in config.rb) turns directory_index off
+      next if resource.metadata[:options][:directory_index] == false
+
+      resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/gzip.rb

@@ -0,0 +1,70 @@
+# This extension Gzips assets and pages when building.
+# Gzipped assets and pages can be served directly by Apache or
+# Nginx with the proper configuration, and pre-zipping means that we
+# can use a more agressive compression level at no CPU cost per request.
+#
+# Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
+# to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
+#
+# Pass the :exts options to customize which file extensions get zipped (defaults
+# to .html, .htm, .js and .css.
+#
+class Middleman::Extensions::Gzip < ::Middleman::Extension
+  option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
+
+  def initialize(app, options_hash={})
+    super
+    
+    require 'zlib'
+    require 'stringio'
+    require 'find'
+
+    gzip_ext = self
+
+    app.after_build do |builder|
+      paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
+      paths.each do |path|
+        next unless gzip_ext.options.exts.include? path.extname
+
+        output_filename, old_size, new_size = gzip_ext.gzip_file(path.to_s)
+
+        if output_filename
+          size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+          old_locale = I18n.locale
+          I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
+          builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
+          I18n.locale = old_locale
+        end
+      end
+    end
+  end
+
+  def gzip_file(path)
+    input_file = File.open(path, 'rb').read
+    output_filename = path + '.gz'
+    input_file_time = File.mtime(path)
+
+    # Check if the right file's already there
+    if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
+      return
+    end
+
+    File.open(output_filename, 'wb') do |f|
+      gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+      gz.mtime = input_file_time.to_i
+      gz.write input_file
+      gz.close
+    end
+
+    # Make the file times match, both for Nginx's gzip_static extension
+    # and so we can ID existing files. Also, so even if the GZ files are
+    # wiped out by build --clean and recreated, we won't rsync them over
+    # again because they'll end up with the same mtime.
+    File.utime(File.atime(output_filename), input_file_time, output_filename)
+
+    old_size = File.size(path)
+    new_size = File.size(output_filename)
+
+    [output_filename, old_size, new_size]
+  end
+end

middleman-core/lib/middleman-more/extensions/lorem.rb

@@ -0,0 +1,176 @@
+class Middleman::Extensions::Lorem < ::Middleman::Extension
+  helpers do
+    # Access to the Lorem object
+    # @return [Middleman::Extensions::Lorem::LoremObject]
+    def lorem
+      LoremObject
+    end
+
+    # Return a placeholder image using placekitten.com
+    #
+    # @param [String] size
+    # @param [Hash] options
+    # @return [String]
+    def placekitten(size, options={})
+      options[:domain] = "http://placekitten.com"
+      lorem.image(size, options)
+    end
+  end
+
+  # Adapted from Frank:
+  # https://github.com/blahed/frank/
+  # Copyright (c) 2010 Travis Dunn
+  #
+  #   Permission is hereby granted, free of charge, to any person
+  #   obtaining a copy of this software and associated documentation
+  #   files (the "Software"), to deal in the Software without
+  #   restriction, including without limitation the rights to use,
+  #   copy, modify, merge, publish, distribute, sublicense, and/or sell
+  #   copies of the Software, and to permit persons to whom the
+  #   Software is furnished to do so, subject to the following
+  #   conditions:
+  #
+  #   The above copyright notice and this permission notice shall be
+  #   included in all copies or substantial portions of the Software.
+  #
+  #   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  #   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  #   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  #   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  #   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  #   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  #   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  #   OTHER DEALINGS IN THE SOFTWARE.
+  module LoremObject
+    class << self
+      # Words for use in lorem text
+      WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
+
+      # Get one placeholder word
+      # @return [String]
+      def word
+        words(1)
+      end
+
+      # Get some number of placeholder words
+      # @param [Fixnum] total
+      # @return [String]
+      def words(total)
+        (1..total).map do
+          randm(WORDS)
+        end.join(' ')
+      end
+
+      # Get one placeholder sentence
+      # @return [String]
+      def sentence
+        sentences(1)
+      end
+
+      # Get some number of placeholder sentences
+      # @param [Fixnum] total
+      # @return [String]
+      def sentences(total)
+        (1..total).map do
+          words(randm(4..15)).capitalize
+        end.join('. ')
+      end
+
+      # Get one placeholder paragraph
+      # @return [String]
+      def paragraph
+        paragraphs(1)
+      end
+
+      # Get some number of placeholder paragraphs
+      # @param [Fixnum] total
+      # @return [String]
+      def paragraphs(total)
+        (1..total).map do
+          sentences(randm(3..7)).capitalize
+        end.join("\n\n")
+      end
+
+      # Get a placeholder date
+      # @param [String] fmt
+      # @return [String]
+      def date(fmt = '%a %b %d, %Y')
+        y = rand(20) + 1990
+        m = rand(12) + 1
+        d = rand(31) + 1
+        Time.local(y,m,d).strftime(fmt)
+      end
+
+      # Get a placeholder name
+      # @return [String]
+      def name
+        "#{first_name} #{last_name}"
+      end
+
+      # Get a placeholder first name
+      # @return [String]
+      def first_name
+        names = "Judith Angelo Margarita Kerry Elaine Lorenzo Justice Doris Raul Liliana Kerry Elise Ciaran Johnny Moses Davion Penny Mohammed Harvey Sheryl Hudson Brendan Brooklynn Denis Sadie Trisha Jacquelyn Virgil Cindy Alexa Marianne Giselle Casey Alondra Angela Katherine Skyler Kyleigh Carly Abel Adrianna Luis Dominick Eoin Noel Ciara Roberto Skylar Brock Earl Dwayne Jackie Hamish Sienna Nolan Daren Jean Shirley Connor Geraldine Niall Kristi Monty Yvonne Tammie Zachariah Fatima Ruby Nadia Anahi Calum Peggy Alfredo Marybeth Bonnie Gordon Cara John Staci Samuel Carmen Rylee Yehudi Colm Beth Dulce Darius inley Javon Jason Perla Wayne Laila Kaleigh Maggie Don Quinn Collin Aniya Zoe Isabel Clint Leland Esmeralda Emma Madeline Byron Courtney Vanessa Terry Antoinette George Constance Preston Rolando Caleb Kenneth Lynette Carley Francesca Johnnie Jordyn Arturo Camila Skye Guy Ana Kaylin Nia Colton Bart Brendon Alvin Daryl Dirk Mya Pete Joann Uriel Alonzo Agnes Chris Alyson Paola Dora Elias Allen Jackie Eric Bonita Kelvin Emiliano Ashton Kyra Kailey Sonja Alberto Ty Summer Brayden Lori Kelly Tomas Joey Billie Katie Stephanie Danielle Alexis Jamal Kieran Lucinda Eliza Allyson Melinda Alma Piper Deana Harriet Bryce Eli Jadyn Rogelio Orlaith Janet Randal Toby Carla Lorie Caitlyn Annika Isabelle inn Ewan Maisie Michelle Grady Ida Reid Emely Tricia Beau Reese Vance Dalton Lexi Rafael Makenzie Mitzi Clinton Xena Angelina Kendrick Leslie Teddy Jerald Noelle Neil Marsha Gayle Omar Abigail Alexandra Phil Andre Billy Brenden Bianca Jared Gretchen Patrick Antonio Josephine Kyla Manuel Freya Kellie Tonia Jamie Sydney Andres Ruben Harrison Hector Clyde Wendell Kaden Ian Tracy Cathleen Shawn".split(" ")
+        names[rand(names.size)]
+      end
+
+      # Get a placeholder last name
+      # @return [String]
+      def last_name
+        names = "Chung Chen Melton Hill Puckett Song Hamilton Bender Wagner McLaughlin McNamara Raynor Moon Woodard Desai Wallace Lawrence Griffin Dougherty Powers May Steele Teague Vick Gallagher Solomon Walsh Monroe Connolly Hawkins Middleton Goldstein Watts Johnston Weeks Wilkerson Barton Walton Hall Ross Chung Bender Woods Mangum Joseph Rosenthal Bowden Barton Underwood Jones Baker Merritt Cross Cooper Holmes Sharpe Morgan Hoyle Allen Rich Rich Grant Proctor Diaz Graham Watkins Hinton Marsh Hewitt Branch Walton O'Brien Case Watts Christensen Parks Hardin Lucas Eason Davidson Whitehead Rose Sparks Moore Pearson Rodgers Graves Scarborough Sutton Sinclair Bowman Olsen Love McLean Christian Lamb James Chandler Stout Cowan Golden Bowling Beasley Clapp Abrams Tilley Morse Boykin Sumner Cassidy Davidson Heath Blanchard McAllister McKenzie Byrne Schroeder Griffin Gross Perkins Robertson Palmer Brady Rowe Zhang Hodge Li Bowling Justice Glass Willis Hester Floyd Graves Fischer Norman Chan Hunt Byrd Lane Kaplan Heller May Jennings Hanna Locklear Holloway Jones Glover Vick O'Donnell Goldman McKenna Starr Stone McClure Watson Monroe Abbott Singer Hall Farrell Lucas Norman Atkins Monroe Robertson Sykes Reid Chandler Finch Hobbs Adkins Kinney Whitaker Alexander Conner Waters Becker Rollins Love Adkins Black Fox Hatcher Wu Lloyd Joyce Welch Matthews Chappell MacDonald Kane Butler Pickett Bowman Barton Kennedy Branch Thornton McNeill Weinstein Middleton Moss Lucas Rich Carlton Brady Schultz Nichols Harvey Stevenson Houston Dunn West O'Brien Barr Snyder Cain Heath Boswell Olsen Pittman Weiner Petersen Davis Coleman Terrell Norman Burch Weiner Parrott Henry Gray Chang McLean Eason Weeks Siegel Puckett Heath Hoyle Garrett Neal Baker Goldman Shaffer Choi Carver".split(" ")
+        names[rand(names.size)]
+      end
+
+      # Get a placeholder 140 character tweet about Philip the Purple Otter
+      # Via http://www.kevadamson.com/talking-of-design/article/140-alternative-characters-to-lorem-ipsum
+      # @return [String]
+      def tweet
+        tweets = [ 'Far away, in a forest next to a river beneath the mountains, there lived a small purple otter called Philip. Philip likes sausages. The End.',
+                   'He liked the quality sausages from Marks & Spencer but due to the recession he had been forced to shop in a less desirable supermarket. End.',
+                   'He awoke one day to find his pile of sausages missing. Roger the greedy boar with human eyes, had skateboarded into the forest & eaten them!']
+        tweets[rand(tweets.size)]
+      end
+
+      # Get a placeholder email address
+      # @return [String]
+      def email
+        delimiters = [ '_', '-', '' ]
+        domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
+        username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
+        "#{username}@#{domains[rand(domains.size)]}".downcase
+      end
+
+      # Get a placeholder image, using placehold.it by default
+      # @param [String] size
+      # @param [Hash] options
+      # @return [String]
+      def image(size, options={})
+        domain           = options[:domain] || "http://placehold.it"
+        src              = "#{domain}/#{size}"
+        hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+        background_color = options[:background_color]
+        color            = options[:color]
+
+        if options[:random_color]
+          background_color = hex.shuffle[0...6].join
+          color = hex.shuffle[0...6].join
+        end
+
+        src << "/#{background_color.sub(/^#/, '')}" if background_color
+        src << "/ccc" if background_color.nil? && color
+        src << "/#{color.sub(/^#/, '')}" if color
+        src << "&text=#{Rack::Utils::escape(options[:text])}" if options[:text]
+
+        src
+      end
+
+      # Pick a random item from a given range
+      # @param [Range] range
+      # @return [Object]
+      def randm(range)
+        a = range.to_a
+        a[rand(a.length)]
+      end
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/minify_css.rb

@@ -0,0 +1,77 @@
+# Minify CSS Extension
+class Middleman::Extensions::MinifyCss < ::Middleman::Extension
+  option :compressor, nil, 'Set the CSS compressor to use.'
+  option :inline, false, 'Whether to minify CSS inline within HTML files'
+  option :ignore, [], 'Patterns to avoid minifying'
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    app.config.define_setting :css_compressor, nil, 'Set the CSS compressor to use. Deprecated in favor of the :compressor option when activating :minify_css'
+  end
+
+  def after_configuration
+    chosen_compressor = app.config[:css_compressor] || options[:compressor] || SassCompressor
+
+    # Setup Rack middleware to minify CSS
+    app.use Rack, :compressor => chosen_compressor,
+                  :ignore     => Array(options[:ignore]) + [/\.min\./],
+                  :inline     => options[:inline]
+  end
+
+  class SassCompressor
+    def self.compress(style, options = {})
+      root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
+      root_node.options = { :style => :compressed }
+      root_node.render.strip
+    end
+  end
+
+  # Rack middleware to look for CSS and compress it
+  class Rack
+
+    # Init
+    # @param [Class] app
+    # @param [Hash] options
+    def initialize(app, options={})
+      @app = app
+      @compressor = options[:compressor]
+      @ignore = options[:ignore]
+      @inline = options[:inline]
+    end
+
+    # Rack interface
+    # @param [Rack::Environmemt] env
+    # @return [Array]
+    def call(env)
+      status, headers, response = @app.call(env)
+
+      path = env["PATH_INFO"]
+
+      if (path.end_with?('.html') || path.end_with?('.php')) && @inline
+        uncompressed_source = ::Middleman::Util.extract_response_text(response)
+
+        minified = uncompressed_source.gsub(/(<style[^>]*>\s*(?:\/\*<!\[CDATA\[\*\/\n)?)(.*?)((?:(?:\n\s*)?\/\*\]\]>\*\/)?\s*<\/style>)/m) do |match|
+          first = $1
+          css = $2
+          last = $3
+
+          minified_css = @compressor.compress(css)
+
+          first << minified_css << last
+        end
+
+        headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+        response = [minified]
+      elsif path.end_with?('.css') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
+        uncompressed_source = ::Middleman::Util.extract_response_text(response)
+        minified_css = @compressor.compress(uncompressed_source)
+
+        headers["Content-Length"] = ::Rack::Utils.bytesize(minified_css).to_s
+        response = [minified_css]
+      end
+
+      [status, headers, response]
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/minify_javascript.rb

@@ -0,0 +1,83 @@
+# Minify Javascript Extension
+class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
+  option :compressor, nil, 'Set the JS compressor to use.'
+  option :inline, false, 'Whether to minify JS inline within HTML files'
+  option :ignore, [], 'Patterns to avoid minifying'
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    app.config.define_setting :js_compressor, nil, 'Set the JS compressor to use. Deprecated in favor of the :compressor option when activating :minify_js'
+  end
+
+  def after_configuration
+    chosen_compressor = app.config[:js_compressor] || options[:compressor] || begin
+      require 'uglifier'
+      ::Uglifier.new
+    end
+
+    # Setup Rack middleware to minify CSS
+    app.use Rack, :compressor => chosen_compressor,
+                  :ignore     => Array(options[:ignore]) + [/\.min\./],
+                  :inline     => options[:inline]
+  end
+
+  # Rack middleware to look for JS and compress it
+  class Rack
+
+    # Init
+    # @param [Class] app
+    # @param [Hash] options
+    def initialize(app, options={})
+      @app = app
+      @compressor = options[:compressor]
+      @ignore = options[:ignore]
+      @inline = options[:inline]
+    end
+
+    # Rack interface
+    # @param [Rack::Environmemt] env
+    # @return [Array]
+    def call(env)
+      status, headers, response = @app.call(env)
+
+      path = env["PATH_INFO"]
+
+      begin
+        if (path.end_with?('.html') || path.end_with?('.php')) && @inline
+          uncompressed_source = ::Middleman::Util.extract_response_text(response)
+
+          minified = uncompressed_source.gsub(/(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m) do |match|
+            first = $1
+            javascript = $2
+            last = $3
+
+            # Only compress script tags that contain JavaScript (as opposed
+            # to something like jQuery templates, identified with a "text/html"
+            # type.
+            if first =~ /<script>/ || first.include?('text/javascript')
+              minified_js = @compressor.compress(javascript)
+
+              first << minified_js << last
+            else
+              match
+            end
+          end
+
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+          response = [minified]
+        elsif path.end_with?('.js') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
+          uncompressed_source = ::Middleman::Util.extract_response_text(response)
+          minified_js = @compressor.compress(uncompressed_source)
+
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified_js).to_s
+          response = [minified_js]
+        end
+      rescue ExecJS::ProgramError => e
+        warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
+      end
+
+      [status, headers, response]
+    end
+  end
+end

middleman-core/lib/middleman-more/extensions/relative_assets.rb

@@ -0,0 +1,29 @@
+# Relative Assets extension
+class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
+
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # After compass is setup, make it use the registered cache buster
+    app.compass_config do |config|
+      config.relative_assets = true
+    end if app.respond_to?(:compass_config)
+  end
+
+  helpers do
+    # asset_url override for relative assets
+    # @param [String] path
+    # @param [String] prefix
+    # @return [String]
+    def asset_url(path, prefix="")
+      path = super(path, prefix)
+
+      if path.include?("//") || !current_resource
+        path
+      else
+        current_dir = Pathname('/' + current_resource.destination_path)
+        Pathname(path).relative_path_from(current_dir.dirname).to_s
+      end
+    end
+  end
+end