jekyll-minibundle 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e069cbc2278b08d8cf93fc9598882f24a56b7f
-  data.tar.gz: 3fa82515fa89f2d632c5428f29adb233663e5f8f
+  metadata.gz: cb4db2142f8fea9e137638a9f81fcf1673b0076c
+  data.tar.gz: 391293041abe19a1f143b28c6592fe2932bbac2e
 SHA512:
-  metadata.gz: 158f82d5e10ea274b76d353b159fbed84b81d12c82cbd6339d3829056edda0adb473f7700336c24e18c765b0f632797e0227ce0e5ae488f01383989a4022f90c
-  data.tar.gz: 8380c680bda3674dfd760c32aa6b5cbb69f7d9a88ca9b1825d97f20c7d03f1be9bb2bf2334e418fcf1ab01be5fd2188881c3b145d917f73d40a5017cc3f6276a
+  metadata.gz: a23acbd135fc4100e284bb059a98c18dc981deb0dd83e0a7ee9aaba52bab6b8188f2fb2121ace3970086292db53053518e3633ff4b73d0f63406f7017dd07395
+  data.tar.gz: 56506b2a3bafebeef270f7630a69ff8c7ba08ed87ee33f13d595487b05e5804843a429d7f1382600c718006b4e03683d8824671395aeb04f108c3ede05868c2e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.4.2 / 2013-12-28
+
+* Ensure touching asset source triggers destination write. This was an
+  unintentional edge case earlier. Now the behavior of touching the
+  asset source is consistent with when changing the contents of the
+  source.
+* Separate tags produced by `minibundle` in development mode with
+  newlines
+* Clarify tests, increase coverage
+
 # 1.4.1 / 2013-12-27
 
 * Add missing files to gem package

data/Rakefile

@@ -30,8 +30,8 @@ namespace :gem do
   end
 
   desc 'Install the software as a gem'
-  task :install => :build do
-    sh %{gem install #{gem_name}-#{Jekyll::Minibundle::VERSION}}
+  task :install do
+    sh %{gem install #{gem_name}-#{Jekyll::Minibundle::VERSION}.gem}
   end
 
   desc 'Uninstall the gem'

data/jekyll-minibundle.gemspec

@@ -21,52 +21,11 @@ minification tool (not even other gems).
     CHANGELOG.md
     LICENSE.txt
     README.md
-    RELEASING.txt
     Rakefile
     jekyll-minibundle.gemspec
-    lib/jekyll/minibundle.rb
-    lib/jekyll/minibundle/asset_bundle.rb
-    lib/jekyll/minibundle/asset_file_operations.rb
-    lib/jekyll/minibundle/asset_file_paths.rb
-    lib/jekyll/minibundle/asset_file_registry.rb
-    lib/jekyll/minibundle/asset_stamp.rb
-    lib/jekyll/minibundle/asset_tag_markup.rb
-    lib/jekyll/minibundle/bundle_file.rb
-    lib/jekyll/minibundle/development_file.rb
-    lib/jekyll/minibundle/development_file_collection.rb
-    lib/jekyll/minibundle/environment.rb
-    lib/jekyll/minibundle/mini_bundle_block.rb
-    lib/jekyll/minibundle/mini_stamp_tag.rb
-    lib/jekyll/minibundle/stamp_file.rb
-    lib/jekyll/minibundle/version.rb
-  }
+  } + `git ls-files -- lib`.split("\n")
 
-  s.test_files = %w{
-    test/fixture/site/_assets/scripts/app.js
-    test/fixture/site/_assets/scripts/dependency.js
-    test/fixture/site/_assets/styles/common.css
-    test/fixture/site/_assets/styles/reset.css
-    test/fixture/site/_bin/remove_comments
-    test/fixture/site/_bin/with_count
-    test/fixture/site/_config.yml
-    test/fixture/site/_layouts/default.html
-    test/fixture/site/_plugins/minibundle.rb
-    test/fixture/site/_tmp/site.css
-    test/fixture/site/about.html
-    test/fixture/site/assets/styles/reset.css
-    test/fixture/site/index.html
-    test/integration/minibundle_development_mode_test.rb
-    test/integration/minibundle_production_mode_test.rb
-    test/integration/ministamp_test.rb
-    test/integration/static_files_as_asset_sources_test.rb
-    test/support/fixture_config.rb
-    test/support/test_case.rb
-    test/unit/asset_bundle_test.rb
-    test/unit/asset_file_registry_test.rb
-    test/unit/asset_tag_markup_test.rb
-    test/unit/bundle_file_test.rb
-    test/unit/stamp_file_test.rb
-  }
+  s.test_files = `git ls-files -- test`.split("\n")
 
   s.add_development_dependency 'jekyll',   '~> 1.4.2'
   s.add_development_dependency 'minitest', '~> 5.2.0'

data/lib/jekyll/minibundle/bundle_file.rb

@@ -26,8 +26,6 @@ module Jekyll::Minibundle
         @is_modified = true
         @_asset_stamp = nil
         asset_bundle.make_bundle
-      else
-        @is_modified = false
       end
 
       AssetTagMarkup.make_markup @type, asset_destination_path, @attributes
@@ -58,6 +56,7 @@ module Jekyll::Minibundle
         false
       else
         write_destination site_destination_dir
+        @is_modified = false
         true
       end
     end

data/lib/jekyll/minibundle/development_file_collection.rb

@@ -28,7 +28,7 @@ module Jekyll::Minibundle
     def markup
       @files.
         map { |f| AssetTagMarkup.make_markup @type, f.asset_destination_path, @attributes }.
-        join('')
+        join("\n")
     end
   end
 end

data/lib/jekyll/minibundle/stamp_file.rb

@@ -27,8 +27,6 @@ module Jekyll::Minibundle
         @stamped_at = mtime
         @is_modified = true
         @_asset_stamp = nil
-      else
-        @is_modified = false
       end
 
       asset_destination_path
@@ -39,6 +37,7 @@ module Jekyll::Minibundle
         false
       else
         write_destination site_destination_dir
+        @is_modified = false
         true
       end
     end

data/lib/jekyll/minibundle/version.rb

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

data/test/integration/minibundle_development_mode_test.rb

@@ -20,7 +20,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_css_assets_are_copied_to_destination_dir
+    def test_copies_css_assets_to_destination_dir
       with_precompiled_site :development do
         EXPECTED_CSS_ASSET_PATHS.each do |path|
           expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(CSS_BUNDLE_SOURCE_DIR, File.basename(path)))
@@ -28,7 +28,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_js_assets_are_copied_to_destination_dir
+    def test_copies_js_assets_to_destination_dir
       with_precompiled_site :development do
         EXPECTED_JS_ASSET_PATHS.each do |path|
           expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(JS_BUNDLE_SOURCE_DIR, File.basename(path)))
@@ -36,33 +36,41 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_changing_css_asset_copies_it_to_destination_dir
-      with_site do
-        generate_site :development
-        destination = destination_path CSS_BUNDLE_DESTINATION_PATH, 'common.css'
-        source = source_path CSS_BUNDLE_SOURCE_DIR, 'common.css'
-        ensure_file_mtime_changes { File.write source, 'h1 {}' }
-
-        refute_equal File.read(destination), File.read(source)
-
-        generate_site :development, clear_cache: false
-
-        assert_equal File.read(destination), File.read(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'
+          ensure_file_mtime_changes { spec[:action].call(source) }
+          generate_site :development, clear_cache: false
+
+          assert_equal File.read(destination), File.read(source)
+          assert_operator mtime_of(destination), :>, org_mtime
+        end
       end
     end
 
-    def test_changing_js_asset_copies_it_to_destination_dir
-      with_site do
-        generate_site :development
-        destination = destination_path JS_BUNDLE_DESTINATION_PATH, 'app.js'
-        source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
-        ensure_file_mtime_changes { File.write source, '(function() {})()' }
-
-        refute_equal File.read(destination), File.read(source)
-
-        generate_site :development, clear_cache: false
-
-        assert_equal File.read(destination), File.read(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'
+          ensure_file_mtime_changes { spec[:action].call(source) }
+          generate_site :development, clear_cache: false
+
+          assert_equal File.read(destination), File.read(source)
+          assert_operator mtime_of(destination), :>, org_mtime
+        end
       end
     end
 
@@ -87,7 +95,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_do_not_require_bundling_cmds
+    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
@@ -96,7 +104,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_do_not_copy_source_when_other_files_change
+    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'

data/test/integration/minibundle_production_mode_test.rb

@@ -32,40 +32,40 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_css_asset_bundle_is_copied_to_destination_dir
+    def test_copies_css_asset_bundle_to_destination_dir
       with_precompiled_site :production do
         assert File.exists?(destination_path(EXPECTED_CSS_BUNDLE_PATH))
       end
     end
 
-    def test_js_asset_bundle_is_copied_to_destination_dir
+    def test_copies_js_asset_bundle_to_destination_dir
       with_precompiled_site :production do
         assert File.exists?(destination_path(EXPECTED_JS_BUNDLE_PATH))
       end
     end
 
-    def test_css_asset_bundle_is_concatenated_in_configured_order
+    def test_concatenates_css_asset_bundle_in_configured_order
       with_precompiled_site :production do
         bundle = File.read(destination_path(EXPECTED_CSS_BUNDLE_PATH))
         assert_operator bundle.index('html { margin: 0; }'), :<, bundle.index('p { margin: 0; }')
       end
     end
 
-    def test_js_asset_bundle_is_concatenated_in_configured_order
+    def test_concatenates_js_asset_bundle_in_configured_order
       with_precompiled_site :production do
         bundle = File.read(destination_path(EXPECTED_JS_BUNDLE_PATH))
         assert_operator bundle.index('root.dependency = {};'), :<, bundle.index('root.app = {};')
       end
     end
 
-    def test_js_asset_bundle_has_inserted_semicolons_between_assets
+    def test_inserts_semicolons_between_js_assets
       with_precompiled_site :production do
         bundle = File.read(destination_path(EXPECTED_JS_BUNDLE_PATH))
         assert_match(%r|}\)\(window\)\n;\n\(function|, bundle)
       end
     end
 
-    def test_css_asset_bundle_is_minified
+    def test_minifies_css_asset_bundle
       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
@@ -73,7 +73,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_js_asset_bundle_is_minified
+    def test_minifies_js_asset_bundle
       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
@@ -81,39 +81,65 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_changing_css_assets_changes_bundle
+    def test_changing_css_asset_source_rewrites_destination
       with_site do
         generate_site :production
-
-        assert File.exists?(destination_path(EXPECTED_CSS_BUNDLE_PATH))
-
+        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
 
         refute File.exists?(destination_path(EXPECTED_CSS_BUNDLE_PATH))
 
-        expected_new_path = 'assets/site-9fd3995d6f0fce425db81c3691dfe93f.css'
+        new_destination = 'assets/site-9fd3995d6f0fce425db81c3691dfe93f.css'
 
-        assert_equal expected_new_path, find_css_path_from_index
-        assert File.exists?(destination_path(expected_new_path))
+        assert_equal new_destination, find_css_path_from_index
+        assert File.exists?(destination_path(new_destination))
+        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
       end
     end
 
-    def test_changing_js_assets_changes_bundle
+    def test_changing_js_asset_source_rewrites_destination
       with_site do
         generate_site :production
-
-        assert File.exists?(destination_path(EXPECTED_JS_BUNDLE_PATH))
-
+        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
 
         refute File.exists?(destination_path(EXPECTED_JS_BUNDLE_PATH))
 
-        expected_new_path = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+        new_destination = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+
+        assert_equal new_destination, find_js_path_from_index
+        assert File.exists?(destination_path(new_destination))
+        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
+      end
+    end
+
+    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
+
+        assert_equal destination, find_css_path_from_index
+        assert File.exists?(destination_path(destination))
+        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
+      end
+    end
+
+    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
 
-        assert_equal expected_new_path, find_js_path_from_index
-        assert File.exists?(destination_path(expected_new_path))
+        assert_equal destination, find_js_path_from_index
+        assert File.exists?(destination_path(destination))
+        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
       end
     end
 
@@ -138,7 +164,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_bundles_assets_only_once_upon_startup
+    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
@@ -147,7 +173,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_do_not_bundle_assets_when_nonsource_files_change
+    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

data/test/integration/ministamp_test.rb

@@ -8,22 +8,18 @@ module Jekyll::Minibundle::Test
     def test_asset_destination_path_has_no_stamp_in_development_mode
       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
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
-      end
-    end
-
-    def test_asset_file_is_copied_to_destination_dir
-      with_precompiled_site :production do
         assert File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
-    def test_asset_file_is_equal_to_source_file
+    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)
@@ -31,21 +27,34 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_change_asset_file
+    def test_changing_asset_source_rewrites_destination
       with_site do
         generate_site :production
-
-        assert File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
-
+        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))
 
-        expected_new_path = 'assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css'
+        new_destination = 'assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css'
+
+        assert_equal new_destination, find_css_path_from_index
+        assert File.exists?(destination_path(new_destination))
+        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
+      end
+    end
+
+    def test_touching_asset_source_rewrites_destination
+      with_site do
+        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
 
-        assert_equal expected_new_path, find_css_path_from_index
-        assert File.exists?(destination_path(expected_new_path))
+        assert_equal destination, find_css_path_from_index
+        assert File.exists?(destination_path(destination))
+        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
       end
     end
 
@@ -65,7 +74,7 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_do_not_copy_source_when_other_files_change
+    def test_does_not_rewrite_destination_when_nonsource_files_change
       with_site do
         generate_site :production
         expected_path = destination_path STAMP_DESTINATION_FINGERPRINT_PATH

data/test/integration/static_files_as_asset_sources_test.rb

@@ -1,7 +1,22 @@
 require 'support/test_case'
+require 'support/fixture_config'
 
 module Jekyll::Minibundle::Test
   class StaticFilesAsAssetSourcesTest < TestCase
+    include FixtureConfig
+
+    def test_asset_and_static_files_with_same_destination_paths_can_coexist
+      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)
+        ].sort
+        assert_equal expected, actual
+      end
+    end
+
     [:development, :production].each do |env|
       define_method :"test_ministamp_allows_using_static_file_as_asset_source_in_#{env}_mode" do
         with_site do
@@ -43,7 +58,7 @@ module Jekyll::Minibundle::Test
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'source_dir: _assets/scripts', 'source_dir: assets')
         generate_site :production
 
-        asset_files = Dir[destination_path('assets') + '/site-*.js']
+        asset_files = Dir[destination_path('assets/site-*.js')]
 
         assert_equal 1, asset_files.size
         assert_equal dep_contents, File.read(destination_path('assets/dependency.js'))

data/test/unit/asset_file_registry_test.rb

@@ -1,25 +1,22 @@
 require 'support/test_case'
-require 'support/fixture_config'
 require 'jekyll/minibundle/asset_file_registry'
 
 module Jekyll::Minibundle::Test
   class AssetFileRegistryTest < TestCase
-    include FixtureConfig
-
     def setup
       AssetFileRegistry.clear
     end
 
-    def test_returns_same_instance_for_same_stamp_file_config
-      first = AssetFileRegistry.stamp_file STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH
-      second = AssetFileRegistry.stamp_file STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH
+    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'
       assert_same first, second
       assert_equal 1, asset_file_registry_size
     end
 
-    def test_returns_same_instance_for_same_bundle_file_config
-      first = AssetFileRegistry.bundle_file bundle_config
-      second = AssetFileRegistry.bundle_file bundle_config
+    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}})
       assert_same first, second
       assert_equal 1, asset_file_registry_size
     end
@@ -36,9 +33,9 @@ module Jekyll::Minibundle::Test
       {
         'type'             => :css,
         'site_dir'         => '.',
-        'source_dir'       => JS_BUNDLE_SOURCE_DIR,
+        'source_dir'       => '_assets/styles',
         'assets'           => %w{dependency app},
-        'destination_path' => JS_BUNDLE_DESTINATION_PATH,
+        'destination_path' => 'assets/site',
         'attributes'       => {}
       }
     end

data/test/unit/asset_tag_markup_test.rb

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

data/test/unit/bundle_file_test.rb

@@ -6,17 +6,10 @@ module Jekyll::Minibundle::Test
   class BundleFileTest < TestCase
     include FixtureConfig
 
-    def test_consistent_fingerprint_in_file_and_markup
+    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({
-            'type'             => :js,
-            'site_dir'         => '.',
-            'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-            'assets'           => %w{dependency app},
-            'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-            'attributes'       => {}
-          })
+          bundle_file = BundleFile.new bundle_config
           source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
           old_destination = destination_path EXPECTED_JS_BUNDLE_PATH
           org_markup, last_markup = nil
@@ -53,5 +46,51 @@ module Jekyll::Minibundle::Test
         end
       end
     end
+
+    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
+          org_markup, last_markup = nil
+
+          capture_io do
+            org_markup = bundle_file.markup
+            bundle_file.markup
+            bundle_file.write '_site'
+          end
+
+          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
+
+          assert_equal org_markup, last_markup
+          assert_operator mtime_of(destination), :>, org_mtime
+          assert_equal 2, get_cmd_count
+        end
+      end
+    end
+
+    private
+
+    def bundle_config
+      {
+       'type'             => :js,
+       'site_dir'         => '.',
+       'source_dir'       => JS_BUNDLE_SOURCE_DIR,
+       'assets'           => %w{dependency app},
+       'destination_path' => JS_BUNDLE_DESTINATION_PATH,
+       'attributes'       => {}
+      }
+    end
   end
 end

data/test/unit/stamp_file_test.rb

@@ -6,10 +6,9 @@ module Jekyll::Minibundle::Test
   class StampFileTest < TestCase
     include FixtureConfig
 
-    def test_consistent_fingerprint_in_file_and_markup
+    def test_calling_markup_determines_fingerprint_and_destination_write
       with_site do
-        basenamer = ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
-        stamp_file = StampFile.new(STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &basenamer)
+        stamp_file = StampFile.new(STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &stamp_basenamer)
 
         source = source_path STAMP_SOURCE_PATH
         old_destination = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
@@ -38,5 +37,35 @@ module Jekyll::Minibundle::Test
         assert_equal File.read(source), File.read(new_destination)
       end
     end
+
+    def test_many_consecutive_markup_calls_trigger_one_destination_write
+      with_site do
+        stamp_file = StampFile.new(STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &stamp_basenamer)
+
+        source = source_path STAMP_SOURCE_PATH
+        destination = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
+
+        org_markup = stamp_file.markup
+        stamp_file.markup
+        stamp_file.write '_site'
+        org_mtime = mtime_of destination
+
+        ensure_file_mtime_changes { FileUtils.touch source }
+
+        last_markup = stamp_file.markup
+        stamp_file.markup
+        stamp_file.write '_site'
+
+        assert_equal org_markup, last_markup
+        assert_operator mtime_of(destination), :>, org_mtime
+        assert_equal File.read(source), File.read(destination)
+      end
+    end
+
+    private
+
+    def stamp_basenamer
+      ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -80,7 +80,6 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- RELEASING.txt
 - Rakefile
 - jekyll-minibundle.gemspec
 - lib/jekyll/minibundle.rb
@@ -109,7 +108,7 @@ files:
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/about.html
-- test/fixture/site/assets/styles/reset.css
+- test/fixture/site/assets/site.css
 - test/fixture/site/index.html
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb
@@ -163,7 +162,7 @@ test_files:
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/about.html
-- test/fixture/site/assets/styles/reset.css
+- test/fixture/site/assets/site.css
 - test/fixture/site/index.html
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb

data/RELEASING.txt

@@ -1,11 +0,0 @@
-In order to release, do
-
-$EDITOR lib/jekyll/minibundle/version.rb  # update version number
-$EDITOR CHANGELOG.md                      # describe a summary of changes since last release
-git diff                                  # review the changes
-bundle exec rake gem:build                # check that tests pass
-git add -p
-git commit -m 'Release <version>'
-git tag <version>
-git push --tags origin master
-gem push jekyll-minibundle-<version>.gem