middleman-core 4.5.1 → 5.0.0.rc.1

data/lib/middleman-core/extension_manager.rb

@@ -24,6 +24,10 @@ module Middleman
       @app.after_configuration_eval(&method(:activate_all))
     end
 
+    def active?(key)
+      @activated.key?(key)
+    end
+
     def auto_activate(key)
       ::Middleman::Extensions.auto_activate(key, @app)
     end
@@ -46,7 +50,7 @@ module Middleman
     # @param [Hash] options Options to pass to the extension
     # @yield [Middleman::Configuration::ConfigurationManager] Extension options that can be modified before the extension is initialized.
     # @return [void]
-    def activate(ext_name, options={}, &block)
+    def activate(ext_name, options_hash = ::Middleman::EMPTY_HASH, &block)
       begin
         extension = ::Middleman::Extensions.load(ext_name)
       rescue LoadError => e
@@ -59,11 +63,11 @@ module Middleman
       if extension.supports_multiple_instances?
         @activated[ext_name] ||= {}
         key = "instance_#{@activated[ext_name].keys.length}"
-        @activated[ext_name][key] = extension.new(@app, options, &block)
-      elsif @activated.key?(ext_name)
+        @activated[ext_name][key] = extension.new(@app, options_hash, &block)
+      elsif active?(ext_name)
         raise "#{ext_name} has already been activated and cannot be re-activated."
       else
-        @activated[ext_name] = extension.new(@app, options, &block)
+        @activated[ext_name] = extension.new(@app, options_hash, &block)
       end
     end
 

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

@@ -1,9 +1,7 @@
-require 'addressable/uri'
 require 'middleman-core/util'
-require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
+  option :sources, %w[.css .htm .html .js .mjs .json .php .xhtml], 'List of extensions that are searched for hashable assets.'
   option :exts, nil, 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
@@ -12,27 +10,18 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     "#{path}#{basename}-#{options.prefix}#{digest}#{extension}"
   }, 'Accepts path parameters and returns path name'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
     super
 
-    require 'addressable/uri'
-    require 'digest/sha1'
-    require 'rack/mock'
-
     # Allow specifying regexes to ignore, plus always ignore apple touch icons
     @ignore = Array(options.ignore) + [/^apple-touch-icon/]
 
+    require 'set'
+
     # Exclude .ico from the default list because browsers expect it
     # to be named "favicon.ico"
-    @exts = options.exts || (app.config[:asset_extensions] - %w(.ico))
-
-    app.rewrite_inline_urls id: :asset_hash,
-                            url_extensions: @exts.sort.reverse,
-                            source_extensions: options.sources,
-                            ignore: @ignore,
-                            rewrite_ignore: options.rewrite_ignore,
-                            proc: method(:rewrite_url),
-                            after: :asset_host
+    @set_of_exts = Set.new(options.exts || (app.config[:asset_extensions] - %w[.ico]))
+    @set_of_sources = Set.new options.sources
   end
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
@@ -41,65 +30,72 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path
-      dirpath.join(asset_path).to_s
-    else
-      asset_path
-    end
+                        dirpath.join(asset_path).to_s
+                      else
+                        asset_path
+                      end
+
+    asset_page = app.sitemap.by_destination_path(full_asset_path) || app.sitemap.by_path(full_asset_path)
 
-    return unless asset_page = app.sitemap.find_resource_by_destination_path(full_asset_path) || app.sitemap.find_resource_by_path(full_asset_path)
+    return unless asset_page
 
     replacement_path = "/#{asset_page.destination_path}"
     replacement_path = Pathname.new(replacement_path).relative_path_from(dirpath).to_s if relative_path
-
     replacement_path
   end
 
   # Update the main sitemap resource list
-  # @return Array<Middleman::Sitemap::Resource>
-  Contract ResourceList => ResourceList
-  def manipulate_resource_list(resources)
-    @rack_client ||= begin
-      rack_app = ::Middleman::Rack.new(app).to_app
-      ::Rack::MockRequest.new(rack_app)
+  Contract IsA['Middleman::Sitemap::ResourceListContainer'] => Any
+  def manipulate_resource_list_container!(resource_list)
+    resource_list.by_extensions(@set_of_sources).each do |r|
+      next if Array(options.rewrite_ignore || []).any? do |i|
+        ::Middleman::Util.path_match(i, "/#{r.destination_path}")
+      end
+
+      r.add_filter ::Middleman::InlineURLRewriter.new(:asset_hash,
+                                                      app,
+                                                      r,
+                                                      create_dependencies: true,
+                                                      url_extensions: @set_of_exts,
+                                                      ignore: options.ignore,
+                                                      proc: method(:rewrite_url))
     end
 
     # 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.
-    resources.sort_by do |a|
-      if %w(.svg .svgz).include? a.ext
+    sorted_resources = resource_list.by_extensions(@set_of_exts).sort_by do |a|
+      if %w[.svg .svgz].include? a.ext
         0
-      elsif %w(.js .css).include? a.ext
+      elsif %w[.js .mjs .css].include? a.ext
         1
       else
         -1
       end
-    end.each(&method(:manipulate_single_resource))
+    end
+
+    sorted_resources.each do |resource|
+      manipulate_single_resource(resource_list, resource)
+    end
   end
 
-  Contract IsA['Middleman::Sitemap::Resource'] => Maybe[IsA['Middleman::Sitemap::Resource']]
-  def manipulate_single_resource(resource)
-    return unless @exts.include?(resource.ext)
+  Contract IsA['Middleman::Sitemap::ResourceListContainer'], IsA['Middleman::Sitemap::Resource'] => Any
+  def manipulate_single_resource(resource_list, resource)
     return if ignored_resource?(resource)
     return if resource.ignored?
 
-    digest = if resource.binary?
-      ::Digest::SHA1.file(resource.source_file).hexdigest[0..7]
-    else
-      # Render through the Rack interface so middleware and mounted apps get a shot
-      response = @rack_client.get(
-        Addressable::URI.encode(resource.destination_path),
-        'bypass_inline_url_rewriter_asset_hash' => 'true'
-      )
-
-      raise "#{resource.path} should be in the sitemap!" unless response.status == 200
-
-      ::Digest::SHA1.hexdigest(response.body)[0..7]
+    digest = if resource.binary? || resource.static_file?
+               ::Middleman::Util.hash_file(resource.source_file)[0..7]
+             else
+               # Render without asset hash
+               body = resource.render({}, {}) { |f| !f.respond_to?(:filter_name) || f.filter_name != :asset_hash }
+               ::Middleman::Util.hash_string(body)[0..7]
+             end
+
+    resource_list.update!(resource, :destination_path) do
+      path, basename, extension = split_path(resource.destination_path)
+      resource.destination_path = options.rename_proc.call(path, basename, digest, extension, options)
     end
-
-    path, basename, extension = split_path(resource.destination_path)
-    resource.destination_path = options.rename_proc.call(path, basename, digest, extension, options)
-    resource
   end
 
   Contract IsA['Middleman::Sitemap::Resource'] => Bool

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

@@ -1,21 +1,33 @@
-require 'addressable/uri'
-
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
   option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w[.css .htm .html .js .mjs .php .xhtml], 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
     super
 
-    app.rewrite_inline_urls id: :asset_host,
-                            url_extensions: options.exts || app.config[:asset_extensions],
-                            source_extensions: options.sources,
-                            ignore: options.ignore,
-                            rewrite_ignore: options.rewrite_ignore,
-                            proc: method(:rewrite_url)
+    require 'set'
+    @set_of_exts = Set.new(options.exts || app.config[:asset_extensions])
+    @set_of_sources = Set.new options.sources
+  end
+
+  Contract IsA['Middleman::Sitemap::ResourceListContainer'] => Any
+  def manipulate_resource_list_container!(resource_list)
+    resource_list.by_extensions(@set_of_sources).each do |r|
+      next if Array(options.rewrite_ignore || []).any? do |i|
+        ::Middleman::Util.path_match(i, "/#{r.destination_path}")
+      end
+
+      r.add_filter ::Middleman::InlineURLRewriter.new(:asset_host,
+                                                      app,
+                                                      r,
+                                                      after_filter: :asset_hash,
+                                                      url_extensions: @set_of_exts,
+                                                      ignore: options.ignore,
+                                                      proc: method(:rewrite_url))
+    end
   end
 
   Contract String, Or[String, Pathname], Any => String
@@ -24,16 +36,16 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
     relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
-      dirpath.join(asset_path).to_s
-    else
-      asset_path
-    end
+                        dirpath.join(asset_path).to_s
+                      else
+                        asset_path
+                      end
 
     asset_prefix = if options[:host].is_a?(Proc)
-      options[:host].call(full_asset_path)
-    elsif options[:host].is_a?(String)
-      options[:host]
-    end
+                     options[:host].call(full_asset_path)
+                   elsif options[:host].is_a?(String)
+                     options[:host]
+                   end
 
     File.join(asset_prefix, full_asset_path)
   end

data/lib/middleman-core/extensions/automatic_alt_tags.rb

@@ -4,9 +4,11 @@ class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
     # Override default image_tag helper to automatically insert alt tag
     # containing image name.
 
-    def image_tag(path, params={})
+    def image_tag(path, options_hash = ::Middleman::EMPTY_HASH)
+      options = options_hash.dup
+
       unless path.include?('://')
-        params[:alt] ||= ''
+        options[:alt] ||= ''
 
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
@@ -17,12 +19,12 @@ class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
           begin
             alt_text = File.basename(file[:full_path].to_s, '.*')
             alt_text.capitalize!
-            params[:alt] = alt_text
+            options[:alt] = alt_text
           end
         end
       end
 
-      super(path, params)
+      super(path, options)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # Automatic Image Sizes extension
 class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
     super
 
     # Include 3rd-party fastimage library
@@ -14,8 +14,10 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
     # @param [String] path
     # @param [Hash] params
     # @return [String]
-    def image_tag(path, params={})
-      if !params.key?(:width) && !params.key?(:height) && !path.include?('://')
+    def image_tag(path, options_hash = ::Middleman::EMPTY_HASH)
+      options = options_hash.dup
+
+      if !options.key?(:width) && !options.key?(:height) && !path.include?('://')
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
 
@@ -32,17 +34,17 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
               width /= factor
               height /= factor
             end
-            params[:width]  = width
-            params[:height] = height
+            options[:width]  = width
+            options[:height] = height
           rescue FastImage::UnknownImageType
             # No message, it's just not supported
-          rescue
+          rescue StandardError
             warn "Couldn't determine dimensions for image #{path}: #{$ERROR_INFO.message}"
           end
         end
       end
 
-      super(path, params)
+      super(path, options)
     end
   end
 end

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

@@ -1,19 +1,32 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
   option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w[.css .htm .html .js .mjs .php .xhtml], 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
     super
 
-    app.rewrite_inline_urls id: :cache_buster,
-                            url_extensions: options.exts || app.config[:asset_extensions],
-                            source_extensions: options.sources,
-                            ignore: options.ignore,
-                            rewrite_ignore: options.rewrite_ignore,
-                            proc: method(:rewrite_url)
+    require 'set'
+    @set_of_exts = Set.new(options.exts || app.config[:asset_extensions])
+    @set_of_sources = Set.new options.sources
+  end
+
+  Contract IsA['Middleman::Sitemap::ResourceListContainer'] => Any
+  def manipulate_resource_list_container!(resource_list)
+    resource_list.by_extensions(@set_of_sources).each do |r|
+      next if Array(options.rewrite_ignore || []).any? do |i|
+        ::Middleman::Util.path_match(i, "/#{r.destination_path}")
+      end
+
+      r.add_filter ::Middleman::InlineURLRewriter.new(:cache_buster,
+                                                      app,
+                                                      r,
+                                                      url_extensions: @set_of_exts,
+                                                      ignore: options.ignore,
+                                                      proc: method(:rewrite_url))
+    end
   end
 
   Contract String, Or[String, Pathname], Any => String

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

@@ -1,32 +1,32 @@
+require 'set'
+
 # Directory Indexes extension
 class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
   # This should run after most other sitemap manipulators so that it
   # gets a chance to modify any new resources that get added.
   self.resource_list_manipulator_priority = 100
 
-  # Update the main sitemap resource list
-  # @return Array<Middleman::Sitemap::Resource>
-  Contract ResourceList => ResourceList
-  def manipulate_resource_list(resources)
+  EXTENSIONS = Set.new %w[.htm .html .php .xhtml]
+
+  Contract IsA['Middleman::Sitemap::ResourceListContainer'] => Any
+  def manipulate_resource_list_container!(resource_list)
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
-    extensions = %w(.htm .html .php .xhtml)
-
-    resources.each do |resource|
-      # Check if it would be pointless to reroute
+    resource_list.by_extensions(EXTENSIONS).each do |resource|
       next if resource.destination_path == index_file ||
-              resource.destination_path.end_with?(new_index_path) ||
-              !extensions.include?(resource.ext)
+              resource.destination_path.end_with?(new_index_path)
 
       # Check if file metadata (options set by "page" in config.rb or frontmatter) turns directory_index off
       next if resource.options[:directory_index] == false
 
-      extensions.each do |ext|
-        resource.destination_path = resource.destination_path.chomp(ext)
-      end
+      resource_list.update!(resource, :destination_path) do
+        EXTENSIONS.each do |ext|
+          resource.destination_path = resource.destination_path.chomp(ext)
+        end
 
-      resource.destination_path += new_index_path
+        resource.destination_path += new_index_path
+      end
     end
   end
 end

data/lib/middleman-core/extensions/external_pipeline.rb

@@ -6,15 +6,13 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   option :source, nil, 'Path to merge into sitemap', required: true
   option :latency, 0.25, 'Latency between refreshes of source'
   option :disable_background_execution, false, "Don't run the command in a separate background thread"
-  option :ignore_exit_code, false, 'Ignore exit code for restart or stop of a command'
 
-  def initialize(app, config={}, &block)
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
     super
 
     return if app.mode?(:config)
 
     require 'servolux'
-    require 'thread'
     require 'fileutils'
 
     source_path = File.expand_path(options[:source], app.root)
@@ -42,12 +40,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   end
 
   def reload!
-    if @current_thread
-      logger.info "== Stopping: `#{options[:command]}`"
+    return unless @current_thread
 
-      @current_thread.stop
-      @current_thread = nil
-    end
+    logger.info "== Stopping: `#{options[:command]}`"
+
+    @current_thread.stop
+    @current_thread = nil
   end
 
   def watch_command!(async)
@@ -59,14 +57,17 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     @current_thread.start
 
     watch_thread = Thread.new do
-      while buf = @current_thread.io.gets
+      buf = @current_thread.io.gets
+
+      while buf
         without_newline = buf.sub(/\n$/, '')
         logger.info "== External: #{without_newline}" unless without_newline.empty?
+        buf = @current_thread.io.gets
       end
 
       @current_thread.wait
 
-      if !options[:ignore_exit_code] && !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
+      if !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
         logger.error '== External: Command failed with non-zero exit status'
         exit(1)
       end
@@ -81,9 +82,12 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   private
 
   def print_command(stdout)
-    while buf = stdout.gets
+    buf = stdout.gets
+
+    while buf
       without_newline = buf.sub(/\n$/, '')
       logger.info "== External: #{without_newline}" unless without_newline.empty?
+      buf = stdout.gets
     end
   end
 end

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

@@ -1,16 +1,16 @@
 # 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.
+# can use a more aggressive 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 .css, .htm, .html, .js, and .xhtml
+# to .css, .htm, .html, .js, .mjs, and .xhtml
 #
 class Middleman::Extensions::Gzip < ::Middleman::Extension
-  option :exts, %w(.css .htm .html .js .svg .xhtml), 'File extensions to Gzip when building.'
+  option :exts, %w[.css .htm .html .js .mjs .svg .xhtml], 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
   option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 
@@ -18,13 +18,15 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     include ::Padrino::Helpers::NumberHelpers
   end
 
-  def initialize(app, options_hash={})
+  def initialize(app, options_hash = ::Middleman::EMPTY_HASH)
     super
 
     require 'zlib'
     require 'stringio'
     require 'find'
-    require 'thread'
+    require 'set'
+
+    @set_of_exts = Set.new options.exts
   end
 
   def after_build(builder)
@@ -43,8 +45,11 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     out_queue = Queue.new
     num_threads.times.each do
       Thread.new do
-        while path = in_queue.pop
+        path = in_queue.pop
+
+        while path
           out_queue << gzip_file(path.to_s)
+          path = in_queue.pop
         end
       end
     end
@@ -63,7 +68,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
       next unless output_filename
 
       total_savings += (old_size - new_size)
-      size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+      size_change_word = (old_size - new_size).positive? ? 'smaller' : 'larger'
       builder.trigger :created, "#{output_filename} (#{NumberHelpers.new.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
     end
 
@@ -78,9 +83,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     input_file_time = File.mtime(path)
 
     # Check if the right file's already there
-    if !options.overwrite && File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
-      return [nil, nil, nil]
-    end
+    return [nil, nil, nil] if !options.overwrite && File.exist?(output_filename) && File.mtime(output_filename) == input_file_time
 
     File.open(output_filename, 'wb') do |f|
       gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
@@ -108,7 +111,9 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
   # @return [Boolean]
   Contract Pathname => Bool
   def should_gzip?(path)
+    return false unless @set_of_exts.include?(path.extname)
+
     path = path.sub app.config[:build_dir] + '/', ''
-    options.exts.include?(path.extname) && options.ignore.none? { |ignore| Middleman::Util.path_match(ignore, path.to_s) }
+    options.ignore.none? { |ignore| Middleman::Util.path_match(ignore, path.to_s) }
   end
 end

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

@@ -11,7 +11,8 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
     # @param [String] size
     # @param [Hash] options
     # @return [String]
-    def placekitten(size, options={})
+    def placekitten(size, options_hash = ::Middleman::EMPTY_HASH)
+      options = options_hash.dup
       options[:domain] = 'http://placekitten.com'
       lorem.image(size, options)
     end
@@ -44,7 +45,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
   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).freeze
+      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].freeze
 
       # Get one placeholder word
       # @return [String]
@@ -94,10 +95,10 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # 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
+      def date(fmt = '%a %b %d, %Y')
+        y = rand(1990..2009)
+        m = rand(1..12)
+        d = rand(1..31)
         Time.local(y, m, d).strftime(fmt)
       end
 
@@ -135,7 +136,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # @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)
+        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
@@ -144,14 +145,14 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # @param [String] size
       # @param [Hash] options
       # @return [String]
-      def image(size, options={})
-        domain           = options[:domain] || 'http://placehold.it'
+      def image(size, options_hash = ::Middleman::EMPTY_HASH)
+        domain           = options_hash[: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]
+        hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+        background_color = options_hash[:background_color]
+        color            = options_hash[:color]
 
-        if options[:random_color]
+        if options_hash[:random_color]
           background_color = hex.sample(6).join
           color = hex.sample(6).join
         end
@@ -159,7 +160,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
         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 << "&text=#{Rack::Utils.escape(options_hash[:text])}" if options_hash[:text]
 
         src
       end