middleman-core 4.4.0 → 5.0.0.rc.1

data/lib/middleman-core/util/paths.rb

@@ -4,11 +4,10 @@ require 'uri'
 require 'addressable/uri'
 require 'memoist'
 require 'tilt'
-require 'webrick'
+require 'set'
 
 require 'middleman-core/contracts'
 
-# rubocop:disable ModuleLength
 module Middleman
   module Util
     extend Memoist
@@ -26,15 +25,17 @@ module Middleman
     def tilt_class(path)
       ::Tilt[path]
     end
-    memoize :tilt_class
+    # memoize :tilt_class
 
     # Normalize a path to not include a leading slash
     # @param [String] path
     # @return [String]
-    Contract String => String
+    Contract Any => String
     def normalize_path(path)
+      return path unless path.is_a?(String)
+
       # The tr call works around a bug in Ruby's Unicode handling
-      WEBrick::HTTPUtils.unescape(path).sub(%r{^/}, '').tr('', '')
+      ::URI.decode(path).sub(%r{^/}, '').tr('', '')
     end
     memoize :normalize_path
 
@@ -47,11 +48,12 @@ module Middleman
     memoize :strip_leading_slash
 
     IGNORE_DESCRIPTOR = Or[Regexp, RespondTo[:call], String]
+
     Contract IGNORE_DESCRIPTOR, String => Bool
     def should_ignore?(validator, value)
       if validator.is_a? Regexp
         # Treat as Regexp
-        !!(value =~ validator)
+        !validator.match(value).nil?
       elsif validator.respond_to? :call
         # Treat as proc
         validator.call(value)
@@ -65,6 +67,8 @@ module Middleman
     end
     memoize :should_ignore?
 
+    IGNORED_ASSET_EXTENSIONS = Set.new %i[images fonts]
+
     # Get the path of a file of a given type
     #
     # @param [Middleman::Application] app The app.
@@ -73,28 +77,28 @@ module Middleman
     # @param [Hash] options Data to pass through.
     # @return [String]
     Contract ::Middleman::Application, Symbol, Or[String, Symbol], Hash => String
-    def asset_path(app, kind, source, options={})
+    def asset_path(app, kind, source, options_hash = ::Middleman::EMPTY_HASH)
       return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
 
       asset_folder = case kind
-      when :css
-        app.config[:css_dir]
-      when :js
-        app.config[:js_dir]
-      when :images
-        app.config[:images_dir]
-      when :fonts
-        app.config[:fonts_dir]
-      else
-        kind.to_s
-      end
+                     when :css
+                       app.config[:css_dir]
+                     when :js
+                       app.config[:js_dir]
+                     when :images
+                       app.config[:images_dir]
+                     when :fonts
+                       app.config[:fonts_dir]
+                     else
+                       kind.to_s
+                     end
 
       source = source.to_s.tr(' ', '')
-      ignore_extension = (kind == :images || kind == :fonts) # don't append extension
+      ignore_extension = IGNORED_ASSET_EXTENSIONS.include? kind # don't append extension
       source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
       asset_folder = '' if source.start_with?('/') # absolute path
 
-      asset_url(app, source, asset_folder, options)
+      asset_url(app, source, asset_folder, options_hash)
     end
 
     # Get the URL of an asset given a type/prefix
@@ -104,39 +108,39 @@ module Middleman
     # @param [Hash] options Data to pass through.
     # @return [String] The fully qualified asset url
     Contract ::Middleman::Application, String, String, Hash => String
-    def asset_url(app, path, prefix='', options={})
+    def asset_url(app, path, prefix = '', options_hash = ::Middleman::EMPTY_HASH)
       # Don't touch assets which already have a full path
       return path if path.include?('//') || path.start_with?('data:')
 
-      if options[:relative] && !options[:current_resource]
-        raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
-      end
+      raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true' if options_hash[:relative] && !options_hash[:current_resource]
 
       uri = ::Middleman::Util.parse_uri(path)
       path = uri.path
 
-      # Ensure the url we pass into find_resource_by_destination_path is not a
+      # Ensure the url we pass into by_destination_path is not a
       # relative path, since it only takes absolute url paths.
-      dest_path = url_for(app, path, options.merge(relative: false))
+      dest_path = url_for(app, path, options_hash.merge(relative: false))
 
-      result = if resource = app.sitemap.find_resource_by_path(dest_path)
-        resource.url
-      elsif resource = app.sitemap.find_resource_by_destination_path(dest_path)
-        resource.url
-      else
-        path = ::File.join(prefix, path)
-        if resource = app.sitemap.find_resource_by_path(path)
-          resource.url
-        else
-          ::File.join(app.config[:http_prefix], path)
-        end
-      end
+      resource = app.sitemap.by_path(dest_path) || app.sitemap.by_destination_path(dest_path)
+
+      result = if resource
+                 resource.url
+               else
+                 path = ::File.join(prefix, path)
+                 resource = app.sitemap.by_path(path)
+
+                 if resource
+                   resource.url
+                 else
+                   ::File.join(app.config[:http_prefix], path)
+                 end
+               end
 
       final_result = ::Addressable::URI.encode(
         relative_path_from_resource(
-          options[:current_resource],
+          options_hash[:current_resource],
           result,
-          options[:relative]
+          options_hash[:relative]
         )
       )
 
@@ -150,19 +154,19 @@ module Middleman
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
     Contract ::Middleman::Application, Or[String, Symbol, ::Middleman::Sitemap::Resource], Hash => String
-    def url_for(app, path_or_resource, options={})
+    def url_for(app, path_or_resource, options_hash = ::Middleman::EMPTY_HASH)
       if path_or_resource.is_a?(String) || path_or_resource.is_a?(Symbol)
-        r = app.sitemap.find_resource_by_page_id(path_or_resource)
+        r = app.sitemap.by_page_id(path_or_resource)
 
-        path_or_resource = r ? r : path_or_resource.to_s
+        path_or_resource = r || path_or_resource.to_s
       end
 
       # Handle Resources and other things which define their own url method
       url = if path_or_resource.respond_to?(:url)
-        path_or_resource.url
-      else
-        path_or_resource.dup
-      end
+              path_or_resource.url
+            else
+              path_or_resource.dup
+            end
 
       # Try to parse URL
       begin
@@ -172,7 +176,7 @@ module Middleman
         return url
       end
 
-      relative = options[:relative]
+      relative = options_hash[:relative]
       raise "Can't use the relative option with an external URL" if relative && uri.host
 
       # Allow people to turn on relative paths for all links with
@@ -182,7 +186,7 @@ module Middleman
       effective_relative = true if relative.nil? && app.config[:relative_links]
 
       # Try to find a sitemap resource corresponding to the desired path
-      this_resource = options[:current_resource]
+      this_resource = options_hash[:current_resource]
 
       if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
         resource = path_or_resource
@@ -192,7 +196,7 @@ module Middleman
         url_path = Pathname(uri.path)
         current_source_dir = Pathname('/' + this_resource.path).dirname
         url_path = current_source_dir.join(url_path) if url_path.relative?
-        resource = app.sitemap.find_resource_by_path(url_path.to_s)
+        resource = app.sitemap.by_path(url_path.to_s)
         if resource
           resource_url = resource.url
         else
@@ -200,35 +204,37 @@ module Middleman
           url_path = Pathname(uri.path)
           current_source_dir = Pathname('/' + this_resource.destination_path).dirname
           url_path = current_source_dir.join(url_path) if url_path.relative?
-          resource = app.sitemap.find_resource_by_destination_path(url_path.to_s)
+          resource = app.sitemap.by_destination_path(url_path.to_s)
           resource_url = resource.url if resource
         end
-      elsif options[:find_resource] && uri.path && !uri.host
-        resource = app.sitemap.find_resource_by_path(uri.path)
+      elsif options_hash[:find_resource] && uri.path && !uri.host
+        resource = app.sitemap.by_path(uri.path)
         resource_url = resource.url if resource
       end
 
       if resource
         uri.path = if this_resource
-          ::Addressable::URI.encode(
-            relative_path_from_resource(
-              this_resource,
-              resource_url,
-              effective_relative
-            )
-          )
-        else
-          resource_url
-        end
+                     ::Addressable::URI.encode(
+                       relative_path_from_resource(
+                         this_resource,
+                         resource_url,
+                         effective_relative
+                       )
+                     )
+                   else
+                     resource_url
+                   end
       end
 
       # Support a :query option that can be a string or hash
-      if query = options[:query]
+      query = options_hash[:query]
+
+      if query
         uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
       end
 
       # Support a :fragment or :anchor option just like Padrino
-      fragment = options[:anchor] || options[:fragment]
+      fragment = options_hash[:anchor] || options_hash[:fragment]
       uri.fragment = fragment.to_s if fragment
 
       # Finally make the URL back into a string
@@ -242,12 +248,12 @@ module Middleman
     # @return [String] Path with index file if necessary.
     Contract String, ::Middleman::Application => String
     def full_path(path, app)
-      resource = app.sitemap.find_resource_by_destination_path(path)
+      resource = app.sitemap.by_destination_path(path)
 
       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)
+        resource = app.sitemap.by_destination_path(indexed_path)
       end
 
       if resource
@@ -273,9 +279,7 @@ module Middleman
         relative_path = Pathname(resource_url).relative_path_from(current_dir).to_s
 
         # Put back the trailing slash to avoid unnecessary Apache redirects
-        if resource_url.end_with?('/') && !relative_path.end_with?('/')
-          relative_path << '/'
-        end
+        relative_path << '/' if resource_url.end_with?('/') && !relative_path.end_with?('/')
 
         relative_path
       else
@@ -301,7 +305,7 @@ module Middleman
           path == matcher
         end
       elsif matcher.respond_to?(:match)
-        !!(path =~ matcher)
+        !matcher.match(path).nil?
       elsif matcher.respond_to?(:call)
         matcher.call(path)
       else

data/lib/middleman-core/util/rack.rb

@@ -20,30 +20,31 @@ module Middleman
       result
     end
 
-    Contract String, String, ArrayOf[String], IsA['::Middleman::Application'], Proc => String
+    Contract String, String, SetOf[String], IsA['::Middleman::Application'], Proc => String
     def rewrite_paths(body, path, exts, app, &_block)
-      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)\(>]+(#{::Regexp.union(exts)}))/
+      sorted_exts = exts.to_a.sort_by { |ext| -ext.size }
+      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)\(>]+(#{::Regexp.union(sorted_exts)}))/
 
       url_fn_prefix = 'url('
 
       body.dup.gsub(matcher) do |match|
-        opening_character = $1
-        asset_path = $2
+        opening_character = Regexp.last_match(1)
+        asset_path = Regexp.last_match(2)
 
         if asset_path.start_with?(url_fn_prefix)
           opening_character << url_fn_prefix
           asset_path = asset_path[url_fn_prefix.length..-1]
         end
 
-        current_resource = app.sitemap.find_resource_by_destination_path(path)
+        current_resource = app.sitemap.by_destination_path(path)
 
         begin
           uri = ::Middleman::Util.parse_uri(asset_path)
 
-          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/)
+          if uri.relative? && uri.host.nil? && asset_path !~ /^[^\/].*[a-z]+\.[a-z]+\/.*/
             dest_path = ::Middleman::Util.url_for(app, asset_path, relative: false, current_resource: current_resource)
 
-            resource = app.sitemap.find_resource_by_destination_path(dest_path)
+            resource = app.sitemap.by_destination_path(dest_path)
 
             if resource && (result = yield(asset_path))
               "#{opening_character}#{result}"

data/lib/middleman-core/util/uri_templates.rb

@@ -1,8 +1,6 @@
 # For URI templating
 require 'addressable/uri'
 require 'addressable/template'
-require 'active_support/inflector'
-require 'active_support/inflector/transliterate'
 
 module Middleman
   module Util
@@ -18,9 +16,7 @@ module Middleman
       # @return [Addressable::Template] a URI template
       def uri_template(tmpl_src)
         # Support the RFC6470 templates directly if people use them
-        if tmpl_src.include?(':')
-          tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
-        end
+        tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}') if tmpl_src.include?(':')
 
         ::Addressable::Template.new(::Middleman::Util.normalize_path(tmpl_src))
       end
@@ -54,6 +50,7 @@ module Middleman
 
         parameterized_string.chars.to_a.each_with_index do |char, i|
           next unless char == '?' && str[i].bytes.count != 1
+
           parameterized_string[i] = str[i]
         end
 

data/lib/middleman-core/util.rb

@@ -1,6 +1,3 @@
-# For instrumenting
-require 'active_support/notifications'
-
 require 'middleman-core/application'
 require 'middleman-core/sources'
 require 'middleman-core/sitemap/resource'
@@ -16,8 +13,8 @@ module Middleman
     module_function
 
     # Facade for ActiveSupport/Notification
-    def instrument(name, payload={}, &block)
-      suffixed_name = name =~ /\.middleman$/ ? name.dup : "#{name}.middleman"
+    def instrument(name, payload = {}, &block)
+      suffixed_name = /\.middleman$/.match?(name) ? name.dup : "#{name}.middleman"
       ::ActiveSupport::Notifications.instrument(suffixed_name, payload, &block)
     end
   end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.4.0'.freeze unless const_defined?(:VERSION)
+  VERSION = '5.0.0.rc.1'.freeze unless const_defined?(:VERSION)
 end

data/lib/middleman-core.rb

@@ -1,14 +1,16 @@
-# rubocop:disable FileName
-
 # Setup our load paths
-libdir = File.expand_path(File.dirname(__FILE__))
+libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+require 'backports/latest'
+require 'active_support/all'
+
 # Top-level Middleman namespace
 module Middleman
   autoload :Application, 'middleman-core/application'
 end
 
+require 'middleman-core/util/empty_hash'
 require 'middleman-core/version'
 require 'middleman-core/util'
 require 'middleman-core/extensions'

data/middleman-core.gemspec

@@ -11,36 +11,34 @@ Gem::Specification.new do |s|
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
   s.homepage    = 'http://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
-  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
+  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 
-  s.files        = `git ls-files -z`.split("\0")
-  s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(fixtures|features|spec)/}) }
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   # Core
-  s.add_dependency('bundler', '~> 2.0')
+  s.add_dependency('bundler')
   s.add_dependency('rack', ['>= 1.4.5', '< 3'])
   s.add_dependency('tilt', ['~> 2.0.9'])
   s.add_dependency('erubis')
-  s.add_dependency('fast_blank')
   s.add_dependency('parallel')
   s.add_dependency('servolux')
   s.add_dependency('dotenv')
-  s.add_dependency('toml')
-  s.add_dependency('webrick')
+  s.add_dependency('rgl', ['~> 0.5.3'])
 
   # Helpers
-  s.add_dependency('activesupport', ['>= 6.1', '< 7.0'])
-  s.add_dependency('padrino-helpers', ['~> 0.15.0'])
-  s.add_dependency("addressable", ["~> 2.4"])
+  s.add_dependency('activesupport', ['~> 5.2'])
+  s.add_dependency('padrino-helpers', ['~> 0.14.4'])
+  s.add_dependency('addressable', ['~> 2.3'])
   s.add_dependency('memoist', ['~> 0.14'])
+  s.add_dependency('backports', ['~> 3.11'])
 
   # Watcher
-  s.add_dependency('listen', ['~> 3.0.0'])
+  s.add_dependency('listen', ['~> 3.0'])
 
   # i18n
-  s.add_dependency('i18n', ['~> 1.6.0'])
+  s.add_dependency('i18n', ['~> 0.9.0'])
 
   # Automatic Image Sizes
   s.add_dependency('fastimage', ['~> 2.0'])
@@ -49,14 +47,16 @@ Gem::Specification.new do |s|
   s.add_dependency('sassc', ['~> 2.0'])
 
   # Minify JS
-  s.add_dependency('uglifier', ['~> 3.0'])
+  s.add_dependency('uglifier', ['~> 4.1'])
   s.add_dependency('execjs', ['~> 2.0'])
 
+  # Perf
+  s.add_dependency('oj', ['~> 3.7'])
+
   # Testing
-  s.add_dependency('contracts', ['~> 0.13.0'])
+  s.add_dependency('contracts', ['~> 0.16.0'])
 
   # Hash stuff
   s.add_dependency('hashie', ['~> 3.4'])
   s.add_dependency('hamster', ['~> 3.0'])
-  s.add_dependency('backports', ['~> 3.6'])
 end