jekyll-minibundle 2.1.0 → 2.1.1

data/test/support/static_file_api_config.rb

@@ -3,6 +3,7 @@ module Jekyll::Minibundle::Test
     STATIC_FILE_API_PROPERTIES = [
       :defaults,
       :destination_rel_dir,
+      :name,
       :extname,
       :modified_time,
       :mtime,

data/test/support/test_case.rb

@@ -40,10 +40,14 @@ module Jekyll::Minibundle::Test
       IO.write(file, YAML.load_file(file).merge(hash).to_yaml)
     end
 
-    def mtime_of(path)
+    def file_mtime_of(path)
       File.stat(path).mtime
     end
 
+    def file_permissions_of(path)
+      File.stat(path).mode & 0o777
+    end
+
     def with_env(env)
       org_env = {}
       env.each do |k, v|
@@ -55,12 +59,24 @@ module Jekyll::Minibundle::Test
       org_env.each { |k, v| ENV[k] = v }
     end
 
-    def with_site_dir(&block)
+    def with_umask(cmask)
+      org_cmask = File.umask
+      File.umask(cmask)
+      yield
+    ensure
+      File.umask(org_cmask)
+    end
+
+    def with_tmp_dir(&block)
       Dir.mktmpdir('jekyll-minibundle-test-site-') do |dir|
-        Dir.chdir(dir) do
-          _copy_fixture_site_dir(Dir.pwd)
-          block.call(dir)
-        end
+        Dir.chdir(dir, &block)
+      end
+    end
+
+    def with_site_dir(&block)
+      with_tmp_dir do |dir|
+        _copy_fixture_site_dir(dir)
+        block.call(dir)
       end
     end
 

data/test/unit/bundle_file_properties_test.rb

@@ -9,54 +9,61 @@ module Jekyll::Minibundle::Test
     include StaticFileAPIConfig
 
     def setup
-      @results ||= with_fake_site do |site|
+      @@results ||= with_fake_site do |site|
         file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments))
+        capture_io { file.destination_path_for_markup }
         get_send_results(file, STATIC_FILE_API_PROPERTIES)
       end
     end
 
     def test_defaults
-      assert_equal({}, @results.fetch(:defaults))
+      assert_equal({}, @@results.fetch(:defaults))
     end
 
     def test_destination_rel_dir
-      assert_equal 'assets', @results.fetch(:destination_rel_dir)
+      assert_equal 'assets', @@results.fetch(:destination_rel_dir)
+    end
+
+    def test_name
+      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", @@results.fetch(:name)
     end
 
     def test_extname
-      assert_equal '.js', @results.fetch(:extname)
+      assert_equal '.js', @@results.fetch(:extname)
     end
 
     def test_modified_time
-      assert_instance_of Time, @results.fetch(:modified_time)
+      assert_instance_of Time, @@results.fetch(:modified_time)
     end
 
     def test_mtime
-      mtime = @results.fetch(:modified_time)
-      assert_equal mtime.to_i, @results.fetch(:mtime)
+      mtime = @@results.fetch(:modified_time)
+      assert_equal mtime.to_i, @@results.fetch(:mtime)
     end
 
     def test_placeholders
-      assert_equal({}, @results.fetch(:placeholders))
+      assert_equal({}, @@results.fetch(:placeholders))
     end
 
     def test_relative_path
-      assert_match(%r{/jekyll-minibundle-.+\.js\z}, @results.fetch(:relative_path))
+      assert_match(%r{/jekyll-minibundle-.+\.js\z}, @@results.fetch(:relative_path))
     end
 
     def test_to_liquid
-      hash = @results.fetch(:to_liquid)
-      assert_match(%r{/jekyll-minibundle-.+\.js\z}, hash['path'])
-      assert_instance_of Time, hash['modified_time']
-      assert_equal '.js', hash['extname']
+      hash = @@results.fetch(:to_liquid)
+      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}", hash.fetch('basename')
+      assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", hash.fetch('name')
+      assert_equal '.js', hash.fetch('extname')
+      assert_instance_of Time, hash.fetch('modified_time')
+      assert_match(%r{/jekyll-minibundle-.+\.js\z}, hash.fetch('path'))
     end
 
     def test_type
-      assert_nil @results.fetch(:type)
+      assert_nil @@results.fetch(:type)
     end
 
     def test_write?
-      assert @results.fetch(:write?)
+      assert @@results.fetch(:write?)
     end
 
     private

data/test/unit/bundle_file_writing_test.rb

@@ -6,7 +6,7 @@ module Jekyll::Minibundle::Test
   class BundleFileWritingTest < TestCase
     include FixtureConfig
 
-    def test_calling_markup_determines_fingerprint_and_destination_write
+    def test_calling_destination_path_for_markup_determines_fingerprint_and_destination_write
       with_fake_site do |site|
         bundle_file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments_and_count))
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
@@ -16,7 +16,7 @@ module Jekyll::Minibundle::Test
 
         assert bundle_file.write('_site')
 
-        org_mtime = mtime_of(old_destination)
+        org_mtime = file_mtime_of(old_destination)
 
         assert_equal 1, get_minifier_cmd_count
 
@@ -26,7 +26,7 @@ module Jekyll::Minibundle::Test
         # preserve fingerprint and content seen in last markup phase
         refute bundle_file.write('_site')
         assert_equal org_markup_path, last_markup_path
-        assert_equal org_mtime, mtime_of(old_destination)
+        assert_equal org_mtime, file_mtime_of(old_destination)
         assert_equal 1, get_minifier_cmd_count
 
         capture_io { last_markup_path = bundle_file.destination_path_for_markup }
@@ -37,12 +37,12 @@ module Jekyll::Minibundle::Test
 
         # see updated fingerprint in the next round
         refute_equal org_markup_path, last_markup_path
-        assert_operator mtime_of(new_destination), :>, org_mtime
+        assert_operator file_mtime_of(new_destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
       end
     end
 
-    def test_many_consecutive_markup_calls_trigger_one_destination_write
+    def test_many_consecutive_destination_path_for_markup_calls_trigger_one_destination_write
       with_fake_site do |site|
         bundle_file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments_and_count))
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
@@ -53,7 +53,7 @@ module Jekyll::Minibundle::Test
 
         assert bundle_file.write('_site')
 
-        org_mtime = mtime_of(destination)
+        org_mtime = file_mtime_of(destination)
 
         assert_equal 1, get_minifier_cmd_count
 
@@ -63,7 +63,7 @@ module Jekyll::Minibundle::Test
 
         assert bundle_file.write('_site')
         assert_equal org_markup_path, last_markup_path
-        assert_operator mtime_of(destination), :>, org_mtime
+        assert_operator file_mtime_of(destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
       end
     end

data/test/unit/development_file_collection_properties_test.rb

@@ -9,7 +9,7 @@ module Jekyll::Minibundle::Test
     include StaticFileAPIConfig
 
     def setup
-      @results ||= with_fake_site do |site|
+      @@results ||= with_fake_site do |site|
         files = DevelopmentFileCollection.new(site, bundle_config).instance_variable_get('@files')
         {
           dependency: get_send_results(files[0], STATIC_FILE_API_PROPERTIES),
@@ -19,63 +19,72 @@ module Jekyll::Minibundle::Test
     end
 
     def test_defaults
-      assert_equal({}, @results.fetch(:dependency).fetch(:defaults))
-      assert_equal({}, @results.fetch(:app).fetch(:defaults))
+      assert_equal({}, @@results.fetch(:dependency).fetch(:defaults))
+      assert_equal({}, @@results.fetch(:app).fetch(:defaults))
     end
 
     def test_destination_rel_dir
-      assert_equal 'assets/site', @results.fetch(:dependency).fetch(:destination_rel_dir)
-      assert_equal 'assets/site', @results.fetch(:app).fetch(:destination_rel_dir)
+      assert_equal 'assets/site', @@results.fetch(:dependency).fetch(:destination_rel_dir)
+      assert_equal 'assets/site', @@results.fetch(:app).fetch(:destination_rel_dir)
+    end
+
+    def test_name
+      assert_equal 'dependency.js', @@results.fetch(:dependency).fetch(:name)
+      assert_equal 'app.js', @@results.fetch(:app).fetch(:name)
     end
 
     def test_extname
-      assert_equal '.js', @results.fetch(:dependency).fetch(:extname)
-      assert_equal '.js', @results.fetch(:app).fetch(:extname)
+      assert_equal '.js', @@results.fetch(:dependency).fetch(:extname)
+      assert_equal '.js', @@results.fetch(:app).fetch(:extname)
     end
 
     def test_modified_time
-      assert_instance_of Time, @results.fetch(:dependency).fetch(:modified_time)
-      assert_instance_of Time, @results.fetch(:app).fetch(:modified_time)
+      assert_instance_of Time, @@results.fetch(:dependency).fetch(:modified_time)
+      assert_instance_of Time, @@results.fetch(:app).fetch(:modified_time)
     end
 
     def test_mtime
-      dep_mtime = @results.fetch(:dependency).fetch(:modified_time)
-      assert_equal dep_mtime.to_i, @results.fetch(:dependency).fetch(:mtime)
+      dep_mtime = @@results.fetch(:dependency).fetch(:modified_time)
+      assert_equal dep_mtime.to_i, @@results.fetch(:dependency).fetch(:mtime)
 
-      app_mtime = @results.fetch(:app).fetch(:modified_time)
-      assert_equal app_mtime.to_i, @results.fetch(:app).fetch(:mtime)
+      app_mtime = @@results.fetch(:app).fetch(:modified_time)
+      assert_equal app_mtime.to_i, @@results.fetch(:app).fetch(:mtime)
     end
 
     def test_placeholders
-      assert_equal({}, @results.fetch(:dependency).fetch(:placeholders))
-      assert_equal({}, @results.fetch(:app).fetch(:placeholders))
+      assert_equal({}, @@results.fetch(:dependency).fetch(:placeholders))
+      assert_equal({}, @@results.fetch(:app).fetch(:placeholders))
     end
 
     def test_relative_path
-      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", @results.fetch(:dependency).fetch(:relative_path)
-      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", @results.fetch(:app).fetch(:relative_path)
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", @@results.fetch(:dependency).fetch(:relative_path)
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", @@results.fetch(:app).fetch(:relative_path)
     end
 
     def test_to_liquid
-      hash = @results.fetch(:dependency).fetch(:to_liquid)
-      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", hash['path']
-      assert_instance_of Time, hash['modified_time']
-      assert_equal '.js', hash['extname']
-
-      hash = @results.fetch(:app).fetch(:to_liquid)
-      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", hash['path']
-      assert_instance_of Time, hash['modified_time']
-      assert_equal '.js', hash['extname']
+      hash = @@results.fetch(:dependency).fetch(:to_liquid)
+      assert_equal 'dependency', hash.fetch('basename')
+      assert_equal 'dependency.js', hash.fetch('name')
+      assert_equal '.js', hash.fetch('extname')
+      assert_instance_of Time, hash.fetch('modified_time')
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/dependency.js", hash.fetch('path')
+
+      hash = @@results.fetch(:app).fetch(:to_liquid)
+      assert_equal 'app', hash.fetch('basename')
+      assert_equal 'app.js', hash.fetch('name')
+      assert_equal '.js', hash.fetch('extname')
+      assert_instance_of Time, hash.fetch('modified_time')
+      assert_equal "/#{JS_BUNDLE_SOURCE_DIR}/app.js", hash.fetch('path')
     end
 
     def test_type
-      assert_nil @results.fetch(:dependency).fetch(:type)
-      assert_nil @results.fetch(:app).fetch(:type)
+      assert_nil @@results.fetch(:dependency).fetch(:type)
+      assert_nil @@results.fetch(:app).fetch(:type)
     end
 
     def test_write?
-      assert @results.fetch(:dependency).fetch(:write?)
-      assert @results.fetch(:app).fetch(:write?)
+      assert @@results.fetch(:dependency).fetch(:write?)
+      assert @@results.fetch(:app).fetch(:write?)
     end
 
     private

data/test/unit/jekyll_static_file_api_test.rb

@@ -17,10 +17,81 @@ module Jekyll::Minibundle::Test
       assert_empty missing_api_methods(StampFile)
     end
 
+    def test_development_file_has_same_to_liquid_hash_keys_as_static_file
+      with_empty_site do |site|
+        FileUtils.touch('static.txt')
+        FileUtils.touch('dev.js')
+
+        expected_keys = make_static_file(site, 'static.txt').to_liquid.keys.sort
+        actual_keys = make_development_file(site, 'dev.js').to_liquid.keys.sort
+
+        assert_equal expected_keys, actual_keys
+      end
+    end
+
+    def test_bundle_file_has_same_to_liquid_hash_keys_as_static_file
+      with_empty_site do |site|
+        FileUtils.touch('static.txt')
+        FileUtils.touch('dependency.js')
+        FileUtils.touch('app.js')
+
+        expected_keys = make_static_file(site, 'static.txt').to_liquid.keys.sort
+        actual_keys = make_bundle_file(site, %w{dependency app}).to_liquid.keys.sort
+
+        assert_equal expected_keys, actual_keys
+      end
+    end
+
+    def test_stamp_file_has_same_to_liquid_hash_keys_as_static_file
+      with_empty_site do |site|
+        FileUtils.touch('static.txt')
+        FileUtils.touch('stamp.js')
+
+        expected_keys = make_static_file(site, 'static.txt').to_liquid.keys.sort
+        actual_keys = make_stamp_file(site, 'stamp.js').to_liquid.keys.sort
+
+        assert_equal expected_keys, actual_keys
+      end
+    end
+
     private
 
     def missing_api_methods(clazz)
       Jekyll::StaticFile.public_instance_methods - clazz.public_instance_methods
     end
+
+    def with_empty_site(&block)
+      with_tmp_dir do |dir|
+        block.call(new_fake_site(dir))
+      end
+    end
+
+    def make_static_file(site, filename)
+      ::Jekyll::StaticFile.new(
+        site,
+        nil,
+        nil,
+        filename
+      )
+    end
+
+    def make_development_file(site, filename)
+      DevelopmentFile.new(site, filename, filename)
+    end
+
+    def make_bundle_file(site, assets)
+      BundleFile.new(
+        site,
+        'type'             => :js,
+        'source_dir'       => '',
+        'assets'           => assets,
+        'destination_path' => 'bundle.js',
+        'minifier_cmd'     => 'false'
+      )
+    end
+
+    def make_stamp_file(site, filename)
+      StampFile.new(site, filename, filename)
+    end
   end
 end

data/test/unit/stamp_file_properties_test.rb

@@ -9,54 +9,61 @@ module Jekyll::Minibundle::Test
     include StaticFileAPIConfig
 
     def setup
-      @results ||= with_fake_site do |site|
+      @@results ||= with_fake_site do |site|
         file = StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
+        file.destination_path_for_markup
         get_send_results(file, STATIC_FILE_API_PROPERTIES)
       end
     end
 
     def test_defaults
-      assert_equal({}, @results.fetch(:defaults))
+      assert_equal({}, @@results.fetch(:defaults))
     end
 
     def test_destination_rel_dir
-      assert_equal 'assets', @results.fetch(:destination_rel_dir)
+      assert_equal 'assets', @@results.fetch(:destination_rel_dir)
+    end
+
+    def test_name
+      assert_equal "screen-#{STAMP_FINGERPRINT}.css", @@results.fetch(:name)
     end
 
     def test_extname
-      assert_equal '.css', @results.fetch(:extname)
+      assert_equal '.css', @@results.fetch(:extname)
     end
 
     def test_modified_time
-      assert_instance_of Time, @results.fetch(:modified_time)
+      assert_instance_of Time, @@results.fetch(:modified_time)
     end
 
     def test_mtime
-      mtime = @results.fetch(:modified_time)
-      assert_equal mtime.to_i, @results.fetch(:mtime)
+      mtime = @@results.fetch(:modified_time)
+      assert_equal mtime.to_i, @@results.fetch(:mtime)
     end
 
     def test_placeholders
-      assert_equal({}, @results.fetch(:placeholders))
+      assert_equal({}, @@results.fetch(:placeholders))
     end
 
     def test_relative_path
-      assert_equal "/#{STAMP_SOURCE_PATH}", @results.fetch(:relative_path)
+      assert_equal "/#{STAMP_SOURCE_PATH}", @@results.fetch(:relative_path)
     end
 
     def test_to_liquid
-      hash = @results.fetch(:to_liquid)
-      assert_equal "/#{STAMP_SOURCE_PATH}", hash['path']
-      assert_instance_of Time, hash['modified_time']
-      assert_equal '.css', hash['extname']
+      hash = @@results.fetch(:to_liquid)
+      assert_equal "screen-#{STAMP_FINGERPRINT}", hash.fetch('basename')
+      assert_equal "screen-#{STAMP_FINGERPRINT}.css", hash.fetch('name')
+      assert_equal '.css', hash.fetch('extname')
+      assert_instance_of Time, hash.fetch('modified_time')
+      assert_equal "/#{STAMP_SOURCE_PATH}", hash.fetch('path')
     end
 
     def test_type
-      assert_nil @results.fetch(:type)
+      assert_nil @@results.fetch(:type)
     end
 
     def test_write?
-      assert @results.fetch(:write?)
+      assert @@results.fetch(:write?)
     end
   end
 end