middleman-core 3.3.12 → 3.4.0

data/lib/middleman-core/templates/extension/Gemfile

@@ -13,7 +13,6 @@ end
 
 group :test do
   gem 'cucumber'
-  gem 'fivemat'
   gem 'aruba'
   gem 'rspec'
 end

data/lib/middleman-core/templates/extension/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color --tags ~@wip --strict"
 end
 
 require 'rake/clean'

data/lib/middleman-core/util.rb

@@ -222,6 +222,30 @@ module Middleman
         end
       end
 
+      # Glob a directory and try to keep path encoding consistent.
+      #
+      # @param [String] path The glob path.
+      # @return [Array<String>]
+      def glob_directory(path)
+        results = ::Dir[path]
+
+        return results unless RUBY_PLATFORM =~ /darwin/
+
+        results.map { |r| r.encode('UTF-8', 'UTF-8-MAC') }
+      end
+
+      # Get the PWD and try to keep path encoding consistent.
+      #
+      # @param [String] path The glob path.
+      # @return [Array<String>]
+      def current_directory
+        result = ::Dir.pwd
+
+        return result unless RUBY_PLATFORM =~ /darwin/
+
+        result.encode('UTF-8', 'UTF-8-MAC')
+      end
+
       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.12' unless const_defined?(:VERSION)
+  VERSION = '3.4.0' unless const_defined?(:VERSION)
 end

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

@@ -8,7 +8,8 @@ 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 = '', 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
@@ -98,6 +99,36 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       end
     end
 
+    # Override helper to add `relative` opt-out.
+    def stylesheet_link_tag(*sources)
+      options = {
+        rel: 'stylesheet'
+      }.update(sources.extract_options!.symbolize_keys)
+
+      path_options = {}
+      path_options[:relative] = options.delete(:relative) if options.key?(:relative)
+
+      sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all, source|
+        all << tag(:link, {
+          href: asset_path(:css, source, path_options)
+        }.update(options))
+      end
+    end
+
+    # Override helper to add `relative` opt-out.
+    def javascript_include_tag(*sources)
+      options = sources.extract_options!.symbolize_keys
+
+      path_options = {}
+      path_options[:relative] = options.delete(:relative) if options.key?(:relative)
+
+      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+        all << content_tag(:script, nil, {
+          src: asset_path(:js, source, path_options)
+        }.update(options))
+      end
+    end
+
     # Output a stylesheet link tag based on the current path
     #
     # @param [Symbol] asset_ext The type of asset
@@ -152,8 +183,9 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     #
     # @param [Symbol] kind The type of file
     # @param [String] source The path to the file
+    # @param [Hash] options Additional options.
     # @return [String]
-    def asset_path(kind, source)
+    def asset_path(kind, source, options={})
       return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
       asset_folder = case kind
       when :css
@@ -173,29 +205,38 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
       asset_folder = '' if source.start_with?('/') # absolute path
 
-      asset_url(source, asset_folder)
+      asset_url(source, asset_folder, options)
     end
 
     # Get the URL of an asset given a type/prefix
     #
     # @param [String] path The path (such as "photo.jpg")
     # @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='')
+    def asset_url(path, prefix='', options={})
       # Don't touch assets which already have a full path
-      if path.include?('//') || path.start_with?('data:')
+      if path.include?('//') || path.start_with?('data:') || !current_resource
         path
       else # rewrite paths to use their destination path
-        if resource = sitemap.find_resource_by_destination_path(url_for(path))
+        result = if resource = sitemap.find_resource_by_destination_path(url_for(path))
           resource.url
         else
           path = File.join(prefix, path)
+
           if resource = sitemap.find_resource_by_path(path)
             resource.url
           else
             File.join(config[:http_prefix], path)
           end
         end
+
+        if options[:relative] != true
+          result
+        else
+          current_dir = Pathname('/' + current_resource.destination_path)
+          Pathname(result).relative_path_from(current_dir.dirname).to_s
+        end
       end
     end
 
@@ -255,12 +296,12 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       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={})
       params.symbolize_keys!
-      
+
       if params.key?(:srcset)
         images_sources = params[:srcset].split(',').map do |src_def|
           if src_def.include?('//')

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

@@ -7,9 +7,13 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   option :mount_at_root, nil, 'Mount a specific language at the root of the site'
   option :data, 'locales', 'The directory holding your locale configurations'
 
+  attr_reader :lookup
+
   def initialize(app, options_hash={}, &block)
     super
 
+    @lookup = {}
+
     # TODO
     # If :directory_indexes is already active,
     # throw a warning explaining the bug and telling the use
@@ -23,13 +27,15 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     app.config.define_setting :locales_dir, 'locales', 'The directory holding your locale configurations'
 
+    ::Middleman::Sitemap::Resource.send :attr_accessor, :locale_root_path
+
     app.send :include, LocaleHelpers
   end
 
   def after_configuration
-    app.files.reload_path(app.config[:locals_dir] || options[:data])
+    app.files.reload_path(app.config[:locales_dir] || options[:data])
 
-    @locales_glob = File.join(app.config[:locals_dir] || options[:data], '**', '*.{rb,yml,yaml}')
+    @locales_glob = File.join(app.config[:locales_dir] || options[:data], '**', '*.{rb,yml,yaml}')
     @locales_regex = convert_glob_to_regex(@locales_glob)
 
     @maps = {}
@@ -53,6 +59,33 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     def t(*args)
       ::I18n.t(*args)
     end
+
+    def url_for(path_or_resource, options={})
+      locale = options.delete(:locale) || ::I18n.locale
+
+      opts = options.dup
+
+      should_relativize = opts.key?(:relative) ? opts[:relative] : config[:relative_links]
+
+      opts[:relative] = false
+
+      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
+
+      opts[:relative] = should_relativize
+
+      begin
+        super(final_path, opts)
+      rescue RuntimeError
+        super(path_or_resource, options)
+      end
+    end
   end
 
   delegate :logger, to: :app
@@ -68,24 +101,45 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     new_resources = []
 
-    resources.each do |resource|
-      # If it uses file extension localization
-      if parse_locale_extension(resource.path)
-        result = parse_locale_extension(resource.path)
-        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))
-        langs.each do |lang|
-          # Remove folder name
-          path = resource.path.sub(options[:templates_dir], '')
-          new_resources << build_resource(path, resource.path, page_id, lang)
-        end
+    file_extension_resources = resources.select do |resource|
+      parse_locale_extension(resource.path)
+    end
+
+    localizable_folder_resources = resources.select do |resource|
+      !file_extension_resources.include?(resource) && File.fnmatch?(File.join(options[:templates_dir], '**'), resource.path)
+    end
+
+    # If it's a "localizable template"
+    localizable_folder_resources.map do |resource|
+      page_id = File.basename(resource.path, File.extname(resource.path))
+      langs.each do |lang|
+        # Remove folder name
+        path = resource.path.sub(options[:templates_dir], '')
+        new_resources << build_resource(path, resource.path, page_id, lang)
       end
     end
 
-    resources + new_resources
+    # If it uses file extension localization
+    file_extension_resources.map do |resource|
+      result = parse_locale_extension(resource.path)
+      ext_lang, path, page_id = result
+      new_resources << build_resource(path, resource.path, page_id, ext_lang)
+    end
+
+    @lookup = new_resources.each_with_object({}) do |desc, sum|
+      abs_path = desc.source_path.sub(options[:templates_dir], '')
+      sum[abs_path] ||= {}
+      sum[abs_path][desc.lang] = '/' + desc.path
+    end
+
+    resources + new_resources.map { |r| r.to_resource(app) }
+  end
+
+  def localized_path(path, lang)
+    lookup_path = path.dup
+    lookup_path << app.config[:index_file] if lookup_path.end_with?('/')
+
+    @lookup[lookup_path] && @lookup[lookup_path][lang]
   end
 
   private
@@ -104,7 +158,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   end
 
   def configure_i18n
-    ::I18n.load_path += Dir[File.join(app.root, @locales_glob)]
+    ::I18n.load_path += ::Middleman::Util.glob_directory(File.join(app.root, @locales_glob))
     ::I18n.reload!
 
     ::I18n.default_locale = @mount_at_root
@@ -147,9 +201,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
         p.to_s.match(@locales_regex) && (p.to_s.split(File::SEPARATOR).length == 2)
       end
 
-      known_langs.map { |p|
+      known_langs.map do |p|
         File.basename(p.to_s).sub(/\.ya?ml$/, '').sub(/\.rb$/, '')
-      }.sort.map(&:to_sym)
+      end.sort.map(&:to_sym)
     end
   end
 
@@ -173,11 +227,33 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     [lang, path, basename]
   end
 
+  LocalizedPageDescriptor = Struct.new(:path, :source_path, :lang) do
+    def to_resource(app)
+      p = ::Middleman::Sitemap::Resource.new(app.sitemap, path)
+      p.proxy_to(source_path)
+
+      templates_dir = app.extensions[:i18n].options[:templates_dir]
+
+      p.locale_root_path = source_path.gsub(templates_dir, '')
+
+      p
+    end
+  end
+
   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: [])
 
+    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).to_s)}"
+    end
+
+    path = "#{partially_localized_path}/#{File.basename(path)}"
+
     prefix = if (options[:mount_at_root] == lang) || (options[:mount_at_root].nil? && langs[0] == lang)
       '/'
     else
@@ -194,11 +270,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     @_localization_data[path] = [lang, path, localized_page_id]
 
-    p = ::Middleman::Sitemap::Resource.new(app.sitemap, path)
-    p.proxy_to(source_path)
-
     ::I18n.locale = old_locale
-    p
+
+    LocalizedPageDescriptor.new(path, source_path, lang)
   end
 
   module LocaleHelpers
@@ -209,10 +283,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     end
 
     def locate_partial(partial_name, try_static=false)
-      locals_dir = extensions[:i18n].options[:templates_dir]
+      locales_dir = extensions[:i18n].options[:templates_dir]
 
       # Try /localizable
-      partials_path = File.join(locals_dir, partial_name)
+      partials_path = File.join(locales_dir, partial_name)
 
       lang_suffix = current_resource.metadata[:locals] && current_resource.metadata[:locals][:lang]
 
@@ -226,7 +300,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       if lang_suffix
         super(suffixed_partial_name, maybe_static) ||
-          super(File.join(locals_dir, suffixed_partial_name), maybe_static) ||
+          super(File.join(locales_dir, suffixed_partial_name), maybe_static) ||
           super(partials_path, try_static) ||
           super
       else

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

@@ -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) }.sort.reverse.join('|')
       @middleman_app   = options[:middleman_app]
     end
 

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

@@ -32,7 +32,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
     # @param [String] path
     # @param [String] prefix
     # @return [String]
-    def asset_url(path, prefix='')
+    def asset_url(path, prefix='', options={})
       controller = extensions[:asset_host]
 
       original_output = super

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

@@ -23,6 +23,13 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
         if File.exist?(full_path)
           begin
             width, height = ::FastImage.size(full_path, raise_on_failure: true)
+            # Check for @2x and @3x image
+            retina = full_path.match(/@(\d)x\.[a-zA-Z]{3,4}$/)
+            if retina
+              factor  = retina[1].to_i
+              width /= factor
+              height /= factor
+            end
             params[:width]  = width
             params[:height] = height
           rescue FastImage::UnknownImageType

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

@@ -21,7 +21,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
     # asset_url override if we're using cache busting
     # @param [String] path
     # @param [String] prefix
-    def asset_url(path, prefix='')
+    def asset_url(path, prefix='', options={})
       http_path = super
 
       if http_path.include?('://') || !%w(.css .png .jpg .jpeg .svg .svgz .webp .js .gif).include?(File.extname(http_path))

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

@@ -152,8 +152,8 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
         color            = options[:color]
 
         if options[:random_color]
-          background_color = hex.shuffle[0...6].join
-          color = hex.shuffle[0...6].join
+          background_color = hex.sample(6).join
+          color = hex.sample(6).join
         end
 
         src << "/#{background_color.sub(/^#/, '')}" if background_color

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

@@ -49,11 +49,11 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       status, headers, response = @app.call(env)
 
       type = headers['Content-Type'].try(:slice, /^[^;]*/)
-      path = env['PATH_INFO']
+      @path = env['PATH_INFO']
 
       minified = if @inline && minifiable_inline?(type)
         minify_inline(::Middleman::Util.extract_response_text(response))
-      elsif minifiable?(type) && !ignore?(path)
+      elsif minifiable?(type) && !ignore?(@path)
         minify(::Middleman::Util.extract_response_text(response))
       end
 
@@ -94,7 +94,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def minify(content)
       @compressor.compress(content)
     rescue ExecJS::ProgramError => e
-      warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
+      warn "WARNING: Couldn't compress JavaScript in #{@path}: #{e.message}"
       content
     end
 
@@ -103,7 +103,9 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     # @return [String]
     def minify_inline(content)
       content.gsub(INLINE_JS_REGEX) do |match|
-        first, inline_content, last = $1, $2, $3
+        first = $1
+        inline_content = $2
+        last = $3
 
         # Only compress script tags that contain JavaScript (as opposed to
         # something like jQuery templates, identified with a "text/html" type).