jekyll-minibundle 2.1.2 → 2.2.0

data/test/unit/asset_tag_markup_test.rb

@@ -3,36 +3,42 @@ 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;">}
+      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">}
-      assert_equal expected, actual
+      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>}
-      assert_equal expected, actual
+      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">}
-      assert_equal expected, actual
+      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="">}
-      assert_equal expected, actual
+      assert_equal(expected, actual)
     end
 
     def test_raise_exception_if_unknown_type
       err = assert_raises(ArgumentError) do
         AssetTagMarkup.make_markup(:unknown, '/asset', {})
       end
-      assert_equal 'Unknown type for generating bundle markup: unknown, /asset', err.to_s
+      assert_equal('Unknown type for generating bundle markup: unknown, /asset', err.to_s)
     end
   end
 end

data/test/unit/bundle_file_properties_test.rb

@@ -1,48 +1,54 @@
 require 'support/test_case'
 require 'support/fixture_config'
-require 'support/static_file_api_config'
+require 'support/static_file_config'
 require 'jekyll/minibundle/bundle_file'
 
 module Jekyll::Minibundle::Test
   class BundleFilePropertiesTest < TestCase
     include FixtureConfig
-    include StaticFileAPIConfig
+    include StaticFileConfig
 
     def setup
-      @@results ||= with_fake_site do |site|
-        file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments))
-        capture_io { file.destination_path_for_markup }
-        get_send_results(file, STATIC_FILE_API_PROPERTIES)
+      @@results ||= with_bundle_file do |file|
+        get_send_results(file, STATIC_FILE_PROPERTIES)
       end
     end
 
+    def test_basename
+      assert_equal("site-#{JS_BUNDLE_FINGERPRINT}", @@results.fetch(:basename))
+    end
+
+    def test_data
+      assert_equal({}, @@results.fetch(:data))
+    end
+
     def test_defaults
       assert_equal({}, @@results.fetch(:defaults))
     end
 
     def test_destination_rel_dir
-      assert_equal 'assets', @@results.fetch(:destination_rel_dir)
-    end
-
-    def test_name
-      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", @@results.fetch(:name)
+      assert_equal('/assets', @@results.fetch(:destination_rel_dir))
     end
 
     def test_extname
-      assert_equal '.js', @@results.fetch(:extname)
+      assert_equal('.js', @@results.fetch(:extname))
     end
 
     def test_modified_time
-      assert_instance_of Time, @@results.fetch(:modified_time)
+      assert_instance_of(Time, @@results.fetch(:modified_time))
     end
 
     def test_mtime
       mtime = @@results.fetch(:modified_time)
-      assert_equal mtime.to_i, @@results.fetch(:mtime)
+      assert_equal(mtime.to_i, @@results.fetch(:mtime))
+    end
+
+    def test_name
+      assert_equal("site-#{JS_BUNDLE_FINGERPRINT}.js", @@results.fetch(:name))
     end
 
     def test_path
-      assert_match(%r{/jekyll-minibundle-.+\.js\z}, @@results.fetch(:path))
+      assert_match(%r{\A/.+/jekyll-minibundle-.+\.js\z}, @@results.fetch(:path))
     end
 
     def test_placeholders
@@ -54,24 +60,39 @@ module Jekyll::Minibundle::Test
     end
 
     def test_to_liquid
-      hash = @@results.fetch(:to_liquid)
-      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}", hash.fetch('basename')
-      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", hash.fetch('name')
-      assert_equal '.js', hash.fetch('extname')
-      assert_instance_of Time, hash.fetch('modified_time')
-      assert_match(%r{/jekyll-minibundle-.+\.js\z}, hash.fetch('path'))
+      with_bundle_file do |file|
+        drop = file.to_liquid
+        assert_equal("site-#{JS_BUNDLE_FINGERPRINT}.js", drop.name)
+        assert_equal('.js', drop.extname)
+        assert_equal("site-#{JS_BUNDLE_FINGERPRINT}", drop.basename)
+        assert_instance_of(Time, drop.modified_time)
+        assert_match(%r{/jekyll-minibundle-.+\.js\z}, drop.path)
+        assert_nil(drop.collection)
+      end
     end
 
     def test_type
-      assert_nil @@results.fetch(:type)
+      assert_nil(@@results.fetch(:type))
+    end
+
+    def test_url
+      assert_equal(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, @@results.fetch(:url))
     end
 
     def test_write?
-      assert @@results.fetch(:write?)
+      assert(@@results.fetch(:write?))
     end
 
     private
 
+    def with_bundle_file(&block)
+      with_fake_site do |site|
+        file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments))
+        capture_io { file.destination_path_for_markup }
+        block.call(file)
+      end
+    end
+
     def bundle_config(minifier_cmd)
       {
         'type'             => :js,

data/test/unit/bundle_file_writing_test.rb

@@ -6,6 +6,24 @@ module Jekyll::Minibundle::Test
   class BundleFileWritingTest < TestCase
     include FixtureConfig
 
+    def test_raise_error_if_source_directory_does_not_exist
+      err = assert_raises(ArgumentError) do
+        with_fake_site do |site|
+          make_bundle_file(site, 'source_dir' => STAMP_SOURCE_PATH)
+        end
+      end
+      assert_match(%r{\ABundle source directory does not exist: .+/#{Regexp.escape(STAMP_SOURCE_PATH)}\z}, err.to_s)
+    end
+
+    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})
+        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)
+    end
+
     def test_calling_destination_path_for_markup_determines_fingerprint_and_destination_write
       with_fake_site do |site|
         bundle_file = make_bundle_file(site)
@@ -18,16 +36,16 @@ module Jekyll::Minibundle::Test
 
         capture_io { org_markup_path = bundle_file.destination_path_for_markup }
 
-        assert write_file(bundle_file)
+        assert(write_file(bundle_file))
 
         org_mtime = file_mtime_of(old_destination)
 
-        assert_equal 1, get_minifier_cmd_count
+        assert_equal(1, get_minifier_cmd_count)
 
         last_markup_path = bundle_file.destination_path_for_markup
 
-        assert_equal org_markup_path, last_markup_path
-        assert_equal 1, get_minifier_cmd_count
+        assert_equal(org_markup_path, last_markup_path)
+        assert_equal(1, get_minifier_cmd_count)
 
         # change content, but don't call destination_path_for_markup yet
 
@@ -35,10 +53,10 @@ module Jekyll::Minibundle::Test
 
         # preserve content's fingerprint
 
-        refute write_file(bundle_file)
+        refute(write_file(bundle_file))
 
-        assert_equal org_mtime, file_mtime_of(old_destination)
-        assert_equal 1, get_minifier_cmd_count
+        assert_equal(org_mtime, file_mtime_of(old_destination))
+        assert_equal(1, get_minifier_cmd_count)
 
         # see content's fingerprint to update after calling
         # destination_path_for_markup
@@ -47,12 +65,12 @@ module Jekyll::Minibundle::Test
 
         refute_equal org_markup_path, last_markup_path
 
-        assert write_file(bundle_file)
+        assert(write_file(bundle_file))
 
         new_destination = destination_path('assets/site-375a0b430b0c5555d0edd2205d26c04d.js')
 
-        assert_operator file_mtime_of(new_destination), :>, org_mtime
-        assert_equal 2, get_minifier_cmd_count
+        assert_operator(file_mtime_of(new_destination), :>, org_mtime)
+        assert_equal(2, get_minifier_cmd_count)
       end
     end
 
@@ -65,20 +83,20 @@ module Jekyll::Minibundle::Test
         capture_io { org_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
-        assert write_file(bundle_file)
+        assert(write_file(bundle_file))
 
         org_mtime = file_mtime_of(destination)
 
-        assert_equal 1, get_minifier_cmd_count
+        assert_equal(1, get_minifier_cmd_count)
 
         ensure_file_mtime_changes { FileUtils.touch(source) }
         capture_io { last_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
-        assert write_file(bundle_file)
-        assert_equal org_markup_path, last_markup_path
-        assert_operator file_mtime_of(destination), :>, org_mtime
-        assert_equal 2, get_minifier_cmd_count
+        assert(write_file(bundle_file))
+        assert_equal(org_markup_path, last_markup_path)
+        assert_operator(file_mtime_of(destination), :>, org_mtime)
+        assert_equal(2, get_minifier_cmd_count)
       end
     end
 
@@ -86,15 +104,15 @@ module Jekyll::Minibundle::Test
       with_fake_site do |site|
         bundle_file = make_bundle_file(site)
 
-        refute write_file(bundle_file)
-        assert_empty Dir[destination_path('assets/*.js')]
-        assert_equal 0, get_minifier_cmd_count
+        refute(write_file(bundle_file))
+        assert_empty(Dir[destination_path('assets/*.js')])
+        assert_equal(0, get_minifier_cmd_count)
 
         capture_io { bundle_file.destination_path_for_markup }
 
-        assert write_file(bundle_file)
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        assert_equal 1, get_minifier_cmd_count
+        assert(write_file(bundle_file))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)))
+        assert_equal(1, get_minifier_cmd_count)
       end
     end
 
@@ -102,30 +120,30 @@ module Jekyll::Minibundle::Test
       with_fake_site do |site|
         bundle_file = make_bundle_file(site)
 
-        refute bundle_file.modified?
-        refute write_file(bundle_file)
+        refute(bundle_file.modified?)
+        refute(write_file(bundle_file))
 
         capture_io { bundle_file.destination_path_for_markup }
 
-        assert bundle_file.modified?
-        assert write_file(bundle_file)
+        assert(bundle_file.modified?)
+        assert(write_file(bundle_file))
 
-        refute bundle_file.modified?
-        refute write_file(bundle_file)
+        refute(bundle_file.modified?)
+        refute(write_file(bundle_file))
       end
     end
 
     private
 
-    def make_bundle_file(site)
-      BundleFile.new(
-        site,
+    def make_bundle_file(site, config = {})
+      bundle_config = {
         'type'             => :js,
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
         'assets'           => %w{dependency app},
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
         'minifier_cmd'     => minifier_cmd_to_remove_comments_and_count
-      )
+      }
+      BundleFile.new(site, bundle_config.merge(config))
     end
 
     def write_file(file)

data/test/unit/development_file_properties_test.rb

@@ -0,0 +1,95 @@
+require 'support/test_case'
+require 'support/fixture_config'
+require 'support/static_file_config'
+require 'jekyll/minibundle/development_file'
+
+module Jekyll::Minibundle::Test
+  class DevelopmentFilePropertiesTest < TestCase
+    include FixtureConfig
+    include StaticFileConfig
+
+    def setup
+      @@results ||= with_development_file do |file|
+        get_send_results(file, STATIC_FILE_PROPERTIES)
+      end
+    end
+
+    def test_basename
+      assert_equal('screen', @@results.fetch(:basename))
+    end
+
+    def test_data
+      assert_equal({}, @@results.fetch(:data))
+    end
+
+    def test_defaults
+      assert_equal({}, @@results.fetch(:defaults))
+    end
+
+    def test_destination_rel_dir
+      assert_equal('/assets', @@results.fetch(:destination_rel_dir))
+    end
+
+    def test_extname
+      assert_equal('.css', @@results.fetch(:extname))
+    end
+
+    def test_modified_time
+      assert_instance_of(Time, @@results.fetch(:modified_time))
+    end
+
+    def test_mtime
+      mtime = @@results.fetch(:modified_time)
+      assert_equal(mtime.to_i, @@results.fetch(:mtime))
+    end
+
+    def test_name
+      assert_equal('screen.css', @@results.fetch(:name))
+    end
+
+    def test_path
+      assert_match(%r{\A/.+/#{STAMP_SOURCE_PATH}\z}, @@results.fetch(:path))
+    end
+
+    def test_placeholders
+      assert_equal({}, @@results.fetch(:placeholders))
+    end
+
+    def test_relative_path
+      assert_equal("/#{STAMP_SOURCE_PATH}", @@results.fetch(:relative_path))
+    end
+
+    def test_to_liquid
+      with_development_file do |file|
+        drop = file.to_liquid
+        assert_equal('screen.css', drop.name)
+        assert_equal('.css', drop.extname)
+        assert_equal('screen', drop.basename)
+        assert_instance_of(Time, drop.modified_time)
+        assert_equal("/#{STAMP_SOURCE_PATH}", drop.path)
+        assert_nil(drop.collection)
+      end
+    end
+
+    def test_type
+      assert_nil(@@results.fetch(:type))
+    end
+
+    def test_url
+      assert_equal(STAMP_DESTINATION_PATH, @@results.fetch(:url))
+    end
+
+    def test_write?
+      assert(@@results.fetch(:write?))
+    end
+
+    private
+
+    def with_development_file(&block)
+      with_fake_site do |site|
+        file = DevelopmentFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
+        block.call(file)
+      end
+    end
+  end
+end

data/test/unit/development_file_writing_test.rb

@@ -6,23 +6,32 @@ module Jekyll::Minibundle::Test
   class DevelopmentFileWritingTest < TestCase
     include FixtureConfig
 
+    def test_raise_error_if_source_file_does_not_exist
+      err = assert_raises(ArgumentError) do
+        with_fake_site do |site|
+          DevelopmentFile.new(site, '_tmp', STAMP_DESTINATION_PATH)
+        end
+      end
+      assert_match(%r{\ADevelopment source file does not exist: .+/_tmp\z}, err.to_s)
+    end
+
     def test_modify_property_determines_if_write_would_succeed
       with_fake_site do |site|
         dev_file = make_development_file(site)
         source = source_path(STAMP_SOURCE_PATH)
 
-        assert dev_file.modified?
-        assert write_file(dev_file)
+        assert(dev_file.modified?)
+        assert(write_file(dev_file))
 
         ensure_file_mtime_changes do
           FileUtils.touch(source)
         end
 
-        assert dev_file.modified?
-        assert write_file(dev_file)
+        assert(dev_file.modified?)
+        assert(write_file(dev_file))
 
-        refute dev_file.modified?
-        refute write_file(dev_file)
+        refute(dev_file.modified?)
+        refute(write_file(dev_file))
       end
     end