jekyll-minibundle 1.4.2 → 1.4.3

data/lib/jekyll/minibundle/bundle_file.rb

@@ -10,8 +10,8 @@ module Jekyll::Minibundle
     def initialize(config)
       @type = config['type']
       @site_source_dir = config['site_dir']
-      asset_source_dir = File.join @site_source_dir, config['source_dir']
-      @assets = config['assets'].map { |asset_path| File.join asset_source_dir, "#{asset_path}.#{@type}" }
+      asset_source_dir = File.join(@site_source_dir, config['source_dir'])
+      @assets = config['assets'].map { |asset_path| File.join(asset_source_dir, "#{asset_path}.#{@type}") }
       @destination_path = config['destination_path']
       @attributes = config['attributes']
       @stamped_at = nil
@@ -28,7 +28,7 @@ module Jekyll::Minibundle
         asset_bundle.make_bundle
       end
 
-      AssetTagMarkup.make_markup @type, asset_destination_path, @attributes
+      AssetTagMarkup.make_markup(@type, asset_destination_path, @attributes)
     end
 
     def path
@@ -40,7 +40,7 @@ module Jekyll::Minibundle
     end
 
     def destination(site_destination_dir)
-      File.join site_destination_dir, asset_destination_path
+      File.join(site_destination_dir, asset_destination_path)
     end
 
     def mtime
@@ -51,20 +51,21 @@ module Jekyll::Minibundle
       @stamped_at != mtime
     end
 
+    # writes destination only after `markup` has been called
     def write(site_destination_dir)
-      if File.exists?(destination(site_destination_dir)) && !@is_modified
-        false
-      else
-        write_destination site_destination_dir
+      if @is_modified
+        write_destination(site_destination_dir)
         @is_modified = false
         true
+      else
+        false
       end
     end
 
     private
 
     def asset_stamp
-      @_asset_stamp ||= AssetStamp.from_file path
+      @_asset_stamp ||= AssetStamp.from_file(path)
     end
 
     def asset_bundle

data/lib/jekyll/minibundle/development_file.rb

@@ -10,18 +10,18 @@ module Jekyll::Minibundle
 
     def initialize(asset_source_path, asset_destination_path)
       @asset_source_path = asset_source_path
-      @asset_destination_dir = File.dirname asset_destination_path
-      @asset_destination_basename = File.basename asset_destination_path
+      @asset_destination_dir = File.dirname(asset_destination_path)
+      @asset_destination_basename = File.basename(asset_destination_path)
       @stamped_at = nil
     end
 
     def write(site_destination_dir)
-      if destination_exists?(site_destination_dir) && !modified?
-        false
-      else
+      if modified?
         @stamped_at = mtime
-        write_destination site_destination_dir
+        write_destination(site_destination_dir)
         true
+      else
+        false
       end
     end
   end

data/lib/jekyll/minibundle/development_file_collection.rb

@@ -5,14 +5,14 @@ module Jekyll::Minibundle
   class DevelopmentFileCollection
     def initialize(config)
       @type = config['type']
-      asset_source_dir = File.join config['site_dir'], config['source_dir']
+      asset_source_dir = File.join(config['site_dir'], config['source_dir'])
       destination_path = config['destination_path']
 
       @files = config['assets'].map do |asset_path|
         asset_basename = "#{asset_path}.#{@type}"
-        asset_source = File.join asset_source_dir, asset_basename
-        asset_destination = File.join destination_path, asset_basename
-        DevelopmentFile.new asset_source, asset_destination
+        asset_source = File.join(asset_source_dir, asset_basename)
+        asset_destination = File.join(destination_path, asset_basename)
+        DevelopmentFile.new(asset_source, asset_destination)
       end
 
       @attributes = config['attributes']
@@ -22,12 +22,12 @@ module Jekyll::Minibundle
       # NOTE: We could optimize here by iterating over site's static
       # files only once instead of per each of our file. Seems like a
       # premature optimization for now, however.
-      @files.each { |f| f.static_file! site }
+      @files.each { |f| f.static_file!(site) }
     end
 
     def markup
       @files.
-        map { |f| AssetTagMarkup.make_markup @type, f.asset_destination_path, @attributes }.
+        map { |f| AssetTagMarkup.make_markup(@type, f.asset_destination_path, @attributes) }.
         join("\n")
     end
   end

data/lib/jekyll/minibundle/environment.rb

@@ -1,14 +1,16 @@
 module Jekyll::Minibundle
   module Environment
-    def self.command_for(type)
-      key = "JEKYLL_MINIBUNDLE_CMD_#{type.upcase}"
-      cmd = ENV[key]
-      raise "You need to set command for minification in $#{key}" if !cmd
-      cmd
-    end
+    class << self
+      def command_for(type)
+        key = "JEKYLL_MINIBUNDLE_CMD_#{type.upcase}"
+        cmd = ENV[key]
+        fail "You need to set command for minification in $#{key}" if !cmd
+        cmd
+      end
 
-    def self.development?
-      ENV['JEKYLL_MINIBUNDLE_MODE'] == 'development'
+      def development?
+        ENV['JEKYLL_MINIBUNDLE_MODE'] == 'development'
+      end
     end
   end
 end

data/lib/jekyll/minibundle/mini_bundle_block.rb

@@ -10,9 +10,9 @@ module Jekyll::Minibundle
 
     def render(context)
       site = context.registers[:site]
-      config = get_current_config YAML.load(super), site
-      file = AssetFileRegistry.bundle_file config
-      file.static_file! site
+      config = get_current_config(YAML.load(super), site)
+      file = AssetFileRegistry.bundle_file(config)
+      file.static_file!(site)
       file.markup
     end
 
@@ -30,7 +30,7 @@ module Jekyll::Minibundle
     def get_current_config(user_config, site)
       MiniBundleBlock.default_config.
         merge(user_config).
-        merge({ 'type' => @type, 'site_dir' => site.source })
+        merge('type' => @type, 'site_dir' => site.source)
     end
   end
 end

data/lib/jekyll/minibundle/mini_stamp_tag.rb

@@ -9,8 +9,8 @@ module Jekyll::Minibundle
 
     def render(context)
       site = context.registers[:site]
-      file = AssetFileRegistry.stamp_file File.join(site.source, @asset_source), @asset_destination
-      file.static_file! site
+      file = AssetFileRegistry.stamp_file(File.join(site.source, @asset_source), @asset_destination)
+      file.static_file!(site)
       file.markup
     end
   end

data/lib/jekyll/minibundle/stamp_file.rb

@@ -12,8 +12,8 @@ module Jekyll::Minibundle
     def initialize(asset_source_path, asset_destination_path, &basenamer)
       @basenamer = basenamer
       @asset_source_path = asset_source_path
-      @asset_destination_dir = File.dirname asset_destination_path
-      @asset_destination_extension = File.extname asset_destination_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)]
       @stamped_at = nil
       @is_modified = false
@@ -32,20 +32,21 @@ module Jekyll::Minibundle
       asset_destination_path
     end
 
+    # writes destination only after `markup` has been called
     def write(site_destination_dir)
-      if destination_exists?(site_destination_dir) && !@is_modified
-        false
-      else
-        write_destination site_destination_dir
+      if @is_modified
+        write_destination(site_destination_dir)
         @is_modified = false
         true
+      else
+        false
       end
     end
 
     private
 
     def asset_destination_basename
-      @basenamer.call @asset_destination_base_prefix, @asset_destination_extension, -> { asset_stamp }
+      @basenamer.call(@asset_destination_base_prefix, @asset_destination_extension, -> { asset_stamp })
     end
 
     def asset_stamp

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end

data/test/fixture/site/_bin/with_count

@@ -8,6 +8,6 @@ else
   0
 end
 
-File.write filename, "#{count + 1}\n"
+File.write(filename, "#{count + 1}\n")
 
 exec(*ARGV[1..-1])

data/test/integration/minibundle_development_mode_test.rb

@@ -5,49 +5,63 @@ module Jekyll::Minibundle::Test
   class MiniBundleDevelopmentModeTest < TestCase
     include FixtureConfig
 
-    EXPECTED_CSS_ASSET_PATHS = %w{reset common}.map { |f| File.join(CSS_BUNDLE_DESTINATION_PATH, "#{f}.css") }
-    EXPECTED_JS_ASSET_PATHS = %w{dependency app}.map { |f| File.join(JS_BUNDLE_DESTINATION_PATH, "#{f}.js") }
+    CSS_ASSET_DESTINATION_PATHS = %w{reset common}.map { |f| File.join(CSS_BUNDLE_DESTINATION_PATH, "#{f}.css") }
+    JS_ASSET_DESTINATION_PATHS = %w{dependency app}.map { |f| File.join(JS_BUNDLE_DESTINATION_PATH, "#{f}.js") }
 
     def test_css_assets_have_tags_in_configured_order
-      with_precompiled_site :development do
-        assert_equal EXPECTED_CSS_ASSET_PATHS, find_css_paths_from_index
+      with_precompiled_site(:development) do
+        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 EXPECTED_JS_ASSET_PATHS, find_js_paths_from_index
+      with_precompiled_site(:development) do
+        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
+      end
+    end
+
+    def test_js_assets_have_configured_attributes
+      with_precompiled_site(:development) do
+        elements = find_js_elements_from_index.map { |el| el['id'] }.uniq
+        assert_equal ['my-scripts'], elements
       end
     end
 
     def test_copies_css_assets_to_destination_dir
-      with_precompiled_site :development do
-        EXPECTED_CSS_ASSET_PATHS.each do |path|
+      with_precompiled_site(:development) do
+        CSS_ASSET_DESTINATION_PATHS.each do |path|
           expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(CSS_BUNDLE_SOURCE_DIR, File.basename(path)))
         end
       end
     end
 
     def test_copies_js_assets_to_destination_dir
-      with_precompiled_site :development do
-        EXPECTED_JS_ASSET_PATHS.each do |path|
+      with_precompiled_site(:development) do
+        JS_ASSET_DESTINATION_PATHS.each do |path|
           expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(JS_BUNDLE_SOURCE_DIR, File.basename(path)))
         end
       end
     end
 
     [
-     {desc: "changing", action: ->(source) { File.write source, 'h1 {}' }},
-     {desc: "touching", action: ->(source) { FileUtils.touch source }}
+     {desc: "changing", action: ->(source) { File.write(source, 'h1 {}') }},
+     {desc: "touching", action: ->(source) { FileUtils.touch(source) }}
     ].each do |spec|
       define_method :"test_#{spec[:desc]}_css_asset_source_rewrites_destination" do
         with_site do
-          generate_site :development
-          destination = destination_path CSS_BUNDLE_DESTINATION_PATH, 'common.css'
-          org_mtime = mtime_of destination
-          source = source_path CSS_BUNDLE_SOURCE_DIR, 'common.css'
+          generate_site(:development)
+          destination = destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')
+          org_mtime = mtime_of(destination)
+          source = source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css')
           ensure_file_mtime_changes { spec[:action].call(source) }
-          generate_site :development, clear_cache: false
+          generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)
           assert_operator mtime_of(destination), :>, org_mtime
@@ -56,17 +70,17 @@ module Jekyll::Minibundle::Test
     end
 
     [
-     {desc: "changing", action: ->(source) { File.write source, '(function() {})()' }},
-     {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[:desc]}_js_asset_source_rewrites_destination" do
         with_site 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'
+          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[:action].call(source) }
-          generate_site :development, clear_cache: false
+          generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)
           assert_operator mtime_of(destination), :>, org_mtime
@@ -76,17 +90,17 @@ module Jekyll::Minibundle::Test
 
     def test_supports_relative_and_absolute_destination_paths
       with_site 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
+        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.exists?(expected_css_path)
         assert File.exists?(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
 
-        find_and_gsub_in_file source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: /assets/site'
-        generate_site :development, clear_cache: false
+        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.exists?(expected_css_path)
         assert File.exists?(expected_js_path)
@@ -97,8 +111,8 @@ module Jekyll::Minibundle::Test
 
     def test_does_not_require_bundling_commands
       with_site do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_CSS' => nil, 'JEKYLL_MINIBUNDLE_CMD_JS' => nil do
-          generate_site :development
+        with_env('JEKYLL_MINIBUNDLE_CMD_CSS' => nil, 'JEKYLL_MINIBUNDLE_CMD_JS' => nil) do
+          generate_site(:development)
           pass
         end
       end
@@ -106,16 +120,16 @@ module Jekyll::Minibundle::Test
 
     def test_does_not_rewrite_destination_when_nonsource_files_change
       with_site 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
+        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
+        ensure_file_mtime_changes { FileUtils.touch('index.html') }
+        generate_site(:development, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_js_path)
       end
@@ -123,12 +137,20 @@ module Jekyll::Minibundle::Test
 
     private
 
+    def find_css_elements_from_index
+      find_html_elements_from_index('head link[media!="screen"]')
+    end
+
     def find_css_paths_from_index
-      find_html_elements_from_index('head link[media="projection"]').map { |el| el['href'] }
+      find_css_elements_from_index.map { |el| el['href'] }
+    end
+
+    def find_js_elements_from_index
+      find_html_elements_from_index('body script')
     end
 
     def find_js_paths_from_index
-      find_html_elements_from_index('body script').map { |el| el['src'] }
+      find_js_elements_from_index.map { |el| el['src'] }
     end
 
     def find_html_elements_from_index(css)

data/test/integration/minibundle_production_mode_test.rb

@@ -5,90 +5,90 @@ module Jekyll::Minibundle::Test
   class MiniBundleProductionModeTest < TestCase
     include FixtureConfig
 
-    def test_css_asset_bundle_has_configured_attributes
-      with_precompiled_site :production do
-        element = find_html_element_from_index %{head link[href="#{EXPECTED_CSS_BUNDLE_PATH}"]}
-        assert_equal 'my-styles', element['id']
-        assert_equal 'projection', element['media']
+    def test_css_asset_bundle_has_stamp
+      with_precompiled_site(:production) do
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
       end
     end
 
-    def test_js_asset_bundle_has_configured_attributes
-      with_precompiled_site :production do
-        element = find_html_element_from_index %{body script[src="#{EXPECTED_JS_BUNDLE_PATH}"]}
-        assert_equal 'my-scripts', element['id']
+    def test_js_asset_bundle_has_stamp
+      with_precompiled_site(:production) do
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
       end
     end
 
-    def test_css_asset_bundle_has_stamp
-      with_precompiled_site :production do
-        assert_equal EXPECTED_CSS_BUNDLE_PATH, find_css_path_from_index
+    def test_css_asset_bundle_has_configured_attributes
+      with_precompiled_site(:production) do
+        element = find_css_element_from_index
+        assert_equal 'my-styles', element['id']
+        assert_equal 'projection', element['media']
       end
     end
 
-    def test_js_asset_bundle_has_stamp
-      with_precompiled_site :production do
-        assert_equal EXPECTED_JS_BUNDLE_PATH, find_js_path_from_index
+    def test_js_asset_bundle_has_configured_attributes
+      with_precompiled_site(:production) do
+        element = find_js_element_from_index
+        assert_equal 'my-scripts', element['id']
       end
     end
 
     def test_copies_css_asset_bundle_to_destination_dir
-      with_precompiled_site :production do
-        assert File.exists?(destination_path(EXPECTED_CSS_BUNDLE_PATH))
+      with_precompiled_site(:production) do
+        assert File.exists?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
     def test_copies_js_asset_bundle_to_destination_dir
-      with_precompiled_site :production do
-        assert File.exists?(destination_path(EXPECTED_JS_BUNDLE_PATH))
+      with_precompiled_site(:production) do
+        assert File.exists?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
     def test_concatenates_css_asset_bundle_in_configured_order
-      with_precompiled_site :production do
-        bundle = File.read(destination_path(EXPECTED_CSS_BUNDLE_PATH))
+      with_precompiled_site(:production) do
+        bundle = File.read(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert_operator bundle.index('html { margin: 0; }'), :<, bundle.index('p { margin: 0; }')
       end
     end
 
     def test_concatenates_js_asset_bundle_in_configured_order
-      with_precompiled_site :production do
-        bundle = File.read(destination_path(EXPECTED_JS_BUNDLE_PATH))
+      with_precompiled_site(:production) do
+        bundle = File.read(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert_operator bundle.index('root.dependency = {};'), :<, bundle.index('root.app = {};')
       end
     end
 
     def test_inserts_semicolons_between_js_assets
-      with_precompiled_site :production do
-        bundle = File.read(destination_path(EXPECTED_JS_BUNDLE_PATH))
+      with_precompiled_site(:production) do
+        bundle = File.read(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert_match(%r|}\)\(window\)\n;\n\(function|, bundle)
       end
     end
 
     def test_minifies_css_asset_bundle
-      with_precompiled_site :production do
+      with_precompiled_site(:production) do
         source_contents_size = source_assets_size(CSS_BUNDLE_SOURCE_DIR, %w{reset common}, 'css')
-        destination_contents_size = File.read(destination_path(EXPECTED_CSS_BUNDLE_PATH)).size
+        destination_contents_size = File.read(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH)).size
         assert_operator destination_contents_size, :<, source_contents_size
       end
     end
 
     def test_minifies_js_asset_bundle
-      with_precompiled_site :production do
+      with_precompiled_site(:production) do
         source_contents_size = source_assets_size(JS_BUNDLE_SOURCE_DIR, %w{dependency app}, 'js')
-        destination_contents_size = File.read(destination_path(EXPECTED_JS_BUNDLE_PATH)).size
+        destination_contents_size = File.read(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)).size
         assert_operator destination_contents_size, :<, source_contents_size
       end
     end
 
     def test_changing_css_asset_source_rewrites_destination
       with_site do
-        generate_site :production
-        org_mtime = mtime_of destination_path(EXPECTED_CSS_BUNDLE_PATH)
-        ensure_file_mtime_changes { File.write source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css'), 'h1 {}' }
-        generate_site :production, clear_cache: false
+        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 {}') }
+        generate_site(:production, clear_cache: false)
 
-        refute File.exists?(destination_path(EXPECTED_CSS_BUNDLE_PATH))
+        refute File.exists?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
         new_destination = 'assets/site-9fd3995d6f0fce425db81c3691dfe93f.css'
 
@@ -100,12 +100,12 @@ module Jekyll::Minibundle::Test
 
     def test_changing_js_asset_source_rewrites_destination
       with_site do
-        generate_site :production
-        org_mtime = mtime_of destination_path(EXPECTED_JS_BUNDLE_PATH)
-        ensure_file_mtime_changes { File.write source_path(JS_BUNDLE_SOURCE_DIR, 'app.js'), '(function() {})()' }
-        generate_site :production, clear_cache: false
+        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() {})()') }
+        generate_site(:production, clear_cache: false)
 
-        refute File.exists?(destination_path(EXPECTED_JS_BUNDLE_PATH))
+        refute File.exists?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
         new_destination = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
 
@@ -117,11 +117,11 @@ module Jekyll::Minibundle::Test
 
     def test_touching_css_asset_source_rewrites_destination
       with_site do
-        generate_site :production
-        destination = EXPECTED_CSS_BUNDLE_PATH
-        org_mtime = mtime_of destination_path(destination)
-        ensure_file_mtime_changes { FileUtils.touch source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css') }
-        generate_site :production, clear_cache: false
+        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')) }
+        generate_site(:production, clear_cache: false)
 
         assert_equal destination, find_css_path_from_index
         assert File.exists?(destination_path(destination))
@@ -131,11 +131,11 @@ module Jekyll::Minibundle::Test
 
     def test_touching_js_asset_source_rewrites_destination
       with_site do
-        generate_site :production
-        destination = EXPECTED_JS_BUNDLE_PATH
-        org_mtime = mtime_of destination_path(destination)
-        ensure_file_mtime_changes { FileUtils.touch source_path(JS_BUNDLE_SOURCE_DIR, 'app.js') }
-        generate_site :production, clear_cache: false
+        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')) }
+        generate_site(:production, clear_cache: false)
 
         assert_equal destination, find_js_path_from_index
         assert File.exists?(destination_path(destination))
@@ -145,29 +145,29 @@ module Jekyll::Minibundle::Test
 
     def test_supports_relative_and_absolute_destination_paths
       with_site do
-        generate_site :production
-        expected_css_path = destination_path EXPECTED_CSS_BUNDLE_PATH
-        expected_js_path = destination_path EXPECTED_JS_BUNDLE_PATH
+        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.exists?(expected_css_path)
         assert File.exists?(expected_js_path)
-        assert_equal EXPECTED_CSS_BUNDLE_PATH, find_css_path_from_index
-        assert_equal EXPECTED_JS_BUNDLE_PATH, find_js_path_from_index
+        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
+        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.exists?(expected_css_path)
         assert File.exists?(expected_js_path)
-        assert_equal "/#{EXPECTED_CSS_BUNDLE_PATH}", find_css_path_from_index
-        assert_equal "/#{EXPECTED_JS_BUNDLE_PATH}", find_js_path_from_index
+        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_bundles_assets_only_once_at_startup
       with_site do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
-          generate_site :production
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count) do
+          generate_site(:production)
         end
         assert_equal 1, get_cmd_count
       end
@@ -175,20 +175,20 @@ module Jekyll::Minibundle::Test
 
     def test_does_not_rebundle_assets_when_nonsource_files_change
       with_site do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
-          generate_site :production
-          expected_js_path = destination_path EXPECTED_JS_BUNDLE_PATH
-          last_mtime = mtime_of expected_js_path
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count) do
+          generate_site(:production)
+          expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+          last_mtime = mtime_of(expected_js_path)
 
           assert_equal 1, get_cmd_count
 
-          ensure_file_mtime_changes { File.write source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css'), 'h1 {}' }
-          generate_site :production, clear_cache: false
+          ensure_file_mtime_changes { File.write(source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css'), 'h1 {}') }
+          generate_site(:production, clear_cache: false)
 
           assert_equal last_mtime, mtime_of(expected_js_path)
           assert_equal 1, get_cmd_count
 
-          ensure_file_mtime_changes { FileUtils.touch 'index.html' }
+          ensure_file_mtime_changes { FileUtils.touch('index.html') }
           generate_site :production, clear_cache: false
 
           assert_equal last_mtime, mtime_of(expected_js_path)
@@ -199,12 +199,20 @@ module Jekyll::Minibundle::Test
 
     private
 
+    def find_css_element_from_index
+      find_html_element_from_index('head link[media!="screen"]')
+    end
+
     def find_css_path_from_index
-      find_html_element_from_index('head link[media="projection"]')['href']
+      find_css_element_from_index['href']
+    end
+
+    def find_js_element_from_index
+      find_html_element_from_index('body script')
     end
 
     def find_js_path_from_index
-      find_html_element_from_index('body script')['src']
+      find_js_element_from_index['src']
     end
 
     def find_html_element_from_index(css)
@@ -213,7 +221,7 @@ module Jekyll::Minibundle::Test
 
     def source_assets_size(source_subdir, assets, type)
       assets.
-        map { |f| File.read site_fixture_path(source_subdir, "#{f}.#{type}") }.
+        map { |f| File.read(site_fixture_path(source_subdir, "#{f}.#{type}")) }.
         join('').
         size
     end