jekyll-minibundle 1.5.1 → 1.6.0

data/test/unit/asset_bundle_test.rb

@@ -6,12 +6,26 @@ module Jekyll::Minibundle::Test
     def test_raise_exception_if_bundle_command_fails
       capture_io do
         err = assert_raises(RuntimeError) { make_bundle('read _ignore ; false') }
-        assert_equal 'Bundling js assets failed with exit status 1, command: read _ignore ; false', err.to_s
+        assert_equal "Bundling js assets failed with exit status 1, command: 'read _ignore ; false'", err.to_s
       end
     end
 
+    def test_log_minifier_stdout_if_bundle_command_fails
+      cmd = 'ruby -E ISO-8859-15 -e \'gets; puts "line 1\a\nline\t2\xa4"; abort\''
+      _, actual_stderr = capture_io do
+        assert_raises(RuntimeError) { make_bundle(cmd) }
+      end
+      expected_stderr = <<-END
+Minibundle: Bundling js assets failed with exit status 1, command: '#{cmd}', last 16 bytes of minifier output:
+Minibundle: line 1\\x07
+Minibundle: line 2\\xa4
+      END
+      assert_equal expected_stderr, actual_stderr.gsub(/\e\[\d+m/, '').gsub(/^ +/, '')
+    end
+
     def test_raise_exception_if_bundle_command_not_found
-      assert_raises(Errno::ENOENT) { make_bundle('no-such-jekyll-minibundle-cmd') }
+      err = assert_raises(RuntimeError) { make_bundle('no-such-jekyll-minibundle-cmd') }
+      assert_equal 'Bundling js assets failed: No such file or directory - no-such-jekyll-minibundle-cmd', err.to_s
     end
 
     def test_raise_exception_if_bundle_command_not_configured

data/test/unit/asset_file_registry_test.rb

@@ -5,26 +5,130 @@ module Jekyll::Minibundle::Test
   class AssetFileRegistryTest < TestCase
     def setup
       AssetFileRegistry.clear
+      @site = new_site
     end
 
-    def test_returns_same_stamp_file_instance_for_same_destination_path
-      first = AssetFileRegistry.stamp_file(site, '_assets/src1.css', 'assets/dest.css')
-      second = AssetFileRegistry.stamp_file(site, '_assets/src2.css', 'assets/dest.css')
+    def test_register_returns_same_bundle_file_for_same_bundle_configs
+      first = AssetFileRegistry.register_bundle_file(@site, bundle_config)
+      second = AssetFileRegistry.register_bundle_file(@site, bundle_config)
       assert_same first, second
       assert_equal 1, asset_file_registry_size
+      assert_contains_only @site.static_files, [first]
     end
 
-    def test_returns_same_bundle_file_instance_for_same_destination_path_and_type
-      first = AssetFileRegistry.bundle_file(site, bundle_config.merge('assets' => %w{a1 a2}))
-      second = AssetFileRegistry.bundle_file(site, bundle_config.merge('assets' => %w{b1 b2}))
+    def test_register_returns_same_development_file_collection_for_same_bundle_configs
+      first = AssetFileRegistry.register_development_file_collection(@site, bundle_config)
+      second = AssetFileRegistry.register_development_file_collection(@site, bundle_config)
       assert_same first, second
       assert_equal 1, asset_file_registry_size
+      assert_contains_only @site.static_files, first.files
     end
 
-    def test_bundle_files_allow_same_path_for_different_types
-      AssetFileRegistry.bundle_file(site, bundle_config.merge('type' => :css))
-      AssetFileRegistry.bundle_file(site, bundle_config.merge('type' => :js))
+    def test_register_returns_different_bundle_files_for_bundle_configs_with_different_destination_paths
+      first = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('destination_path' => 'assets/dest1'))
+      second = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('destination_path' => 'assets/dest2'))
+      refute_same first, second
       assert_equal 2, asset_file_registry_size
+      assert_contains_only @site.static_files, [first, second]
+    end
+
+    def test_register_returns_different_development_file_collections_for_bundle_configs_with_different_destination_paths
+      first = AssetFileRegistry.register_development_file_collection(@site, bundle_config.merge('destination_path' => 'assets/dest1'))
+      second = AssetFileRegistry.register_development_file_collection(@site, bundle_config.merge('destination_path' => 'assets/dest2'))
+      refute_same first, second
+      assert_equal 2, asset_file_registry_size
+      assert_contains_only @site.static_files, (first.files + second.files)
+    end
+
+    def test_register_returns_different_bundle_files_for_bundle_configs_with_different_types
+      first = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('type' => :css))
+      second = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('type' => :js))
+      refute_same first, second
+      assert_equal 2, asset_file_registry_size
+      assert_contains_only @site.static_files, [first, second]
+    end
+
+    def test_register_returns_different_development_file_collections_for_bundle_configs_with_different_types
+      first = AssetFileRegistry.register_development_file_collection(@site, bundle_config.merge('type' => :css))
+      second = AssetFileRegistry.register_development_file_collection(@site, bundle_config.merge('type' => :js))
+      refute_same first, second
+      assert_equal 2, asset_file_registry_size
+      assert_contains_only @site.static_files, (first.files + second.files)
+    end
+
+    [
+      {description: 'assets', config_diff: {'assets' => %w{b1 b2}}},
+      {description: 'source_directory', config_diff: {'source_dir' => '_assets/src2'}}
+    ].each do |spec|
+      define_method :"test_register_replaces_cached_bundle_file_with_bundle_config_with_different_#{spec.fetch(:description)}" do
+        first = AssetFileRegistry.register_bundle_file(@site, bundle_config)
+        second = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge(spec[:config_diff]))
+        refute_same first, second
+        assert_equal 1, asset_file_registry_size
+        assert_contains_only @site.static_files, [second]
+      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_register_replaces_cached_development_file_collection_with_bundle_config_with_different_#{spec.fetch(:description)}" do
+        first = AssetFileRegistry.register_development_file_collection(@site, bundle_config)
+        second = AssetFileRegistry.register_development_file_collection(@site, bundle_config.merge(spec[:config_diff]))
+        refute_same first, second
+        assert_equal 1, asset_file_registry_size
+        assert_contains_only @site.static_files, second.files
+      end
+    end
+
+    [
+      {description: 'stamp_file', method: :register_stamp_file},
+      {description: 'development_file', method: :register_development_file}
+    ].each do |spec|
+      define_method :"test_register_returns_same_#{spec.fetch(:description)}_for_same_source_and_destination_paths" do
+        first = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src1.css', 'assets/dest1.css')
+        second = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src1.css', 'assets/dest1.css')
+        assert_same first, second
+        assert_equal 1, asset_file_registry_size
+        assert_contains_only @site.static_files, [first]
+      end
+
+      define_method :"test_register_returns_different_#{spec.fetch(:description)}s_for_different_source_and_destination_paths" do
+        first = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src1.css', 'assets/dest1.css')
+        second = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src2.css', 'assets/dest2.css')
+        refute_same first, second
+        assert_equal 2, asset_file_registry_size
+        assert_contains_only @site.static_files, [first, second]
+      end
+
+      define_method :"test_register_replaces_cached_#{spec.fetch(:description)}_with_different_source_and_same_destination_paths" do
+        first = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src1.css', 'assets/dest1.css')
+        second = AssetFileRegistry.send(spec.fetch(:method), @site, '_assets/src2.css', 'assets/dest1.css')
+        refute_same first, second
+        assert_equal 1, asset_file_registry_size
+        assert_contains_only @site.static_files, [second]
+      end
+    end
+
+    def test_raise_exception_if_registering_stamp_file_with_same_destination_path_as_existing_bundle_file
+      file = AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('type' => :css, 'destination_path' => 'assets/dest'))
+      err = assert_raises(RuntimeError) do
+        AssetFileRegistry.register_stamp_file(@site, '_assets/src1.css', 'assets/dest.css')
+      end
+      assert_equal 'ministamp tag has same destination path as a minibundle block: assets/dest.css', err.to_s
+      assert_equal 1, asset_file_registry_size
+      assert_contains_only @site.static_files, [file]
+    end
+
+    def test_raise_exception_if_registering_bundle_file_with_same_destination_path_as_existing_stamp_file
+      file = AssetFileRegistry.register_stamp_file(@site, '_assets/src1.css', 'assets/dest.css')
+      err = assert_raises(RuntimeError) do
+        AssetFileRegistry.register_bundle_file(@site, bundle_config.merge('type' => :css, 'destination_path' => 'assets/dest'))
+      end
+      assert_equal 'minibundle block has same destination path as a ministamp tag: assets/dest.css', err.to_s
+      assert_equal 1, asset_file_registry_size
+      assert_contains_only @site.static_files, [file]
     end
 
     private
@@ -32,19 +136,18 @@ module Jekyll::Minibundle::Test
     def bundle_config
       {
         'type'             => :css,
-        'source_dir'       => '_assets/styles',
+        'source_dir'       => '_assets/src',
         'assets'           => %w{dependency app},
-        'destination_path' => 'assets/site',
-        'attributes'       => {},
+        'destination_path' => 'assets/dest',
         'minifier_cmd'     => 'unused_minifier_cmd'
       }
     end
 
     def asset_file_registry_size
-      AssetFileRegistry.instance_variable_get(:@_instances).size
+      AssetFileRegistry.instance_variable_get(:@_files).size
     end
 
-    def site
+    def new_site
       new_fake_site('.')
     end
   end

data/test/unit/asset_tag_markup_test.rb

@@ -4,17 +4,29 @@ require 'jekyll/minibundle/asset_tag_markup'
 module Jekyll::Minibundle::Test
   class AssetTagMarkupTest < TestCase
     def test_escapes_attribute_values
-      attributes = { media: 'screen, projection', extra: '">attack<br' }
-      actual = AssetTagMarkup.make_markup(:css, '/asset', attributes)
-      expected = %{<link rel="stylesheet" href="/asset" media="screen, projection" extra="&quot;&gt;attack&lt;br">}
+      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
     end
 
     def test_raise_exception_if_unknown_type
       err = assert_raises(ArgumentError) do
-        AssetTagMarkup.make_markup(:unknown, '/asset', {})
+        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
+
+    def test_joins_empty_baseurl_and_path
+      assert_equal %{<link rel="stylesheet" href="asset.css">}, AssetTagMarkup.make_markup(:css, '', 'asset.css', {})
+    end
+
+    def test_joins_nonempty_baseurl_and_path
+      assert_equal %{<link rel="stylesheet" href="/root/path/asset.css">}, AssetTagMarkup.make_markup(:css, '/root', 'path/asset.css', {})
+    end
+
+    def test_removes_extra_slash_between_baseurl_and_path
+      assert_equal %{<link rel="stylesheet" href="/asset.css">}, AssetTagMarkup.make_markup(:css, '/', '/asset.css', {})
     end
   end
 end

data/test/unit/bundle_file_properties_test.rb

@@ -15,19 +15,44 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_to_liquid
-      hash = @results.fetch(:to_liquid)
-      assert_match(%r{/jekyll-minibundle-.+\.js\z}, hash['path'])
-      refute_empty hash['modified_time']
-      assert_equal '.js', hash['extname']
+    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 '.js', @results.fetch(:extname)
     end
 
-    def test_destination_rel_dir
-      assert_equal 'assets', @results.fetch(:destination_rel_dir)
+    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_placeholders
+      assert_equal({}, @results.fetch(:placeholders))
+    end
+
+    def test_relative_path
+      assert_match(%r{/jekyll-minibundle-.+\.js\z}, @results.fetch(:relative_path))
+    end
+
+    def test_to_liquid
+      hash = @results.fetch(:to_liquid)
+      assert_match(%r{/jekyll-minibundle-.+\.js\z}, hash['path'])
+      assert_instance_of Time, hash['modified_time']
+      assert_equal '.js', hash['extname']
+    end
+
+    def test_type
+      assert_nil @results.fetch(:type)
     end
 
     def test_write?
@@ -42,7 +67,6 @@ module Jekyll::Minibundle::Test
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
         'assets'           => %w{dependency app},
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-        'attributes'       => {},
         'minifier_cmd'     => minifier_cmd
       }
     end

data/test/unit/bundle_file_writing_test.rb

@@ -11,8 +11,8 @@ module Jekyll::Minibundle::Test
         bundle_file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments_and_count))
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
         old_destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_markup, last_markup = nil
-        capture_io { org_markup = bundle_file.destination_path_for_markup }
+        org_markup_path, last_markup_path = nil
+        capture_io { org_markup_path = bundle_file.destination_path_for_markup }
 
         assert bundle_file.write('_site')
 
@@ -20,23 +20,23 @@ module Jekyll::Minibundle::Test
 
         assert_equal 1, get_minifier_cmd_count
 
-        last_markup = bundle_file.destination_path_for_markup
+        last_markup_path = bundle_file.destination_path_for_markup
         ensure_file_mtime_changes { File.write(source, '(function() {})()') }
 
         # preserve fingerprint and content seen in last markup phase
         refute bundle_file.write('_site')
-        assert_equal org_markup, last_markup
+        assert_equal org_markup_path, last_markup_path
         assert_equal org_mtime, mtime_of(old_destination)
         assert_equal 1, get_minifier_cmd_count
 
-        capture_io { last_markup = bundle_file.destination_path_for_markup }
+        capture_io { last_markup_path = bundle_file.destination_path_for_markup }
 
         assert bundle_file.write('_site')
 
         new_destination = destination_path('assets/site-375a0b430b0c5555d0edd2205d26c04d.js')
 
         # see updated fingerprint in the next round
-        refute_equal org_markup, last_markup
+        refute_equal org_markup_path, last_markup_path
         assert_operator mtime_of(new_destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
       end
@@ -47,8 +47,8 @@ module Jekyll::Minibundle::Test
         bundle_file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments_and_count))
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
         destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_markup, last_markup = nil
-        capture_io { org_markup = bundle_file.destination_path_for_markup }
+        org_markup_path, last_markup_path = nil
+        capture_io { org_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
         assert bundle_file.write('_site')
@@ -58,11 +58,11 @@ module Jekyll::Minibundle::Test
         assert_equal 1, get_minifier_cmd_count
 
         ensure_file_mtime_changes { FileUtils.touch(source) }
-        capture_io { last_markup = bundle_file.destination_path_for_markup }
+        capture_io { last_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
         assert bundle_file.write('_site')
-        assert_equal org_markup, last_markup
+        assert_equal org_markup_path, last_markup_path
         assert_operator mtime_of(destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
       end
@@ -92,7 +92,6 @@ module Jekyll::Minibundle::Test
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
         'assets'           => %w{dependency app},
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-        'attributes'       => {},
         'minifier_cmd'     => minifier_cmd
       }
     end

data/test/unit/development_file_collection_properties_test.rb

@@ -18,26 +18,59 @@ module Jekyll::Minibundle::Test
       end
     end
 
+    def test_defaults
+      assert_equal({}, @results.fetch(:dependency).fetch(:defaults))
+      assert_equal({}, @results.fetch(:app).fetch(:defaults))
+    end
+
+    def test_destination_rel_dir
+      assert_equal 'assets/site', @results.fetch(:dependency).fetch(:destination_rel_dir)
+      assert_equal 'assets/site', @results.fetch(:app).fetch(:destination_rel_dir)
+    end
+
+    def test_extname
+      assert_equal '.js', @results.fetch(:dependency).fetch(:extname)
+      assert_equal '.js', @results.fetch(:app).fetch(:extname)
+    end
+
+    def test_modified_time
+      assert_instance_of Time, @results.fetch(:dependency).fetch(:modified_time)
+      assert_instance_of Time, @results.fetch(:app).fetch(:modified_time)
+    end
+
+    def test_mtime
+      dep_mtime = @results.fetch(:dependency).fetch(:modified_time)
+      assert_equal dep_mtime.to_i, @results.fetch(:dependency).fetch(:mtime)
+
+      app_mtime = @results.fetch(:app).fetch(:modified_time)
+      assert_equal app_mtime.to_i, @results.fetch(:app).fetch(:mtime)
+    end
+
+    def test_placeholders
+      assert_equal({}, @results.fetch(:dependency).fetch(:placeholders))
+      assert_equal({}, @results.fetch(:app).fetch(:placeholders))
+    end
+
+    def test_relative_path
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", @results.fetch(:dependency).fetch(:relative_path)
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", @results.fetch(:app).fetch(:relative_path)
+    end
+
     def test_to_liquid
       hash = @results.fetch(:dependency).fetch(:to_liquid)
       assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", hash['path']
-      refute_empty hash['modified_time']
+      assert_instance_of Time, hash['modified_time']
       assert_equal '.js', hash['extname']
 
       hash = @results.fetch(:app).fetch(:to_liquid)
       assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", hash['path']
-      refute_empty hash['modified_time']
+      assert_instance_of Time, hash['modified_time']
       assert_equal '.js', hash['extname']
     end
 
-    def test_extname
-      assert_equal '.js', @results.fetch(:dependency).fetch(:extname)
-      assert_equal '.js', @results.fetch(:app).fetch(:extname)
-    end
-
-    def test_destination_rel_dir
-      assert_equal 'assets/site', @results.fetch(:dependency).fetch(:destination_rel_dir)
-      assert_equal 'assets/site', @results.fetch(:app).fetch(:destination_rel_dir)
+    def test_type
+      assert_nil @results.fetch(:dependency).fetch(:type)
+      assert_nil @results.fetch(:app).fetch(:type)
     end
 
     def test_write?
@@ -49,11 +82,10 @@ module Jekyll::Minibundle::Test
 
     def bundle_config
       {
-       'type'             => :js,
-       'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-       'assets'           => %w{dependency app},
-       'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-       'attributes'       => {}
+        'type'             => :js,
+        'source_dir'       => JS_BUNDLE_SOURCE_DIR,
+        'assets'           => %w{dependency app},
+        'destination_path' => JS_BUNDLE_DESTINATION_PATH
       }
     end
   end

data/test/unit/environment_test.rb

@@ -3,19 +3,6 @@ require 'jekyll/minibundle/environment'
 
 module Jekyll::Minibundle::Test
   class EnvironmentTest < TestCase
-    def test_traverse_keys_returns_value_when_found
-      assert_equal 1, Environment.traverse_keys({top: {middle: {leaf: 1}}}, [:top, :middle, :leaf])
-      assert_equal({leaf: 1}, Environment.traverse_keys({top: {middle: {leaf: 1}}}, [:top, :middle]))
-      assert_equal 1, Environment.traverse_keys({top: [{}, {leaf: 1}]}, [:top, 1, :leaf])
-    end
-
-    def test_traverse_keys_returns_nil_when_not_found
-      assert_nil Environment.traverse_keys({}, [:top, :no_such_leaf])
-      assert_nil Environment.traverse_keys({top: {}}, [:top, :no_such_leaf])
-      assert_nil Environment.traverse_keys({top: {leaf: 1}}, [:top, :no_such_leaf])
-      assert_nil Environment.traverse_keys({top: []}, [:top, 0])
-    end
-
     def test_find_site_config_returns_value_when_found
       assert_equal 1, Environment.find_site_config(new_site(top: {leaf: 1}), [:top, :leaf], Integer)
     end