merb_helpers 0.5 → 0.9.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "merb_helpers"
 NAME = "merb_helpers"
-GEM_VERSION = "0.5"
+VERSION = "0.9.2"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://merb.rubyforge.org/"
@@ -17,7 +17,7 @@ SUDO = windows ? "" : "sudo"
 
 spec = Gem::Specification.new do |s|
   s.name = NAME
-  s.version = GEM_VERSION
+  s.version = VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
@@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency("merb", ">=0.5")
+  s.add_dependency("merb-core", ">=0.9.2")
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
@@ -39,7 +39,7 @@ end
 
 desc "Run :package and install resulting .gem"
 task :install => [:package] do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{GEM_VERSION} --no-rdoc --no-ri}
+  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
 end
 
 Rake::RDocTask.new do |rdoc|
@@ -54,7 +54,6 @@ end
 
 
 Spec::Rake::SpecTask.new do |t|
-   t.warning = true
    t.spec_opts = ["--format", "specdoc", "--colour"]
    t.spec_files = Dir['spec/**/*_spec.rb'].sort   
 end

data/lib/merb_helpers.rb

@@ -24,12 +24,12 @@ module Merb
       else
         load_helpers
       end
-
-      Merb::Plugins.add_rakefiles "tasks/merb_tasks"
     end
     
   end
   
 end
 
-Merb::Helpers.load if defined?(Merb::Plugins)
+Merb::BootLoader.before_app_loads do  
+  Merb::Helpers.load if defined?(Merb::Plugins)
+end

data/lib/merb_helpers/date_time_helpers.rb

@@ -1,7 +1,276 @@
+module TimeDSL
+  {:second => 1, 
+   :minute => 60, 
+   :hour => 3600, 
+   :day => [24,:hours], 
+   :week => [7,:days], 
+   :month => [30,:days], 
+   :year => [364.25, :days]}.each do |meth, amount|
+    define_method meth do
+      amount = amount.is_a?(Array) ? amount[0].send(amount[1]) : amount
+      self * amount
+    end
+    alias_method "#{meth}s".intern, meth
+  end
+  
+  # Reads best without arguments:  10.minutes.ago
+  def ago(time = ::Time.now)
+    time - self
+  end
+  alias :until :ago
+  
+  # Reads best with argument:  10.minutes.since(time)
+  def since(time = ::Time.now)
+    time + self
+  end
+  alias :from_now :since
+end
+
+class Integer
+  # Ordinalize turns a number into an ordinal string used to denote the
+  # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
+  #
+  # Examples
+  #   1.ordinalize     # => "1st"
+  #   2.ordinalize     # => "2nd"
+  #   1002.ordinalize  # => "1002nd"
+  #   1003.ordinalize  # => "1003rd"
+  def ordinalize
+    if (11..13).include?(self % 100)
+      "#{self}th"
+    else
+      case self % 10
+        when 1; "#{self}st"
+        when 2; "#{self}nd"
+        when 3; "#{self}rd"
+        else    "#{self}th"
+      end
+    end
+  end
+end
+
+Numeric.send :include, TimeDSL
+# Everything above here has pretty much been implemented in the assistance gem...
+
+# Time.now.to_ordinalized_s :long
+# => "February 28th, 2006 21:10"
+module OrdinalizedFormatting
+  def to_ordinalized_s(format = :default)
+    format = Merb::Helpers::DateAndTime::DATE_FORMATS[format] 
+    return to_default_s if format.nil?
+    strftime_ordinalized(format)
+  end
+
+  def strftime_ordinalized(fmt)
+    strftime(fmt.gsub(/%d/, '_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
+  end
+end
+
+class Date
+  include OrdinalizedFormatting
+  # Converts a Date instance to a Time, where the time is set to the beginning of the day.
+  # The timezone can be either :local or :utc (default :utc).
+  #
+  # ==== Examples:
+  #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
+  #
+  #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
+  #   date.to_time(:local)           # => Sat Nov 10 00:00:00 0800 2007
+  #
+  #   date.to_time(:utc)             # => Sat Nov 10 00:00:00 UTC 2007
+  def to_time(form = :utc)
+    ::Time.send("#{form}_time", year, month, day)
+  end
+  def to_date; self; end
+end
+
+class Time
+  include OrdinalizedFormatting
+  # Ruby 1.8-cvs and 1.9 define private Time#to_date
+  %w(to_date to_datetime).each do |method|
+    public method if private_instance_methods.include?(method)
+  end
+  def to_time; self; end
+end
+
 module Merb
   module Helpers
+    # Provides a number of methods for displaying and dealing with dates and times
+    #
+    # Parts were strongly based on http://ar-code.svn.engineyard.com/plugins/relative_time_helpers/, and
+    # active_support
+    #
+    # The key methods are `relative_date`, `relative_date_span`, and `relative_time_span`.  This also gives
+    # you the Rails style Time DSL for working with numbers eg. 3.months.ago or 5.days.until(1.year.from_now)
     module DateAndTime
+      TIME_CLASS = Time
+      TIME_OUTPUT = {
+        :today          => 'today',
+        :yesterday      => 'yesterday',
+        :tomorrow       => 'tomorrow',
+        :initial_format => '%b %d',
+        :year_format    => ', %Y'
+      }
+      DATE_FORMATS = {
+        :db           => "%Y-%m-%d %H:%M:%S",
+        :time         => "%H:%M",
+        :short        => "%d %b %H:%M",
+        :long         => "%B %d, %Y %H:%M",
+        :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") },
+        :rfc822       => "%a, %d %b %Y %H:%M:%S %z"
+      }
+      
+      # Gives you a relative date in an attractive format
+      #
+      # ==== Parameters
+      # time<~to_date>:: The Date or Time to test
+      #
+      # ==== Returns
+      # String:: The sexy relative date
+      #
+      # ==== Examples
+      #   relative_date(Time.now.utc) => "today"
+      #   relative_date(5.days.ago) => "March 5th"
+      #   relative_date(1.year.ago) => "March 10th, 2007"
+      def relative_date(time)
+        date  = time.to_date
+        today = TIME_CLASS.now.to_date
+        if date == today
+          TIME_OUTPUT[:today]
+        elsif date == (today - 1)
+          TIME_OUTPUT[:yesterday]
+        elsif date == (today + 1)
+          TIME_OUTPUT[:tomorrow]
+        else
+          fmt  = TIME_OUTPUT[:initial_format].dup
+          fmt << TIME_OUTPUT[:year_format] unless date.year == today.year
+          time.strftime_ordinalized(fmt)
+        end
+      end
+      
+      # Gives you a relative date span in an attractive format
+      #
+      # ==== Parameters
+      # times<~first,~last>:: The Dates or Times to test
+      #
+      # ==== Returns
+      # String:: The sexy relative date span
+      #
+      # ==== Examples
+      #   relative_date([1.second.ago, 10.seconds.ago]) => "March 10th"
+      #   relative_date([1.year.ago, 1.year.ago) => "March 10th, 2007"
+      #   relative_date([Time.now, 1.day.from_now]) => "March 10th - 11th"
+      #   relative_date([Time.now, 1.year.ago]) => "March 10th, 2007 - March 10th, 2008"
+      def relative_date_span(times)
+        times = [times.first, times.last].collect! { |t| t.to_date }
+        times.sort!
+        if times.first == times.last
+          relative_date(times.first)
+        else
+          first = times.first; last = times.last; now = TIME_CLASS.now
+          arr = [first.strftime_ordinalized('%b %d')]
+          arr << ", #{first.year}" unless first.year == last.year
+          arr << ' - '
+          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
+          arr << last.day.ordinalize
+          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
+          arr.to_s
+        end
+      end
+      
+      # Gives you a relative date span in an attractive format
+      #
+      # ==== Parameters
+      # times<~first,~last>:: The Dates or Times to test
+      #
+      # ==== Returns
+      # String:: The sexy relative time span
+      #
+      # ==== Examples
+      #   relative_time_span([1.second.ago, 10.seconds.ago]) => "12:00 - 12:09 AM March 10th"
+      #   relative_time_span([1.year.ago, 1.year.ago) => "12:09 AM March 10th, 2007"
+      #   relative_time_span([Time.now, 13.hours.from_now]) => "12:09 AM - 1:09 PM March 10th"
+      #   relative_time_span([Time.now, 1.year.ago]) => "12:09 AM March 10th, 2007 - 12:09 AM March 10th, 2008"
+      def relative_time_span(times)
+        times = [times.first, times.last].collect! { |t| t.to_time }
+        times.sort!
+        if times.first == times.last
+          "#{prettier_time(times.first)} #{relative_date(times.first)}"
+        elsif times.first.to_date == times.last.to_date
+            same_half = (times.first.hour/12 == times.last.hour/12)
+            "#{prettier_time(times.first, !same_half)} - #{prettier_time(times.last)} #{relative_date(times.first)}"
+      
+        else
+          first = times.first; last = times.last; now = TIME_CLASS.now        
+          arr = [prettier_time(first)]
+          arr << ' '
+          arr << first.strftime_ordinalized('%b %d')
+          arr << ", #{first.year}" unless first.year == last.year
+          arr << ' - '
+          arr << prettier_time(last)
+          arr << ' '
+          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
+          arr << last.day.ordinalize
+          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
+          arr.to_s
+        end
+      end
+      
+      # Condenses time... very similar to time_ago_in_words in ActionPack
+      #
+      # ==== Parameters
+      # from_time<~to_time>:: The Date or Time to start from
+      # to_time<~to_time>:: The Date or Time to go to, Defaults to Time.now.utc
+      # include_seconds<Boolean>:: Count the seconds initially, Defaults to false
+      #
+      # ==== Returns
+      # String:: The time distance
+      #
+      # ==== Examples
+      # time_lost_in_words(3.minutes.from_now)           # => 3 minutes
+      # time_lost_in_words(Time.now - 15.hours)          # => 15 hours
+      # time_lost_in_words(Time.now, 3.minutes.from_now) # => 3 minutes
+      # time_lost_in_words(Time.now)                     # => less than a minute
+      # time_lost_in_words(Time.now, Time.now, true)     # => less than 5 seconds
+      #
+      def time_lost_in_words(from_time, to_time = Time.now.utc, include_seconds = false)
+        from_time = from_time.to_time if from_time.respond_to?(:to_time)
+        to_time = to_time.to_time if to_time.respond_to?(:to_time)
+        distance_in_minutes = (((to_time - from_time).abs)/60).round
+        distance_in_seconds = ((to_time - from_time).abs).round
+      
+        case distance_in_minutes
+          when 0..1
+            return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
+            case distance_in_seconds
+              when 0..4   then 'less than 5 seconds'
+              when 5..9   then 'less than 10 seconds'
+              when 10..19 then 'less than 20 seconds'
+              when 20..39 then 'half a minute'
+              when 40..59 then 'less than a minute'
+              else             '1 minute'
+            end
+      
+          when 2..44           then "#{distance_in_minutes} minutes"
+          when 45..89          then 'about 1 hour'
+          when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+          when 1440..2879      then '1 day'
+          when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
+          when 43200..86399    then 'about 1 month'
+          when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
+          when 525600..1051199 then 'about 1 year'
+          else                      "over #{(distance_in_minutes / 525600).round} years"
+        end
+      end
+      alias :time_ago_in_words :time_lost_in_words
       
+      def prettier_time(time, ampm=true)
+        time.strftime("%I:%M#{" %p" if ampm}").sub(/^0/, '')
+      end
     end
   end
+end
+
+class Merb::Controller #:nodoc:
+  include Merb::Helpers::DateAndTime
 end

data/lib/merb_helpers/form_helpers.rb

@@ -1,3 +1,5 @@
+require "#{File.dirname(__FILE__)}/tag_helpers"
+
 module Merb #:nodoc:
   
   # Merb helpers include several helpers used for simplifying view creation.
@@ -28,7 +30,7 @@ module Merb #:nodoc:
     #     </form>
     #
     # You may also create a normal form using form_tag
-    #     <% form_tag({url(:controller => "foo", :action => "bar", :id => 1)} do %>
+    #     <% form_tag(:action => url(:controller => "foo", :action => "bar", :id => 1)) do %>
     #       <%= text_field :name => 'first_name', :label => 'First Name' %>
     #       <%= submit_button 'Create' %>
     #     <% end %>
@@ -43,20 +45,35 @@ module Merb #:nodoc:
     
       # Provides a HTML formatted display of resource errors in an unordered list with a h2 form submission error
       # ==== Options
+      # +build_li+:: Block for generating a list item for an error. It receives an instance of the error.
       # +html_class+:: Set for custom error div class default is <tt>submittal_failed<tt>
       #
-      # ==== Example
-      #   <%= error_messages_for :person %>      
-      def error_messages_for(obj, error_li = nil, html_class='submittal_failed')
-        return "" if !obj.respond_to?(:errors) || obj.errors.empty?
-        header_message = block_given? ? yield(obj.errors) : "<h2>Form submittal failed because of #{obj.errors.size} #{obj.errors.size == 1 ? 'problem' : 'problems'}</h2>"
-        ret = %Q{
+      # ==== Examples
+      #   <%= error_messages_for :person %>
+      #   <%= error_messages_for :person {|errors| "You can has probs nao: #{errors.size} of em!"}
+      #   <%= error_messages_for :person, lambda{|error| "<li class='aieeee'>#{error.join(' ')}"} %>
+      #   <%= error_messages_for :person, nil, 'bad_mojo' %>
+      def error_messages_for(obj, build_li = nil, html_class='error')
+        return "" unless obj.respond_to?(:errors) && ! obj.errors.empty?
+
+        header_message = if block_given?
+          yield(obj.errors)
+        else
+          error_plurality = (obj.errors.size == 1 ? 'problem' : 'problems')
+          "<h2>Form submittal failed because of #{obj.errors.size} #{error_plurality}</h2>"
+        end
+        
+        build_li ||= lambda{|err| "<li>#{err.join(' ')}</li>"}
+        
+        markup = %Q{
           <div class='#{html_class}'>
             #{header_message}
             <ul>
         }
-        obj.errors.each {|err| ret << (error_li ? error_li.call(err) : "<li>#{err.join(" ")}</li>") }
-        ret << %Q{
+        
+        obj.errors.each {|error| markup << build_li.call(error) }
+        
+        markup << %Q{
             </ul>
           </div>
         }
@@ -65,15 +82,10 @@ module Merb #:nodoc:
       def obj_from_ivar_or_sym(obj) #:nodoc:
         obj.is_a?(Symbol) ? instance_variable_get("@#{obj}") : obj
       end
-
-      # Creates a generic HTML tag 
-      def tag(tag_name, contents, attrs = {}) #:nodoc:
-        open_tag(tag_name, attrs) + contents.to_s + "</#{tag_name}>"
-      end
-
+      
       # Generates a form tag, which accepts a block that is not directly based on resource attributes
       # 
-      #     <% form_tag({url(:controller => "foo", :action => "bar", :id => 1)} do %>
+      #     <% form_tag(:action => url(:controller => "foo", :action => "bar", :id => 1)) do %>
       #       <%= text_field :name => 'first_name', :label => 'First Name' %>
       #       <%= submit_button 'Create' %>
       #     <% end %>
@@ -152,7 +164,7 @@ module Merb #:nodoc:
       end
       
       def control_value(col) #:nodoc:
-        @_obj.send(col)
+        escape_xml(@_obj.send(col))
       end
       
       def control_name_value(col, attrs) #:nodoc:
@@ -175,7 +187,7 @@ module Merb #:nodoc:
       # Provides a HTML text input tag based on a resource attribute.
       #
       # ==== Example
-      #     <%= text_field :fav_color, :label => 'Your Favorite Color' %>
+      #     <%= text_field :name => :fav_color, :label => 'Your Favorite Color' %>
       #     # => <label for="fav_color">Your Favorite Color</label><input type="text" name="fav_color" id="fav_color"/>
       def text_field(attrs = {})
         attrs.merge!(:type => "text")
@@ -197,7 +209,7 @@ module Merb #:nodoc:
       # Provides a generic HTML password input tag.
       #
       # ==== Example
-      #     <%= password_field :password, :label => "Password" %>
+      #     <%= password_field :name => :password, :label => "Password" %>
       #     # => <label for="password">Password</label><input type="password" name="password" id="password"/>
       def password_field(attrs = {})
         attrs.delete(:value)
@@ -296,9 +308,10 @@ module Merb #:nodoc:
         val = @_obj.send(col)
         ret = ""
         options.each do |opt|
-          value, label = opt.is_a?(Hash) ? [opt[:value], opt[:label]] : [opt, opt]
-          hash = {:name => "#{@_object_name}[#{col}]", :value => value, :label => label}
-          hash.merge!(:selected => "selected") if val.to_s == value.to_s
+          value, label = opt.is_a?(Hash) ? [opt.delete(:value), opt.delete(:label)] : [opt, opt]
+          hash = {:name => "#{@_object_name}[#{col}]", :value => value, :label => label, :id => "#{control_id(col)}_#{value}" }
+          hash.merge!(opt) if opt.is_a?(Hash)
+          hash.merge!(:checked => "checked") if val.to_s == value.to_s
           ret << radio_field(hash)
         end
         ret
@@ -324,6 +337,7 @@ module Merb #:nodoc:
       def text_area_control(col, attrs = {})
         attrs ||= {}
         errorify_field(attrs, col)
+        attrs.merge!(:id => control_id(col))
         text_area_field(control_value(col), attrs.merge(:name => control_name(col)))
       end
       
@@ -388,6 +402,7 @@ module Merb #:nodoc:
       def select_control(col, attrs = {})
         attrs.merge!(:name => attrs[:name] || control_name(col))
         attrs.merge!(:id   => attrs[:id]   || control_id(col))
+        attrs.merge!(:selected => attrs[:selected] || control_value(col))
         errorify_field(attrs, col)
         optional_label(attrs) { select_field(attrs) }
       end
@@ -414,22 +429,24 @@ module Merb #:nodoc:
         prompt     = attrs.delete(:prompt)
         blank      = attrs.delete(:include_blank)
         selected   = attrs.delete(:selected)
-        returning '' do |ret|
-          ret << tag('option', prompt, :value => '') if prompt
-          ret << tag("option", '', :value => '') if blank
-          unless collection.blank?
-            if collection.is_a?(Hash)
-              collection.each do |label,group|
-                ret << open_tag("optgroup", :label => label.to_s.titleize) + options_for_select(group, :selected => selected) + "</optgroup>"
-              end
-            else
-              collection.each do |value,text|
-                options = selected.to_a.include?(value) ? {:selected => 'selected'} : {}
-                ret << tag( 'option', text, {:value => value}.merge(options) )
-              end
+        ret = String.new
+        ret << tag('option', prompt, :value => '') if prompt
+        ret << tag("option", '', :value => '') if blank
+        unless collection.blank?
+          if collection.is_a?(Hash)
+            collection.each do |label,group|
+              ret << open_tag("optgroup", :label => label.to_s.gsub(/\b[a-z]/) {|x| x.upcase}) + 
+                options_for_select(group, :selected => selected) + "</optgroup>"
+            end
+          else
+            collection.each do |value,text|
+              options = selected.to_a.include?(value) ? {:selected => 'selected'} : {}
+              ret << tag( 'option', text, {:value => value}.merge(options) )
             end
           end
         end
+
+        return ret
       end
 
       # Returns a string of option tags that have been compiled by iterating over the collection and
@@ -442,7 +459,7 @@ module Merb #:nodoc:
       # If we had a collection of people within a @project object, and want to use 'id' as the value, and 'name'
       # as the option content we could do something similar to this;
       #
-      #   <%= options_from_collection_for_select(@project.people, :text_method => "id", :value_method => "name") %>
+      #   <%= options_from_collection_for_select(@project.people, :value_method => "id", :text_method => "name") %>
       #   The iteration of the collection would create options in this manner;
       #   =>  <option value="#{person.id}">#{person.name}</option>
       #
@@ -458,14 +475,16 @@ module Merb #:nodoc:
       def options_from_collection_for_select(collection, attrs = {})
         prompt     = attrs.delete(:prompt)
         blank      = attrs.delete(:include_blank)
+        ret = String.new
         if collection.is_a?(Hash)
-          returning '' do |ret|
-	          ret << tag("option", prompt, :value => '') if prompt
-	          ret << tag("option", '',     :value => '') if blank
-            collection.each do |label, group|
-              ret << open_tag("optgroup", :label => label.to_s.humanize.titleize) + options_from_collection_for_select(group, attrs) + "</optgroup>"
-            end
+          ret << tag("option", prompt, :value => '') if prompt
+          ret << tag("option", '',     :value => '') if blank
+          collection.each do |label, group|
+            # .gsub(/_/, " ").gsub(/\b[a-z]/) {|x| x.upcase}) == .humanize.titleize, which is no longer in -core
+            ret << open_tag("optgroup", :label => label.to_s.gsub(/_/, " ").gsub(/\b[a-z]/) {|x| x.upcase}) + 
+              options_from_collection_for_select(group, attrs) + "</optgroup>"
           end
+          return ret
         else
           text_method    = attrs[:text_method]
           value_method   = attrs[:value_method]
@@ -552,45 +571,51 @@ module Merb #:nodoc:
       end
       
     private
-      
-      # Fake out the browser to send back the method for RESTful stuff.
-      # Fall silently back to post if a method is given that is not supported here
-      def set_form_method(options = {}, obj = nil)
-        options[:method] ||= ((obj && obj.respond_to?(:new_record?) && !obj.new_record?) ? :put : :post)
-        if ![:get,:post].include?(options[:method])
-          fake_form_method = options[:method] if [:put, :delete].include?(options[:method])
-          options[:method] = :post
-        end
-        fake_form_method
-      end
-      
-      def generate_fake_form_method(fake_form_method)
-        fake_form_method ? hidden_field(:name => "_method", :value => "#{fake_form_method}") : ""
-      end
-      
-      def optional_label(attrs = {})
-        label = attrs.delete(:label) if attrs
-        if label
-          title = label.is_a?(Hash) ? label.delete(:title) : label
-          named = attrs[:id].blank? ? {} : {:for => attrs[:id]}
-          label(title, '', label.is_a?(Hash) ? label.merge(named) : named) + yield
+    # Fake out the browser to send back the method for RESTful stuff.
+    # Fall silently back to post if a method is given that is not supported here
+    def set_form_method(options = {}, obj = nil)
+      options[:method] ||= ((obj && obj.respond_to?(:new_record?) && !obj.new_record?) ? :put : :post)
+      if ![:get,:post].include?(options[:method])
+        fake_form_method = options[:method] if [:put, :delete].include?(options[:method])
+        options[:method] = :post
+      end
+      fake_form_method
+    end
+    
+    def generate_fake_form_method(fake_form_method)
+      fake_form_method ? hidden_field(:name => "_method", :value => "#{fake_form_method}") : ""
+    end
+    
+    def optional_label(attrs = {})
+      label = attrs.delete(:label) if attrs
+      if label
+        title = label.is_a?(Hash) ? label.delete(:title) : label
+        named = attrs[:id].blank? ? {} : {:for => attrs[:id]}
+        align = label.delete(:align) if label.is_a?(Hash)
+        align ||= ['radio', 'checkbox'].include?(attrs[:type].to_s) ? :right : :left
+        label_tag = label(title, '', label.is_a?(Hash) ? label.merge(named) : named)
+        if align && align.to_sym == :right
+          yield + label_tag
         else
-          yield
+          label_tag + yield
         end
+      else
+        yield
       end
-      
-      def errorify_field(attrs, col)
-        attrs.add_html_class!("error") if @_obj.respond_to?(:errors) && @_obj.errors.on(col)
-      end   
-      
-      def set_multipart_attribute!(attrs = {})
-        attrs.merge!( :enctype => "multipart/form-data" ) if attrs.delete(:multipart)      
-      end
+    end
+    
+    def errorify_field(attrs, col)
+      attrs.add_html_class!("error") if @_obj.respond_to?(:errors) && @_obj.errors.on(col)
+    end   
+    
+    def set_multipart_attribute!(attrs = {})
+      attrs.merge!( :enctype => "multipart/form-data" ) if attrs.delete(:multipart)      
+    end
       
     end
   end
 end
 
-class Merb::ViewContext #:nodoc:
+class Merb::Controller #:nodoc:
   include Merb::Helpers::Form
 end

data/lib/merb_helpers/tag_helpers.rb

@@ -0,0 +1,61 @@
+module Merb
+  module Helpers
+    module Tag    
+      # Creates a generic HTML tag. You can invoke it a variety of ways.
+      #   
+      #   tag :div
+      #   # <div></div>
+      #   
+      #   tag :div, 'content'
+      #   # <div>content</div>
+      #   
+      #   tag :div, :class => 'class'
+      #   # <div class="class"></div>
+      #   
+      #   tag :div, 'content', :class => 'class'
+      #   # <div class="class">content</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"
+      #
+      # Note: This tag will need to be closed
+      def open_tag(name, attrs = nil)
+        "<#{name}#{' ' + attrs.to_html_attributes if attrs && !attrs.empty?}>"
+      end
+    
+      # Creates a closing tag
+      def close_tag(name)
+        "</#{name}>"
+      end
+    
+      # Creates a self closing tag.  Like <br/> or <img src="..."/>
+      #
+      # +name+ : the name of the tag to create
+      # +attrs+ : a hash where all members will be mapped to key="value"
+      def self_closing_tag(name, attrs = nil)
+        "<#{name}#{' ' + attrs.to_html_attributes if attrs && !attrs.empty?}/>"
+      end
+        
+    end
+  end
+end
+
+class Merb::Controller #:nodoc:
+  include Merb::Helpers::Tag
+end    

metadata

@@ -1,66 +1,72 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: merb_helpers
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2008-01-09 00:00:00 -08:00
-summary: Helper support for merb (similar to the Rails form helpers)
-require_paths: 
-- lib
-email: wycats@gmail.com
-homepage: http://merb.rubyforge.org/
-rubyforge_project: 
-description: Helper support for merb (similar to the Rails form helpers)
-autorequire: merb_helpers
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Yehuda Katz
+autorequire: merb_helpers
+bindir: bin
+cert_chain: []
+
+date: 2008-03-24 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
+description: Helper support for merb (similar to the Rails form helpers)
+email: wycats@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
 - lib/merb_helpers
-- lib/merb_helpers.rb
-- lib/tasks
 - lib/merb_helpers/date_time_helpers.rb
 - lib/merb_helpers/form_helpers.rb
 - lib/merb_helpers/form_model.rb
-- lib/tasks/merb_tasks.rb
-test_files: []
-
+- lib/merb_helpers/tag_helpers.rb
+- lib/merb_helpers.rb
+has_rdoc: true
+homepage: http://merb.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Helper support for merb (similar to the Rails form helpers)
+test_files: []
+

data/lib/tasks/merb_tasks.rb

@@ -1,6 +0,0 @@
-namespace :merb_helpers do
-  desc "Do something for merb_helpers"
-  task :default do
-    puts "merb_helpers doesn't do anything"
-  end
-end