jekyll-minibundle 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13fbeab915d4a828821cdccab516572fd71f735f
-  data.tar.gz: e549b653ee51a6542cd290f24b6c677100d5ad1c
+  metadata.gz: f0e8eb69fc25d07f84cdd00cebe04669a4f0a09c
+  data.tar.gz: 3469c040798e5add50f205cd0327d10d8083743a
 SHA512:
-  metadata.gz: ebe97e47891f916457af596045cc900964d24599134cdcbee63011a8858cf0dd31f229a111ad72753c3df0eea30755a42873e84b828f4cea863f9e1dd5294be5
-  data.tar.gz: a7882e6b3adc793ee44b52c3606f653f6b1728b9b7828612327f49ff471000fb31539eaf717ab63a1621f72e320216c466d63256f16082d421bbeeb18c799fff
+  metadata.gz: 4953977ee09c4cdaf507b1c1f6a231e7778be1c9a84843968bd7e471baf678a3a4edf601b71d61f3b178dc63d1b72271ed291c4b23961d93790aae28175a7f1c
+  data.tar.gz: edcfeee786bbb756434e9e7576936891681060f92d90544e2cbef2367a230966c99eb289e3e3c24109e4d8f2ff2d06e5507131c727793dc099aad514815520b2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.1.0 / 2016-05-04
+
+* Allow attributes without values. Useful for `async` attribute, for
+  example. Pull Request #7 by Sam (@codewisdom).
+* Ensure attribute value conversion to string
+
 # 2.0.1 / 2016-04-06
 
 * Fix Jekyll version requirement check to be more reliable

data/README.md

@@ -124,6 +124,7 @@ assets:
   - app
 attributes:
   id: my-scripts
+  async:
 {% endminibundle %}
 ```
 
@@ -140,14 +141,15 @@ minibundle:
 Output in the content file:
 
 ``` html
-<script src="/assets/site-8e764372a0dbd296033cb2a416f064b5.js" type="text/javascript" id="my-scripts"></script>
+<script src="/assets/site-8e764372a0dbd296033cb2a416f064b5.js" type="text/javascript" id="my-scripts" async></script>
 ```
 
-You can pass custom attributes, like `id="my-scripts"` above, to the
-generated markup with `attributes` map inside the `minibundle` block.
+You can pass custom attributes, like `id="my-scripts"` and `async`
+above, to the generated markup with `attributes` map inside the
+`minibundle` block.
 
-For bundling CSS assets, you use `css` as the argument to the
-`minibundle` block:
+For bundling CSS assets, use `css` as the argument to the `minibundle`
+block:
 
 ``` text
 {% minibundle css %}

data/lib/jekyll/minibundle/asset_tag_markup.rb

@@ -20,7 +20,11 @@ module Jekyll::Minibundle
       end
 
       def make_attribute(name, value)
-        %{ #{name}="#{CGI.escape_html(value)}"}
+        if value.nil?
+          %{ #{name}}
+        else
+          %{ #{name}="#{CGI.escape_html(value.to_s)}"}
+        end
       end
 
       def make_url(baseurl, path)

data/lib/jekyll/minibundle/version.rb

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

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

@@ -22,6 +22,7 @@
       - app
     attributes:
       id: my-scripts
+      async:
     {% endminibundle %}
   </body>
   <title>{{ page.title }}</title>

data/test/integration/minibundle_development_mode_test.rb

@@ -29,8 +29,8 @@ module Jekyll::Minibundle::Test
 
     def test_js_assets_have_configured_attributes
       with_precompiled_site(:development) do
-        elements = find_js_elements_from_index.map { |el| el['id'] }.uniq
-        assert_equal ['my-scripts'], elements
+        elements = find_js_elements_from_index.map { |el| [el['id'], el['async']] }.uniq
+        assert_equal [['my-scripts', '']], elements
       end
     end
 

data/test/integration/minibundle_production_mode_test.rb

@@ -29,6 +29,7 @@ module Jekyll::Minibundle::Test
       with_precompiled_site(:production) do
         element = find_js_element_from_index
         assert_equal 'my-scripts', element['id']
+        assert_equal '', element['async']
       end
     end
 
@@ -240,6 +241,8 @@ 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

data/test/unit/asset_tag_markup_test.rb

@@ -3,13 +3,31 @@ require 'jekyll/minibundle/asset_tag_markup'
 
 module Jekyll::Minibundle::Test
   class AssetTagMarkupTest < TestCase
-    def test_escapes_attribute_values
+    def test_escape_attribute_value
       attributes = {media: 'screen, projection', extra: '">attack<br'}
       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)
+      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)
+      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: '')
+      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', {})
@@ -17,15 +35,15 @@ module Jekyll::Minibundle::Test
       assert_equal 'Unknown type for generating bundle markup: unknown, /asset', err.to_s
     end
 
-    def test_joins_empty_baseurl_and_path
+    def test_join_empty_baseurl_and_path
       assert_equal %{<link rel="stylesheet" href="asset.css">}, AssetTagMarkup.make_markup(:css, '', 'asset.css', {})
     end
 
-    def test_joins_nonempty_baseurl_and_path
+    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_removes_extra_slash_between_baseurl_and_path
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A minimalistic asset bundling plugin for Jekyll