herbie 0.1.5 → 0.1.6

data/lib/herbie/erb_helpers.rb

@@ -4,7 +4,7 @@ require 'erubis'
 module Herbie
   module Helpers
     private
-    
+
     def erb_with_output_buffer(buf = '')
       @_out_buf, old_buffer = buf, @_out_buf
       yield
@@ -20,6 +20,6 @@ module Herbie
     def erb_concat(text)
       @_out_buf << text unless @_out_buf.nil?
     end
-    
+
   end
 end

data/lib/herbie/generic_helpers.rb

@@ -19,7 +19,7 @@ module Herbie
         end
       end
       a.join(' ')
-    end 
+    end
 
   end
 end

data/lib/herbie/html_helpers.rb

@@ -4,20 +4,25 @@ module Herbie
       if block_given?
         erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>\n#{capture_erb(&block)}\n</#{name}>"
       elsif !attrs[:content].nil?
-        content = attrs.delete :content
-        "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
+        case name
+        when :meta
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
+        else
+          content = attrs.delete :content
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
+        end
       else
         "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
       end
     end
-    
+
     # work in progress
     def tags(name, collection, attrs={}, &block)
       cycle = attrs.delete :cycle
       result = ""
       collection.each_with_index do |item, i|
         a = attrs.dup
-        
+
         unless cycle.nil?
           c = a.delete :class
           classes = []
@@ -26,7 +31,7 @@ module Herbie
           classes << cycle[:odd] if i.odd? && cycle.key?(:odd)
           a[:class] = classes.join " " unless classes.empty?
         end
-        
+
         result += tag name, a do
           block.call(item)
         end
@@ -34,13 +39,13 @@ module Herbie
       end
       result
     end
-  
+
     def script(source=nil, &block)
       attrs = {
         :type    => "text/javascript",
         :charset => "utf-8"
       }
-      
+
       if block_given?
         erb_concat "#{tag :script, attrs}\n#{capture_erb(&block)}\n</script>"
       else
@@ -49,23 +54,23 @@ module Herbie
         "#{tag :script, attrs}</script>"
       end
     end
-    
+
     def style(href=nil, attrs={}, &block)
       default_attrs = {
         :rel  => "stylesheet",
         :type => "text/css"
       }
-      
+
       if block_given?
         default_attrs.delete :rel
         erb_concat "#{tag :style, default_attrs.merge(attrs)}\n#{capture_erb(&block)}\n</style>"
       else
         href = "/stylesheets/#{href}" unless href.match(/^\/{1,2}|^http:\/\/|^https:\/\//)
         attrs = default_attrs.merge({:href => href}.merge(attrs))
-        "#{tag :link, attrs}"        
+        "#{tag :link, attrs}"
       end
     end
-    
+
     def link_to(href, text=nil, attrs={}, &block)
       attrs = {:href => href}.merge(attrs)
       if block_given?
@@ -74,10 +79,10 @@ module Herbie
         "#{tag :a, attrs}#{text ||= attrs[:href]}</a>"
       end
     end
-    
+
     def content_for(name, content=nil, &block)
       @captured_content ||= {}
-      
+
       if content || block_given?
         if @captured_content.key? name
           @capured_content[name] += content || capture_erb(&block)
@@ -88,6 +93,6 @@ module Herbie
         @captured_content[name]
       end
     end
-    
+
   end
 end

data/spec/herbie_spec.rb

@@ -3,7 +3,7 @@ require_relative "../lib/herbie.rb"
 
 describe Herbie::Helpers do
   include Herbie::Helpers
-  
+
   describe "tag helpers" do
     it "should be able to output a simple tag" do
       attrs = {
@@ -37,6 +37,15 @@ describe Herbie::Helpers do
 
       tag(:input, attrs).should == "<input type=\"#{attrs[:type]}\" name=\"#{attrs[:name]}\" value=\"#{attrs[:value]}\" checked>"
     end
+    
+    it "should output the content parameter as an attribute on meta tags" do
+      attrs = {
+        :name    => "viewport",
+        :content => "width=device-width, user-scalable=yes, initial-scale=1.0"
+      }
+      
+      tag(:meta, attrs).should == "<meta name=\"#{attrs[:name]}\" content=\"#{attrs[:content]}\">"
+    end
 
     it "should output tags mixed with ERB" do
       pending "Need a mechanism for capturing erb output within a passed block"
@@ -74,7 +83,7 @@ HTML
 <li><a href="/contactus" title="Get in touch with us">Contact Us</a></li>
 <li><a href="/help" title="Can't find what you need? Get help here">Help</a></li>
 MARKUP
-      
+
       navigation_items = [
         {:text => "Home", :href => "/", :title => "Back to the homepage"},
         {:text => "Shop", :href => "/shop", :title => "View all our products"},
@@ -87,7 +96,7 @@ MARKUP
       end
       result.should == markup
     end
-    
+
     it "should allow an arbitrary class to be added to alternating elements within the collection" do
       pending "Need a mechanism for capturing erb output within a passed block"
       markup = <<-MARKUP
@@ -105,55 +114,55 @@ MARKUP
       result.should == markup
     end
   end
-  
+
   describe "script helpers" do
     it "should prefix the path to the script with ‘/javascripts’ if the script path is relative" do
       script("script.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/javascripts/script.js\"></script>"
     end
-    
+
     it "should output a script with an absolute path to the script if the path provided was absolute" do
       script("/path/to/script.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/path/to/script.js\"></script>"
     end
-    
+
     it "should output a script with an absolute path to the script if the path provided begins with http://, https:// or //" do
       script("http://code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"http://code.jquery.com/jquery.js\"></script>" and
       script("https://code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"https://code.jquery.com/jquery.js\"></script>" and
       script("//code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"//code.jquery.com/jquery.js\"></script>"
     end
-    
+
     it "should output a script element with arbitrary javascript content provided by a block" do
       pending "Need a mechanism for capturing erb output within a passed block"
       script_block = Proc.new { "function hello_world(){ console.log(\"hello world!\"); }" }
       script(&script_block).should == "<script type=\"text/javascript\" charset=\"utf-8\">\n#{capture_erb(&script_block)}\n</script>"
     end
-    
+
     it "should output a jQuery script include with the specified options" do
       pending "NYI"
-      
+
       jquery(:version => "1.5.0", :min => false, :cdn => :google).should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"\"></script>"
     end
   end
-  
+
   describe "stylesheet helpers" do
     it "should prefix the path to the script with ‘/stylesheets’ if the stylesheet path is relative" do
       style("foo.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"/stylesheets/foo.css\">"
     end
-    
+
     it "should output a link element with the absolute path to the stylesheet if the path provided was absolute" do
       style("/style/foo.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style/foo.css\">"
     end
-    
+
     it "should output a link element with the absolute path to the stylesheet if the path provided starts with http://, https:// or //" do
       style("http://foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://foo.com/style/bar.css\">" and
       style("https://foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"https://foo.com/style/bar.css\">" and
       style("//foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"//foo.com/style/bar.css\">"
     end
-    
+
     it "should output a link element with appropriate media query attribute if provided" do
       media = "screen and (min-width:500px)"
       style("/style/foo.css", :media => media).should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style/foo.css\" media=\"#{media}\">"
     end
-    
+
     it "should output a style element with arbitrary content provided by a block" do
       pending "Need a mechanism for capturing erb output within a passed block"
       media     = "screen and (min-width:500px)"
@@ -161,19 +170,19 @@ MARKUP
       style({:media => media}, &css_block).should == "<style type=\"text/css\" media=\"#{media}\">\n#{capture_erb(&css_block)}\n</style>"
     end
   end
-  
+
   describe "link helpers" do
     it "should be able to output a simple link" do
       href = "http://www.foo.com/"
       link_to(href).should == "<a href=\"#{href}\">#{href}</a>"
     end
-    
+
     it "should be able to output a link with href and text" do
       href = "http://www.foo.com/"
       text = "Visit foo.com"
       link_to(href, text).should == "<a href=\"#{href}\">#{text}</a>"
     end
-    
+
     it "should be able to output links with arbitrary attributes" do
       href = "http://www.foo.com/"
       text = "Visit foo.com"
@@ -183,7 +192,7 @@ MARKUP
       }
       link_to(href, text, attrs).should == "<a href=\"#{href}\" class=\"#{attrs[:class]}\" target=\"#{attrs[:target]}\">#{text}</a>"
     end
-    
+
     it "should be able to output a link enclosing arbitrary markup provided by a block" do
       pending "Need a mechanism for capturing erb output within a passed block"
       href = "http://www.foo.com/"
@@ -195,7 +204,7 @@ MARKUP
       link_to(href, text, attrs, &markup_block).should == "<a href=\"#{href}\" class=\"#{attrs[:class]}\">#{capture_erb(&markup_block)}</a>"
     end
   end
-  
+
   describe "content helpers" do
     it "should accept a named block of content which can then be displayed elsewhere later" do
       pending "Need a mechanism for capturing erb output within a passed block"
@@ -204,7 +213,7 @@ MARKUP
         "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/application.js\">"
         # Tilt['erb'].new { "%><%= script 'application.js' %><%" }
       end
-      
+
       content_for(:script).should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/application.js\">"
     end
   end

metadata

@@ -1,105 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: herbie
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease: 
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Ben Darlow
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-08 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Lovable HTML view helpers for use with ERB.
 email: ben@kapowaz.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/herbie/erb_helpers.rb
 - lib/herbie/generic_helpers.rb
 - lib/herbie/html_helpers.rb
 - lib/herbie.rb
 - spec/herbie_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kapowaz/herbie
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: herbie
-test_files: 
+test_files:
 - spec/herbie_spec.rb
 - spec/spec_helper.rb