middleman-core 4.3.0.rc.4 → 4.3.0

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

@@ -19,7 +19,7 @@ module Middleman
       # The regex which tells Middleman which files are for data
       DATA_FILE_MATCHER = /^(.*?)[\w-]+\.(yml|yaml|json)$/
 
-      def initialize(app, config = {}, &block)
+      def initialize(app, config={}, &block)
         super
 
         @data_store = DataStore.new(app, DATA_FILE_MATCHER)
@@ -32,7 +32,7 @@ module Middleman
 
         # Tell the file watcher to observe the :data_dir
         @watcher = app.files.watch :data,
-                                   path: File.expand_path(dir, app.root),
+                                   path: File.join(app.root, dir),
                                    only: DATA_FILE_MATCHER
 
         # Setup data files before anything else so they are available when
@@ -68,7 +68,7 @@ module Middleman
         # @param [Hash] content The content for this data
         # @return [Hash]
         Contract Symbol, Or[Hash, Array] => Hash
-        def store(name = nil, content = nil)
+        def store(name=nil, content=nil)
           @local_sources[name.to_s] = content unless name.nil? || content.nil?
           @local_sources
         end
@@ -79,7 +79,7 @@ module Middleman
         # @param [Proc] proc The callback which will return data
         # @return [Hash]
         Contract Maybe[Symbol], Maybe[Proc] => Hash
-        def callbacks(name = nil, proc = nil)
+        def callbacks(name=nil, proc=nil)
           @callback_sources[name.to_s] = proc unless name.nil? || proc.nil?
           @callback_sources
         end
@@ -102,9 +102,9 @@ module Middleman
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
-          return unless %w[.yaml .yml .json].include?(extension)
+          return unless %w(.yaml .yml .json).include?(extension)
 
-          if %w[.yaml .yml].include?(extension)
+          if %w(.yaml .yml).include?(extension)
             data, postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :yaml)
             data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash)
           elsif extension == '.json'
@@ -153,10 +153,10 @@ module Middleman
         Contract Or[String, Symbol] => Maybe[Or[Array, IsA['Middleman::Util::EnhancedHash']]]
         def data_for_path(path)
           response = if store.key?(path.to_s)
-                       store[path.to_s]
-                     elsif callbacks.key?(path.to_s)
-                       callbacks[path.to_s].call
-                     end
+            store[path.to_s]
+          elsif callbacks.key?(path.to_s)
+            callbacks[path.to_s].call
+          end
 
           ::Middleman::Util.recursively_enhance(response)
         end
@@ -179,7 +179,7 @@ module Middleman
         end
 
         # Needed so that method_missing makes sense
-        def respond_to?(method, include_private = false)
+        def respond_to?(method, include_private=false)
           super || key?(method)
         end
 

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

@@ -1,4 +1,11 @@
 require 'padrino-helpers'
+require 'padrino-helpers/output_helpers'
+require 'padrino-helpers/asset_tag_helpers'
+require 'padrino-helpers/form_helpers'
+require 'padrino-helpers/format_helpers'
+require 'padrino-helpers/number_helpers'
+require 'padrino-helpers/output_helpers'
+require 'padrino-helpers/render_helpers'
 require 'middleman-core/contracts'
 
 # Don't fail on invalid locale, that's not what our current
@@ -20,7 +27,7 @@ end
 class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
   define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
 
-  def initialize(app, options_hash = {}, &block)
+  def initialize(app, options_hash={}, &block)
     super
 
     require 'active_support/core_ext/object/to_query'
@@ -38,7 +45,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
   # The helpers
   helpers do
     # Make all block content html_safe
-    def content_tag(name, content = nil, options = nil, &block)
+    def content_tag(name, content=nil, options=nil, &block)
       # safe_content_tag(name, content, options, &block)
       if block_given?
         options = content if content.is_a?(Hash)
@@ -64,13 +71,11 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     end
 
     def capture_html(*args, &block)
-      handler = auto_find_proper_handler(&block)
-
-      result = if handler
-                 handler.capture_from_template(*args, &block)
-               else
-                 yield(*args)
-               end
+      result = if handler = auto_find_proper_handler(&block)
+        handler.capture_from_template(*args, &block)
+      else
+        yield(*args)
+      end
 
       ::ActiveSupport::SafeBuffer.new.safe_concat(result)
     end
@@ -142,14 +147,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Symbol] asset_ext The type of asset
     # @param [String] asset_dir Where to look for assets
     # @return [void]
-    def auto_tag(asset_ext, asset_dir = nil)
+    def auto_tag(asset_ext, asset_dir=nil)
       if asset_dir.nil?
         asset_dir = case asset_ext
-                    when :js
-                      config[:js_dir]
-                    when :css
-                      config[:css_dir]
-                    end
+        when :js
+          config[:js_dir]
+        when :css
+          config[:css_dir]
+        end
       end
 
       # If the basename of the request as no extension, assume we are serving a
@@ -163,7 +168,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
@@ -193,7 +198,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [String] source The path to the file
     # @param [Hash] options Data to pass through.
     # @return [String]
-    def asset_path(kind, source, options = {})
+    def asset_path(kind, source, options={})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_path(app, kind, source, options_with_resource)
     end
@@ -204,7 +209,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [String] prefix The type prefix (such as "images")
     # @param [Hash] options Additional options.
     # @return [String] The fully qualified asset url
-    def asset_url(path, prefix = '', options = {})
+    def asset_url(path, prefix='', options={})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_url(app, path, prefix, options_with_resource)
     end
@@ -212,7 +217,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # Given a source path (referenced either absolutely or relatively)
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
-    def url_for(path_or_resource, options = {})
+    def url_for(path_or_resource, options={})
       options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.url_for(app, path_or_resource, options_with_resource)
     end
@@ -238,9 +243,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
         raise ArgumentError, 'Too many arguments to link_to(url, options={}, &block)'
       end
 
-      url = args[url_arg_index]
-
-      if url
+      if url = args[url_arg_index]
         options = args[options_index] || {}
         raise ArgumentError, 'Options must be a hash' unless options.is_a?(Hash)
 
@@ -256,14 +259,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
     # Modified Padrino form_for that uses Middleman's url_for
     # to transform the URL.
-    def form_tag(url, options = {}, &block)
+    def form_tag(url, options={}, &block)
       url = url_for(url, options)
       super
     end
 
     # Modified Padrino image_tag so that it finds the paths for srcset
     # using asset_path for the images listed in the srcset param
-    def image_tag(path, params = {})
+    def image_tag(path, params={})
       params.symbolize_keys!
 
       if params.key?(:srcset)
@@ -282,8 +285,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       super(path, params)
     end
 
-    def partial(template, options = {}, &block)
-      including_parent_locals = Middleman::Util::EnhancedHash.new
+    def partial(template, options={}, &block)
+      including_parent_locals = {}
       including_parent_locals.merge!(@locs || {})
       including_parent_locals.merge!(options[:locals] || {})
 

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

@@ -19,7 +19,7 @@ module Middleman
           module_name = app.config[:helpers_filename_to_module_name_proc].call(filename)
           next unless module_name
 
-          load filename
+          require filename
           next unless Object.const_defined?(module_name.to_sym)
 
           app.template_context_class.send :include, Object.const_get(module_name.to_sym)

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.
-    return unless ENV['TEST']
-
-    app.after_configuration_eval do
-      ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
-      ::I18n.reload!
+    if ENV['TEST']
+      app.after_configuration_eval do
+        ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
+        ::I18n.reload!
+      end
     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,9 +79,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       href = super(path_or_resource, opts)
 
-      result = extensions[:i18n].localized_path(href, locale)
-
-      final_path = result || href
+      final_path = if result = extensions[:i18n].localized_path(href, locale)
+        result
+      else
+        # Should we log the missing file?
+        href
+      end
 
       opts[:relative] = should_relativize
 
@@ -92,7 +95,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
@@ -103,10 +106,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) ||
@@ -152,8 +155,6 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it's a "localizable template"
     localizable_folder_resources.each do |resource|
-      next if resource.ignored?
-
       page_id = File.basename(resource.path, File.extname(resource.path))
       locales.each do |locale|
         # Remove folder name
@@ -173,30 +174,15 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it uses file extension localization
     file_extension_resources.each do |resource|
-      next if resource.ignored?
-
       result = parse_locale_extension(resource.path)
       ext_locale, path, page_id = result
-
-      new_resource = build_resource(path, resource.path, page_id, ext_locale)
-
-      # extension resources replace original i18n attempt.
-      exists = new_resources.find { |r| r.path == new_resource.path }
-      new_resources.delete(exists) if exists
-
-      new_resources << new_resource
+      new_resources << build_resource(path, resource.path, page_id, ext_locale)
 
       resource.ignore!
     end
 
     @lookup = new_resources.each_with_object({}) do |desc, sum|
       abs_path = desc.source_path.sub(options[:templates_dir], '')
-
-      # Process templates with locale suffix
-      locales.each do |locale|
-        abs_path = abs_path.sub(".#{locale}.", '.')
-      end
-
       sum[abs_path] ||= {}
       sum[abs_path][desc.locale] = '/' + desc.path
     end
@@ -208,15 +194,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
   Contract String, Symbol => Maybe[String]
   def localized_path(path, locale)
-    lookup = ::Middleman::Util.parse_uri(path)
-    lookup.path << app.config[:index_file] if lookup.path&.end_with?('/')
+    lookup_path = path.dup
+    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
+    @lookup[lookup_path] && @lookup[lookup_path][locale]
   end
 
   Contract Symbol => String
@@ -291,14 +272,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def build_resource(path, source_path, page_id, locale)
     old_locale = ::I18n.locale
     ::I18n.locale = locale
-    localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id)
-
+    localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id, fallback: false)
     partially_localized_path = ''
 
     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)}"
+      partially_localized_path = "#{partially_localized_path}/#{::I18n.t("paths.#{path_sub}", default: path_sub, fallback: false)}"
     end
 
     path = "#{partially_localized_path}/#{File.basename(path)}"

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,10 +79,7 @@ module Middleman
           path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
           return [status, headers, response] unless path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
-
-          body = ::Middleman::Util.extract_response_text(response)
-
-          return [status, headers, response] unless body
+          return [status, headers, response] unless body = ::Middleman::Util.extract_response_text(response)
 
           dirpath = ::Pathname.new(File.dirname(path))
 
@@ -93,10 +90,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/core_extensions.rb

@@ -100,10 +100,10 @@ Middleman::Extensions.register :minify_css do
   Middleman::Extensions::MinifyCss
 end
 
-# MinifyJavaScript compresses JS
+# MinifyJavascript compresses JS
 Middleman::Extensions.register :minify_javascript do
   require 'middleman-core/extensions/minify_javascript'
-  Middleman::Extensions::MinifyJavaScript
+  Middleman::Extensions::MinifyJavascript
 end
 
 # GZIP assets and pages during build

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, Errno::ENETUNREACH
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
         []
       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, Errno::ENETUNREACH
+      rescue Resolv::ResolvError, Errno::EADDRNOTAVAIL
         []
       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/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)