jekyll-minibundle 1.5.1 → 1.6.0

data/lib/jekyll/minibundle/stamp_file.rb

@@ -9,21 +9,20 @@ module Jekyll::Minibundle
 
     attr_reader :asset_source_path, :asset_destination_dir, :stamped_at
 
-    def initialize(site, asset_source_path, asset_destination_path, &basenamer)
+    def initialize(site, asset_source_path, asset_destination_path)
       @site = site
-      @basenamer = basenamer
       @asset_source_path = File.join(@site.source, asset_source_path)
       @asset_destination_dir = File.dirname(asset_destination_path)
       @asset_destination_extension = File.extname(asset_destination_path)
-      @asset_destination_base_prefix = File.basename(asset_destination_path)[0 .. -(@asset_destination_extension.size + 1)]
+      @asset_destination_base_prefix = File.basename(asset_destination_path)[0..-(@asset_destination_extension.size + 1)]
       @stamped_at = nil
       @is_modified = false
     end
 
     def destination_path_for_markup
       # we must regenerate the fingerprint here, if at all, in order
-      # to make sure the markup and generated file have the same
-      # fingerprint
+      # to make sure markup destination and generated file paths have
+      # the same fingerprint
       if modified?
         @stamped_at = mtime
         @is_modified = true
@@ -33,6 +32,10 @@ module Jekyll::Minibundle
       asset_destination_path
     end
 
+    def extname
+      @asset_destination_extension
+    end
+
     # writes destination only after `markup` has been called
     def write(site_destination_dir)
       if @is_modified
@@ -47,7 +50,7 @@ module Jekyll::Minibundle
     private
 
     def asset_destination_basename
-      @basenamer.call(@asset_destination_base_prefix, @asset_destination_extension, -> { asset_stamp })
+      "#{@asset_destination_base_prefix}-#{asset_stamp}#{extname}"
     end
 
     def asset_stamp

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.5.1'
+    VERSION = '1.6.0'.freeze
   end
 end

data/test/fixture/site/_bin/with_count

@@ -2,11 +2,12 @@
 
 filename = ARGV.first
 
-count = if File.exist?(filename)
-  File.read(filename).strip.to_i
-else
-  0
-end
+count =
+  if File.exist?(filename)
+    File.read(filename).strip.to_i
+  else
+    0
+  end
 
 File.write(filename, "#{count + 1}\n")
 

data/test/integration/known_caveats_test.rb

@@ -0,0 +1,89 @@
+require 'support/test_case'
+require 'support/fixture_config'
+
+module Jekyll::Minibundle::Test
+  # Known software caveats that won't be fixed in the current design
+  # of the software.
+  class KnownCaveatsTest < TestCase
+    include FixtureConfig
+
+    # In Jekyll's watch (auto-regeneration) mode, changing asset
+    # destination path to a new value triggers the plugin to rebundle
+    # the assets and writing the bundle file to site output
+    # directory. After that, changing the destination path back to the
+    # original value should cause the plugin to write the original
+    # bundle file to site output directory again. This should happen
+    # without rebundling the assets, because the plugin stores the
+    # original bundle in a temporary file.
+    #
+    # The plugin cannot rewrite the original bundle file to site
+    # output directory, because it does not get a trigger for doing
+    # so. The plugin has a non-expiring cumulative cache for
+    # assets. This allows the plugin to avoid rebundling assets in
+    # site regeneration if the assets themselves are unchanged.  This
+    # same mechanism is the cause for this caveat.
+    #
+    # As a workaround, touching or changing one of the assets in the
+    # bundle triggers rebundling and rewriting the bundle file to site
+    # output directory.
+    #
+    # For now, we have decided that the caveat is a minor drawback
+    # compared to the benefit of avoiding unnecessary rebundling in
+    # site regeneration.
+    def test_changing_asset_destination_path_to_new_value_and_back_to_original_does_not_rewrite_destination
+      with_site_dir do
+        generate_site(:production)
+
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        ensure_file_mtime_changes do
+          change_destination_path('assets/site', 'assets/site2')
+        end
+
+        generate_site(:production, clear_cache: false)
+
+        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        new_destination = "assets/site2-#{JS_BUNDLE_FINGERPRINT}.js"
+
+        assert_equal new_destination, find_js_path_from_index
+        assert File.exist?(destination_path(new_destination))
+
+        ensure_file_mtime_changes do
+          change_destination_path('assets/site2', 'assets/site')
+
+          # CAVEAT: This should not be needed.
+          FileUtils.touch(source_path('_assets/scripts/dependency.js'))
+        end
+
+        generate_site(:production, clear_cache: false)
+
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+        refute File.exist?(destination_path(new_destination))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+      end
+    end
+
+    private
+
+    def change_destination_path(from, to)
+      match_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: #{from}
+      END
+
+      replacement_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: #{to}
+      END
+
+      find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+    end
+
+    def find_js_path_from_index
+      find_html_element(File.read(destination_path('index.html')), 'body script').first['src']
+    end
+  end
+end

data/test/integration/minibundle_development_mode_test.rb

@@ -51,16 +51,18 @@ module Jekyll::Minibundle::Test
     end
 
     [
-     {desc: "changing", action: ->(source) { File.write(source, 'h1 {}') }},
-     {desc: "touching", action: ->(source) { FileUtils.touch(source) }}
+      {desc: 'changing', action: ->(source) { File.write(source, '(function() {})()') }},
+      {desc: 'touching', action: ->(source) { FileUtils.touch(source) }}
     ].each do |spec|
-      define_method :"test_#{spec.fetch(:desc)}_css_asset_source_rewrites_destination" do
+      define_method :"test_#{spec.fetch(:desc)}_asset_source_file_rewrites_destination" do
         with_site_dir do
           generate_site(:development)
-          destination = destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')
+
+          destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
           org_mtime = mtime_of(destination)
-          source = source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css')
+          source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
           ensure_file_mtime_changes { spec.fetch(:action).call(source) }
+
           generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)
@@ -69,46 +71,152 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    [
-     {desc: "changing", action: ->(source) { File.write(source, '(function() {})()') }},
-     {desc: "touching", action: ->(source) { FileUtils.touch(source) }}
-    ].each do |spec|
-      define_method :"test_#{spec.fetch(:desc)}_js_asset_source_rewrites_destination" do
-        with_site_dir do
-          generate_site(:development)
-          destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-          org_mtime = mtime_of(destination)
-          source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
-          ensure_file_mtime_changes { spec.fetch(:action).call(source) }
-          generate_site(:development, clear_cache: false)
+    def test_changing_asset_source_directory_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
 
-          assert_equal File.read(destination), File.read(source)
-          assert_operator mtime_of(destination), :>, org_mtime
+        destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
+        org_mtime = mtime_of(destination)
+
+        match_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+        END
+
+        replacement_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts2
+        END
+
+        ensure_file_mtime_changes do
+          FileUtils.mv(source_path('_assets/scripts'), source_path('_assets/scripts2'))
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+        end
+
+        generate_site(:development, clear_cache: false)
+
+        assert_operator mtime_of(destination), :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_source_list_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
+
+        match_snippet = <<-END
+    assets:
+      - dependency
+      - app
+        END
+
+        replacement_snippet = <<-END
+    assets:
+      - dependency
+        END
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
         end
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal [File.join(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')], find_js_paths_from_index
+
+        new_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_destination_path_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+
+        match_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: assets/site
+        END
+
+        replacement_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: assets/site2
+        END
+
+        find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal ['assets/site2/dependency.js', 'assets/site2/app.js'], find_js_paths_from_index
+        assert File.exist?(destination_path('assets/site2/dependency.js'))
+        assert File.exist?(destination_path('assets/site2/app.js'))
       end
     end
 
     def test_supports_relative_and_absolute_destination_paths
       with_site_dir do
-        expected_css_path = destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')
-        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
         generate_site(:development)
 
-        assert File.exist?(expected_css_path)
-        assert File.exist?(expected_js_path)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css'))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+
         assert_equal 'assets/site/common.css', find_css_paths_from_index.last
         assert_equal 'assets/site/app.js', find_js_paths_from_index.last
 
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: /assets/site')
+
         generate_site(:development, clear_cache: false)
 
-        assert File.exist?(expected_css_path)
-        assert File.exist?(expected_js_path)
         assert_equal '/assets/site/common.css', find_css_paths_from_index.last
         assert_equal '/assets/site/app.js', find_js_paths_from_index.last
       end
     end
 
+    def test_supports_baseurl
+      with_site_dir do
+        generate_site(:development)
+
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css'))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+
+        assert_equal 'assets/site/common.css', find_css_paths_from_index.last
+        assert_equal 'assets/site/app.js', find_js_paths_from_index.last
+
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle css %}', "{% minibundle css %}\n    baseurl: /css-root")
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: /js-root")
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal '/css-root/assets/site/common.css', find_css_paths_from_index.last
+        assert_equal '/js-root/assets/site/app.js', find_js_paths_from_index.last
+      end
+    end
+
+    def test_supports_changing_attributes
+      with_site_dir do
+        generate_site(:development)
+
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css'))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-styles', 'id: my-styles2')
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-scripts', 'id: my-scripts2')
+
+        generate_site(:development, clear_cache: false)
+
+        css_ids = find_css_elements_from_index.map { |el| el['id'] }.uniq
+        assert_equal ['my-styles2'], css_ids
+
+        js_ids = find_js_elements_from_index.map { |el| el['id'] }.uniq
+        assert_equal ['my-scripts2'], js_ids
+      end
+    end
+
     def test_does_not_require_bundling_commands
       with_site_dir do
         generate_site(:development, minifier_cmd_css: nil, minifier_cmd_js: nil)
@@ -116,17 +224,54 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_does_not_rewrite_destination_when_nonsource_files_change
+    def test_does_not_rewrite_destination_when_changing_nonsource_files
       with_site_dir do
         generate_site(:development)
+
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
         org_mtime = mtime_of(expected_js_path)
         ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'dependency.js'), '(function() {})()') }
+
         generate_site(:development, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_js_path)
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal org_mtime, mtime_of(expected_js_path)
+      end
+    end
+
+    def test_does_not_rewrite_destination_when_changing_attributes
+      with_site_dir do
+        generate_site(:development)
+
+        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
+        org_mtime = mtime_of(expected_js_path)
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-scripts', 'id: my-scripts2')
+        end
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal org_mtime, mtime_of(expected_js_path)
+      end
+    end
+
+    def test_does_not_rebundle_assets_when_changing_baseurl
+      with_site_dir do
+        generate_site(:development)
+
+        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
+        org_mtime = mtime_of(expected_js_path)
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: /js-root")
+        end
+
         generate_site(:development, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_js_path)

data/test/integration/minibundle_production_mode_test.rb

@@ -61,7 +61,7 @@ module Jekyll::Minibundle::Test
     def test_inserts_semicolons_between_js_assets
       with_precompiled_site(:production) do
         bundle = File.read(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        assert_match(%r|}\)\(window\)\n;\n\(function|, bundle)
+        assert_match(/}\)\(window\)\n;\n\(function/, bundle)
       end
     end
 
@@ -81,89 +81,232 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_changing_css_asset_source_rewrites_destination
+    def test_changing_asset_source_file_rewrites_destination
       with_site_dir do
         generate_site(:production)
-        org_mtime = mtime_of(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        ensure_file_mtime_changes { File.write(source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css'), 'h1 {}') }
+
+        ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'app.js'), '(function() {})()') }
+
         generate_site(:production, clear_cache: false)
 
-        refute File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
-        new_destination = 'assets/site-9fd3995d6f0fce425db81c3691dfe93f.css'
+        new_destination = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
 
-        assert_equal new_destination, find_css_path_from_index
+        assert_equal new_destination, find_js_path_from_index
         assert File.exist?(destination_path(new_destination))
-        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
       end
     end
 
-    def test_changing_js_asset_source_rewrites_destination
+    def test_touching_asset_source_file_rewrites_destination
       with_site_dir do
         generate_site(:production)
+
         org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'app.js'), '(function() {})()') }
+        ensure_file_mtime_changes { FileUtils.touch(source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')) }
+
+        generate_site(:production, clear_cache: false)
+
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert_operator mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)), :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_source_directory_rewrites_destination
+      with_site_dir do
+        generate_site(:production)
+
+        org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        match_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+        END
+
+        replacement_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts2
+        END
+
+        ensure_file_mtime_changes do
+          FileUtils.mv(source_path('_assets/scripts'), source_path('_assets/scripts2'))
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+        end
+
+        generate_site(:production, clear_cache: false)
+
+        new_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_source_list_rewrites_destination
+      with_site_dir do
+        generate_site(:production)
+
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        match_snippet = <<-END
+    assets:
+      - dependency
+      - app
+        END
+
+        replacement_snippet = <<-END
+    assets:
+      - dependency
+        END
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+        end
+
         generate_site(:production, clear_cache: false)
 
         refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
-        new_destination = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+        new_destination = 'assets/site-71042d0b7c86c04e015fde694dd9f409.js'
 
         assert_equal new_destination, find_js_path_from_index
         assert File.exist?(destination_path(new_destination))
-        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
       end
     end
 
-    def test_touching_css_asset_source_rewrites_destination
+    def test_changing_asset_destination_path_rewrites_destination
       with_site_dir do
         generate_site(:production)
-        destination = CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH
-        org_mtime = mtime_of(destination_path(destination))
-        ensure_file_mtime_changes { FileUtils.touch(source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css')) }
+
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        match_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: assets/site
+        END
+
+        replacement_snippet = <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: assets/site2
+        END
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+        end
+
         generate_site(:production, clear_cache: false)
 
-        assert_equal destination, find_css_path_from_index
-        assert File.exist?(destination_path(destination))
-        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
+        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        new_destination = "assets/site2-#{JS_BUNDLE_FINGERPRINT}.js"
+
+        assert_equal new_destination, find_js_path_from_index
+        assert File.exist?(destination_path(new_destination))
       end
     end
 
-    def test_touching_js_asset_source_rewrites_destination
+    def test_changing_minifier_cmd_rewrites_destination
       with_site_dir do
         generate_site(:production)
-        destination = JS_BUNDLE_DESTINATION_FINGERPRINT_PATH
-        org_mtime = mtime_of(destination_path(destination))
-        ensure_file_mtime_changes { FileUtils.touch(source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')) }
+
+        assert_equal 0, get_minifier_cmd_count
+        destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+        org_mtime = mtime_of(destination)
+
+        match_snippet = <<-END
+    {% minibundle js %}
+        END
+
+        replacement_snippet = <<-END
+    {% minibundle js %}
+    minifier_cmd: #{minifier_cmd_to_remove_comments_and_count}
+        END
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
+        end
+
         generate_site(:production, clear_cache: false)
 
-        assert_equal destination, find_js_path_from_index
-        assert File.exist?(destination_path(destination))
-        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
+        assert_equal 1, get_minifier_cmd_count
+        assert_operator mtime_of(destination), :>, org_mtime
       end
     end
 
     def test_supports_relative_and_absolute_destination_paths
       with_site_dir do
         generate_site(:production)
-        expected_css_path = destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
 
-        assert File.exist?(expected_css_path)
-        assert File.exist?(expected_js_path)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
         assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
         assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
 
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: /assets/site')
+
         generate_site(:production, clear_cache: false)
 
-        assert File.exist?(expected_css_path)
-        assert File.exist?(expected_js_path)
         assert_equal "/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
         assert_equal "/#{JS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_js_path_from_index
       end
     end
 
+    def test_supports_baseurl
+      with_site_dir do
+        generate_site(:production)
+
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle css %}', "{% minibundle css %}\n    baseurl: /css-root")
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: /js-root")
+
+        generate_site(:production, clear_cache: false)
+
+        assert_equal "/css-root/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
+        assert_equal "/js-root/#{JS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_js_path_from_index
+      end
+    end
+
+    def test_supports_baseurl_via_liquid_variable
+      with_site_dir do
+        merge_to_yaml_file(source_path('_config.yml'), 'baseurl' => '/')
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle css %}', "{% minibundle css %}\n    baseurl: {{ site.baseurl }}")
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: {{ site.baseurl }}")
+
+        generate_site(:production)
+
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+
+        assert_equal "/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
+        assert_equal "/#{JS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_js_path_from_index
+      end
+    end
+
+    def test_supports_changing_attributes
+      with_site_dir do
+        generate_site(:production)
+
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-styles', 'id: my-styles2')
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-scripts', 'id: my-scripts2')
+
+        generate_site(:production, clear_cache: false)
+
+        assert_equal 'my-styles2', find_css_element_from_index['id']
+        assert_equal 'my-scripts2', find_js_element_from_index['id']
+      end
+    end
+
     def test_bundles_assets_only_once_at_startup
       with_site_dir do
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
@@ -171,31 +314,77 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_does_not_rebundle_assets_when_nonsource_files_change
+    def test_does_not_rebundle_assets_when_changing_nonsource_files
       with_site_dir do
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
+
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        last_mtime = mtime_of(expected_js_path)
+        org_mtime = mtime_of(expected_js_path)
 
         assert_equal 1, get_minifier_cmd_count
 
         ensure_file_mtime_changes { File.write(source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css'), 'h1 {}') }
+
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal last_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
+
+        generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
+
+        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal 1, get_minifier_cmd_count
+      end
+    end
+
+    def test_does_not_rebundle_assets_when_changing_attributes
+      with_site_dir do
+        generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
+
+        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+        org_mtime = mtime_of(expected_js_path)
+
+        assert_equal 1, get_minifier_cmd_count
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-scripts', 'id: my-scripts2')
+        end
+
+        generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
+
+        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal 1, get_minifier_cmd_count
+      end
+    end
+
+    def test_does_not_rebundle_assets_when_changing_baseurl
+      with_site_dir do
+        generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
+
+        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+        org_mtime = mtime_of(expected_js_path)
+
+        assert_equal 1, get_minifier_cmd_count
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: /js-root")
+        end
+
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal last_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
       end
     end
 
     def test_gets_minifier_command_from_site_configuration
       with_site_dir do
-        merge_to_yaml_file('_config.yml', 'minibundle' => {'minifier_commands' => {'js' => minifier_cmd_to_remove_comments_and_count('minifier_cmd_config_count')}})
+        merge_to_yaml_file(
+          source_path('_config.yml'),
+          'minibundle' => {'minifier_commands' => {'js' => minifier_cmd_to_remove_comments_and_count('minifier_cmd_config_count')}}
+        )
 
         generate_site(:production, minifier_cmd_js: nil)
 
@@ -207,7 +396,10 @@ module Jekyll::Minibundle::Test
 
     def test_minifier_command_from_environment_overrides_command_from_site_configuration
       with_site_dir do
-        merge_to_yaml_file('_config.yml', 'minibundle' => {'minifier_commands' => {'js' => minifier_cmd_to_remove_comments_and_count('minifier_cmd_config_count')}})
+        merge_to_yaml_file(
+          source_path('_config.yml'),
+          'minibundle' => {'minifier_commands' => {'js' => minifier_cmd_to_remove_comments_and_count('minifier_cmd_config_count')}}
+        )
 
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count('minifier_cmd_env_count'))
 
@@ -275,10 +467,10 @@ title: Test
     end
 
     def source_assets_size(source_subdir, assets, type)
-      assets.
-        map { |f| File.read(site_fixture_path(source_subdir, "#{f}.#{type}")) }.
-        join('').
-        size
+      assets
+        .map { |f| File.read(site_fixture_path(source_subdir, "#{f}.#{type}")) }
+        .join('')
+        .size
     end
   end
 end