jekyll-minibundle 2.2.0 → 3.0.0

data/test/integration/ministamp_development_mode_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 
 module Jekyll::Minibundle::Test
   class MinistampDevelopmentModeTest < TestCase

data/test/integration/ministamp_production_mode_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 
 module Jekyll::Minibundle::Test
   class MinistampProductionModeTest < TestCase
@@ -239,11 +241,11 @@ module Jekyll::Minibundle::Test
         find_and_gsub_in_file(
           source_path('_layouts/default.html'),
           '    <link rel="stylesheet" href="{% ministamp _tmp/site.css assets/screen.css %}" media="screen">',
-          <<-END
+          <<-LIQUID
     {% assign stamp_source_filename = 'site' %}
     {% assign stamp_destination_url = 'assets/screen.css' %}
     <link rel="stylesheet" href="{% ministamp { source_path: '_tmp/{{ stamp_source_filename }}.css', destination_path: '{{ stamp_destination_url }}' } %}" media="screen">
-          END
+          LIQUID
         )
 
         generate_site(:production)

data/test/integration/static_files_as_asset_sources_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 
 module Jekyll::Minibundle::Test
   class StaticFilesAsAssetSourcesTest < TestCase
@@ -17,7 +19,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    [:development, :production].each do |env|
+    %i[development production].each do |env|
       define_method :"test_ministamp_allows_using_static_file_as_asset_source_in_#{env}_mode" do
         with_site_dir do
           contents = 'h2 {}'
@@ -26,7 +28,7 @@ module Jekyll::Minibundle::Test
 
           generate_site(env)
 
-          asset_files = Dir[destination_path('assets') + '/screen*.css']
+          asset_files = Dir["#{destination_path('assets')}/screen*.css"]
 
           assert_equal(1, asset_files.size)
           assert_equal(contents, File.read(destination_path('assets/shared.css')))

data/test/support/assertions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll::Minibundle::Test
   module Assertions
     def assert_contains_only(collection, expected_elements)

data/test/support/fixture_config.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module Jekyll::Minibundle::Test
   module FixtureConfig
-    STAMP_SOURCE_PATH = '_tmp/site.css'.freeze
-    STAMP_DESTINATION_PATH = 'assets/screen.css'.freeze
-    STAMP_FINGERPRINT = 'd57c1404fe726e66d57128a1bd190cbb'.freeze
-    STAMP_DESTINATION_FINGERPRINT_PATH = "assets/screen-#{STAMP_FINGERPRINT}.css".freeze
+    STAMP_SOURCE_PATH = '_tmp/site.css'
+    STAMP_DESTINATION_PATH = 'assets/screen.css'
+    STAMP_FINGERPRINT = 'd57c1404fe726e66d57128a1bd190cbb'
+    STAMP_DESTINATION_FINGERPRINT_PATH = "assets/screen-#{STAMP_FINGERPRINT}.css"
 
-    CSS_BUNDLE_SOURCE_DIR = '_assets/styles'.freeze
-    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'.freeze
-    CSS_BUNDLE_FINGERPRINT = 'b2e0ecc1c100effc2c7353caad20c327'.freeze
-    CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{CSS_BUNDLE_DESTINATION_PATH}-#{CSS_BUNDLE_FINGERPRINT}.css".freeze
+    CSS_BUNDLE_SOURCE_DIR = '_assets/styles'
+    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'
+    CSS_BUNDLE_FINGERPRINT = 'b2e0ecc1c100effc2c7353caad20c327'
+    CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{CSS_BUNDLE_DESTINATION_PATH}-#{CSS_BUNDLE_FINGERPRINT}.css"
 
-    JS_BUNDLE_SOURCE_DIR = '_assets/scripts'.freeze
-    JS_BUNDLE_DESTINATION_PATH = 'assets/site'.freeze
-    JS_BUNDLE_FINGERPRINT = '4782a1f67803038d4f8351051e67deb8'.freeze
-    JS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{JS_BUNDLE_DESTINATION_PATH}-#{JS_BUNDLE_FINGERPRINT}.js".freeze
+    JS_BUNDLE_SOURCE_DIR = '_assets/scripts'
+    JS_BUNDLE_DESTINATION_PATH = 'assets/site'
+    JS_BUNDLE_FINGERPRINT = '4782a1f67803038d4f8351051e67deb8'
+    JS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{JS_BUNDLE_DESTINATION_PATH}-#{JS_BUNDLE_FINGERPRINT}.js"
   end
 end

data/test/support/static_file_config.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 module Jekyll::Minibundle::Test
   module StaticFileConfig
-    STATIC_FILE_PROPERTIES = [
-      :basename,
-      :data,
-      :defaults,
-      :destination_rel_dir,
-      :extname,
-      :modified_time,
-      :mtime,
-      :name,
-      :path,
-      :placeholders,
-      :relative_path,
-      :to_liquid,
-      :type,
-      :url,
-      :write?
+    STATIC_FILE_PROPERTIES = %i[
+      basename
+      data
+      defaults
+      destination_rel_dir
+      extname
+      modified_time
+      mtime
+      name
+      path
+      placeholders
+      relative_path
+      to_liquid
+      type
+      url
+      write?
     ].freeze
   end
 end

data/test/support/test_case.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'ostruct'
 require 'tempfile'
-require 'minitest/autorun'
 require 'nokogiri'
-require 'support/assertions'
 require 'jekyll'
 require 'jekyll/minibundle'
+require 'minitest/autorun'
+require_relative 'assertions'
 
 module Jekyll::Minibundle::Test
   class TestCase < ::Minitest::Test
@@ -104,7 +106,7 @@ module Jekyll::Minibundle::Test
 
     def generate_site(mode, options = {})
       env = {
-        'JEKYLL_MINIBUNDLE_MODE'    => mode && mode.to_s,
+        'JEKYLL_MINIBUNDLE_MODE'    => mode&.to_s,
         'JEKYLL_MINIBUNDLE_CMD_CSS' => options.fetch(:minifier_cmd_css, minifier_cmd_to_remove_comments),
         'JEKYLL_MINIBUNDLE_CMD_JS'  => options.fetch(:minifier_cmd_js, minifier_cmd_to_remove_comments)
       }

data/test/unit/asset_bundle_test.rb

@@ -1,4 +1,6 @@
-require 'support/test_case'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
 require 'jekyll/minibundle/asset_bundle'
 
 module Jekyll::Minibundle::Test
@@ -15,11 +17,11 @@ module Jekyll::Minibundle::Test
       _, actual_stderr = capture_io do
         assert_raises(RuntimeError) { make_bundle(cmd) }
       end
-      expected_stderr = <<-END
-Minibundle: Bundling "assets/site.js" failed with exit status 1, command: #{cmd.inspect}, last 16 bytes of minifier output:
-Minibundle: line 1\\x07
-Minibundle: line 2\\xa4
-      END
+      expected_stderr = <<~MESSAGE
+        Minibundle: Bundling "assets/site.js" failed with exit status 1, command: #{cmd.inspect}, last 16 bytes of minifier output:
+        Minibundle: line 1\\x07
+        Minibundle: line 2\\xa4
+      MESSAGE
       assert_equal(expected_stderr, actual_stderr.gsub(/\e\[\d+m/, '').gsub(/^ +/, ''))
     end
 
@@ -30,12 +32,12 @@ Minibundle: line 2\\xa4
 
     def test_raise_exception_if_bundle_command_not_configured
       err = assert_raises(RuntimeError) { make_bundle(nil) }
-      expected_errmsg = <<-END
-Missing minification command for bundling "assets/site.js". Specify it in
-1) minibundle.minifier_commands.js setting in _config.yml,
-2) $JEKYLL_MINIBUNDLE_CMD_JS environment variable, or
-3) minifier_cmd setting inside minibundle block.
-      END
+      expected_errmsg = <<~MESSAGE
+        Missing minification command for bundling "assets/site.js". Specify it in
+        1) minibundle.minifier_commands.js setting in _config.yml,
+        2) $JEKYLL_MINIBUNDLE_CMD_JS environment variable, or
+        3) minifier_cmd setting inside minibundle block.
+      MESSAGE
       assert_equal(expected_errmsg, err.to_s)
     end
 

data/test/unit/asset_file_drop_test.rb

@@ -1,6 +1,7 @@
-require 'json'
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 require 'jekyll/minibundle/asset_file_drop'
 require 'jekyll/minibundle/stamp_file'
 

data/test/unit/asset_file_registry_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 require 'jekyll/minibundle/asset_file_registry'
 
 module Jekyll::Minibundle::Test
@@ -75,7 +77,7 @@ module Jekyll::Minibundle::Test
     end
 
     [
-      {description: 'assets', config_diff: {'assets' => %w{b1 b2}}},
+      {description: 'assets', config_diff: {'assets' => %w[b1 b2]}},
       {description: 'source_directory', config_diff: {'source_dir' => '_assets/src2'}}
     ].each do |spec|
       define_method :"test_raise_exception_if_registering_bundle_file_with_same_destination_path_but_with_different_#{spec.fetch(:description)}" do
@@ -86,19 +88,14 @@ module Jekyll::Minibundle::Test
           err = assert_raises(RuntimeError) do
             AssetFileRegistry.register_bundle_file(site, second_config)
           end
-          assert_equal(<<-END, err.to_s)
-Two or more minibundle blocks with the same destination path "assets/site.js", but having different asset configuration: #{second_config.inspect} vs. #{first_config.inspect}
-          END
+          assert_equal(<<~MESSAGE, err.to_s)
+            Two or more minibundle blocks with the same destination path "assets/site.js", but having different asset configuration: #{second_config.inspect} vs. #{first_config.inspect}
+          MESSAGE
           assert_equal(1, asset_file_registry_size)
           assert_contains_only(site.static_files, [first_file])
         end
       end
-    end
 
-    [
-      {description: 'assets', config_diff: {'assets' => %w{b1 b2}}},
-      {description: 'source_directory', config_diff: {'source_dir' => '_assets/src2'}}
-    ].each do |spec|
       define_method :"test_raise_exception_if_registering_development_file_collection_with_same_destination_path_but_with_different_#{spec.fetch(:description)}" do
         with_fake_site do |site|
           first_config = bundle_config
@@ -107,9 +104,9 @@ Two or more minibundle blocks with the same destination path "assets/site.js", b
           err = assert_raises(RuntimeError) do
             AssetFileRegistry.register_development_file_collection(site, second_config)
           end
-          assert_equal(<<-END, err.to_s)
-Two or more minibundle blocks with the same destination path "assets/site.js", but having different asset configuration: #{second_config.inspect} vs. #{first_config.inspect}
-          END
+          assert_equal(<<~MESSAGE, err.to_s)
+            Two or more minibundle blocks with the same destination path "assets/site.js", but having different asset configuration: #{second_config.inspect} vs. #{first_config.inspect}
+          MESSAGE
           assert_equal(1, asset_file_registry_size)
           assert_contains_only(site.static_files, first_file.files)
         end
@@ -142,7 +139,7 @@ Two or more minibundle blocks with the same destination path "assets/site.js", b
 
       define_method :"test_raise_exception_if_registering_#{spec.fetch(:description)}s_with_different_source_and_same_destination_paths" do
         with_fake_site do |site|
-          source_paths = %w{src1.css src2.css}.map do |file|
+          source_paths = %w[src1.css src2.css].map do |file|
             File.join(CSS_BUNDLE_SOURCE_DIR, file)
           end
           source_paths.each { |path| FileUtils.touch(path) }
@@ -150,9 +147,9 @@ Two or more minibundle blocks with the same destination path "assets/site.js", b
           err = assert_raises(RuntimeError) do
             AssetFileRegistry.send(spec.fetch(:method), site, source_paths[1], 'assets/dest1.css')
           end
-          assert_equal(<<-END, err.to_s)
-Two or more ministamp tags with the same destination path "assets/dest1.css", but different asset source paths: "#{source_paths[1]}" vs. "#{source_paths[0]}"
-          END
+          assert_equal(<<~MESSAGE, err.to_s)
+            Two or more ministamp tags with the same destination path "assets/dest1.css", but different asset source paths: "#{source_paths[1]}" vs. "#{source_paths[0]}"
+          MESSAGE
           assert_equal(1, asset_file_registry_size)
           assert_contains_only(site.static_files, [first])
         end
@@ -227,7 +224,7 @@ Two or more ministamp tags with the same destination path "assets/dest1.css", bu
       {
         'type'             => :js,
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-        'assets'           => %w{dependency app},
+        'assets'           => %w[dependency app],
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
         'minifier_cmd'     => 'unused_minifier_cmd'
       }

data/test/unit/asset_tag_markup_test.rb

@@ -1,36 +1,38 @@
-require 'support/test_case'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
 require 'jekyll/minibundle/asset_tag_markup'
 
 module Jekyll::Minibundle::Test
   class AssetTagMarkupTest < TestCase
     def test_escape_url
       actual = AssetTagMarkup.make_markup(:css, 'https://example.com/path?a=this+"thing"&b=<br>', {})
-      expected = %{<link rel="stylesheet" href="https://example.com/path?a=this+&quot;thing&quot;&amp;b=&lt;br&gt;">}
+      expected = %(<link rel="stylesheet" href="https://example.com/path?a=this+&quot;thing&quot;&amp;b=&lt;br&gt;">)
       assert_equal(expected, actual)
     end
 
     def test_escape_attribute_value
       attributes = {media: 'screen, projection', extra: '">attack<br'}
       actual = AssetTagMarkup.make_markup(:css, '/asset.css', attributes)
-      expected = %{<link rel="stylesheet" href="/asset.css" media="screen, projection" extra="&quot;&gt;attack&lt;br">}
+      expected = %(<link rel="stylesheet" href="/asset.css" media="screen, projection" extra="&quot;&gt;attack&lt;br">)
       assert_equal(expected, actual)
     end
 
     def test_output_just_attribute_name_for_nil_value
       actual = AssetTagMarkup.make_markup(:css, '/asset.css', async: nil)
-      expected = %{<link rel="stylesheet" href="/asset.css" async>}
+      expected = %(<link rel="stylesheet" href="/asset.css" async>)
       assert_equal(expected, actual)
     end
 
     def test_convert_attribute_value_to_string
       actual = AssetTagMarkup.make_markup(:css, '/asset.css', boolean: false)
-      expected = %{<link rel="stylesheet" href="/asset.css" boolean="false">}
+      expected = %(<link rel="stylesheet" href="/asset.css" boolean="false">)
       assert_equal(expected, actual)
     end
 
     def test_output_empty_attribute_value
       actual = AssetTagMarkup.make_markup(:css, '/asset.css', empty: '')
-      expected = %{<link rel="stylesheet" href="/asset.css" empty="">}
+      expected = %(<link rel="stylesheet" href="/asset.css" empty="">)
       assert_equal(expected, actual)
     end
 

data/test/unit/bundle_file_properties_test.rb

@@ -1,6 +1,8 @@
-require 'support/test_case'
-require 'support/fixture_config'
-require 'support/static_file_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
+require_relative '../support/static_file_config'
 require 'jekyll/minibundle/bundle_file'
 
 module Jekyll::Minibundle::Test
@@ -97,7 +99,7 @@ module Jekyll::Minibundle::Test
       {
         'type'             => :js,
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-        'assets'           => %w{dependency app},
+        'assets'           => %w[dependency app],
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
         'minifier_cmd'     => minifier_cmd
       }

data/test/unit/bundle_file_writing_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 require 'jekyll/minibundle/bundle_file'
 
 module Jekyll::Minibundle::Test
@@ -18,7 +20,7 @@ module Jekyll::Minibundle::Test
     def test_raise_error_if_asset_source_file_does_not_exist
       err = assert_raises(ArgumentError) do
         with_fake_site do |site|
-          make_bundle_file(site, 'assets' => %w{no-such})
+          make_bundle_file(site, 'assets' => %w[no-such])
         end
       end
       assert_match(%r{\ABundle asset source file does not exist: .+/#{Regexp.escape(JS_BUNDLE_SOURCE_DIR)}/no-such.js\z}, err.to_s)
@@ -139,7 +141,7 @@ module Jekyll::Minibundle::Test
       bundle_config = {
         'type'             => :js,
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-        'assets'           => %w{dependency app},
+        'assets'           => %w[dependency app],
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
         'minifier_cmd'     => minifier_cmd_to_remove_comments_and_count
       }

data/test/unit/development_file_properties_test.rb

@@ -1,6 +1,8 @@
-require 'support/test_case'
-require 'support/fixture_config'
-require 'support/static_file_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
+require_relative '../support/static_file_config'
 require 'jekyll/minibundle/development_file'
 
 module Jekyll::Minibundle::Test

data/test/unit/development_file_writing_test.rb

@@ -1,5 +1,7 @@
-require 'support/test_case'
-require 'support/fixture_config'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
+require_relative '../support/fixture_config'
 require 'jekyll/minibundle/development_file'
 
 module Jekyll::Minibundle::Test

data/test/unit/environment_test.rb

@@ -1,19 +1,21 @@
-require 'support/test_case'
+# frozen_string_literal: true
+
+require_relative '../support/test_case'
 require 'jekyll/minibundle/environment'
 
 module Jekyll::Minibundle::Test
   class EnvironmentTest < TestCase
     def test_find_site_config_returns_value_when_found
-      assert_equal(1, Environment.find_site_config(make_site(top: {leaf: 1}), [:top, :leaf], Integer))
+      assert_equal(1, Environment.find_site_config(make_site(top: {leaf: 1}), %i[top leaf], Integer))
     end
 
     def test_find_site_config_returns_nil_when_not_found
-      assert_nil(Environment.find_site_config(make_site, [:top, :leaf], Integer))
+      assert_nil(Environment.find_site_config(make_site, %i[top leaf], Integer))
     end
 
     def test_find_site_config_raises_exception_if_found_value_is_of_unexpected_type
       err = assert_raises(RuntimeError) do
-        Environment.find_site_config(make_site(top: {leaf: '1'}), [:top, :leaf], Integer)
+        Environment.find_site_config(make_site(top: {leaf: '1'}), %i[top leaf], Integer)
       end
       assert_equal('Invalid site configuration for key top.leaf; expecting type Integer', err.to_s)
     end