merb_helpers 0.9.2 → 0.9.3

data/README

@@ -13,27 +13,4 @@ dependency "merb_helpers"
 
 #...
 
-By default all modules of merb_helpers are loaded and are available to your merb app.
-
-You can selectively include/exclude modules from this list to keep you app lean if you like. 
-The inclusions/exclusions are relative to all modules.  
-
-\:include: will only include the specified modules.
-
-\:exclude: will include all except the specified modules.
-
-Do not use :include: and :exclude: options at the same time or an error will be raised.
-
-To set this up in config/plugins.yml
-
-To Include specified helpers
-
-  \:merb_helpers:
-    \:include: - date_time_helpers
-              - form_helpers
-
-To Exclude specified helpers
-
-  \:merb_helpers:
-    \:exclude: - date_time_helpers
-              - form_helpers
+# TODO: describe date_time_helpers, form_helpers, tag_helpers

data/Rakefile

@@ -5,7 +5,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "merb_helpers"
 NAME = "merb_helpers"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://merb.rubyforge.org/"
@@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency("merb-core", ">=0.9.2")
+  s.add_dependency("merb-core", ">=0.9.3")
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")

data/lib/merb_helpers/date_time_helpers.rb

@@ -1,68 +1,22 @@
-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 self.extended(obj)
+    include Merb::Helpers::DateAndTime
+  end
+  
   def to_ordinalized_s(format = :default)
-    format = Merb::Helpers::DateAndTime::DATE_FORMATS[format] 
-    return to_default_s if format.nil?
+    format = Merb::Helpers::DateAndTime.date_formats[format] 
+    return self.to_s if format.nil?
     strftime_ordinalized(format)
   end
 
   def strftime_ordinalized(fmt)
-    strftime(fmt.gsub(/%d/, '_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
+    strftime(fmt.gsub(/(^|[^-])%d/, '\1_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
   end
 end
 
@@ -103,15 +57,15 @@ module Merb
     # 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 = {
+      @@time_class = Time
+      @@time_output = {
         :today          => 'today',
         :yesterday      => 'yesterday',
         :tomorrow       => 'tomorrow',
         :initial_format => '%b %d',
         :year_format    => ', %Y'
       }
-      DATE_FORMATS = {
+      @@date_formats = {
         :db           => "%Y-%m-%d %H:%M:%S",
         :time         => "%H:%M",
         :short        => "%d %b %H:%M",
@@ -120,6 +74,18 @@ module Merb
         :rfc822       => "%a, %d %b %Y %H:%M:%S %z"
       }
       
+      def self.time_class
+        @@time_class
+      end
+      
+      def time_output
+        @@time_output
+      end
+      
+      def date_formats
+        @@date_formats
+      end
+      
       # Gives you a relative date in an attractive format
       #
       # ==== Parameters
@@ -134,16 +100,16 @@ module Merb
       #   relative_date(1.year.ago) => "March 10th, 2007"
       def relative_date(time)
         date  = time.to_date
-        today = TIME_CLASS.now.to_date
+        today = DateAndTime.time_class.now.to_date
         if date == today
-          TIME_OUTPUT[:today]
+          DateAndTime.time_output[:today]
         elsif date == (today - 1)
-          TIME_OUTPUT[:yesterday]
+          DateAndTime.time_output[:yesterday]
         elsif date == (today + 1)
-          TIME_OUTPUT[:tomorrow]
+          DateAndTime.time_output[:tomorrow]
         else
-          fmt  = TIME_OUTPUT[:initial_format].dup
-          fmt << TIME_OUTPUT[:year_format] unless date.year == today.year
+          fmt  = DateAndTime.time_output[:initial_format].dup
+          fmt << DateAndTime.time_output[:year_format] unless date.year == today.year
           time.strftime_ordinalized(fmt)
         end
       end
@@ -167,7 +133,7 @@ module Merb
         if times.first == times.last
           relative_date(times.first)
         else
-          first = times.first; last = times.last; now = TIME_CLASS.now
+          first = times.first; last = times.last; now = DateAndTime.time_class.now
           arr = [first.strftime_ordinalized('%b %d')]
           arr << ", #{first.year}" unless first.year == last.year
           arr << ' - '
@@ -201,7 +167,7 @@ module Merb
             "#{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        
+          first = times.first; last = times.last; now = DateAndTime.time_class.now        
           arr = [prettier_time(first)]
           arr << ' '
           arr << first.strftime_ordinalized('%b %d')
@@ -273,4 +239,4 @@ end
 
 class Merb::Controller #:nodoc:
   include Merb::Helpers::DateAndTime
-end
+end

data/lib/merb_helpers/form_helpers.rb

@@ -54,25 +54,34 @@ module Merb #:nodoc:
       #   <%= 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')
+        obj = self.instance_variable_get("@#{obj}") if obj.kind_of?(Symbol)
+        
         return "" unless obj.respond_to?(:errors) && ! obj.errors.empty?
+        
+        if obj.errors.respond_to?(:each) # AR & DM
+          build_li ||= lambda{|err| "<li>#{err.join(' ')}</li>"}
+          error_collection = obj.errors
+        else # Sequel
+          build_li ||= lambda{|msg| "<li>#{msg}</li>"}
+          error_collection = obj.errors.full_messages
+        end
+        error_count = error_collection.size
 
         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>"
+          error_plurality = (error_count == 1 ? 'problem' : 'problems')
+          "<h2>Form submittal failed because of #{error_count} #{error_plurality}</h2>"
         end
         
-        build_li ||= lambda{|err| "<li>#{err.join(' ')}</li>"}
-        
         markup = %Q{
           <div class='#{html_class}'>
             #{header_message}
             <ul>
         }
         
-        obj.errors.each {|error| markup << build_li.call(error) }
-        
+        error_collection.each {|error, message| markup << build_li.call([error, message])}
+
         markup << %Q{
             </ul>
           </div>
@@ -232,9 +241,11 @@ module Merb #:nodoc:
       #     <%= checkbox_control :is_activated, :label => "Activated?" %>
       def checkbox_control(col, attrs = {}, hidden_attrs={})
         errorify_field(attrs, col)
-        attrs.merge!(:checked => "checked") if col_val_to_bool(@_obj.send(col))
+        method_name = @_obj.respond_to?(col) ? col : :"#{col}?"
+        attrs.merge!(:checked => "checked") if col_val_to_bool(@_obj.send(method_name))
         attrs.merge!(:id => control_id(col))
-        checkbox_field(control_name_value(col, attrs), hidden_attrs)
+        attrs = {:name => control_name(col), :value => control_value(method_name)}.merge(attrs)
+        checkbox_field(attrs, hidden_attrs)
       end
 
       # Provides a generic HTML checkbox input tag.
@@ -440,7 +451,7 @@ module Merb #:nodoc:
             end
           else
             collection.each do |value,text|
-              options = selected.to_a.include?(value) ? {:selected => 'selected'} : {}
+              options = Array(selected).include?(value) ? {:selected => 'selected'} : {}
               ret << tag( 'option', text, {:value => value}.merge(options) )
             end
           end

data/lib/merb_helpers/ordinalize.rb

@@ -0,0 +1,23 @@
+module Ordinalize
+  # 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
+Integer.send :include, Ordinalize

data/lib/merb_helpers/time_dsl.rb

@@ -0,0 +1,58 @@
+# Provides a a simple way of calling time units and to see the elapsed time between 2 moments
+# ==== Examples
+#   142.minutes => returns a value in seconds
+#   7.days => returns a value in seconds
+#   1.week => returns a value in seconds
+#   2.weeks.ago => returns a date
+#   1.year.since(time) => returns a date
+#   5.months.since(2.weeks.from_now) => returns a date
+module TimeDSL
+  
+  def second
+    self * 1
+  end
+  alias_method :seconds, :second
+  
+  def minute
+    self * 60
+  end
+  alias_method :minutes, :minute
+  
+  def hour
+    self * 3600
+  end
+  alias_method :hours, :hour
+  
+  def day
+    self * 86400
+  end
+  alias_method :days, :day
+  
+  def week
+    self * 604800
+  end
+  alias_method :weeks, :week
+  
+  def month
+    self * 2592000
+  end
+  alias_method :months, :month
+  
+  def year
+    self * 31471200
+  end
+  alias_method :years, :year
+  
+  # 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
+Numeric.send :include, TimeDSL

data/lib/merb_helpers.rb

@@ -9,6 +9,13 @@ module Merb
     end
     
     def self.load
+      require HELPERS_DIR + '/time_dsl'
+      require HELPERS_DIR + '/ordinalize'
+      # TODO remove with and without and only allow 2 options:
+      # config[:load] 
+      # if defined then load the modules passed along
+      # otherwise load everything
+       
       if Merb::Plugins.config[:merb_helpers]
         config = Merb::Plugins.config[:merb_helpers]
         raise "With and Without options cannot be used with merb_helpers plugin configuration" if config[:with] && config[:without]
@@ -31,5 +38,5 @@ module Merb
 end
 
 Merb::BootLoader.before_app_loads do  
-  Merb::Helpers.load if defined?(Merb::Plugins)
-end
+  Merb::Helpers.load
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: merb_helpers
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 description: Helper support for merb (similar to the Rails form helpers)
 email: wycats@gmail.com
@@ -39,8 +39,9 @@ files:
 - lib/merb_helpers
 - lib/merb_helpers/date_time_helpers.rb
 - lib/merb_helpers/form_helpers.rb
-- lib/merb_helpers/form_model.rb
+- lib/merb_helpers/ordinalize.rb
 - lib/merb_helpers/tag_helpers.rb
+- lib/merb_helpers/time_dsl.rb
 - lib/merb_helpers.rb
 has_rdoc: true
 homepage: http://merb.rubyforge.org/

data/lib/merb_helpers/form_model.rb

@@ -1,5 +0,0 @@
-module Merb
-  class FormModel
-  
-  end  
-end