jekyll-minibundle 2.1.1 → 2.1.2

data/test/unit/bundle_file_properties_test.rb

@@ -41,6 +41,10 @@ module Jekyll::Minibundle::Test
       assert_equal mtime.to_i, @@results.fetch(:mtime)
     end
 
+    def test_path
+      assert_match(%r{/jekyll-minibundle-.+\.js\z}, @@results.fetch(:path))
+    end
+
     def test_placeholders
       assert_equal({}, @@results.fetch(:placeholders))
     end

data/test/unit/bundle_file_writing_test.rb

@@ -8,35 +8,49 @@ module Jekyll::Minibundle::Test
 
     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))
+        bundle_file = make_bundle_file(site)
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
         old_destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
         org_markup_path, last_markup_path = nil
+
+        # the call to destination_path_for_markup determines the
+        # fingerprint
+
         capture_io { org_markup_path = bundle_file.destination_path_for_markup }
 
-        assert bundle_file.write('_site')
+        assert write_file(bundle_file)
 
         org_mtime = file_mtime_of(old_destination)
 
         assert_equal 1, get_minifier_cmd_count
 
         last_markup_path = bundle_file.destination_path_for_markup
-        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_path, last_markup_path
+        assert_equal 1, get_minifier_cmd_count
+
+        # change content, but don't call destination_path_for_markup yet
+
+        ensure_file_mtime_changes { File.write(source, '(function() {})()') }
+
+        # preserve content's fingerprint
+
+        refute write_file(bundle_file)
+
         assert_equal org_mtime, file_mtime_of(old_destination)
         assert_equal 1, get_minifier_cmd_count
 
+        # see content's fingerprint to update after calling
+        # destination_path_for_markup
+
         capture_io { last_markup_path = bundle_file.destination_path_for_markup }
 
-        assert bundle_file.write('_site')
+        refute_equal org_markup_path, last_markup_path
+
+        assert write_file(bundle_file)
 
         new_destination = destination_path('assets/site-375a0b430b0c5555d0edd2205d26c04d.js')
 
-        # see updated fingerprint in the next round
-        refute_equal org_markup_path, last_markup_path
         assert_operator file_mtime_of(new_destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
       end
@@ -44,14 +58,14 @@ module Jekyll::Minibundle::Test
 
     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))
+        bundle_file = make_bundle_file(site)
         source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
         destination = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
         org_markup_path, last_markup_path = nil
         capture_io { org_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
-        assert bundle_file.write('_site')
+        assert write_file(bundle_file)
 
         org_mtime = file_mtime_of(destination)
 
@@ -61,7 +75,7 @@ module Jekyll::Minibundle::Test
         capture_io { last_markup_path = bundle_file.destination_path_for_markup }
         bundle_file.destination_path_for_markup
 
-        assert bundle_file.write('_site')
+        assert write_file(bundle_file)
         assert_equal org_markup_path, last_markup_path
         assert_operator file_mtime_of(destination), :>, org_mtime
         assert_equal 2, get_minifier_cmd_count
@@ -70,30 +84,52 @@ module Jekyll::Minibundle::Test
 
     def test_calling_write_before_destination_path_for_markup_has_no_effect
       with_fake_site do |site|
-        bundle_file = BundleFile.new(site, bundle_config(minifier_cmd_to_remove_comments_and_count))
+        bundle_file = make_bundle_file(site)
 
-        refute bundle_file.write('_site')
+        refute write_file(bundle_file)
         assert_empty Dir[destination_path('assets/*.js')]
         assert_equal 0, get_minifier_cmd_count
 
         capture_io { bundle_file.destination_path_for_markup }
 
-        assert bundle_file.write('_site')
+        assert write_file(bundle_file)
         assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
         assert_equal 1, get_minifier_cmd_count
       end
     end
 
+    def test_modified_property_determines_if_write_would_succeed
+      with_fake_site do |site|
+        bundle_file = make_bundle_file(site)
+
+        refute bundle_file.modified?
+        refute write_file(bundle_file)
+
+        capture_io { bundle_file.destination_path_for_markup }
+
+        assert bundle_file.modified?
+        assert write_file(bundle_file)
+
+        refute bundle_file.modified?
+        refute write_file(bundle_file)
+      end
+    end
+
     private
 
-    def bundle_config(minifier_cmd)
-      {
+    def make_bundle_file(site)
+      BundleFile.new(
+        site,
         'type'             => :js,
         'source_dir'       => JS_BUNDLE_SOURCE_DIR,
         'assets'           => %w{dependency app},
         'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-        'minifier_cmd'     => minifier_cmd
-      }
+        'minifier_cmd'     => minifier_cmd_to_remove_comments_and_count
+      )
+    end
+
+    def write_file(file)
+      file.write(File.join(Dir.pwd, '_site'))
     end
   end
 end

data/test/unit/development_file_collection_properties_test.rb

@@ -51,6 +51,11 @@ module Jekyll::Minibundle::Test
       assert_equal app_mtime.to_i, @@results.fetch(:app).fetch(:mtime)
     end
 
+    def test_path
+      assert_match(%r{/#{JS_BUNDLE_SOURCE_DIR}/dependency.js\z}, @@results.fetch(:dependency).fetch(:relative_path))
+      assert_match(%r{/#{JS_BUNDLE_SOURCE_DIR}/app.js\z}, @@results.fetch(:app).fetch(:relative_path))
+    end
+
     def test_placeholders
       assert_equal({}, @@results.fetch(:dependency).fetch(:placeholders))
       assert_equal({}, @@results.fetch(:app).fetch(:placeholders))

data/test/unit/development_file_writing_test.rb

@@ -0,0 +1,39 @@
+require 'support/test_case'
+require 'support/fixture_config'
+require 'jekyll/minibundle/development_file'
+
+module Jekyll::Minibundle::Test
+  class DevelopmentFileWritingTest < TestCase
+    include FixtureConfig
+
+    def test_modify_property_determines_if_write_would_succeed
+      with_fake_site do |site|
+        dev_file = make_development_file(site)
+        source = source_path(STAMP_SOURCE_PATH)
+
+        assert dev_file.modified?
+        assert write_file(dev_file)
+
+        ensure_file_mtime_changes do
+          FileUtils.touch(source)
+        end
+
+        assert dev_file.modified?
+        assert write_file(dev_file)
+
+        refute dev_file.modified?
+        refute write_file(dev_file)
+      end
+    end
+
+    private
+
+    def make_development_file(site)
+      DevelopmentFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
+    end
+
+    def write_file(file)
+      file.write(File.join(Dir.pwd, '_site'))
+    end
+  end
+end

data/test/unit/environment_test.rb

@@ -4,23 +4,23 @@ require 'jekyll/minibundle/environment'
 module Jekyll::Minibundle::Test
   class EnvironmentTest < TestCase
     def test_find_site_config_returns_value_when_found
-      assert_equal 1, Environment.find_site_config(new_site(top: {leaf: 1}), [:top, :leaf], Integer)
+      assert_equal 1, Environment.find_site_config(make_site(top: {leaf: 1}), [:top, :leaf], Integer)
     end
 
     def test_find_site_config_returns_nil_when_not_found
-      assert_nil Environment.find_site_config(new_site, [:top, :leaf], Integer)
+      assert_nil Environment.find_site_config(make_site, [:top, :leaf], Integer)
     end
 
     def test_find_site_config_raises_exception_if_found_value_is_of_unexpected_type
       err = assert_raises(RuntimeError) do
-        Environment.find_site_config(new_site(top: {leaf: '1'}), [:top, :leaf], Integer)
+        Environment.find_site_config(make_site(top: {leaf: '1'}), [:top, :leaf], Integer)
       end
       assert_equal 'Invalid site configuration for key top.leaf; expecting type Integer', err.to_s
     end
 
     private
 
-    def new_site(config = {})
+    def make_site(config = {})
       OpenStruct.new(config: config)
     end
   end

data/test/unit/files_test.rb

@@ -3,6 +3,15 @@ require 'jekyll/minibundle/files'
 
 module Jekyll::Minibundle::Test
   class FilesTest < TestCase
+    def test_copy_p
+      with_tmp_dir do
+        File.write('foo', 'content')
+        Files.copy_p('foo', 'bar/zap')
+        copied = File.read('bar/zap')
+        assert_equal 'content', copied
+      end
+    end
+
     def test_read_last_with_non_existing_file_raises_exception
       assert_raises(Errno::ENOENT) { Files.read_last('no-such-file', 4) }
     end
@@ -42,5 +51,9 @@ module Jekyll::Minibundle::Test
         assert_equal '', Files.read_last(file.path, -1)
       end
     end
+
+    def test_strip_dot_slash_from_path_start
+      assert_equal 'path', Files.strip_dot_slash_from_path_start('./path')
+    end
   end
 end

data/test/unit/jekyll_static_file_api_test.rb

@@ -62,7 +62,7 @@ module Jekyll::Minibundle::Test
 
     def with_empty_site(&block)
       with_tmp_dir do |dir|
-        block.call(new_fake_site(dir))
+        block.call(make_fake_site(dir))
       end
     end
 

data/test/unit/mini_bundle_block_test.rb

@@ -57,7 +57,7 @@ minifier_cmd: #{minifier_cmd_to_remove_comments}
 
         actual_output = nil
         capture_io do
-          actual_output = template.render({}, registers: {site: new_fake_site(site_fixture_path)})
+          actual_output = template.render({}, registers: {site: make_fake_site(site_fixture_path)})
         end
         expected_output = %{<link rel="stylesheet" href="#{spec.fetch(:expected_asset_url)}">\n}
 

data/test/unit/mini_stamp_tag_test.rb

@@ -24,7 +24,7 @@ module Jekyll::Minibundle::Test
       AssetFileRegistry.clear_all
       output = Liquid::Template
                .parse("{% ministamp #{STAMP_SOURCE_PATH} #{STAMP_DESTINATION_PATH} rest %}")
-               .render({}, registers: {site: new_fake_site(site_fixture_path)})
+               .render({}, registers: {site: make_fake_site(site_fixture_path)})
       assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, output
     end
   end

data/test/unit/stamp_file_properties_test.rb

@@ -41,6 +41,10 @@ module Jekyll::Minibundle::Test
       assert_equal mtime.to_i, @@results.fetch(:mtime)
     end
 
+    def test_path
+      assert_match(%r{/#{STAMP_SOURCE_PATH}\z}, @@results.fetch(:path))
+    end
+
     def test_placeholders
       assert_equal({}, @@results.fetch(:placeholders))
     end

data/test/unit/stamp_file_writing_test.rb

@@ -8,31 +8,46 @@ module Jekyll::Minibundle::Test
 
     def test_calling_destination_path_for_markup_determines_fingerprint_and_destination_write
       with_fake_site do |site|
-        stamp_file = new_stamp_file(site)
+        stamp_file = make_stamp_file(site)
         source = source_path(STAMP_SOURCE_PATH)
         old_destination = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
-        org_markup = stamp_file.destination_path_for_markup
 
-        assert stamp_file.write('_site')
+        # the call to destination_path_for_markup determines the
+        # fingerprint
+
+        org_markup_path = stamp_file.destination_path_for_markup
+
+        assert write_file(stamp_file)
 
         org_mtime = file_mtime_of(old_destination)
-        last_markup = stamp_file.destination_path_for_markup
+
+        last_markup_path = stamp_file.destination_path_for_markup
+
+        assert_equal org_markup_path, last_markup_path
+
+        # change content, but don't call destination_path_for_markup yet
+
         ensure_file_mtime_changes { File.write(source, 'h1 {}') }
 
-        # preserve fingerprint and content seen in last markup phase
-        refute stamp_file.write('_site')
-        assert_equal org_markup, last_markup
+        # preserve content's fingerprint
+
+        refute write_file(stamp_file)
+
+        assert_equal org_markup_path, last_markup_path
         assert_equal org_mtime, file_mtime_of(old_destination)
         assert_equal File.read(site_fixture_path(STAMP_SOURCE_PATH)), File.read(old_destination)
 
-        last_markup = stamp_file.destination_path_for_markup
+        # see content's fingerprint to update after calling
+        # destination_path_for_markup
+
+        last_markup_path = stamp_file.destination_path_for_markup
 
-        assert stamp_file.write('_site')
+        refute_equal org_markup_path, last_markup_path
+
+        assert write_file(stamp_file)
 
         new_destination = destination_path('assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css')
 
-        # see updated fingerprint in the next round
-        refute_equal org_markup, last_markup
         assert_operator file_mtime_of(new_destination), :>, org_mtime
         assert_equal File.read(source), File.read(new_destination)
       end
@@ -40,20 +55,20 @@ module Jekyll::Minibundle::Test
 
     def test_many_consecutive_destination_path_for_markup_calls_trigger_one_destination_write
       with_fake_site do |site|
-        stamp_file = new_stamp_file(site)
+        stamp_file = make_stamp_file(site)
         source = source_path(STAMP_SOURCE_PATH)
         destination = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
         org_markup = stamp_file.destination_path_for_markup
         stamp_file.destination_path_for_markup
 
-        assert stamp_file.write('_site')
+        assert write_file(stamp_file)
 
         org_mtime = file_mtime_of(destination)
         ensure_file_mtime_changes { FileUtils.touch(source) }
         last_markup = stamp_file.destination_path_for_markup
         stamp_file.destination_path_for_markup
 
-        assert stamp_file.write('_site')
+        assert write_file(stamp_file)
         assert_equal org_markup, last_markup
         assert_operator file_mtime_of(destination), :>, org_mtime
         assert_equal File.read(source), File.read(destination)
@@ -62,22 +77,43 @@ module Jekyll::Minibundle::Test
 
     def test_calling_write_before_destination_path_for_markup_has_no_effect
       with_fake_site do |site|
-        stamp_file = new_stamp_file(site)
+        stamp_file = make_stamp_file(site)
 
-        refute stamp_file.write('_site')
+        refute write_file(stamp_file)
         assert_empty Dir[destination_path('assets/*.css')]
 
         stamp_file.destination_path_for_markup
 
-        assert stamp_file.write('_site')
+        assert write_file(stamp_file)
         assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
+    def test_modified_property_determines_if_write_would_succeed
+      with_fake_site do |site|
+        stamp_file = make_stamp_file(site)
+
+        refute stamp_file.modified?
+        refute write_file(stamp_file)
+
+        stamp_file.destination_path_for_markup
+
+        assert stamp_file.modified?
+        assert write_file(stamp_file)
+
+        refute stamp_file.modified?
+        refute write_file(stamp_file)
+      end
+    end
+
     private
 
-    def new_stamp_file(site)
+    def make_stamp_file(site)
       StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
     end
+
+    def write_file(file)
+      file.write(File.join(Dir.pwd, '_site'))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.0
 description: |
   A straightforward asset bundling plugin for Jekyll, utilizing external
   minification tool of your choice. It provides asset concatenation for
@@ -112,7 +112,6 @@ files:
 - 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_properties.rb
 - lib/jekyll/minibundle/asset_file_registry.rb
 - lib/jekyll/minibundle/asset_stamp.rb
@@ -156,6 +155,7 @@ files:
 - test/unit/bundle_file_properties_test.rb
 - test/unit/bundle_file_writing_test.rb
 - test/unit/development_file_collection_properties_test.rb
+- test/unit/development_file_writing_test.rb
 - test/unit/environment_test.rb
 - test/unit/files_test.rb
 - test/unit/hashes_test.rb
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A minimalistic asset bundling plugin for Jekyll
@@ -221,6 +221,7 @@ test_files:
 - test/unit/bundle_file_properties_test.rb
 - test/unit/bundle_file_writing_test.rb
 - test/unit/development_file_collection_properties_test.rb
+- test/unit/development_file_writing_test.rb
 - test/unit/environment_test.rb
 - test/unit/files_test.rb
 - test/unit/hashes_test.rb