Merge pull request #93 from tomdiggle/master

Fix Liquid tag generates no space between attributes

lib/jekyll/assets_plugin/renderer.rb

@@ -12,6 +12,7 @@ def initialize(context, logical_path)
         @path   = logical_path.strip
 
         @path, _, @attrs = @path.partition(" ") if @path[" "]
+        @attrs.prepend(" ") if @attrs
       end
 
       def render_asset

spec/lib/jekyll/assets_plugin/tag_spec.rb

@@ -17,33 +17,45 @@ def render_tag(template, path, attrs = "")
   end
 
   context "{% image <file> %}" do
-    def tag_re(name)
+    def tag_re(name, attrs = "")
       file = "/assets/#{name}-[a-f0-9]{32}\.png"
-      Regexp.new "^#{render_tag :IMAGE, file}$"
+      attrs.prepend(" ") unless attrs.empty?
+      Regexp.new "^#{render_tag :IMAGE, file, attrs}$"
     end
 
     context "when <file> exists" do
       subject { render("{% image noise.png %}") }
       it { is_expected.to match tag_re("noise") }
     end
 
+    context "when <file> has an attribute" do
+      subject { render("{% image noise.png alt=\"Foobar\" %}") }
+      it { is_expected.to match tag_re("noise", "alt=\"Foobar\"") }
+    end
+
     context "when <file> does not exists" do
       subject { render("{% image not-found.png %}") }
       it { is_expected.to match not_found_error "not-found.png" }
     end
   end
 
   context "{% stylesheet <file> %}" do
-    def tag_re(name)
+    def tag_re(name, attrs = "")
       file = "/assets/#{name}-[a-f0-9]{32}\.css"
-      Regexp.new "^#{render_tag :STYLESHEET, file}$"
+      attrs.prepend(" ") unless attrs.empty?
+      Regexp.new "^#{render_tag :STYLESHEET, file, attrs}$"
     end
 
     context "when <file> exists" do
       subject { render("{% stylesheet app.css %}") }
       it { is_expected.to match tag_re("app") }
     end
 
+    context "when <file> has an attribute" do
+      subject { render("{% stylesheet app.css type=\"text/css\" %}") }
+      it { is_expected.to match tag_re("app", "type=\"text/css\"") }
+    end
+
     context "when <file> name has multiple dots" do
       subject { render("{% stylesheet app.min %}") }
       it { is_expected.to match tag_re("app.min") }
@@ -61,16 +73,22 @@ def tag_re(name)
   end
 
   context "{% javascript <file> %}" do
-    def tag_re(name)
+    def tag_re(name, attrs = "")
       file = "/assets/#{name}-[a-f0-9]{32}\.js"
-      Regexp.new "^#{render_tag :JAVASCRIPT, file}$"
+      attrs.prepend(" ") unless attrs.empty?
+      Regexp.new "^#{render_tag :JAVASCRIPT, file, attrs}$"
     end
 
     context "when <file> exists" do
       subject { render("{% javascript app.js %}") }
       it { is_expected.to match tag_re("app") }
     end
 
+    context "when <file> has an attribute" do
+      subject { render("{% javascript app.js type=\"text/javascript\" %}") }
+      it { is_expected.to match tag_re("app", "type=\"text/javascript\"") }
+    end
+
     context "when <file> name has multiple dots" do
       subject { render("{% javascript app.min %}") }
       it { is_expected.to match tag_re("app.min") }