middleman-core 3.3.2 → 3.3.3

data/lib/middleman-core/templates/local.rb

@@ -1,6 +1,5 @@
 # Local templates
 class Middleman::Templates::Local < Middleman::Templates::Base
-
   # Look for templates in ~/.middleman
   # @return [String]
   def self.source_root
@@ -20,7 +19,7 @@ Dir[File.join(Middleman::Templates::Local.source_root, '*')].each do |dir|
 
   template_file = File.join(dir, 'template.rb')
 
-  if File.exists?(template_file)
+  if File.exist?(template_file)
     require template_file
   else
     Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)

data/lib/middleman-core/templates/mobile.rb

@@ -1,10 +1,9 @@
 # Mobile HTML5 Boilerplate
 class Middleman::Templates::Mobile < Middleman::Templates::Base
-
   # Slightly different paths
-  class_option :css_dir, :default => 'css'
-  class_option :js_dir, :default => 'js'
-  class_option :images_dir, :default => 'img'
+  class_option :css_dir, default: 'css'
+  class_option :js_dir, default: 'js'
+  class_option :images_dir, default: 'img'
 
   # Template files are relative to this file
   # @return [String]

data/lib/middleman-core/templates/shared/config.ru

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'middleman/rack'
 
-run Middleman.server
+run Middleman.server

data/lib/middleman-core/util.rb

@@ -14,7 +14,6 @@ require 'rack/mime'
 module Middleman
   module Util
     class << self
-
       # Whether the source file is binary.
       #
       # @param [String] filename The file to check.
@@ -27,7 +26,7 @@ module Middleman
 
         return false if Tilt.registered?(ext.sub('.', ''))
 
-        dot_ext = (ext.to_s[0] == ?.) ? ext.dup : ".#{ext}"
+        dot_ext = (ext.to_s[0] == '.') ? ext.dup : ".#{ext}"
 
         if mime = ::Rack::Mime.mime_type(dot_ext, nil)
           !nonbinary_mime?(mime)
@@ -69,7 +68,7 @@ module Middleman
       # @return [String]
       def normalize_path(path)
         # The tr call works around a bug in Ruby's Unicode handling
-        path.sub(%r{^/}, '').tr('','')
+        path.sub(%r{^/}, '').tr('', '')
       end
 
       # This is a separate method from normalize_path in case we
@@ -85,7 +84,7 @@ module Middleman
       def extract_response_text(response)
         # The rack spec states all response bodies must respond to each
         result = ''
-        response.each do |part, s|
+        response.each do |part, _|
           result << part
         end
         result
@@ -210,7 +209,7 @@ module Middleman
       def full_path(path, app)
         resource = app.sitemap.find_resource_by_destination_path(path)
 
-        if !resource
+        unless resource
           # Try it with /index.html at the end
           indexed_path = File.join(path.sub(%r{/$}, ''), app.config[:index_file])
           resource = app.sitemap.find_resource_by_destination_path(indexed_path)
@@ -223,7 +222,7 @@ module Middleman
         end
       end
 
-    private
+      private
 
       # Is mime type known to be non-binary?
       #

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.2' unless const_defined?(:VERSION)
+  VERSION = '3.3.3' unless const_defined?(:VERSION)
 end

data/lib/middleman-more/core_extensions/compass.rb

@@ -2,7 +2,6 @@ require 'middleman-core/renderers/sass'
 require 'compass'
 
 class Middleman::CoreExtensions::Compass < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
 

data/lib/middleman-more/core_extensions/default_helpers.rb

@@ -6,8 +6,9 @@ require 'padrino-helpers'
 
 class Padrino::Helpers::OutputHelpers::ErbHandler
   # Force Erb capture not to use safebuffer
+  # rubocop:disable UnderscorePrefixedVariableName
   def capture_from_template(*args, &block)
-    self.output_buffer, _buf_was = '', self.output_buffer
+    self.output_buffer, _buf_was = '', output_buffer
     raw = block.call(*args)
     captured = template.instance_variable_get(:@_out_buf)
     self.output_buffer = _buf_was
@@ -16,7 +17,6 @@ class Padrino::Helpers::OutputHelpers::ErbHandler
 end
 
 class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
 
@@ -39,7 +39,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
   helpers do
 
     # Make all block content html_safe
-    def content_tag(name, content = nil, options = nil, &block)
+    # rubocop:disable Semicolon
+    def content_tag(name, content=nil, options=nil, &block)
       if block_given?
         options = content if content.is_a?(Hash)
         content = capture_html(&block)
@@ -108,8 +109,10 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     def auto_tag(asset_ext, asset_dir=nil)
       if asset_dir.nil?
         asset_dir = case asset_ext
-          when :js  then js_dir
-          when :css then css_dir
+        when :js
+          js_dir
+        when :css
+          css_dir
         end
       end
 
@@ -124,7 +127,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # Generate body css classes based on the current path
     #
     # @return [String]
-    def page_classes(path = current_path.dup, options={})
+    def page_classes(path=current_path.dup, options={})
       if path.is_a? Hash
         options = path
         path = current_path.dup
@@ -135,7 +138,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
       classes = []
       parts = path.split('.').first.split('/')
-      parts.each_with_index { |_, i| classes << parts.first(i+1).join('_') }
+      parts.each_with_index { |_, i| classes << parts.first(i + 1).join('_') }
 
       prefix = options[:numeric_prefix] || 'x'
       classes.map do |c|
@@ -155,13 +158,19 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @return [String]
     def asset_path(kind, source)
       return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
-      asset_folder  = case kind
-        when :css    then css_dir
-        when :js     then js_dir
-        when :images then images_dir
-        when :fonts  then fonts_dir
-        else kind.to_s
+      asset_folder = case kind
+      when :css
+        css_dir
+      when :js
+        js_dir
+      when :images
+        images_dir
+      when :fonts
+        fonts_dir
+      else
+        kind.to_s
       end
+
       source = source.to_s.tr(' ', '')
       ignore_extension = (kind == :images || kind == :fonts) # don't append extension
       source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
@@ -177,7 +186,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @return [String] The fully qualified asset url
     def asset_url(path, prefix='')
       # Don't touch assets which already have a full path
-      if path.include?('//') or path.start_with?('data:')
+      if path.include?('//') || path.start_with?('data:')
         path
       else # rewrite paths to use their destination path
         if resource = sitemap.find_resource_by_destination_path(url_for(path))
@@ -221,12 +230,12 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       options_index = block_given? ? 1 : 2
 
       if block_given? && args.size > 2
-        raise ArgumentError.new('Too many arguments to link_to(url, options={}, &block)')
+        raise ArgumentError, 'Too many arguments to link_to(url, options={}, &block)'
       end
 
       if url = args[url_arg_index]
         options = args[options_index] || {}
-        raise ArgumentError.new('Options must be a hash') unless options.is_a?(Hash)
+        raise ArgumentError, 'Options must be a hash' unless options.is_a?(Hash)
 
         # Transform the url through our magic url_for method
         args[url_arg_index] = url_for(url, options)

data/lib/middleman-more/core_extensions/i18n.rb

@@ -37,8 +37,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     configure_i18n
 
-    if !app.build?
-      logger.info "== Locales: #{langs.join(", ")} (Default #{@mount_at_root})"
+    unless app.build?
+      logger.info "== Locales: #{langs.join(', ')} (Default #{@mount_at_root})"
     end
 
     # Don't output localizable files
@@ -55,10 +55,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     end
   end
 
-  delegate :logger, :to => :app
+  delegate :logger, to: :app
 
   def langs
-    @_langs ||= get_known_languages
+    @_langs ||= known_languages
   end
 
   # Update the main sitemap resource list
@@ -70,10 +70,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     resources.each do |resource|
       # If it uses file extension localization
-      if !parse_locale_extension(resource.path).nil?
+      if parse_locale_extension(resource.path)
         result = parse_locale_extension(resource.path)
-        lang, path, page_id = result
-        new_resources << build_resource(path, resource.path, page_id, lang)
+        ext_lang, path, page_id = result
+        new_resources << build_resource(path, resource.path, page_id, ext_lang)
       # If it's a "localizable template"
       elsif File.fnmatch?(File.join(options[:templates_dir], '**'), resource.path)
         page_id = File.basename(resource.path, File.extname(resource.path))
@@ -90,7 +90,6 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
   private
 
-
   def on_file_changed(file)
     if @locales_regex =~ file
       @_langs = nil # Clear langs cache
@@ -100,7 +99,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
   def convert_glob_to_regex(glob)
     # File.fnmatch doesn't support brackets: {rb,yml,yaml}
-    regex = @locales_glob.sub(/\./, '\.').sub(File.join('**', '*'), '.*').sub(/\//, '\/').sub('{rb,yml,yaml}', '(rb|ya?ml)')
+    regex = glob.sub(/\./, '\.').sub(File.join('**', '*'), '.*').sub(/\//, '\/').sub('{rb,yml,yaml}', '(rb|ya?ml)')
     %r{^#{regex}}
   end
 
@@ -116,7 +115,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   end
 
   def metadata_for_path(url)
-    if d = get_localization_data(url)
+    if d = localization_data(url)
       lang, page_id = d
     else
       # Default to the @mount_at_root lang
@@ -124,36 +123,38 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       lang = @mount_at_root
     end
 
-    instance_vars = Proc.new do
+    instance_vars = proc do
       @lang         = lang
       @page_id      = page_id
     end
 
     locals = {
-      :lang => lang,
-      :page_id => page_id
+      lang: lang,
+      page_id: page_id
     }
 
     {
-      :blocks => [instance_vars],
-      :locals => locals,
-      :options => { :lang => lang }
+      blocks: [instance_vars],
+      locals: locals,
+      options: { lang: lang }
     }
   end
 
-  def get_known_languages
+  def known_languages
     if options[:langs]
       Array(options[:langs]).map(&:to_sym)
     else
       known_langs = app.files.known_paths.select do |p|
-        p.to_s.match(@locales_regex) && (p.to_s.split(File::SEPARATOR).length === 2)
-      end.map { |p|
+        p.to_s.match(@locales_regex) && (p.to_s.split(File::SEPARATOR).length == 2)
+      end
+
+      known_langs.map { |p|
         File.basename(p.to_s).sub(/\.ya?ml$/, '').sub(/\.rb$/, '')
       }.sort.map(&:to_sym)
     end
   end
 
-  def get_localization_data(path)
+  def localization_data(path)
     @_localization_data ||= {}
     @_localization_data[path]
   end
@@ -176,9 +177,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def build_resource(path, source_path, page_id, lang)
     old_locale = ::I18n.locale
     ::I18n.locale = lang
-    localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id, :fallback => [])
+    localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id, fallback: [])
 
-    prefix = if (options[:mount_at_root] == lang) || (options[:mount_at_root] == nil && langs[0] == lang)
+    prefix = if (options[:mount_at_root] == lang) || (options[:mount_at_root].nil? && langs[0] == lang)
       '/'
     else
       replacement = options[:lang_map].fetch(lang, lang)
@@ -190,7 +191,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       File.join(prefix, path.sub(page_id, localized_page_id))
     )
 
-    path.gsub!(options[:templates_dir]+'/', '')
+    path.gsub!(options[:templates_dir] + '/', '')
 
     @_localization_data[path] = [lang, path, localized_page_id]
 

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

@@ -16,7 +16,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # 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
+    app.use Middleware, exts: options.exts, middleman_app: app, ignore: @ignore
   end
 
   # Update the main sitemap resource list
@@ -44,7 +44,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     return if resource.ignored?
 
     # 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' })
+    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]
@@ -63,7 +63,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       @rack_app        = app
       @exts            = options[:exts]
       @ignore          = options[:ignore]
-      @exts_regex_text = @exts.map {|e| Regexp.escape(e) }.join('|')
+      @exts_regex_text = @exts.map { |e| Regexp.escape(e) }.join('|')
       @middleman_app   = options[:middleman_app]
     end
 
@@ -85,7 +85,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       [status, headers, response]
     end
 
-  private
+    private
 
     def rewrite_paths(body, path)
       dirpath = Pathname.new(File.dirname(path))
@@ -111,9 +111,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
         end
       end
     end
-
   end
-
 end
 
 # =================Temp Generate Test data==============================

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

@@ -14,7 +14,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
         if asset_host.is_a?(Proc)
           config.asset_host(&asset_host)
         else
-          config.asset_host do |asset|
+          config.asset_host do |_|
             asset_host
           end
         end

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

@@ -1,6 +1,5 @@
 # Automatic Image alt tags from image names extension
 class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
   end
@@ -10,14 +9,14 @@ class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
     # containing image name.
 
     def image_tag(path)
-      if !path.include?('://')
+      unless 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)
+        if File.exist?(full_path)
           begin
             alt_text = File.basename(full_path, '.*')
             alt_text.capitalize!

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

@@ -1,6 +1,5 @@
 # Automatic Image Sizes extension
 class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
 
@@ -16,22 +15,22 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
     # @param [Hash] params
     # @return [String]
     def image_tag(path, params={})
-      if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?('://')
+      if !params.key?(:width) && !params.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)
+        if File.exist?(full_path)
           begin
-            width, height = ::FastImage.size(full_path, :raise_on_failure => true)
+            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}"
+            warn "Couldn't determine dimensions for image #{path}: #{$ERROR_INFO.message}"
           end
         end
       end