update minify css extension, unindent other exts
This commit is contained in:
Thomas Reynolds
parent
3da3a2acc8
commit
11a3507528
|
|
@ -55,10 +55,8 @@ module Middleman
|
||||||
end
|
end
|
||||||
|
|
||||||
# MinifyCss compresses CSS
|
# MinifyCss compresses CSS
|
||||||
Middleman::Extensions.register(:minify_css) do
|
require "middleman-more/extensions/minify_css"
|
||||||
require "middleman-more/extensions/minify_css"
|
Middleman::Extensions::MinifyCss.register
|
||||||
Middleman::Extensions::MinifyCss
|
|
||||||
end
|
|
||||||
|
|
||||||
# MinifyJavascript compresses JS
|
# MinifyJavascript compresses JS
|
||||||
Middleman::Extensions.register(:minify_javascript) do
|
Middleman::Extensions.register(:minify_javascript) do
|
||||||
|
|
|
||||||
|
|
@ -1,108 +1,104 @@
|
||||||
module Middleman
|
class Middleman::Extensions::AssetHash < ::Middleman::Extension
|
||||||
module Extensions
|
option :exts, %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg), "List of extensions that get asset hashes appended to them."
|
||||||
class AssetHash < ::Middleman::Extension
|
option :ignore, [], "Regexes of filenames to skip adding asset hashes to"
|
||||||
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={})
|
def initialize(app, options_hash={}, &block)
|
||||||
super
|
super
|
||||||
|
|
||||||
require 'digest/sha1'
|
require 'digest/sha1'
|
||||||
require 'rack/test'
|
require 'rack/test'
|
||||||
require 'uri'
|
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
|
||||||
|
end.each do |resource|
|
||||||
|
next unless options.exts.include? resource.ext
|
||||||
|
next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
|
||||||
|
|
||||||
def after_configuration
|
# Render through the Rack interface so middleware and mounted apps get a shot
|
||||||
# Allow specifying regexes to ignore, plus always ignore apple touch icons
|
response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => "true" })
|
||||||
@ignore = Array(options.ignore) + [/^apple-touch-icon/]
|
raise "#{resource.path} should be in the sitemap!" unless response.status == 200
|
||||||
|
|
||||||
app.use Middleware, :exts => options.exts, :middleman_app => app, :ignore => @ignore
|
digest = Digest::SHA1.hexdigest(response.body)[0..7]
|
||||||
end
|
|
||||||
|
|
||||||
# Update the main sitemap resource list
|
resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
|
||||||
# @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
|
|
||||||
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
|
||||||
end
|
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==============================
|
# =================Temp Generate Test data==============================
|
||||||
# ["jpg", "png", "gif"].each do |ext|
|
# ["jpg", "png", "gif"].each do |ext|
|
||||||
|
|
|
||||||
|
|
@ -1,55 +1,50 @@
|
||||||
# Extensions namespace
|
|
||||||
module Middleman
|
|
||||||
module Extensions
|
|
||||||
|
|
||||||
# Asset Host module
|
# Asset Host module
|
||||||
class AssetHost < ::Middleman::Extension
|
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'
|
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)
|
def initialize(app, options_hash={}, &block)
|
||||||
super
|
super
|
||||||
|
|
||||||
# Backwards compatible API
|
# 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.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|
|
app.compass_config do |config|
|
||||||
if asset_host = extensions[:asset_host].host
|
if asset_host = extensions[:asset_host].host
|
||||||
if asset_host.is_a?(Proc)
|
if asset_host.is_a?(Proc)
|
||||||
config.asset_host(&asset_host)
|
config.asset_host(&asset_host)
|
||||||
else
|
else
|
||||||
config.asset_host do |asset|
|
config.asset_host do |asset|
|
||||||
asset_host
|
asset_host
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
def host
|
end
|
||||||
app.config[:asset_host] || options[:host]
|
|
||||||
end
|
def host
|
||||||
|
app.config[:asset_host] || options[:host]
|
||||||
helpers do
|
end
|
||||||
# Override default asset url helper to include asset hosts
|
|
||||||
#
|
helpers do
|
||||||
# @param [String] path
|
# Override default asset url helper to include asset hosts
|
||||||
# @param [String] prefix
|
#
|
||||||
# @return [String]
|
# @param [String] path
|
||||||
def asset_url(path, prefix="")
|
# @param [String] prefix
|
||||||
controller = extensions[:asset_host]
|
# @return [String]
|
||||||
|
def asset_url(path, prefix="")
|
||||||
original_output = super
|
controller = extensions[:asset_host]
|
||||||
return original_output unless controller.host
|
|
||||||
|
original_output = super
|
||||||
asset_prefix = if controller.host.is_a?(Proc)
|
return original_output unless controller.host
|
||||||
controller.host.call(original_output)
|
|
||||||
elsif controller.host.is_a?(String)
|
asset_prefix = if controller.host.is_a?(Proc)
|
||||||
controller.host
|
controller.host.call(original_output)
|
||||||
end
|
elsif controller.host.is_a?(String)
|
||||||
|
controller.host
|
||||||
File.join(asset_prefix, original_output)
|
end
|
||||||
end
|
|
||||||
end
|
File.join(asset_prefix, original_output)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,48 +1,42 @@
|
||||||
# Extensions namespace
|
# Automatic Image Sizes extension
|
||||||
module Middleman
|
class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
|
||||||
module Extensions
|
|
||||||
|
|
||||||
# Automatic Image Sizes extension
|
def initialize(app, options_hash={}, &block)
|
||||||
class AutomaticImageSizes < ::Middleman::Extension
|
super
|
||||||
|
|
||||||
def initialize(app, options_hash={}, &block)
|
# Include 3rd-party fastimage library
|
||||||
super
|
require "middleman-more/extensions/automatic_image_sizes/fastimage"
|
||||||
|
end
|
||||||
|
|
||||||
# Include 3rd-party fastimage library
|
helpers do
|
||||||
require "middleman-more/extensions/automatic_image_sizes/fastimage"
|
# Override default image_tag helper to automatically calculate and include
|
||||||
end
|
# 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] ||= ""
|
||||||
|
|
||||||
helpers do
|
real_path = path
|
||||||
# Override default image_tag helper to automatically calculate and include
|
real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
|
||||||
# image dimensions.
|
full_path = File.join(source_dir, real_path)
|
||||||
#
|
|
||||||
# @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
|
if File.exists?(full_path)
|
||||||
real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
|
begin
|
||||||
full_path = File.join(source_dir, real_path)
|
width, height = ::FastImage.size(full_path, :raise_on_failure => true)
|
||||||
|
params[:width] = width
|
||||||
if File.exists?(full_path)
|
params[:height] = height
|
||||||
begin
|
rescue FastImage::UnknownImageType
|
||||||
width, height = ::FastImage.size(full_path, :raise_on_failure => true)
|
# No message, it's just not supported
|
||||||
params[:width] = width
|
rescue
|
||||||
params[:height] = height
|
warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
|
||||||
rescue FastImage::UnknownImageType
|
|
||||||
# No message, it's just not supported
|
|
||||||
rescue
|
|
||||||
warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
super(path, params)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
super(path, params)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,62 +1,56 @@
|
||||||
# Extension namespace
|
# The Cache Buster extension
|
||||||
module Middleman
|
class Middleman::Extensions::CacheBuster < ::Middleman::Extension
|
||||||
module Extensions
|
|
||||||
|
|
||||||
# The Cache Buster extension
|
def initialize(app, options_hash={}, &block)
|
||||||
class CacheBuster < ::Middleman::Extension
|
super
|
||||||
|
|
||||||
def initialize(app, options_hash={}, &block)
|
# After compass is setup, make it use the registered cache buster
|
||||||
super
|
app.compass_config do |config|
|
||||||
|
config.asset_cache_buster do |path, real_path|
|
||||||
# After compass is setup, make it use the registered cache buster
|
real_path = real_path.path if real_path.is_a? File
|
||||||
app.compass_config do |config|
|
real_path = real_path.gsub(File.join(root, build_dir), source)
|
||||||
config.asset_cache_buster do |path, real_path|
|
if File.readable?(real_path)
|
||||||
real_path = real_path.path if real_path.is_a? File
|
File.mtime(real_path).strftime("%s")
|
||||||
real_path = real_path.gsub(File.join(root, build_dir), source)
|
else
|
||||||
if File.readable?(real_path)
|
logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(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
|
|
||||||
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
|
end
|
||||||
end
|
end
|
||||||
end
|
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
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,24 @@
|
||||||
# Extensions namespace
|
# Directory Indexes extension
|
||||||
module Middleman
|
class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
|
||||||
module Extensions
|
# Update the main sitemap resource list
|
||||||
|
# @return [void]
|
||||||
|
def manipulate_resource_list(resources)
|
||||||
|
index_file = app.index_file
|
||||||
|
new_index_path = "/#{index_file}"
|
||||||
|
|
||||||
# Directory Indexes extension
|
resources.each do |resource|
|
||||||
class DirectoryIndexes < ::Middleman::Extension
|
# Check if it would be pointless to reroute
|
||||||
# Update the main sitemap resource list
|
next if resource.destination_path == index_file ||
|
||||||
# @return [void]
|
resource.destination_path.end_with?(new_index_path) ||
|
||||||
def manipulate_resource_list(resources)
|
File.extname(index_file) != resource.ext
|
||||||
index_file = app.index_file
|
|
||||||
new_index_path = "/#{index_file}"
|
|
||||||
|
|
||||||
resources.each do |resource|
|
# Check if frontmatter turns directory_index off
|
||||||
# Check if it would be pointless to reroute
|
next if resource.data[:directory_index] == false
|
||||||
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
|
# Check if file metadata (options set by "page" in config.rb) turns directory_index off
|
||||||
next if resource.data[:directory_index] == false
|
next if resource.metadata[:options][:directory_index] == false
|
||||||
|
|
||||||
# Check if file metadata (options set by "page" in config.rb) turns directory_index off
|
resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
|
||||||
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
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,73 +1,70 @@
|
||||||
module Middleman::Extensions
|
# 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.'
|
||||||
|
|
||||||
# This extension Gzips assets and pages when building.
|
def initialize(app, options_hash={})
|
||||||
# Gzipped assets and pages can be served directly by Apache or
|
super
|
||||||
# Nginx with the proper configuration, and pre-zipping means that we
|
|
||||||
# can use a more agressive compression level at no CPU cost per request.
|
require 'zlib'
|
||||||
#
|
require 'stringio'
|
||||||
# Use Nginx's gzip_static directive, or AddEncoding and mod_rewrite in Apache
|
require 'find'
|
||||||
# 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 Gzip < ::Middleman::Extension
|
|
||||||
option :exts, %w(.js .css .html .htm), 'File extensions to Gzip when building.'
|
|
||||||
|
|
||||||
def initialize(app, options_hash={})
|
gzip_ext = self
|
||||||
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
|
||||||
|
|
||||||
app.after_build do |builder|
|
output_filename, old_size, new_size = gzip_ext.gzip_file(path.to_s)
|
||||||
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'
|
||||||
if output_filename
|
old_locale = I18n.locale
|
||||||
size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
|
I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
|
||||||
old_locale = I18n.locale
|
builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
|
||||||
I18n.locale = :en # use the english localizations for printing out file sizes to make sure the localizations exist
|
I18n.locale = old_locale
|
||||||
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
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def gzip_file(path)
|
def gzip_file(path)
|
||||||
input_file = File.open(path, 'rb').read
|
input_file = File.open(path, 'rb').read
|
||||||
output_filename = path + '.gz'
|
output_filename = path + '.gz'
|
||||||
input_file_time = File.mtime(path)
|
input_file_time = File.mtime(path)
|
||||||
|
|
||||||
# Check if the right file's already there
|
# Check if the right file's already there
|
||||||
if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
|
if File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
|
||||||
return
|
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
|
||||||
|
|
||||||
|
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
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,182 +1,175 @@
|
||||||
# Extension namespace
|
class Middleman::Extensions::Lorem < ::Middleman::Extension
|
||||||
module Middleman
|
helpers do
|
||||||
module Extensions
|
# Access to the Lorem object
|
||||||
|
# @return [Middleman::Extensions::Lorem::LoremObject]
|
||||||
|
def lorem
|
||||||
|
LoremObject
|
||||||
|
end
|
||||||
|
|
||||||
# Lorem helper
|
# Return a placeholder image using placekitten.com
|
||||||
class Lorem < ::Middleman::Extension
|
#
|
||||||
helpers do
|
# @param [String] size
|
||||||
# Access to the Lorem object
|
# @param [Hash] options
|
||||||
# @return [Middleman::Extensions::Lorem::LoremObject]
|
# @return [String]
|
||||||
def lorem
|
def placekitten(size, options={})
|
||||||
LoremObject
|
options[:domain] = "http://placekitten.com"
|
||||||
end
|
lorem.image(size, options)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Return a placeholder image using placekitten.com
|
# Adapted from Frank:
|
||||||
#
|
# https://github.com/blahed/frank/
|
||||||
# @param [String] size
|
# Copyright (c) 2010 Travis Dunn
|
||||||
# @param [Hash] options
|
#
|
||||||
# @return [String]
|
# Permission is hereby granted, free of charge, to any person
|
||||||
def placekitten(size, options={})
|
# obtaining a copy of this software and associated documentation
|
||||||
options[:domain] = "http://placekitten.com"
|
# files (the "Software"), to deal in the Software without
|
||||||
lorem.image(size, options)
|
# restriction, including without limitation the rights to use,
|
||||||
end
|
# 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
|
end
|
||||||
|
|
||||||
# Adapted from Frank:
|
# Get some number of placeholder words
|
||||||
# https://github.com/blahed/frank/
|
# @param [Fixnum] total
|
||||||
# Copyright (c) 2010 Travis Dunn
|
# @return [String]
|
||||||
#
|
def words(total)
|
||||||
# Permission is hereby granted, free of charge, to any person
|
(1..total).map do
|
||||||
# obtaining a copy of this software and associated documentation
|
randm(WORDS)
|
||||||
# files (the "Software"), to deal in the Software without
|
end.join(' ')
|
||||||
# restriction, including without limitation the rights to use,
|
end
|
||||||
# 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
|
# Get one placeholder sentence
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def word
|
def sentence
|
||||||
words(1)
|
sentences(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Get some number of placeholder words
|
# Get some number of placeholder sentences
|
||||||
# @param [Fixnum] total
|
# @param [Fixnum] total
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def words(total)
|
def sentences(total)
|
||||||
(1..total).map do
|
(1..total).map do
|
||||||
randm(WORDS)
|
words(randm(4..15)).capitalize
|
||||||
end.join(' ')
|
end.join('. ')
|
||||||
end
|
end
|
||||||
|
|
||||||
# Get one placeholder sentence
|
# Get one placeholder paragraph
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def sentence
|
def paragraph
|
||||||
sentences(1)
|
paragraphs(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Get some number of placeholder sentences
|
# Get some number of placeholder paragraphs
|
||||||
# @param [Fixnum] total
|
# @param [Fixnum] total
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def sentences(total)
|
def paragraphs(total)
|
||||||
(1..total).map do
|
(1..total).map do
|
||||||
words(randm(4..15)).capitalize
|
sentences(randm(3..7)).capitalize
|
||||||
end.join('. ')
|
end.join("\n\n")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Get one placeholder paragraph
|
# Get a placeholder date
|
||||||
# @return [String]
|
# @param [String] fmt
|
||||||
def paragraph
|
# @return [String]
|
||||||
paragraphs(1)
|
def date(fmt = '%a %b %d, %Y')
|
||||||
end
|
y = rand(20) + 1990
|
||||||
|
m = rand(12) + 1
|
||||||
|
d = rand(31) + 1
|
||||||
|
Time.local(y,m,d).strftime(fmt)
|
||||||
|
end
|
||||||
|
|
||||||
# Get some number of placeholder paragraphs
|
# Get a placeholder name
|
||||||
# @param [Fixnum] total
|
# @return [String]
|
||||||
# @return [String]
|
def name
|
||||||
def paragraphs(total)
|
"#{first_name} #{last_name}"
|
||||||
(1..total).map do
|
end
|
||||||
sentences(randm(3..7)).capitalize
|
|
||||||
end.join("\n\n")
|
|
||||||
end
|
|
||||||
|
|
||||||
# Get a placeholder date
|
# Get a placeholder first name
|
||||||
# @param [String] fmt
|
# @return [String]
|
||||||
# @return [String]
|
def first_name
|
||||||
def date(fmt = '%a %b %d, %Y')
|
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(" ")
|
||||||
y = rand(20) + 1990
|
names[rand(names.size)]
|
||||||
m = rand(12) + 1
|
end
|
||||||
d = rand(31) + 1
|
|
||||||
Time.local(y,m,d).strftime(fmt)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Get a placeholder name
|
# Get a placeholder last name
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def name
|
def last_name
|
||||||
"#{first_name} #{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(" ")
|
||||||
end
|
names[rand(names.size)]
|
||||||
|
end
|
||||||
|
|
||||||
# Get a placeholder first name
|
# Get a placeholder 140 character tweet about Philip the Purple Otter
|
||||||
# @return [String]
|
# Via http://www.kevadamson.com/talking-of-design/article/140-alternative-characters-to-lorem-ipsum
|
||||||
def first_name
|
# @return [String]
|
||||||
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(" ")
|
def tweet
|
||||||
names[rand(names.size)]
|
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.',
|
||||||
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 last name
|
# Get a placeholder email address
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def last_name
|
def email
|
||||||
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(" ")
|
delimiters = [ '_', '-', '' ]
|
||||||
names[rand(names.size)]
|
domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
|
||||||
end
|
username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
|
||||||
|
"#{username}@#{domains[rand(domains.size)]}".downcase
|
||||||
|
end
|
||||||
|
|
||||||
# Get a placeholder 140 character tweet about Philip the Purple Otter
|
# Get a placeholder image, using placehold.it by default
|
||||||
# Via http://www.kevadamson.com/talking-of-design/article/140-alternative-characters-to-lorem-ipsum
|
# @param [String] size
|
||||||
# @return [String]
|
# @param [Hash] options
|
||||||
def tweet
|
# @return [String]
|
||||||
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.',
|
def image(size, options={})
|
||||||
'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.',
|
domain = options[:domain] || "http://placehold.it"
|
||||||
'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!']
|
src = "#{domain}/#{size}"
|
||||||
tweets[rand(tweets.size)]
|
hex = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
|
||||||
end
|
background_color = options[:background_color]
|
||||||
|
color = options[:color]
|
||||||
|
|
||||||
# Get a placeholder email address
|
if options[:random_color]
|
||||||
# @return [String]
|
background_color = hex.shuffle[0...6].join
|
||||||
def email
|
color = hex.shuffle[0...6].join
|
||||||
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
|
||||||
|
|
||||||
|
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
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,89 +1,77 @@
|
||||||
# Extensions namespace
|
# Minify CSS Extension
|
||||||
module Middleman
|
class Middleman::Extensions::MinifyCss < ::Middleman::Extension
|
||||||
module Extensions
|
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'
|
||||||
|
|
||||||
# Minify CSS Extension
|
def initialize(app, options_hash={}, &block)
|
||||||
module MinifyCss
|
super
|
||||||
|
|
||||||
# Setup extension
|
app.config.define_setting :css_compressor, nil, 'Set the CSS compressor to use. Deprecated in favor of the :compressor option when activating :minify_css'
|
||||||
class << self
|
end
|
||||||
|
|
||||||
# Once registered
|
def after_configuration
|
||||||
def registered(app, options={})
|
chosen_compressor = app.config[:css_compressor] || options[:compressor] || SassCompressor
|
||||||
app.config.define_setting :css_compressor, nil, 'Set the CSS compressor to use. Deprecated in favor of the :compressor option when activating :minify_css'
|
|
||||||
|
|
||||||
ignore = Array(options[:ignore]) << /\.min\./
|
# Setup Rack middleware to minify CSS
|
||||||
inline = options[:inline] || false
|
app.use Rack, :compressor => chosen_compressor,
|
||||||
|
:ignore => options[:ignore] + [/\.min\./],
|
||||||
|
:inline => options[:inline]
|
||||||
|
end
|
||||||
|
|
||||||
app.after_configuration do
|
class SassCompressor
|
||||||
chosen_compressor = config[:css_compressor] || options[:compressor] || begin
|
def self.compress(style, options = {})
|
||||||
::Middleman::Extensions::MinifyCss::SassCompressor
|
root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
|
||||||
end
|
root_node.options = { :style => :compressed }
|
||||||
|
root_node.render.strip
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Setup Rack middleware to minify CSS
|
# Rack middleware to look for CSS and compress it
|
||||||
use Rack, :compressor => chosen_compressor,
|
class Rack
|
||||||
:ignore => ignore,
|
|
||||||
:inline => inline
|
# Init
|
||||||
end
|
# @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
|
end
|
||||||
alias :included :registered
|
|
||||||
|
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
|
end
|
||||||
|
|
||||||
class SassCompressor
|
[status, headers, response]
|
||||||
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
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue