herbie 0.3.2 → 0.3.3

data/lib/herbie/generic_helpers.rb

@@ -9,12 +9,16 @@ module Herbie
 
     def attributes(hash)
       a = []
-      hash.each_pair do |k,v|
-        unless v.nil?
-          if v === true
-            a.push "#{snake_case(k.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}"
+      hash.each_pair do |attribute, value|
+        unless value.nil?
+          if value === true
+            a.push "#{snake_case(attribute.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}"
           else
-            a.push "#{snake_case(k.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}=\"#{v}\""
+            if attribute == :class && value.class == Array
+              a.push "#{snake_case(attribute.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}=\"#{value.join(' ')}\""
+            else
+              a.push "#{snake_case(attribute.to_s).sub(/^(.{1,1})/) { |m| m.downcase }}=\"#{value}\""
+            end
           end
         end
       end

data/lib/herbie/html_helpers.rb

@@ -2,14 +2,14 @@ module Herbie
   module Helpers
     def tag(name, attrs={}, &block)
       if block_given?
-        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>\n#{capture_erb(&block)}\n</#{name}>\n"
+        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty? || attributes(attrs).empty?}>\n#{capture_erb(&block)}\n</#{name}>\n"
       elsif !attrs[:content].nil?
         case name
         when :meta
-          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty? || attributes(attrs).empty?}>"
         else
           content = attrs.delete :content
-          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty? || attributes(attrs).empty?}>#{content}</#{name}>"
         end
       else
         case name
@@ -22,11 +22,11 @@ module Herbie
               tag :option, option
             end
           end.join
-          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{option_tags}</#{name}>"
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty? || attributes(attrs).empty?}>#{option_tags}</#{name}>"
         when :span
-          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}></#{name}>"
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty? || attributes(attrs).empty?}></#{name}>"
         else
-          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty? || attributes(attrs).empty?}>"
         end
       end
     end

data/lib/herbie.rb

@@ -3,5 +3,5 @@ require 'herbie/generic_helpers.rb'
 require 'herbie/html_helpers.rb'
 
 module Herbie
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/herbie_spec.rb

@@ -48,6 +48,14 @@ describe Herbie::Helpers do
       tag(:meta, attrs).should == "<meta name=\"#{attrs[:name]}\" content=\"#{attrs[:content]}\">"
     end
     
+    it "should ignore passed attributes with a nil value" do
+      tag(:div, :class => nil, :content => "They have absolutely no class, and they're always on the hustle.").should == "<div>They have absolutely no class, and they're always on the hustle.</div>"
+    end
+    
+    it "should output all class names supplied as an array" do
+      tag(:div, :class => [:foo, :bar], :content => "hello world").should == "<div class=\"foo bar\">hello world</div>"
+    end
+    
     it "should automatically close span tags when no content is supplied" do
       tag(:span).should == "<span></span>"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbie
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors: