jekyll-minibundle 2.1.0 → 2.1.1

data/lib/jekyll/minibundle/stamp_file.rb

@@ -14,15 +14,15 @@ module Jekyll::Minibundle
       @asset_source_path = File.join(@site.source, asset_source_path)
       @asset_destination_dir = File.dirname(asset_destination_path)
       @asset_destination_extension = File.extname(asset_destination_path)
-      @asset_destination_base_prefix = File.basename(asset_destination_path)[0..-(@asset_destination_extension.size + 1)]
+      @asset_destination_filename_prefix = File.basename(asset_destination_path)[0..-(@asset_destination_extension.size + 1)]
       @stamped_at = nil
       @is_modified = false
     end
 
     def destination_path_for_markup
-      # we must regenerate the fingerprint here, if at all, in order
-      # to make sure markup destination and generated file paths have
-      # the same fingerprint
+      # we must rebundle here, if at all, in order to make sure the
+      # destination path in the markup and the generated file path
+      # have the same fingerprint
       if modified?
         @stamped_at = mtime
         @is_modified = true
@@ -32,11 +32,16 @@ module Jekyll::Minibundle
       asset_destination_path
     end
 
+    def asset_destination_filename
+      "#{@asset_destination_filename_prefix}-#{asset_stamp}#{extname}"
+    end
+
     def extname
       @asset_destination_extension
     end
 
-    # writes destination only after `markup` has been called
+    # allows writing destination only after
+    # `destination_path_for_markup` has been called
     def write(site_destination_dir)
       if @is_modified
         write_destination(site_destination_dir)
@@ -49,12 +54,8 @@ module Jekyll::Minibundle
 
     private
 
-    def asset_destination_basename
-      "#{@asset_destination_base_prefix}-#{asset_stamp}#{extname}"
-    end
-
     def asset_stamp
-      @_asset_stamp ||= AssetStamp.from_file(path)
+      @_asset_stamp ||= AssetStamp.from_file(asset_source_path)
     end
   end
 end

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.1.1'.freeze
   end
 end

data/test/integration/minibundle_development_mode_test.rb

@@ -59,14 +59,14 @@ module Jekyll::Minibundle::Test
           generate_site(:development)
 
           destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-          org_mtime = mtime_of(destination)
+          org_mtime = file_mtime_of(destination)
           source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
           ensure_file_mtime_changes { spec.fetch(:action).call(source) }
 
           generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)
-          assert_operator mtime_of(destination), :>, org_mtime
+          assert_operator file_mtime_of(destination), :>, org_mtime
         end
       end
     end
@@ -76,7 +76,7 @@ module Jekyll::Minibundle::Test
         generate_site(:development)
 
         destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-        org_mtime = mtime_of(destination)
+        org_mtime = file_mtime_of(destination)
 
         match_snippet = <<-END
     {% minibundle js %}
@@ -95,7 +95,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_operator mtime_of(destination), :>, org_mtime
+        assert_operator file_mtime_of(destination), :>, org_mtime
       end
     end
 
@@ -103,7 +103,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
 
-        org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
+        org_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
 
         match_snippet = <<-END
     assets:
@@ -124,7 +124,7 @@ module Jekyll::Minibundle::Test
 
         assert_equal [File.join(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')], find_js_paths_from_index
 
-        new_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
+        new_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js'))
         assert_operator new_mtime, :>, org_mtime
       end
     end
@@ -257,18 +257,18 @@ module Jekyll::Minibundle::Test
         generate_site(:development)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-        org_mtime = mtime_of(expected_js_path)
+        org_mtime = file_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)
+        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, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
       end
     end
 
@@ -277,7 +277,7 @@ module Jekyll::Minibundle::Test
         generate_site(:development)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-        org_mtime = mtime_of(expected_js_path)
+        org_mtime = file_mtime_of(expected_js_path)
 
         ensure_file_mtime_changes do
           find_and_gsub_in_file(source_path('_layouts/default.html'), 'id: my-scripts', 'id: my-scripts2')
@@ -285,7 +285,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
       end
     end
 
@@ -294,7 +294,7 @@ module Jekyll::Minibundle::Test
         generate_site(:development)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
-        org_mtime = mtime_of(expected_js_path)
+        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")
@@ -302,7 +302,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
       end
     end
 

data/test/integration/minibundle_production_mode_test.rb

@@ -103,14 +103,14 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
 
-        org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        org_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         ensure_file_mtime_changes { FileUtils.touch(source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')) }
 
         generate_site(:production, clear_cache: false)
 
         assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
         assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        assert_operator mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)), :>, org_mtime
+        assert_operator file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)), :>, org_mtime
       end
     end
 
@@ -118,7 +118,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
 
-        org_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        org_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
         match_snippet = <<-END
     {% minibundle js %}
@@ -137,7 +137,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false)
 
-        new_mtime = mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        new_mtime = file_mtime_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
         assert_operator new_mtime, :>, org_mtime
       end
@@ -177,6 +177,8 @@ module Jekyll::Minibundle::Test
 
     def test_changing_asset_source_list_removes_old_temporary_bundle_file
       with_site_dir do
+        other_tempfiles = find_tempfiles('*.js')
+
         generate_site(:production)
 
         assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
@@ -192,7 +194,7 @@ module Jekyll::Minibundle::Test
       - dependency
         END
 
-        org_tempfiles = find_tempfiles
+        old_tempfiles = find_tempfiles('*.js') - other_tempfiles
 
         ensure_file_mtime_changes do
           find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
@@ -202,7 +204,7 @@ module Jekyll::Minibundle::Test
 
         refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert File.exist?(destination_path('assets/site-71042d0b7c86c04e015fde694dd9f409.js'))
-        assert_equal 1, (org_tempfiles - find_tempfiles).size
+        assert((find_tempfiles('*.js') & old_tempfiles).empty?)
       end
     end
 
@@ -229,11 +231,13 @@ module Jekyll::Minibundle::Test
 
     def test_changing_asset_destination_path_removes_old_temporary_bundle_file
       with_site_dir do
+        other_tempfiles = find_tempfiles('*.js')
+
         generate_site(:production)
 
         assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
 
-        org_tempfiles = find_tempfiles
+        old_tempfiles = find_tempfiles('*.js') - other_tempfiles
 
         ensure_file_mtime_changes do
           change_destination_path_in_minibundle_block('assets/site', 'assets/site2')
@@ -241,11 +245,9 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false)
 
-        sleep 1  # wait for unlinked temp files to actually disappear
-
         refute File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert File.exist?(destination_path("assets/site2-#{JS_BUNDLE_FINGERPRINT}.js"))
-        assert_equal 1, (org_tempfiles - find_tempfiles).size
+        assert((find_tempfiles('*.js') & old_tempfiles).empty?)
       end
     end
 
@@ -286,7 +288,7 @@ module Jekyll::Minibundle::Test
 
         assert_equal 0, get_minifier_cmd_count
         destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_mtime = mtime_of(destination)
+        org_mtime = file_mtime_of(destination)
 
         match_snippet = <<-END
     {% minibundle js %}
@@ -304,7 +306,7 @@ module Jekyll::Minibundle::Test
         generate_site(:production, clear_cache: false)
 
         assert_equal 1, get_minifier_cmd_count
-        assert_operator mtime_of(destination), :>, org_mtime
+        assert_operator file_mtime_of(destination), :>, org_mtime
       end
     end
 
@@ -392,7 +394,7 @@ module Jekyll::Minibundle::Test
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_mtime = mtime_of(expected_js_path)
+        org_mtime = file_mtime_of(expected_js_path)
 
         assert_equal 1, get_minifier_cmd_count
 
@@ -400,14 +402,14 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
 
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
       end
     end
@@ -417,7 +419,7 @@ module Jekyll::Minibundle::Test
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_mtime = mtime_of(expected_js_path)
+        org_mtime = file_mtime_of(expected_js_path)
 
         assert_equal 1, get_minifier_cmd_count
 
@@ -427,7 +429,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
       end
     end
@@ -437,7 +439,7 @@ module Jekyll::Minibundle::Test
         generate_site(:production, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
         expected_js_path = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
-        org_mtime = mtime_of(expected_js_path)
+        org_mtime = file_mtime_of(expected_js_path)
 
         assert_equal 1, get_minifier_cmd_count
 
@@ -447,7 +449,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false, minifier_cmd_js: minifier_cmd_to_remove_comments_and_count)
 
-        assert_equal org_mtime, mtime_of(expected_js_path)
+        assert_equal org_mtime, file_mtime_of(expected_js_path)
         assert_equal 1, get_minifier_cmd_count
       end
     end
@@ -517,6 +519,15 @@ title: Test
       end
     end
 
+    def test_destination_file_respects_umask
+      with_site_dir do
+        with_umask(0o027) do
+          generate_site(:production)
+          assert_equal 0o640, file_permissions_of(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        end
+      end
+    end
+
     private
 
     def find_css_element_from_index
@@ -562,8 +573,8 @@ title: Test
       find_and_gsub_in_file(source_path('_layouts/default.html'), match_snippet, replacement_snippet)
     end
 
-    def find_tempfiles
-      Dir[File.join(Dir.tmpdir, AssetBundle::TEMPFILE_PREFIX + '*')]
+    def find_tempfiles(glob)
+      Dir[File.join(Dir.tmpdir, AssetBundle::TEMPFILE_PREFIX + glob)]
     end
   end
 end

data/test/integration/ministamp_development_mode_test.rb

@@ -24,12 +24,12 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
 
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        org_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
         ensure_file_mtime_changes { File.write(source_path(STAMP_SOURCE_PATH), 'h1 {}') }
 
         generate_site(:development, clear_cache: false)
 
-        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        new_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
         assert_operator new_mtime, :>, org_mtime
       end
     end
@@ -38,12 +38,12 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
 
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        org_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
         ensure_file_mtime_changes { FileUtils.touch(source_path(STAMP_SOURCE_PATH)) }
 
         generate_site(:development, clear_cache: false)
 
-        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        new_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
         assert_operator new_mtime, :>, org_mtime
       end
     end
@@ -52,7 +52,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
 
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        org_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
 
         ensure_file_mtime_changes do
           FileUtils.mv(source_path('_tmp/site.css'), source_path('_tmp/site2.css'))
@@ -66,7 +66,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:development, clear_cache: false)
 
-        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        new_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_PATH))
 
         assert_operator new_mtime, :>, org_mtime
       end
@@ -161,18 +161,18 @@ module Jekyll::Minibundle::Test
         generate_site(:development)
 
         expected_path = destination_path(STAMP_DESTINATION_PATH)
-        org_mtime = mtime_of(expected_path)
+        org_mtime = file_mtime_of(expected_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_path)
+        assert_equal org_mtime, file_mtime_of(expected_path)
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
 
         generate_site(:development, clear_cache: false)
 
-        assert_equal org_mtime, mtime_of(expected_path)
+        assert_equal org_mtime, file_mtime_of(expected_path)
       end
     end
 

data/test/integration/ministamp_production_mode_test.rb

@@ -41,13 +41,13 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
 
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        org_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         ensure_file_mtime_changes { FileUtils.touch(source_path(STAMP_SOURCE_PATH)) }
         generate_site(:production, clear_cache: false)
 
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
 
-        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        new_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         assert_operator new_mtime, :>, org_mtime
       end
     end
@@ -56,7 +56,7 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
 
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        org_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
 
         ensure_file_mtime_changes do
           FileUtils.mv(source_path('_tmp/site.css'), source_path('_tmp/site2.css'))
@@ -70,7 +70,7 @@ module Jekyll::Minibundle::Test
 
         generate_site(:production, clear_cache: false)
 
-        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        new_mtime = file_mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
 
         assert_operator new_mtime, :>, org_mtime
       end
@@ -165,18 +165,18 @@ module Jekyll::Minibundle::Test
         generate_site(:production)
 
         expected_path = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
-        org_mtime = mtime_of(expected_path)
+        org_mtime = file_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)
+        assert_equal org_mtime, file_mtime_of(expected_path)
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
 
         generate_site(:production, clear_cache: false)
 
-        assert_equal org_mtime, mtime_of(expected_path)
+        assert_equal org_mtime, file_mtime_of(expected_path)
       end
     end