herbie 0.0.3 → 0.1.1

data/lib/herbie/erb_helpers.rb

@@ -14,7 +14,7 @@ module Herbie
     end
 
     def erb_concat(text)
-      @_out_buf << text if !@_out_buf.nil?
+      @_out_buf << text unless @_out_buf.nil?
     end
     
   end

data/lib/herbie/html_helpers.rb

@@ -2,14 +2,39 @@ module Herbie
   module Helpers
     def tag(name, attrs={}, &block)
       if block_given?
-        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>#{capture_erb(&block)}</#{name}>"
+        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>#{capture_erb(&block)}</#{name}>" # if we're capturing ERB...
+        "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{block.call}</#{name}>" # if we're nesting function calls...
       elsif !attrs[:content].nil?
         content = attrs.delete :content
-        "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>#{content}</#{name}>"
+        "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
       else
-        "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>"
+        "<#{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 = []
+          classes << c unless c.nil?
+          classes << cycle[:even] if i.even? && cycle.key?(:even)
+          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
+        result += "\n"
+      end
+      result
+    end
   
     def script(source=nil, &block)
       attrs = {

data/lib/herbie.rb

@@ -1,7 +1,8 @@
+require 'erubis'
 require 'herbie/erb_helpers.rb'
 require 'herbie/generic_helpers.rb'
 require 'herbie/html_helpers.rb'
 
 module Herbie
-  VERSION = '0.0.3'
+  VERSION = '0.1.1'
 end

data/spec/herbie_spec.rb

@@ -4,37 +4,85 @@ require_relative "../lib/herbie.rb"
 describe Herbie::Helpers do
   include Herbie::Helpers
   
-  it "should be able to output a simple tag" do
-    attrs = {
-      :src    => "/path/to/image.jpg",
-      :height => 320,
-      :width  => 640,
-      :alt    => "An image of something"
-    }
-    
-    tag(:img, attrs).should == "<img src=\"#{attrs[:src]}\" height=\"#{attrs[:height]}\" width=\"#{attrs[:width]}\" alt=\"#{attrs[:alt]}\">"
-  end
-  
-  it "should not output attributes whose values are nil" do
-    attrs = {
-      :type    => "checkbox",
-      :name    => "stay_logged_in",
-      :value   => "true",
-      :checked => nil
-    }
-    
-    tag(:input, attrs).should == "<input type=\"#{attrs[:type]}\" name=\"#{attrs[:name]}\" value=\"#{attrs[:value]}\">"
-  end
-  
-  it "should output just the property name for attributes with a boolean value of true" do
-    attrs = {
-      :type    => "checkbox",
-      :name    => "stay_logged_in",
-      :value   => "true",
-      :checked => true
-    }
+  describe "tag helpers" do
+    it "should be able to output a simple tag" do
+      attrs = {
+        :src    => "/path/to/image.jpg",
+        :height => 320,
+        :width  => 640,
+        :alt    => "An image of something"
+      }
+
+      tag(:img, attrs).should == "<img src=\"#{attrs[:src]}\" height=\"#{attrs[:height]}\" width=\"#{attrs[:width]}\" alt=\"#{attrs[:alt]}\">"
+    end
+
+    it "should not output attributes whose values are nil" do
+      attrs = {
+        :type    => "checkbox",
+        :name    => "stay_logged_in",
+        :value   => "true",
+        :checked => nil
+      }
+
+      tag(:input, attrs).should == "<input type=\"#{attrs[:type]}\" name=\"#{attrs[:name]}\" value=\"#{attrs[:value]}\">"
+    end
+
+    it "should output just the property name for attributes with a boolean value of true" do
+      attrs = {
+        :type    => "checkbox",
+        :name    => "stay_logged_in",
+        :value   => "true",
+        :checked => true
+      }
+
+      tag(:input, attrs).should == "<input type=\"#{attrs[:type]}\" name=\"#{attrs[:name]}\" value=\"#{attrs[:value]}\" checked>"
+    end
+
+    it "should output all nested tag method calls" do
+      markup = "<div class=\"container\"><h1>Status Report</h1></div>"
+      result = tag :div, :class => "container" do
+        tag :h1, :content => "Status Report"
+      end
+      result.should == markup
+    end
+
+    it "should output a collection of tags" do
+      markup = <<-MARKUP
+<li><a href="/" title="Back to the homepage">Home</a></li>
+<li><a href="/shop" title="View all our products">Shop</a></li>
+<li><a href="/orders" title="View your existing orders">Orders</a></li>
+<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"},
+        {:text => "Orders", :href => "/orders", :title => "View your existing orders"},
+        {:text => "Contact Us", :href => "/contactus", :title => "Get in touch with us"},
+        {:text => "Help", :href => "/help", :title => "Can't find what you need? Get help here"}
+      ]
+      result = tags :li, navigation_items do |item|
+        link_to item[:href], item[:text], :title => item[:title]
+      end
+      result.should == markup
+    end
     
-    tag(:input, attrs).should == "<input type=\"#{attrs[:type]}\" name=\"#{attrs[:name]}\" value=\"#{attrs[:value]}\" checked>"
+    it "should allow an arbitrary class to be added to alternating elements within the collection" do
+      markup = <<-MARKUP
+<li class="even">Annie</li>
+<li>Brenda</li>
+<li class="even">Charlie</li>
+<li>Davinia</li>
+<li class="even">Emma</li>
+MARKUP
+
+      names = ['Annie', 'Brenda', 'Charlie', 'Davinia', 'Emma']
+      result = tags :li, names, :cycle => {:even => "even"} do |name|
+        name
+      end
+      result.should == markup
+    end
   end
   
   describe "script helpers" do

metadata

@@ -2,7 +2,7 @@
 name: herbie
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ben Darlow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 +01:00
+date: 2011-10-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +24,17 @@ dependencies:
         version: "2.6"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Lovable HTML view helpers for use with ERB.
 email: ben@kapowaz.net
 executables: []