jekyll-minibundle 1.4.2 → 1.4.3

data/test/integration/ministamp_test.rb

@@ -6,33 +6,33 @@ module Jekyll::Minibundle::Test
     include FixtureConfig
 
     def test_asset_destination_path_has_no_stamp_in_development_mode
-      with_precompiled_site :development do
+      with_precompiled_site(:development) do
         assert_equal STAMP_DESTINATION_PATH, find_css_path_from_index
         assert File.exists?(destination_path(STAMP_DESTINATION_PATH))
       end
     end
 
     def test_asset_destination_path_has_stamp_in_production_mode
-      with_precompiled_site :production do
+      with_precompiled_site(:production) do
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
         assert File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
     def test_contents_of_asset_destination_are_equal_to_source
-      with_precompiled_site :production do
-        source_contents = File.read site_fixture_path(STAMP_SOURCE_PATH)
-        destination_contents = File.read destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
+      with_precompiled_site(:production) do
+        source_contents = File.read(site_fixture_path(STAMP_SOURCE_PATH))
+        destination_contents = File.read(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         assert_equal source_contents, destination_contents
       end
     end
 
     def test_changing_asset_source_rewrites_destination
       with_site do
-        generate_site :production
-        org_mtime = mtime_of destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
-        ensure_file_mtime_changes { File.write source_path(STAMP_SOURCE_PATH), 'h1 {}' }
-        generate_site :production, clear_cache: false
+        generate_site(:production)
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        ensure_file_mtime_changes { File.write(source_path(STAMP_SOURCE_PATH), 'h1 {}') }
+        generate_site(:production, clear_cache: false)
 
         refute File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
 
@@ -46,11 +46,11 @@ module Jekyll::Minibundle::Test
 
     def test_touching_asset_source_rewrites_destination
       with_site do
-        generate_site :production
+        generate_site(:production)
         destination = STAMP_DESTINATION_FINGERPRINT_PATH
-        org_mtime = mtime_of destination_path(destination)
-        ensure_file_mtime_changes { FileUtils.touch source_path(STAMP_SOURCE_PATH) }
-        generate_site :production, clear_cache: false
+        org_mtime = mtime_of(destination_path(destination))
+        ensure_file_mtime_changes { FileUtils.touch(source_path(STAMP_SOURCE_PATH)) }
+        generate_site(:production, clear_cache: false)
 
         assert_equal destination, find_css_path_from_index
         assert File.exists?(destination_path(destination))
@@ -60,14 +60,14 @@ module Jekyll::Minibundle::Test
 
     def test_supports_relative_and_absolute_destination_paths
       with_site do
-        generate_site :production
-        expected_path = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
+        generate_site(:production)
+        expected_path = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
 
         assert File.exists?(expected_path)
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
 
         find_and_gsub_in_file(source_path('_layouts/default.html'), %r{assets/screen.css}, '/\0')
-        generate_site :production, clear_cache: false
+        generate_site(:production, clear_cache: false)
 
         assert File.exists?(expected_path)
         assert_equal "/#{STAMP_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
@@ -76,16 +76,16 @@ module Jekyll::Minibundle::Test
 
     def test_does_not_rewrite_destination_when_nonsource_files_change
       with_site do
-        generate_site :production
-        expected_path = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
-        org_mtime = mtime_of expected_path
-        ensure_file_mtime_changes { File.write source_path(JS_BUNDLE_SOURCE_DIR, 'dependency.js'), '(function() {})()' }
-        generate_site :production, clear_cache: false
+        generate_site(:production)
+        expected_path = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
+        org_mtime = mtime_of(expected_path)
+        ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'dependency.js'), '(function() {})()') }
+        generate_site(:production, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_path)
 
-        ensure_file_mtime_changes { FileUtils.touch 'index.html' }
-        generate_site :production, clear_cache: false
+        ensure_file_mtime_changes { FileUtils.touch('index.html') }
+        generate_site(:production, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_path)
       end

data/test/integration/static_files_as_asset_sources_test.rb

@@ -6,12 +6,12 @@ module Jekyll::Minibundle::Test
     include FixtureConfig
 
     def test_asset_and_static_files_with_same_destination_paths_can_coexist
-      with_precompiled_site :production do
+      with_precompiled_site(:production) do
         actual = Dir[destination_path('assets/site*.*')].sort
         expected = [
           destination_path('assets/site.css'),
-          destination_path(EXPECTED_CSS_BUNDLE_PATH),
-          destination_path(EXPECTED_JS_BUNDLE_PATH)
+          destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH),
+          destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
         ].sort
         assert_equal expected, actual
       end
@@ -21,9 +21,9 @@ module Jekyll::Minibundle::Test
       define_method :"test_ministamp_allows_using_static_file_as_asset_source_in_#{env}_mode" do
         with_site do
           contents = 'h2 {}'
-          File.write source_path('assets/shared.css'), contents
+          File.write(source_path('assets/shared.css'), contents)
           find_and_gsub_in_file(source_path('_layouts/default.html'), 'ministamp _tmp/site.css', 'ministamp assets/shared.css')
-          generate_site env
+          generate_site(env)
 
           asset_files = Dir[destination_path('assets') + '/screen*.css']
 
@@ -38,10 +38,10 @@ module Jekyll::Minibundle::Test
       with_site do
         dep_contents = 'console.log("lol")'
         app_contents = 'console.log("balal")'
-        File.write source_path('assets/dependency.js'), dep_contents
-        File.write source_path('assets/app.js'), app_contents
+        File.write(source_path('assets/dependency.js'), dep_contents)
+        File.write(source_path('assets/app.js'), app_contents)
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'source_dir: _assets/scripts', 'source_dir: assets')
-        generate_site :development
+        generate_site(:development)
 
         assert_equal dep_contents, File.read(destination_path('assets/dependency.js'))
         assert_equal app_contents, File.read(destination_path('assets/app.js'))
@@ -53,10 +53,10 @@ module Jekyll::Minibundle::Test
         dep_contents = 'console.log("lol")'
         app_contents = 'console.log("balal")'
         bundled_contents = "#{dep_contents};\n#{app_contents};\n"
-        File.write source_path('assets/dependency.js'), dep_contents
-        File.write source_path('assets/app.js'), app_contents
+        File.write(source_path('assets/dependency.js'), dep_contents)
+        File.write(source_path('assets/app.js'), app_contents)
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'source_dir: _assets/scripts', 'source_dir: assets')
-        generate_site :production
+        generate_site(:production)
 
         asset_files = Dir[destination_path('assets/site-*.js')]
 

data/test/support/fixture_config.rb

@@ -4,12 +4,12 @@ module Jekyll::Minibundle::Test
     STAMP_DESTINATION_PATH = 'assets/screen.css'
     STAMP_DESTINATION_FINGERPRINT_PATH = 'assets/screen-d57c1404fe726e66d57128a1bd190cbb.css'
 
-    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'
     CSS_BUNDLE_SOURCE_DIR = '_assets/styles'
-    EXPECTED_CSS_BUNDLE_PATH = CSS_BUNDLE_DESTINATION_PATH + '-b2e0ecc1c100effc2c7353caad20c327.css'
+    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'
+    CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH = CSS_BUNDLE_DESTINATION_PATH + '-b2e0ecc1c100effc2c7353caad20c327.css'
     
-    JS_BUNDLE_DESTINATION_PATH = 'assets/site'
     JS_BUNDLE_SOURCE_DIR = '_assets/scripts'
-    EXPECTED_JS_BUNDLE_PATH = JS_BUNDLE_DESTINATION_PATH + '-4782a1f67803038d4f8351051e67deb8.js'
+    JS_BUNDLE_DESTINATION_PATH = 'assets/site'
+    JS_BUNDLE_DESTINATION_FINGERPRINT_PATH = JS_BUNDLE_DESTINATION_PATH + '-4782a1f67803038d4f8351051e67deb8.js'
   end
 end

data/test/support/test_case.rb

@@ -28,9 +28,9 @@ module Jekyll::Minibundle::Test
     end
 
     def find_and_gsub_in_file(file, pattern, replacement)
-      old_content = File.read file
-      new_content = old_content.gsub pattern, replacement
-      File.write file, new_content
+      old_content = File.read(file)
+      new_content = old_content.gsub(pattern, replacement)
+      File.write(file, new_content)
     end
 
     def mtime_of(path)
@@ -49,9 +49,9 @@ module Jekyll::Minibundle::Test
     end
 
     def with_site(&block)
-      Dir.mktmpdir "jekyll-minibundle-test-site-" do |dir|
-        Dir.chdir dir do
-          _copy_fixture_site_dir Dir.pwd
+      Dir.mktmpdir("jekyll-minibundle-test-site-") do |dir|
+        Dir.chdir(dir) do
+          _copy_fixture_site_dir(Dir.pwd)
           yield dir
         end
       end
@@ -62,8 +62,8 @@ module Jekyll::Minibundle::Test
     end
 
     def generate_site(mode, options = {})
-      with_env 'JEKYLL_MINIBUNDLE_MODE' => mode.to_s do
-        _generate_site _get_site_generation_test_options(options)
+      with_env('JEKYLL_MINIBUNDLE_MODE' => mode.to_s) do
+        _generate_site(_get_site_generation_test_options(options))
       end
     end
 
@@ -77,13 +77,17 @@ module Jekyll::Minibundle::Test
     end
 
     def get_cmd_count
-      File.read('count').to_i
+      if File.exists?('count')
+        File.read('count').to_i
+      else
+        0
+      end
     end
 
     private
 
     def _copy_fixture_site_dir(dir)
-      FileUtils.cp_r site_fixture_path('.'), dir
+      FileUtils.cp_r(site_fixture_path('.'), dir)
     end
 
     @@_precompiled_site_dirs = {}
@@ -92,12 +96,12 @@ module Jekyll::Minibundle::Test
       @@_precompiled_site_dirs[mode] ||= begin
         dir = Dir.mktmpdir("jekyll-minibundle-test-precompiled-site-#{mode}-")
         at_exit do
-          FileUtils.rm_rf dir
+          FileUtils.rm_rf(dir)
           puts "\nCleaned precompiled site in #{mode} mode for tests: #{dir}"
         end
         Dir.chdir(dir) do
-          _copy_fixture_site_dir Dir.pwd
-          generate_site mode
+          _copy_fixture_site_dir(Dir.pwd)
+          generate_site(mode)
         end
         dir
       end
@@ -112,7 +116,7 @@ module Jekyll::Minibundle::Test
     end
 
     def _get_site_generation_test_options(options)
-      TestCase.site_generation_test_options.merge options
+      TestCase.site_generation_test_options.merge(options)
     end
 
     def self.site_generation_test_options

data/test/unit/asset_bundle_test.rb

@@ -5,7 +5,7 @@ module Jekyll::Minibundle::Test
   class AssetBundleTest < TestCase
     def test_raise_exception_if_bundle_command_fails
       capture_io do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => 'false' do
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => 'false') do
           err = assert_raises(RuntimeError) { make_bundle }
           assert_equal 'Bundling js assets failed with exit status 1, command: false', err.to_s
         end
@@ -13,13 +13,13 @@ module Jekyll::Minibundle::Test
     end
 
     def test_raise_exception_if_bundle_command_not_found
-      with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => 'no-such-jekyll-minibundle-cmd' do
+      with_env('JEKYLL_MINIBUNDLE_CMD_JS' => 'no-such-jekyll-minibundle-cmd') do
         assert_raises(Errno::ENOENT) { make_bundle }
       end
     end
 
     def test_raise_exception_if_bundle_command_not_configured
-      with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => nil do
+      with_env('JEKYLL_MINIBUNDLE_CMD_JS' => nil) do
         err = assert_raises(RuntimeError) { make_bundle }
         assert_equal 'You need to set command for minification in $JEKYLL_MINIBUNDLE_CMD_JS', err.to_s
       end
@@ -28,7 +28,7 @@ module Jekyll::Minibundle::Test
     private
 
     def make_bundle
-      bundle = AssetBundle.new :js, [site_fixture_path('_assets/scripts/dependency.js')], site_fixture_path
+      bundle = AssetBundle.new(:js, [site_fixture_path('_assets/scripts/dependency.js')], site_fixture_path)
       bundle.make_bundle
     end
   end

data/test/unit/asset_file_registry_test.rb

@@ -8,22 +8,22 @@ module Jekyll::Minibundle::Test
     end
 
     def test_returns_same_stamp_file_instance_for_same_destination_path
-      first = AssetFileRegistry.stamp_file '_assets/src1.css', 'assets/dest.css'
-      second = AssetFileRegistry.stamp_file '_assets/src2.css', 'assets/dest.css'
+      first = AssetFileRegistry.stamp_file('_assets/src1.css', 'assets/dest.css')
+      second = AssetFileRegistry.stamp_file('_assets/src2.css', 'assets/dest.css')
       assert_same first, second
       assert_equal 1, asset_file_registry_size
     end
 
     def test_returns_same_bundle_file_instance_for_same_destination_path_and_type
-      first = AssetFileRegistry.bundle_file bundle_config.merge({'assets' => %w{a1 a2}})
-      second = AssetFileRegistry.bundle_file bundle_config.merge({'assets' => %w{b1 b2}})
+      first = AssetFileRegistry.bundle_file(bundle_config.merge('assets' => %w{a1 a2}))
+      second = AssetFileRegistry.bundle_file(bundle_config.merge('assets' => %w{b1 b2}))
       assert_same first, second
       assert_equal 1, asset_file_registry_size
     end
 
     def test_bundle_files_allow_same_path_for_different_types
-      AssetFileRegistry.bundle_file bundle_config.merge('type' => :css)
-      AssetFileRegistry.bundle_file bundle_config.merge('type' => :js)
+      AssetFileRegistry.bundle_file(bundle_config.merge('type' => :css))
+      AssetFileRegistry.bundle_file(bundle_config.merge('type' => :js))
       assert_equal 2, asset_file_registry_size
     end
 
@@ -41,7 +41,7 @@ module Jekyll::Minibundle::Test
     end
 
     def asset_file_registry_size
-      AssetFileRegistry.class_variable_get(:@@_instances).size
+      AssetFileRegistry.instance_variable_get(:@_instances).size
     end
   end
 end

data/test/unit/asset_tag_markup_test.rb

@@ -5,7 +5,7 @@ module Jekyll::Minibundle::Test
   class AssetTagMarkupTest < TestCase
     def test_escapes_attribute_values
       attributes = { media: 'screen, projection', extra: '">attack<br' }
-      actual = AssetTagMarkup.make_markup :css, 'http://localhost', attributes
+      actual = AssetTagMarkup.make_markup(:css, 'http://localhost', attributes)
       expected = %{<link rel="stylesheet" href="http://localhost" media="screen, projection" extra="&quot;&gt;attack&lt;br">}
       assert_equal expected, actual
     end

data/test/unit/bundle_file_test.rb

@@ -8,36 +8,33 @@ module Jekyll::Minibundle::Test
 
     def test_calling_markup_determines_fingerprint_and_destination_write
       with_site do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
-          bundle_file = BundleFile.new bundle_config
-          source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
-          old_destination = destination_path EXPECTED_JS_BUNDLE_PATH
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count) do
+          bundle_file = BundleFile.new(bundle_config)
+          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.markup }
 
-          capture_io do
-            org_markup = bundle_file.markup
-            bundle_file.write '_site'
-          end
+          assert bundle_file.write('_site')
 
-          org_mtime = mtime_of old_destination
+          org_mtime = mtime_of(old_destination)
 
           assert_equal 1, get_cmd_count
 
           last_markup = bundle_file.markup
-          ensure_file_mtime_changes { File.write source, '(function() {})()' }
-          bundle_file.write '_site'
+          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_mtime, mtime_of(old_destination)
           assert_equal 1, get_cmd_count
 
-          capture_io do
-            last_markup = bundle_file.markup
-            bundle_file.write '_site'
-          end
+          capture_io { last_markup = bundle_file.markup }
 
-          new_destination = destination_path 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+          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
@@ -49,30 +46,25 @@ module Jekyll::Minibundle::Test
 
     def test_many_consecutive_markup_calls_trigger_one_destination_write
       with_site do
-        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
-          bundle_file = BundleFile.new bundle_config
-          source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
-          destination = destination_path EXPECTED_JS_BUNDLE_PATH
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count) do
+          bundle_file = BundleFile.new(bundle_config)
+          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.markup }
+          bundle_file.markup
 
-          capture_io do
-            org_markup = bundle_file.markup
-            bundle_file.markup
-            bundle_file.write '_site'
-          end
+          assert bundle_file.write('_site')
 
-          org_mtime = mtime_of destination
+          org_mtime = mtime_of(destination)
 
           assert_equal 1, get_cmd_count
 
-          ensure_file_mtime_changes { FileUtils.touch source }
-
-          capture_io do
-            last_markup = bundle_file.markup
-            bundle_file.markup
-            bundle_file.write '_site'
-          end
+          ensure_file_mtime_changes { FileUtils.touch(source) }
+          capture_io { last_markup = bundle_file.markup }
+          bundle_file.markup
 
+          assert bundle_file.write('_site')
           assert_equal org_markup, last_markup
           assert_operator mtime_of(destination), :>, org_mtime
           assert_equal 2, get_cmd_count
@@ -80,6 +72,24 @@ module Jekyll::Minibundle::Test
       end
     end
 
+    def test_calling_write_before_markup_has_no_effect
+      with_site do
+        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count) do
+          bundle_file = BundleFile.new(bundle_config)
+
+          refute bundle_file.write('_site')
+          assert_empty Dir[destination_path('assets/*.js')]
+          assert_equal 0, get_cmd_count
+
+          capture_io { bundle_file.markup }
+
+          assert bundle_file.write('_site')
+          assert File.exists?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+          assert_equal 1, get_cmd_count
+        end
+      end
+    end
+
     private
 
     def bundle_config