herbie 0.3.1 → 0.3.2

data/lib/herbie/html_helpers.rb

@@ -2,7 +2,7 @@ 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}>"
+        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>\n#{capture_erb(&block)}\n</#{name}>\n"
       elsif !attrs[:content].nil?
         case name
         when :meta
@@ -23,6 +23,8 @@ module Herbie
             end
           end.join
           "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{option_tags}</#{name}>"
+        when :span
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}></#{name}>"
         else
           "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
         end
@@ -60,7 +62,7 @@ module Herbie
       }
 
       if block_given?
-        erb_concat "#{tag :script, attrs}\n#{capture_erb(&block)}\n</script>"
+        erb_concat "#{tag :script, attrs}\n#{capture_erb(&block)}\n</script>\n"
       else
         source = "/javascripts/#{source}" unless source.nil? || source.match(/^\/{1,2}|^http:\/\/|^https:\/\//)
         source = source.sub(/.js$/, '.min.js') if source && options[:minified] && !source.match(/.min.js$/)
@@ -77,7 +79,7 @@ module Herbie
 
       if block_given?
         default_attrs.delete :rel
-        erb_concat "#{tag :style, default_attrs.merge(attrs)}\n#{capture_erb(&block)}\n</style>"
+        erb_concat "#{tag :style, default_attrs.merge(attrs)}\n#{capture_erb(&block)}\n</style>\n"
       else
         href = "/stylesheets/#{href}" unless href.match(/^\/{1,2}|^http:\/\/|^https:\/\//)
         

data/lib/herbie.rb

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

data/spec/herbie_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require_relative "../lib/herbie.rb"
+require "rspec/expectations"
 
 describe Herbie::Helpers do
   include Herbie::Helpers
@@ -47,6 +48,19 @@ describe Herbie::Helpers do
       tag(:meta, attrs).should == "<meta name=\"#{attrs[:name]}\" content=\"#{attrs[:content]}\">"
     end
     
+    it "should automatically close span tags when no content is supplied" do
+      tag(:span).should == "<span></span>"
+    end
+    
+    it "should output a new line after passing a block to a tag" do
+      pending "Need a mechanism for capturing erb output within a passed block"
+      output = tag :div do
+        "hello world"
+      end
+      
+      output.should end_with "\n"
+    end
+    
     it "should output select tags with a supplied list of options" do
       attrs = {
         :name => "colour",

data/spec/spec.opts

@@ -0,0 +1 @@
+--color --format documentation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbie
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +102,7 @@ files:
 - lib/herbie/html_helpers.rb
 - lib/herbie.rb
 - spec/herbie_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/kapowaz/herbie
 licenses: []
@@ -113,5 +130,5 @@ specification_version: 3
 summary: herbie
 test_files:
 - spec/herbie_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: