middleman-core 4.3.0.rc.1 → 4.3.0.rc.2

data/lib/middleman-core/core_extensions/file_watcher.rb

@@ -24,7 +24,7 @@ module Middleman
       }.freeze
 
       # Setup the extension.
-      def initialize(app, config={}, &block)
+      def initialize(app, config = {}, &block)
         super
 
         # Setup source collection.

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -16,11 +16,11 @@ module Middleman::CoreExtensions
 
     # Set textual delimiters that denote the start and end of frontmatter
     define_setting :frontmatter_delims, {
-      json: [%w(;;; ;;;)],
-      yaml: [%w(--- ---), %w(--- ...)]
+      json: [%w[;;; ;;;]],
+      yaml: [%w[--- ---], %w[--- ...]]
     }, 'Allowed frontmatter delimiters'
 
-    def initialize(app, options_hash={}, &block)
+    def initialize(app, options_hash = {}, &block)
       super
 
       @cache = {}

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

@@ -29,11 +29,11 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     # don't completely reload middleman, I18n.load_path can get
     # polluted with paths from other test app directories that don't
     # exist anymore.
-    if ENV['TEST']
-      app.after_configuration_eval do
-        ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
-        ::I18n.reload!
-      end
+    return unless ENV['TEST']
+
+    app.after_configuration_eval do
+      ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
+      ::I18n.reload!
     end
   end
 
@@ -68,7 +68,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       ::I18n.t(*args)
     end
 
-    def url_for(path_or_resource, options={})
+    def url_for(path_or_resource, options = {})
       locale = options.delete(:locale) || ::I18n.locale
 
       opts = options.dup
@@ -79,12 +79,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       href = super(path_or_resource, opts)
 
-      final_path = if result = extensions[:i18n].localized_path(href, locale)
-        result
-      else
-        # Should we log the missing file?
-        href
-      end
+      result = extensions[:i18n].localized_path(href, locale)
+
+      final_path = result || href
 
       opts[:relative] = should_relativize
 
@@ -95,7 +92,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       end
     end
 
-    def locate_partial(partial_name, try_static=false)
+    def locate_partial(partial_name, try_static = false)
       locals_dir = extensions[:i18n].options[:templates_dir]
 
       # Try /localizable
@@ -106,10 +103,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       extname = File.extname(partial_name)
       maybe_static = !extname.empty?
       suffixed_partial_name = if maybe_static
-        partial_name.sub(extname, ".#{locale_suffix}#{extname}")
-      else
-        "#{partial_name}.#{locale_suffix}"
-      end
+                                partial_name.sub(extname, ".#{locale_suffix}#{extname}")
+                              else
+                                "#{partial_name}.#{locale_suffix}"
+                              end
 
       if locale_suffix
         super(suffixed_partial_name, maybe_static) ||
@@ -190,7 +187,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       # Process templates with locale suffix
       locales.each do |locale|
-        abs_path = abs_path.sub(".#{locale}.", ".")
+        abs_path = abs_path.sub(".#{locale}.", '.')
       end
 
       sum[abs_path] ||= {}
@@ -204,13 +201,15 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
   Contract String, Symbol => Maybe[String]
   def localized_path(path, locale)
-    begin
-      lookup = ::Middleman::Util.parse_uri(path)
-      lookup.path << app.config[:index_file] if lookup.path && lookup.path.end_with?('/')
-      lookup.to_s if @lookup[lookup.path] && lookup.path = @lookup[lookup.path][locale]
-    rescue ::Addressable::URI::InvalidURIError
-      nil
+    lookup = ::Middleman::Util.parse_uri(path)
+    lookup.path << app.config[:index_file] if lookup.path&.end_with?('/')
+
+    if @lookup[lookup.path] && @lookup[lookup.path][locale]
+      lookup.path = @lookup[lookup.path][locale]
+      lookup.to_s
     end
+  rescue ::Addressable::URI::InvalidURIError
+    nil
   end
 
   Contract Symbol => String
@@ -291,6 +290,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     File.dirname(path).split('/').each do |path_sub|
       next if path_sub == ''
+
       partially_localized_path = "#{partially_localized_path}/#{::I18n.t("paths.#{path_sub}", default: path_sub)}"
     end
 

data/lib/middleman-core/core_extensions/inline_url_rewriter.rb

@@ -20,7 +20,7 @@ module Middleman
         after: Maybe[Symbol]
       }.freeze
 
-      def initialize(app, options_hash={}, &block)
+      def initialize(app, options_hash = {}, &block)
         super
 
         @rewriters = {}
@@ -53,7 +53,7 @@ module Middleman
           middleman_app: IsA['Middleman::Application'],
           rewriters: ArrayOf[REWRITER_DESCRIPTOR]
         } => Any
-        def initialize(app, options={})
+        def initialize(app, options = {})
           @rack_app = app
           @middleman_app = options.fetch(:middleman_app)
           @rewriters = options.fetch(:rewriters)
@@ -79,7 +79,10 @@ module Middleman
           path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
           return [status, headers, response] unless path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
-          return [status, headers, response] unless body = ::Middleman::Util.extract_response_text(response)
+
+          body = ::Middleman::Util.extract_response_text(response)
+
+          return [status, headers, response] unless body
 
           dirpath = ::Pathname.new(File.dirname(path))
 
@@ -90,10 +93,10 @@ module Middleman
               relative_path = uri.host.nil?
 
               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
 
               @rewriters.each do |rewriter|
                 uid = rewriter.fetch(:id)

data/lib/middleman-core/core_extensions/routing.rb

@@ -49,7 +49,7 @@ module Middleman
       # @option opts [Hash] data Extra metadata to add to the page. This is the same as frontmatter, though frontmatter will take precedence over metadata defined here. Available via {Resource#data}.
       # @return [void]
       Contract Or[String, Regexp], Hash => PageDescriptor
-      def page(path, opts={})
+      def page(path, opts = {})
         options = opts.dup
 
         page_data = options.delete(:data) || {}

data/lib/middleman-core/dns_resolver.rb

@@ -27,7 +27,7 @@ module Middleman
     #
     # First the local resolver is queried. If this raises an error or returns
     # nil or [] the network resolver is queried.
-    def initialize(opts={})
+    def initialize(opts = {})
       @resolvers = []
       @resolvers << opts.fetch(:hosts_resolver, HostsResolver.new)
 

data/lib/middleman-core/dns_resolver/basic_network_resolver.rb

@@ -8,7 +8,7 @@ module Middleman
 
       public
 
-      def initialize(opts={})
+      def initialize(opts = {})
         @timeouts = opts.fetch(:timeouts, 2)
       end
 
@@ -21,7 +21,7 @@ module Middleman
       #   Array of Names
       def getnames(ip)
         resolver.getnames(ip.to_s).map(&:to_s)
-      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL, Errno::ENETUNREACH
         []
       end
 
@@ -34,7 +34,7 @@ module Middleman
       #   Array of ipaddresses
       def getaddresses(name)
         resolver.getaddresses(name.to_s).map(&:to_s)
-      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL, Errno::ENETUNREACH
         []
       end
 

data/lib/middleman-core/dns_resolver/hosts_resolver.rb

@@ -8,7 +8,7 @@ module Middleman
 
       public
 
-      def initialize(opts={})
+      def initialize(opts = {})
         # using the splat operator works around a non-existing HOSTSRC variable
         # using nil as input does not work, but `*[]` does and then Resolv::Hosts
         # uses its defaults

data/lib/middleman-core/dns_resolver/local_link_resolver.rb

@@ -4,7 +4,7 @@ module Middleman
   class DnsResolver
     # Use network name server to resolve ips and names
     class LocalLinkResolver < BasicNetworkResolver
-      def initialize(opts={})
+      def initialize(opts = {})
         super
 
         @timeouts = opts.fetch(:timeouts, 1)

data/lib/middleman-core/dns_resolver/network_resolver.rb

@@ -4,7 +4,7 @@ module Middleman
   class DnsResolver
     # Use network name server to resolve ips and names
     class NetworkResolver < BasicNetworkResolver
-      def initialize(opts={})
+      def initialize(opts = {})
         super
 
         @resolver = opts.fetch(:resolver, Resolv::DNS.new(nameserver_config))

data/lib/middleman-core/extension.rb

@@ -135,7 +135,7 @@ module Middleman
       # @param [Symbol] key The name of the option
       # @param [Object] default The default value for the option
       # @param [String] description A human-readable description of what the option does
-      def option(key, default=nil, description=nil, options={})
+      def option(key, default = nil, description = nil, options = {})
         config.define_setting(key, default, description, options)
       end
 
@@ -152,7 +152,7 @@ module Middleman
       # @param [Symbol] key The name of the option
       # @param [Object] default The default value for the option
       # @param [String] description A human-readable description of what the option does
-      def define_setting(key, default=nil, description=nil, options={})
+      def define_setting(key, default = nil, description = nil, options = {})
         global_config.define_setting(key, default, description, options)
       end
 
@@ -209,7 +209,7 @@ module Middleman
       def expose_to_application(*symbols)
         self.exposed_to_application ||= {}
 
-        if symbols.first && symbols.first.is_a?(Hash)
+        if symbols.first&.is_a?(Hash)
           self.exposed_to_application.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -229,7 +229,7 @@ module Middleman
       def expose_to_config(*symbols)
         self.exposed_to_config ||= {}
 
-        if symbols.first && symbols.first.is_a?(Hash)
+        if symbols.first&.is_a?(Hash)
           self.exposed_to_config.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -249,7 +249,7 @@ module Middleman
       def expose_to_template(*symbols)
         self.exposed_to_template ||= {}
 
-        if symbols.first && symbols.first.is_a?(Hash)
+        if symbols.first&.is_a?(Hash)
           self.exposed_to_template.merge!(symbols.first)
         elsif symbols.is_a? Array
           symbols.each do |sym|
@@ -282,7 +282,8 @@ module Middleman
       # @return [void]
       def activated_extension(instance)
         name = instance.class.ext_name
-        return unless @_extension_activation_callbacks && @_extension_activation_callbacks.key?(name)
+        return unless @_extension_activation_callbacks&.key?(name)
+
         @_extension_activation_callbacks[name].each do |block|
           block.arity == 1 ? block.call(instance) : block.call
         end
@@ -307,7 +308,7 @@ module Middleman
     # @param [Hash] options_hash The raw options hash. Subclasses should not manipulate this directly - it will be turned into {#options}.
     # @yield An optional block that can be used to customize options before the extension is activated.
     # @yieldparam [Middleman::Configuration::ConfigurationManager] options Extension options
-    def initialize(app, options_hash={}, &block)
+    def initialize(app, options_hash = {}, &block)
       @_helpers = []
       @app = app
 
@@ -423,18 +424,18 @@ module Middleman
     def generate_resources(resources)
       generator_defs = self.class.resources_generators.reduce({}) do |sum, g|
         resource_definitions = if g.is_a? Hash
-          g
-        elsif g.is_a? Symbol
-          definition = method(g)
-
-          if definition.arity == 0
-            send(g)
-          else
-            send(g, resources)
-          end
-        else
-          {}
-        end
+                                 g
+                               elsif g.is_a? Symbol
+                                 definition = method(g)
+
+                                 if definition.arity.zero?
+                                   send(g)
+                                 else
+                                   send(g, resources)
+                                 end
+                               else
+                                 {}
+                               end
 
         sum.merge!(resource_definitions)
       end
@@ -443,11 +444,11 @@ module Middleman
         if g.is_a? Symbol
           definition = method(g)
 
-          g = if definition.arity == 0
-            send(g)
-          else
-            send(g, resources)
-          end
+          g = if definition.arity.zero?
+                send(g)
+              else
+                send(g, resources)
+              end
         end
 
         ::Middleman::Sitemap::StringResource.new(
@@ -492,7 +493,7 @@ module Middleman
   end
 
   class ConfigExtension < Extension
-    def initialize(app, config={}, &block)
+    def initialize(app, config = {}, &block)
       @descriptors = {}
       @ready = false
 

data/lib/middleman-core/extension_manager.rb

@@ -50,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 = {}, &block)
       begin
         extension = ::Middleman::Extensions.load(ext_name)
       rescue LoadError => e

data/lib/middleman-core/extensions.rb

@@ -49,8 +49,9 @@ module Middleman
       #        you the ability to require other files only when the
       #        extension is first activated.
       # @return [void]
-      def register(name, extension_class=nil, options={}, &block)
+      def register(name, extension_class = nil, options = {}, &block)
         raise 'Extension name must be a symbol' unless name.is_a?(Symbol)
+
         # If we've already got an extension registered under this name, bail out
         # raise "There is a already an extension registered with the name '#{name}'" if registered.key?(name)
 
@@ -61,12 +62,12 @@ module Middleman
         end
 
         registered[name] = if block_given?
-          block
-        elsif extension_class && extension_class.ancestors.include?(::Middleman::Extension)
-          extension_class
-        else
-          raise 'You must provide a Middleman::Extension or a block that returns a Middleman::Extension'
-        end
+                             block
+                           elsif extension_class && extension_class.ancestors && extension_class.ancestors.include?(::Middleman::Extension)
+                             extension_class
+                           else
+                             raise 'You must provide a Middleman::Extension or a block that returns a Middleman::Extension'
+                           end
 
         return unless options[:auto_activate]
 

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

@@ -2,13 +2,13 @@ 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 .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'
   option :prefix, '', 'Prefix for hash'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, options_hash = {}, &block)
     super
 
     require 'addressable/uri'
@@ -20,7 +20,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
     # Exclude .ico from the default list because browsers expect it
     # to be named "favicon.ico"
-    @exts = options.exts || (app.config[:asset_extensions] - %w(.ico))
+    @exts = options.exts || (app.config[:asset_extensions] - %w[.ico])
 
     app.rewrite_inline_urls id: :asset_hash,
                             url_extensions: @exts.sort.reverse,
@@ -37,12 +37,14 @@ 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.find_resource_by_destination_path(full_asset_path) || app.sitemap.find_resource_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
@@ -63,9 +65,9 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # 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
+      if %w[.svg .svgz].include? a.ext
         0
-      elsif %w(.js .css).include? a.ext
+      elsif %w[.js .css].include? a.ext
         1
       else
         -1
@@ -80,18 +82,18 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     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(
-        ::URI.escape(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]
-    end
+               ::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(
+                 ::URI.escape(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]
+             end
 
     resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{options.prefix}#{digest}#{ext}" }
     resource