RubyGems - jekyll-minibundle - Versions diffs - 2.1.1 → 2.1.2 - Mend

jekyll-minibundle 2.1.1 → 2.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +29 -0
data/README.md +6 -2
data/jekyll-minibundle.gemspec +1 -1
data/lib/jekyll/minibundle/asset_bundle.rb +10 -5
data/lib/jekyll/minibundle/asset_file_properties.rb +1 -5
data/lib/jekyll/minibundle/asset_tag_markup.rb +3 -12
data/lib/jekyll/minibundle/bundle_file.rb +25 -16
data/lib/jekyll/minibundle/development_file.rb +14 -4
data/lib/jekyll/minibundle/files.rb +22 -9
data/lib/jekyll/minibundle/mini_bundle_block.rb +14 -10
data/lib/jekyll/minibundle/mini_stamp_tag.rb +2 -1
data/lib/jekyll/minibundle/stamp_file.rb +21 -9
data/lib/jekyll/minibundle/version.rb +1 -1
data/test/fixture/site/_layouts/default.html +1 -1
data/test/integration/minibundle_development_mode_test.rb +18 -3
data/test/integration/minibundle_production_mode_test.rb +108 -4
data/test/integration/ministamp_development_mode_test.rb +13 -6
data/test/integration/ministamp_production_mode_test.rb +63 -4
data/test/support/static_file_api_config.rb +1 -0
data/test/support/test_case.rb +4 -4
data/test/unit/asset_bundle_test.rb +15 -8
data/test/unit/asset_file_registry_test.rb +3 -3
data/test/unit/asset_tag_markup_test.rb +5 -17
data/test/unit/bundle_file_properties_test.rb +4 -0
data/test/unit/bundle_file_writing_test.rb +54 -18
data/test/unit/development_file_collection_properties_test.rb +5 -0
data/test/unit/development_file_writing_test.rb +39 -0
data/test/unit/environment_test.rb +4 -4
data/test/unit/files_test.rb +13 -0
data/test/unit/jekyll_static_file_api_test.rb +1 -1
data/test/unit/mini_bundle_block_test.rb +1 -1
data/test/unit/mini_stamp_tag_test.rb +1 -1
data/test/unit/stamp_file_properties_test.rb +4 -0
data/test/unit/stamp_file_writing_test.rb +54 -18
metadata +7 -6
data/lib/jekyll/minibundle/asset_file_operations.rb +0 -16

data/lib/jekyll/minibundle/version.rb CHANGED Viewed

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

data/test/fixture/site/_layouts/default.html CHANGED Viewed

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <title>{{ page.title }}</title>
     <link rel="stylesheet" href="{% ministamp _tmp/site.css assets/screen.css %}" media="screen">
     {% minibundle css %}
     source_dir: _assets/styles
@@ -25,5 +26,4 @@
       async:
     {% endminibundle %}
   </body>
-  <title>{{ page.title }}</title>
 </html>

data/test/integration/minibundle_development_mode_test.rb CHANGED Viewed

@@ -190,16 +190,31 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
-        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css'))
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js'))
+        destination_css = destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')
+        destination_js = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
+        org_mtime_css = file_mtime_of(destination_css)
+        org_mtime_js = file_mtime_of(destination_js)
+        assert File.exist?(destination_css)
+        assert File.exist?(destination_js)
         assert_equal 'assets/site/common.css', find_css_paths_from_index.last
         assert_equal 'assets/site/app.js', find_js_paths_from_index.last
-        find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: /assets/site')
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            'destination_path: assets/site',
+            'destination_path: /assets/site'
+          )
+        end
         generate_site(:development, clear_cache: false)
+        assert File.exist?(destination_css)
+        assert File.exist?(destination_js)
+        assert_equal org_mtime_css, file_mtime_of(destination_css)
+        assert_equal org_mtime_js, file_mtime_of(destination_js)
         assert_equal '/assets/site/common.css', find_css_paths_from_index.last
         assert_equal '/assets/site/app.js', find_js_paths_from_index.last
       end

data/test/integration/minibundle_production_mode_test.rb CHANGED Viewed

@@ -314,16 +314,31 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
-        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
-        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        destination_css = destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+        destination_js = destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH)
+        org_mtime_css = file_mtime_of(destination_css)
+        org_mtime_js = file_mtime_of(destination_js)
+        assert File.exist?(destination_css)
+        assert File.exist?(destination_js)
         assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
         assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
-        find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: /assets/site')
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            'destination_path: assets/site',
+            'destination_path: /assets/site'
+          )
+        end
         generate_site(:production, clear_cache: false)
+        assert File.exist?(destination_css)
+        assert File.exist?(destination_js)
+        assert_equal org_mtime_css, file_mtime_of(destination_css)
+        assert_equal org_mtime_js, file_mtime_of(destination_js)
         assert_equal "/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
         assert_equal "/#{JS_BUNDLE_DESTINATION_FINGERPRINT_PATH}", find_js_path_from_index
       end
@@ -365,6 +380,96 @@ module Jekyll::Minibundle::Test
       end
     end
+    def test_strips_dot_slash_from_dot_baseurl
+      with_site_dir do
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle css %}', "{% minibundle css %}\n    baseurl: .")
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: .")
+        generate_site(:production)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+        generate_site(:production, clear_cache: false)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+      end
+    end
+    def test_strips_dot_slash_from_dot_slash_baseurl
+      with_site_dir do
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle css %}', "{% minibundle css %}\n    baseurl: ./")
+        find_and_gsub_in_file(source_path('_layouts/default.html'), '{% minibundle js %}', "{% minibundle js %}\n    baseurl: ./")
+        generate_site(:production)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+        generate_site(:production, clear_cache: false)
+        assert File.exist?(destination_path(CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert File.exist?(destination_path(JS_BUNDLE_DESTINATION_FINGERPRINT_PATH))
+        assert_equal CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        assert_equal JS_BUNDLE_DESTINATION_FINGERPRINT_PATH, find_js_path_from_index
+      end
+    end
+    def test_strips_dot_slash_from_relative_destination_path
+      with_site_dir do
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: site')
+        generate_site(:production)
+        assert File.exist?(destination_path("site-#{CSS_BUNDLE_FINGERPRINT}.css"))
+        assert File.exist?(destination_path("site-#{JS_BUNDLE_FINGERPRINT}.js"))
+        assert_equal "site-#{CSS_BUNDLE_FINGERPRINT}.css", find_css_path_from_index
+        assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", find_js_path_from_index
+        generate_site(:production, clear_cache: false)
+        assert File.exist?(destination_path("site-#{CSS_BUNDLE_FINGERPRINT}.css"))
+        assert File.exist?(destination_path("site-#{JS_BUNDLE_FINGERPRINT}.js"))
+        assert_equal "site-#{CSS_BUNDLE_FINGERPRINT}.css", find_css_path_from_index
+        assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", find_js_path_from_index
+      end
+    end
+    def test_strips_dot_slash_from_dot_slash_destination_path
+      with_site_dir do
+        find_and_gsub_in_file(source_path('_layouts/default.html'), 'destination_path: assets/site', 'destination_path: ./site')
+        generate_site(:production)
+        assert File.exist?(destination_path("site-#{CSS_BUNDLE_FINGERPRINT}.css"))
+        assert File.exist?(destination_path("site-#{JS_BUNDLE_FINGERPRINT}.js"))
+        assert_equal "site-#{CSS_BUNDLE_FINGERPRINT}.css", find_css_path_from_index
+        assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", find_js_path_from_index
+        generate_site(:production, clear_cache: false)
+        assert File.exist?(destination_path("site-#{CSS_BUNDLE_FINGERPRINT}.css"))
+        assert File.exist?(destination_path("site-#{JS_BUNDLE_FINGERPRINT}.js"))
+        assert_equal "site-#{CSS_BUNDLE_FINGERPRINT}.css", find_css_path_from_index
+        assert_equal "site-#{JS_BUNDLE_FINGERPRINT}.js", find_js_path_from_index
+      end
+    end
     def test_supports_changing_attributes
       with_site_dir do
         generate_site(:production)
@@ -505,7 +610,6 @@ title: Test
     minifier_cmd: #{minifier_cmd_to_remove_comments_and_count('minifier_cmd_local_count')}
     {% endminibundle %}
   </body>
-  <title>{{ page.title }}</title>
 </html>
         END

data/test/integration/ministamp_development_mode_test.rb CHANGED Viewed

@@ -141,17 +141,24 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:development)
-        assert File.exist?(destination_path(STAMP_DESTINATION_PATH))
+        destination = destination_path(STAMP_DESTINATION_PATH)
+        org_mtime = file_mtime_of(destination)
+        assert File.exist?(destination)
         assert_equal STAMP_DESTINATION_PATH, find_css_path_from_index
-        find_and_gsub_in_file(
-          source_path('_layouts/default.html'),
-          '{% ministamp _tmp/site.css assets/screen.css',
-          '{% ministamp _tmp/site.css /assets/screen.css'
-        )
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site.css /assets/screen.css'
+          )
+        end
         generate_site(:development, clear_cache: false)
+        assert File.exist?(destination)
+        assert_equal org_mtime, file_mtime_of(destination)
         assert_equal "/#{STAMP_DESTINATION_PATH}", find_css_path_from_index
       end
     end

data/test/integration/ministamp_production_mode_test.rb CHANGED Viewed

@@ -145,18 +145,77 @@ module Jekyll::Minibundle::Test
       with_site_dir do
         generate_site(:production)
-        assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        destination = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
+        org_mtime = file_mtime_of(destination)
+        assert File.exist?(destination)
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site.css /assets/screen.css'
+          )
+        end
+        generate_site(:production, clear_cache: false)
+        assert File.exist?(destination)
+        assert_equal org_mtime, file_mtime_of(destination)
+        assert_equal "/#{STAMP_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
+      end
+    end
+    def test_strips_dot_slash_from_relative_destination_path
+      with_site_dir do
         find_and_gsub_in_file(
           source_path('_layouts/default.html'),
           '{% ministamp _tmp/site.css assets/screen.css',
-          '{% ministamp _tmp/site.css /assets/screen.css'
+          '{% ministamp _tmp/site.css screen.css'
         )
-        generate_site(:production, clear_cache: false)
+        generate_site(:production)
-        assert_equal "/#{STAMP_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
+        destination = destination_path("screen-#{STAMP_FINGERPRINT}.css")
+        org_mtime = file_mtime_of(destination)
+        assert File.exist?(destination)
+        assert_equal "screen-#{STAMP_FINGERPRINT}.css", find_css_path_from_index
+        ensure_file_mtime_changes do
+          generate_site(:production, clear_cache: false)
+        end
+        assert File.exist?(destination)
+        assert_equal org_mtime, file_mtime_of(destination)
+        assert_equal "screen-#{STAMP_FINGERPRINT}.css", find_css_path_from_index
+      end
+    end
+    def test_strips_dot_slash_from_destination_path
+      with_site_dir do
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '{% ministamp _tmp/site.css assets/screen.css',
+          '{% ministamp _tmp/site.css ./screen.css'
+        )
+        generate_site(:production)
+        destination = destination_path("screen-#{STAMP_FINGERPRINT}.css")
+        org_mtime = file_mtime_of(destination)
+        assert File.exist?(destination)
+        assert_equal "screen-#{STAMP_FINGERPRINT}.css", find_css_path_from_index
+        ensure_file_mtime_changes do
+          generate_site(:production, clear_cache: false)
+        end
+        assert File.exist?(destination)
+        assert_equal org_mtime, file_mtime_of(destination)
+        assert_equal "screen-#{STAMP_FINGERPRINT}.css", find_css_path_from_index
       end
     end

data/test/support/static_file_api_config.rb CHANGED Viewed

@@ -7,6 +7,7 @@ module Jekyll::Minibundle::Test
       :extname,
       :modified_time,
       :mtime,
+      :path,
       :placeholders,
       :relative_path,
       :to_liquid,

data/test/support/test_case.rb CHANGED Viewed

@@ -80,11 +80,11 @@ module Jekyll::Minibundle::Test
       end
     end
-    def new_fake_site(dir)
+    def make_fake_site(dir)
       OpenStruct.new(source: dir, static_files: [])
     end
-    def new_real_site
+    def make_real_site
       config = nil
       capture_io do
         config = Jekyll.configuration('source' => Dir.pwd, 'destination' => '_site')
@@ -94,7 +94,7 @@ module Jekyll::Minibundle::Test
     def with_fake_site(&block)
       with_site_dir do |dir|
-        block.call(new_fake_site(dir))
+        block.call(make_fake_site(dir))
       end
     end
@@ -163,7 +163,7 @@ module Jekyll::Minibundle::Test
     def _generate_site(test_options)
       AssetFileRegistry.clear_all if test_options.fetch(:clear_cache, true)
-      site = new_real_site
+      site = make_real_site
       capture_io { site.process }
     end
   end

data/test/unit/asset_bundle_test.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module Jekyll::Minibundle::Test
     def test_raise_exception_if_bundle_command_fails
       capture_io do
         err = assert_raises(RuntimeError) { make_bundle('read _ignore ; false') }
-        assert_equal "Bundling js assets failed with exit status 1, command: 'read _ignore ; false'", err.to_s
+        assert_equal "Bundling assets/site.js failed with exit status 1, command: 'read _ignore ; false'", err.to_s
       end
     end
@@ -16,7 +16,7 @@ module Jekyll::Minibundle::Test
         assert_raises(RuntimeError) { make_bundle(cmd) }
       end
       expected_stderr = <<-END
-Minibundle: Bundling js assets failed with exit status 1, command: '#{cmd}', last 16 bytes of minifier output:
+Minibundle: Bundling assets/site.js failed with exit status 1, command: '#{cmd}', last 16 bytes of minifier output:
 Minibundle: line 1\\x07
 Minibundle: line 2\\xa4
       END
@@ -25,22 +25,29 @@ Minibundle: line 2\\xa4
     def test_raise_exception_if_bundle_command_not_found
       err = assert_raises(RuntimeError) { make_bundle('no-such-jekyll-minibundle-cmd') }
-      assert_equal 'Bundling js assets failed: No such file or directory - no-such-jekyll-minibundle-cmd', err.to_s
+      assert_equal 'Bundling assets/site.js failed: No such file or directory - no-such-jekyll-minibundle-cmd', err.to_s
     end
     def test_raise_exception_if_bundle_command_not_configured
       err = assert_raises(RuntimeError) { make_bundle(nil) }
-      assert_match(/\AMissing minification command for bundling js assets. Specify it in/, err.to_s)
+      expected_errmsg = <<-END
+Missing minification command for bundling assets/site.js. Specify it in
+1) minibundle.minifier_commands.js setting in _config.yml,
+2) $JEKYLL_MINIBUNDLE_CMD_JS environment variable, or
+3) minifier_cmd setting inside minibundle block.
+      END
+      assert_equal expected_errmsg, err.to_s
     end
     private
     def make_bundle(minifier_cmd)
       bundle = AssetBundle.new(
-        type: :js,
-        asset_paths: [site_fixture_path('_assets/scripts/dependency.js')],
-        site_dir: site_fixture_path,
-        minifier_cmd: minifier_cmd
+        type:             :js,
+        asset_paths:      [site_fixture_path('_assets/scripts/dependency.js')],
+        destination_path: 'assets/site',
+        site_dir:         site_fixture_path,
+        minifier_cmd:     minifier_cmd
       )
       bundle.make_bundle
     end

data/test/unit/asset_file_registry_test.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Jekyll::Minibundle::Test
   class AssetFileRegistryTest < TestCase
     def setup
       AssetFileRegistry.clear_all
-      @site = new_site
+      @site = make_site
     end
     def test_register_returns_same_bundle_file_for_same_bundle_config
@@ -195,8 +195,8 @@ Two or more ministamp tags with the same destination path 'assets/dest1.css', bu
       AssetFileRegistry.instance_variable_get(:@_files).size
     end
-    def new_site
-      new_fake_site('.')
+    def make_site
+      make_fake_site('.')
     end
   end
 end

data/test/unit/asset_tag_markup_test.rb CHANGED Viewed

@@ -5,46 +5,34 @@ module Jekyll::Minibundle::Test
   class AssetTagMarkupTest < TestCase
     def test_escape_attribute_value
       attributes = {media: 'screen, projection', extra: '">attack<br'}
-      actual = AssetTagMarkup.make_markup(:css, '', '/asset.css', attributes)
+      actual = AssetTagMarkup.make_markup(:css, '/asset.css', attributes)
       expected = %{<link rel="stylesheet" href="/asset.css" media="screen, projection" extra="&quot;&gt;attack&lt;br">}
       assert_equal expected, actual
     end
     def test_output_just_attribute_name_for_nil_value
-      actual = AssetTagMarkup.make_markup(:css, '', '/asset.css', async: nil)
+      actual = AssetTagMarkup.make_markup(:css, '/asset.css', async: nil)
       expected = %{<link rel="stylesheet" href="/asset.css" async>}
       assert_equal expected, actual
     end
     def test_convert_attribute_value_to_string
-      actual = AssetTagMarkup.make_markup(:css, '', '/asset.css', boolean: false)
+      actual = AssetTagMarkup.make_markup(:css, '/asset.css', boolean: false)
       expected = %{<link rel="stylesheet" href="/asset.css" boolean="false">}
       assert_equal expected, actual
     end
     def test_output_empty_attribute_value
-      actual = AssetTagMarkup.make_markup(:css, '', '/asset.css', empty: '')
+      actual = AssetTagMarkup.make_markup(:css, '/asset.css', empty: '')
       expected = %{<link rel="stylesheet" href="/asset.css" empty="">}
       assert_equal expected, actual
     end
     def test_raise_exception_if_unknown_type
       err = assert_raises(ArgumentError) do
-        AssetTagMarkup.make_markup(:unknown, '', '/asset', {})
+        AssetTagMarkup.make_markup(:unknown, '/asset', {})
       end
       assert_equal 'Unknown type for generating bundle markup: unknown, /asset', err.to_s
     end
-    def test_join_empty_baseurl_and_path
-      assert_equal %{<link rel="stylesheet" href="asset.css">}, AssetTagMarkup.make_markup(:css, '', 'asset.css', {})
-    end
-    def test_join_nonempty_baseurl_and_path
-      assert_equal %{<link rel="stylesheet" href="/root/path/asset.css">}, AssetTagMarkup.make_markup(:css, '/root', 'path/asset.css', {})
-    end
-    def test_remove_extra_slash_between_baseurl_and_path
-      assert_equal %{<link rel="stylesheet" href="/asset.css">}, AssetTagMarkup.make_markup(:css, '/', '/asset.css', {})
-    end
   end
 end