Changeset 1291

Timestamp:

01/12/08 20:11:36 (11 months ago)

Author:

sethrasmuss..@gmail.com

Message:

snag tag() from merb_helpers and give it some steroids.. maybe all the tag helpers belong in merb_helpers? all of tag()'s relatives are in merb so this move makes sense for now

Files:

• trunk/lib/merb/mixins/view_context.rb (modified) (3 diffs)
• trunk/spec/merb/view_context_spec.rb (modified) (2 diffs)

trunk/lib/merb/mixins/view_context.rb

@@ -508 +508 @@
-    end
-    
+    # Creates a generic HTML tag. You can invoke it a variety of ways.
+    #   
+    #   tag :div
+    #   # <div></div>
+    #   
+    #   tag :div, :class => 'class'
+    #   # <div class="class"></div>
+    #   
+    #   tag :div do
+    #     'content'
+    #   end
+    #   # <div>content</div>
+    #   
+    #   tag :div, :class => 'class' do
+    #     'content'
+    #   end
+    #   # <div class="class">content</div>
+    #   
+    # 
+    def tag(name, contents = nil, attrs = {}, &block)
+      attrs = contents if contents.is_a?(Hash)
+      contents = capture(&block) if block_given?
+      open_tag(name, attrs) + contents.to_s + close_tag(name)
+    end
+    
-    # Creates the opening tag with attributes for the provided +name+
-    # attrs is a hash where all members will be mapped to key="value"
@@ -513 +538 @@
-    # Note: This tag will need to be closed
-    def open_tag(name, attrs = nil)
-(' ' + attrs.to_html_attributes)
+' ' + attrs.to_html_attributes
-    end
-    
@@ -526 +551 @@
-    # +attrs+ : a hash where all members will be mapped to key="value"
-    def self_closing_tag(name, attrs = nil)
-
-    
-  
+ && !attrs.empty?
+
+
-end

trunk/spec/merb/view_context_spec.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require FIXTURES + '/controllers/render_spec_controllers'
-
-describe "View Context", "image tag" do
@@ -310 +311 @@
-
-describe Merb::ViewContextMixin do
-
+
+
+
+
+
+
+
+
+
+
+
-  it "should render the start of a tag" do
-open_tag(:div).should == "<div>"
-
-
+@view.open_tag(:div).should match_tag(:div)
+
+
-  it "should render the start of a tag with attributes" do
-tag = open_tag(:div, :id => 1, :class => "CLASS")
-tag.
-
-
+@view.open_tag(:div, :id => 1, :class => "CLASS").
+  
+
+
-  it "should render a self closing tag" do
-self_closing_tag(:br).should == "<br/>"
-
-
+@view.self_closing_tag(:br).should match_tag(:br)
+
+
-  it "should render a self closing tag with attributes" do
-
-
-
+
+
+
+
-  it "should render a closing tag" do
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+