jekyll-minibundle 2.1.2 → 2.2.0

data/lib/jekyll/minibundle/mini_stamp_tag.rb

@@ -1,36 +1,120 @@
+require 'cgi/util'
 require 'jekyll/minibundle/files'
 require 'jekyll/minibundle/asset_file_registry'
+require 'jekyll/minibundle/variable_template_registry'
 
 module Jekyll::Minibundle
   class MiniStampTag < Liquid::Tag
     def initialize(tag_name, text, _tokens)
       super
+      @local_stamp_config =
+        MiniStampTag
+        .default_stamp_config
+        .merge(parse_arguments(text.strip))
+    end
+
+    def render(context)
+      site = context.registers.fetch(:site)
+
+      stamp_config = get_current_stamp_config(context)
+      source_path = stamp_config.fetch('source_path')
+      destination_path = stamp_config.fetch('destination_path')
+      render_basename_only = stamp_config.fetch('render_basename_only')
 
-      @source_path, destination_path = text.split(/\s+/, 3)[0, 2]
+      file = register_asset_file(site, source_path, destination_path)
+      dst_path = Files.strip_dot_slash_from_path_start(file.destination_path_for_markup)
+
+      url =
+        if render_basename_only
+          File.basename(dst_path)
+        else
+          stamp_config.fetch('baseurl') + dst_path
+        end
+
+      CGI.escape_html(url)
+    end
 
-      if !@source_path || @source_path.empty?
-        raise ArgumentError, "No asset source for ministamp tag; pass value such as '_assets/site.css' as the first argument"
+    def self.default_stamp_config
+      {
+        'source_path'          => '',
+        'destination_path'     => '',
+        'baseurl'              => '',
+        'render_basename_only' => false,
+        'use_template'         => false
+      }
+    end
+
+    private
+
+    def parse_arguments(args)
+      raise ArgumentError, 'Missing asset source and destination paths for ministamp tag; specify value such as "_assets/source.css assets/destination.css" as the argument' if args.empty?
+
+      structure = parse_structure(args)
+
+      case structure
+      when String
+        parse_string_argument(structure)
+      when Hash
+        parse_hash_argument(structure)
+      else
+        raise ArgumentError, "Unsupported ministamp tag argument type (#{structure.class}), only String and Hash are supported: #{args}"
       end
+    end
 
-      if !destination_path || destination_path.empty?
-        raise ArgumentError, "No asset destination for ministamp tag; pass value such as 'assets/site.css' as the second argument"
+    def parse_structure(args)
+      ::SafeYAML.load(args)
+    rescue => e
+      raise ArgumentError, "Failed parsing ministamp tag argument syntax as YAML: #{args.inspect}. Cause: #{e}"
+    end
+
+    def parse_string_argument(str)
+      source_path, destination_path = str.split(/\s+/, 3)[0, 2]
+
+      unless destination_path
+        raise ArgumentError, 'Missing asset destination path for ministamp tag; specify value such as "assets/destination.css" after asset source path argument, separated with a space'
       end
 
-      @baseurl, @destination_path = normalize_destination_path(destination_path)
+      {
+        'source_path'      => source_path,
+        'destination_path' => destination_path
+      }
     end
 
-    def render(context)
-      site = context.registers.fetch(:site)
-      file =
-        if Environment.development?(site)
-          AssetFileRegistry.register_development_file(site, @source_path, @destination_path)
-        else
-          AssetFileRegistry.register_stamp_file(site, @source_path, @destination_path)
-        end
-      @baseurl + Files.strip_dot_slash_from_path_start(file.destination_path_for_markup)
+    def parse_hash_argument(hash)
+      source_path = hash.fetch('source_path', '').to_s
+      destination_path = hash.fetch('destination_path', '').to_s
+      render_basename_only = hash.fetch('render_basename_only', false)
+
+      raise ArgumentError, 'Missing asset source path for ministamp tag; specify Hash entry such as "source_path: _assets/site.css"' if source_path.empty?
+      raise ArgumentError, 'Missing asset destination path for ministamp tag; specify Hash entry such as "destination_path: assets/site.css"' if destination_path.empty?
+
+      {
+        'source_path'          => source_path,
+        'destination_path'     => destination_path,
+        'render_basename_only' => render_basename_only,
+        'use_template'         => true
+      }
     end
 
-    private
+    def get_current_stamp_config(context)
+      source_path = @local_stamp_config.fetch('source_path')
+      destination_path = @local_stamp_config.fetch('destination_path')
+      render_basename_only = @local_stamp_config.fetch('render_basename_only')
+
+      if @local_stamp_config.fetch('use_template')
+        source_path = VariableTemplateRegistry.register_template(source_path).render(context)
+        destination_path = VariableTemplateRegistry.register_template(destination_path).render(context)
+      end
+
+      baseurl, destination_path = normalize_destination_path(destination_path)
+
+      {
+        'source_path'          => source_path,
+        'destination_path'     => destination_path,
+        'baseurl'              => baseurl,
+        'render_basename_only' => render_basename_only
+      }
+    end
 
     def normalize_destination_path(destination_path)
       if destination_path.start_with?('/')
@@ -39,6 +123,14 @@ module Jekyll::Minibundle
         ['', destination_path]
       end
     end
+
+    def register_asset_file(site, source_path, destination_path)
+      if Environment.development?(site)
+        AssetFileRegistry.register_development_file(site, source_path, destination_path)
+      else
+        AssetFileRegistry.register_stamp_file(site, source_path, destination_path)
+      end
+    end
   end
 end
 

data/lib/jekyll/minibundle/stamp_file.rb

@@ -13,6 +13,7 @@ module Jekyll::Minibundle
     def initialize(site, asset_source_path, asset_destination_path)
       @site = site
       @asset_source_path = File.join(@site.source, asset_source_path)
+      raise ArgumentError, "Stamp source file does not exist: #{@asset_source_path}" unless File.file?(@asset_source_path)
       @asset_destination_dir = File.dirname(asset_destination_path)
       @asset_destination_extension = File.extname(asset_destination_path)
       @asset_destination_filename_prefix = File.basename(asset_destination_path)[0..-(@asset_destination_extension.size + 1)]

data/lib/jekyll/minibundle/variable_template.rb

@@ -0,0 +1,145 @@
+require 'strscan'
+
+module Jekyll::Minibundle
+  class VariableTemplate
+    OPEN_TAG = '{{'.freeze
+    CLOSE_TAG = '}}'.freeze
+    ESCAPE_CHAR = '\\'.freeze
+
+    def initialize(interpolation)
+      instance_eval("def render(variables) #{interpolation} end", __FILE__, __LINE__)
+    end
+
+    def self.compile(template)
+      new(Generator.compile(Parser.parse(template)))
+    end
+
+    class SyntaxError < ArgumentError
+      CURSOR = '@'.freeze
+
+      def initialize(message, template, position)
+        @message = message
+        @template = template
+        @position = position
+      end
+
+      def to_s
+        template_before_pos = @template[0, @position]
+        template_after_pos = @template[@position..-1]
+
+        <<-END
+#{@message} at position #{@position} in template (position highlighted with "#{CURSOR}"):
+#{template_before_pos}#{CURSOR}#{template_after_pos}
+        END
+      end
+    end
+
+    module Parser
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def self.parse(template)
+        raise ArgumentError, 'Nil template' if template.nil?
+
+        escape_or_open_regex = Parser.make_escape_sequence_or_open_tag_regexp
+        close_regex = Parser.make_close_tag_regexp
+
+        scanner = StringScanner.new(template)
+
+        tokens = []
+        text_buffer = ''
+        escape_or_open_match = scanner.scan_until(escape_or_open_regex)
+
+        while escape_or_open_match
+          escape_match = scanner[1]
+
+          # escape sequence
+          if escape_match
+            text_buffer += escape_or_open_match[0..-3]
+            text_buffer += escape_match[1, 1]
+          # open tag
+          else
+            text_buffer += escape_or_open_match[0..-(OPEN_TAG.size + 1)]
+            tokens << Token.text(text_buffer)
+            text_buffer = ''
+            close_match = scanner.scan_until(close_regex)
+            raise SyntaxError.new(%{Missing closing tag ("#{CLOSE_TAG}") for variable opening tag ("#{OPEN_TAG}")}, template, scanner.charpos) unless close_match
+            tokens << Token.variable(close_match[0..-(CLOSE_TAG.size + 1)].strip)
+          end
+
+          escape_or_open_match = scanner.scan_until(escape_or_open_regex)
+        end
+
+        text_buffer += scanner.rest unless scanner.eos?
+        tokens << Token.text(text_buffer) unless text_buffer.empty?
+
+        tokens
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      def self.make_escape_sequence_regexp
+        escape_chars = (OPEN_TAG + CLOSE_TAG).chars.uniq
+        escape_chars << ESCAPE_CHAR
+        escape_chars.map { |c| Regexp.escape(ESCAPE_CHAR + c) }
+      end
+
+      def self.make_escape_sequence_or_open_tag_regexp
+        @_escape_sequence_or_open_tag_regexp ||=
+          begin
+            regexp = [make_escape_sequence_regexp.join('|'), Regexp.escape(OPEN_TAG)].map { |p| "(#{p})" }.join('|')
+            Regexp.compile(regexp)
+          end
+      end
+
+      def self.make_close_tag_regexp
+        @_close_tag_regexp ||= Regexp.compile(Regexp.escape(CLOSE_TAG))
+      end
+    end
+
+    class Token
+      attr_reader :value
+
+      def initialize(value, is_variable)
+        @value = value
+        @is_variable = is_variable
+      end
+
+      def variable?
+        @is_variable
+      end
+
+      def self.text(value)
+        new(value, false)
+      end
+
+      def self.variable(value)
+        new(value, true)
+      end
+    end
+
+    # Transforms array of tokens to Ruby interpolation string.
+    #
+    # Idea adapted from Mustache's
+    # [Generator](https://github.com/mustache/mustache/blob/master/lib/mustache/generator.rb).
+    module Generator
+      def self.compile(tokens)
+        result = '"'
+
+        tokens.each do |token|
+          result +=
+            if token.variable?
+              %(#\{variables["#{escape_token(token.value)}"].to_s})
+            else
+              escape_token(token.value)
+            end
+        end
+
+        result += '"'
+
+        result
+      end
+
+      def self.escape_token(token)
+        token.inspect[1..-2]
+      end
+    end
+  end
+end

data/lib/jekyll/minibundle/variable_template_registry.rb

@@ -0,0 +1,19 @@
+require 'jekyll/minibundle/variable_template'
+
+module Jekyll::Minibundle
+  module VariableTemplateRegistry
+    def self.clear
+      @_templates = {}
+    end
+
+    def self.register_template(template)
+      @_templates[template] ||= VariableTemplate.compile(template)
+    end
+
+    clear
+  end
+end
+
+::Jekyll::Hooks.register(:site, :post_write) do
+  ::Jekyll::Minibundle::VariableTemplateRegistry.clear
+end

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '2.1.2'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/test/fixture/site/_bin/with_count

@@ -3,7 +3,7 @@
 filename = ARGV.first
 
 count =
-  if File.exist?(filename)
+  if File.file?(filename)
     File.read(filename).strip.to_i
   else
     0

data/test/integration/minibundle_development_mode_test.rb

@@ -10,27 +10,27 @@ module Jekyll::Minibundle::Test
 
     def test_css_assets_have_tags_in_configured_order
       with_precompiled_site(:development) do
-        assert_equal CSS_ASSET_DESTINATION_PATHS, find_css_paths_from_index
+        assert_equal(CSS_ASSET_DESTINATION_PATHS, find_css_paths_from_index)
       end
     end
 
     def test_js_assets_have_tags_in_configured_order
       with_precompiled_site(:development) do
-        assert_equal JS_ASSET_DESTINATION_PATHS, find_js_paths_from_index
+        assert_equal(JS_ASSET_DESTINATION_PATHS, find_js_paths_from_index)
       end
     end
 
     def test_css_assets_have_configured_attributes
       with_precompiled_site(:development) do
         elements = find_css_elements_from_index.map { |el| [el['id'], el['media']] }.uniq
-        assert_equal [['my-styles', 'projection']], elements
+        assert_equal([['my-styles', 'projection']], elements)
       end
     end
 
     def test_js_assets_have_configured_attributes
       with_precompiled_site(:development) do
         elements = find_js_elements_from_index.map { |el| [el['id'], el['async']] }.uniq
-        assert_equal [['my-scripts', '']], elements
+        assert_equal([['my-scripts', '']], elements)
       end
     end
 
@@ -65,8 +65,8 @@ module Jekyll::Minibundle::Test
 
           generate_site(:development, clear_cache: false)
 
-          assert_equal File.read(destination), File.read(source)
-          assert_operator file_mtime_of(destination), :>, org_mtime
+          assert_equal(File.read(destination), File.read(source))
+          assert_operator(file_mtime_of(destination), :>, org_mtime)
         end
       end
     end
@@ -95,7 +95,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_operator file_mtime_of(destination), :>, org_mtime
+        assert_operator(file_mtime_of(destination), :>, org_mtime)
       end
     end
 
@@ -122,10 +122,10 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal [File.join(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')], find_js_paths_from_index
+        assert_equal([File.join(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')], find_js_paths_from_index)
 
         new_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
-        assert_operator new_mtime, :>, org_mtime
+        assert_operator(new_mtime, :>, org_mtime)
       end
     end
 
@@ -133,8 +133,8 @@ module Jekyll::Minibundle::Test
       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'))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
 
         ensure_file_mtime_changes do
           change_destination_path_in_minibundle_block('assets/site', 'assets/site2')
@@ -142,12 +142,12 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
-        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        refute(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')))
+        refute(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
 
-        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'))
+        assert_equal(['assets/site2/dependency.js', 'assets/site2/app.js'], find_js_paths_from_index)
+        assert(File.file?(destination_path('assets/site2/dependency.js')))
+        assert(File.file?(destination_path('assets/site2/app.js')))
       end
     end
 
@@ -155,8 +155,8 @@ module Jekyll::Minibundle::Test
       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'))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
 
         ensure_file_mtime_changes do
           change_destination_path_in_minibundle_block('assets/site', 'assets/site2')
@@ -164,12 +164,12 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
-        refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        refute(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')))
+        refute(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
 
-        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'))
+        assert_equal(['assets/site2/dependency.js', 'assets/site2/app.js'], find_js_paths_from_index)
+        assert(File.file?(destination_path('assets/site2/dependency.js')))
+        assert(File.file?(destination_path('assets/site2/app.js')))
 
         ensure_file_mtime_changes do
           change_destination_path_in_minibundle_block('assets/site2', 'assets/site')
@@ -177,12 +177,12 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        refute File.exist?(destination_path('assets/site2/dependency.js'))
-        refute File.exist?(destination_path('assets/site2/app.js'))
+        refute(File.file?(destination_path('assets/site2/dependency.js')))
+        refute(File.file?(destination_path('assets/site2/app.js')))
 
-        assert_equal ['assets/site/dependency.js', 'assets/site/app.js'], find_js_paths_from_index
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        assert_equal(['assets/site/dependency.js', 'assets/site/app.js'], find_js_paths_from_index)
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
       end
     end
 
@@ -195,11 +195,11 @@ module Jekyll::Minibundle::Test
         org_mtime_css = file_mtime_of(destination_css)
         org_mtime_js = file_mtime_of(destination_js)
 
-        assert File.exist?(destination_css)
-        assert File.exist?(destination_js)
+        assert(File.file?(destination_css))
+        assert(File.file?(destination_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
+        assert_equal('assets/site/common.css', find_css_paths_from_index.last)
+        assert_equal('assets/site/app.js', find_js_paths_from_index.last)
 
         ensure_file_mtime_changes do
           find_and_gsub_in_file(
@@ -211,32 +211,84 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert File.exist?(destination_css)
-        assert File.exist?(destination_js)
-        assert_equal org_mtime_css, file_mtime_of(destination_css)
-        assert_equal org_mtime_js, file_mtime_of(destination_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
+        assert(File.file?(destination_css))
+        assert(File.file?(destination_js))
+        assert_equal(org_mtime_css, file_mtime_of(destination_css))
+        assert_equal(org_mtime_js, file_mtime_of(destination_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)
       end
     end
 
     def test_supports_baseurl
       with_site_dir do
+        merge_to_yaml_file(source_path('_config.yml'), 'baseurl' => '/root')
+
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '    {% minibundle css %}',
+          <<-END
+    {% minibundle css %}
+    baseurl: '{{ site.baseurl }}/'
+          END
+        )
+
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '    {% minibundle js %}',
+          <<-END
+    {% minibundle js %}
+    baseurl: {{ site.baseurl }}/js
+          END
+        )
+
         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(File.file?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
+
+        assert_equal('/root/assets/site/common.css', find_css_paths_from_index.last)
+        assert_equal('/root/js/assets/site/app.js', find_js_paths_from_index.last)
+      end
+    end
 
-        assert_equal 'assets/site/common.css', find_css_paths_from_index.last
-        assert_equal 'assets/site/app.js', find_js_paths_from_index.last
+    def test_supports_destination_baseurl
+      with_site_dir do
+        merge_to_yaml_file(source_path('_config.yml'), 'cdn_baseurl' => 'https://cdn.example.com/?file=')
+
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '    {% minibundle css %}',
+          <<-END
+    {% minibundle css %}
+    baseurl: /ignored
+    destination_baseurl: {{ site.cdn_baseurl }}css/
+          END
+        )
+
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          /    #{Regexp.escape('{% minibundle js %}')}.*#{Regexp.escape('{% endminibundle %}')}/m,
+          <<-END
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: static
+    baseurl: /ignored
+    destination_baseurl: '{{ site.cdn_baseurl }}'
+    assets:
+      - dependency
+      - app
+    {% endminibundle %}
+          END
+        )
 
-        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)
 
-        generate_site(:development, clear_cache: false)
+        assert(File.file?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')))
+        assert(File.file?(destination_path('static/app.js')))
 
-        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
+        assert_equal('https://cdn.example.com/?file=css/site/common.css', find_css_paths_from_index.last)
+        assert_equal('https://cdn.example.com/?file=static/app.js', find_js_paths_from_index.last)
       end
     end
 
@@ -244,8 +296,8 @@ module Jekyll::Minibundle::Test
       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(File.file?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')))
+        assert(File.file?(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')
@@ -253,10 +305,10 @@ module Jekyll::Minibundle::Test
         generate_site(:development, clear_cache: false)
 
         css_ids = find_css_elements_from_index.map { |el| el['id'] }.uniq
-        assert_equal ['my-styles2'], css_ids
+        assert_equal(['my-styles2'], css_ids)
 
         js_ids = find_js_elements_from_index.map { |el| el['id'] }.uniq
-        assert_equal ['my-scripts2'], js_ids
+        assert_equal(['my-scripts2'], js_ids)
       end
     end
 
@@ -277,13 +329,13 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, file_mtime_of(expected_js_path)
+        assert_equal(org_mtime, file_mtime_of(expected_js_path))
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, file_mtime_of(expected_js_path)
+        assert_equal(org_mtime, file_mtime_of(expected_js_path))
       end
     end
 
@@ -300,11 +352,11 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, file_mtime_of(expected_js_path)
+        assert_equal(org_mtime, file_mtime_of(expected_js_path))
       end
     end
 
-    def test_does_not_rebundle_assets_when_changing_baseurl
+    def test_does_not_rewrite_destination_when_changing_baseurl
       with_site_dir do
         generate_site(:development)
 
@@ -312,12 +364,45 @@ module Jekyll::Minibundle::Test
         org_mtime = file_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")
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '    {% minibundle js %}',
+            <<-END
+    {% minibundle js %}
+    baseurl: /js-root
+            END
+          )
+        end
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal(org_mtime, file_mtime_of(expected_js_path))
+        assert_equal("/js-root/#{JS_BUNDLE_DESTINATION_PATH}/app.js", find_js_paths_from_index.last)
+      end
+    end
+
+    def test_does_not_rewrite_destination_when_changing_destination_baseurl
+      with_site_dir do
+        generate_site(:development)
+
+        expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
+        org_mtime = file_mtime_of(expected_js_path)
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '    {% minibundle js %}',
+            <<-END
+    {% minibundle js %}
+    destination_baseurl: /js-root/
+            END
+          )
         end
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, file_mtime_of(expected_js_path)
+        assert_equal(org_mtime, file_mtime_of(expected_js_path))
+        assert_equal('/js-root/site/app.js', find_js_paths_from_index.last)
       end
     end
 
@@ -325,7 +410,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         merge_to_yaml_file('_config.yml', 'minibundle' => {'mode' => 'development'})
         generate_site(nil)
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
       end
     end
 
@@ -333,7 +418,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         merge_to_yaml_file('_config.yml', 'minibundle' => {'mode' => 'production'})
         generate_site(:development)
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        assert(File.file?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')))
       end
     end
 
@@ -360,8 +445,8 @@ module Jekyll::Minibundle::Test
     end
 
     def expect_file_exists_and_is_equal_to(actual, expected)
-      assert File.exist?(actual)
-      assert_equal File.read(expected), File.read(actual)
+      assert(File.file?(actual))
+      assert_equal(File.read(expected), File.read(actual))
     end
 
     def change_destination_path_in_minibundle_block(from, to)