padrino-helpers 0.7.9 → 0.8.0

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
     gem.add_development_dependency "haml",          ">= 2.2.1"
-    gem.add_development_dependency "shoulda",       ">= 0"
+    gem.add_development_dependency "shoulda",       ">= 2.10.3"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"
@@ -38,14 +38,15 @@ end
 
 begin
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
+  Rcov::RcovTask.new do |rcov|
+    rcov.libs << 'test'
+    rcov.pattern = 'test/**/test_*.rb'
+    rcov.verbose = true
+    rcov.rcov_opts << ['--exclude /Gems/1.8/gems/,/tmp/,padrino-admin,padrino-cache,padrino-core,padrino-gen,padrino-mailer']
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install relevance-rcov"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.8.0

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -7,6 +7,7 @@ module Padrino
       # ==== Examples
       # 
       #   flash_tag(:notice, :class => 'flash', :id => 'flash-notice')
+      # 
       def flash_tag(kind, options={})
         flash_text = flash[kind]
         return '' if flash_text.blank?
@@ -127,52 +128,71 @@ module Padrino
         src =~ %r{^\s*(/|http)} ? src : uri_root_path('images', src)
       end
 
-      protected
-        # stylesheet_tag('style', :media => 'screen')
-        def stylesheet_tag(source, options={})
-          options = options.dup.reverse_merge!(:href => stylesheet_path(source), :media => 'screen', :rel => 'stylesheet', :type => 'text/css')
-          tag(:link, options)
-        end
-
-        # javascript_tag 'application', :src => '/javascripts/base/application.js'
-        def javascript_tag(source, options={})
-          options = options.dup.reverse_merge!(:src => javascript_path(source), :type => 'text/javascript', :content => "")
-          tag(:script, options)
-        end
+      ##
+      # Generate a +link+ tag for stylesheet.
+      # 
+      # ==== Examples
+      # 
+      #   stylesheet_tag('style', :media => 'screen')
+      # 
+      def stylesheet_tag(source, options={})
+        options = options.dup.reverse_merge!(:href => stylesheet_path(source), :media => 'screen', :rel => 'stylesheet', :type => 'text/css')
+        tag(:link, options)
+      end
+      ##
+      # Generate a link +script+ for javascript.
+      # 
+      # ==== Examples
+      # 
+      #   javascript_tag 'application', :src => '/javascripts/base/application.js'
+      # 
+      def javascript_tag(source, options={})
+        options = options.dup.reverse_merge!(:src => javascript_path(source), :type => 'text/javascript', :content => "")
+        tag(:script, options)
+      end
 
-        # Returns the javascript_path appending the default javascripts path if necessary
-        def javascript_path(source)
-          return source if source =~ /^http/
-          source        = source.to_s.gsub(/\.js$/, '')
-          source_name   = source; source_name << ".js" unless source =~ /\.js/
-          result_path   = source_name if source =~ %r{^/} # absolute path
-          result_path ||= uri_root_path("javascripts", source_name)
-          return result_path if result_path =~ /\?/
-          public_path = Padrino.root("public", result_path)
-          stamp = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
-          "#{result_path}?#{stamp}"
-        end
+      ##
+      # Returns the javascript_path appending the default javascripts path if necessary
+      # 
+      def javascript_path(source)
+        return source if source =~ /^http/
+        source        = source.to_s.gsub(/\.js$/, '')
+        source_name   = source; source_name << ".js" unless source =~ /\.js/
+        result_path   = source_name if source =~ %r{^/} # absolute path
+        result_path ||= uri_root_path("javascripts", source_name)
+        return result_path if result_path =~ /\?/
+        public_path = Padrino.root("public", result_path)
+        stamp = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
+        "#{result_path}?#{stamp}"
+      end
 
-        # Returns the stylesheet_path appending the default stylesheets path if necessary
-        def stylesheet_path(source)
-          return source if source =~ /^http/
-          source        = source.to_s.gsub(/\.css$/, '')
-          source_name   = source; source_name << ".css" unless source =~ /\.css/
-          result_path   = source_name if source =~ %r{^/} # absolute path
-          result_path ||= uri_root_path("stylesheets", source_name)
-          return result_path if result_path =~ /\?/
-          public_path   = Padrino.root("public", result_path)
-          stamp         = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
-          "#{result_path}?#{stamp}"
-        end
+      ##
+      # Returns the stylesheet_path appending the default stylesheets path if necessary
+      # 
+      def stylesheet_path(source)
+        return source if source =~ /^http/
+        source        = source.to_s.gsub(/\.css$/, '')
+        source_name   = source; source_name << ".css" unless source =~ /\.css/
+        result_path   = source_name if source =~ %r{^/} # absolute path
+        result_path ||= uri_root_path("stylesheets", source_name)
+        return result_path if result_path =~ /\?/
+        public_path   = Padrino.root("public", result_path)
+        stamp         = File.exist?(public_path) ? File.mtime(public_path).to_i : Time.now.to_i
+        "#{result_path}?#{stamp}"
+      end
 
-        # Returns the uri root of the application, defaulting to '/'
+      private
+        ##
+        # Returns the uri root of the application.'
+        # 
         def uri_root_path(*paths)
           root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
           File.join(root_uri || '/', *paths)
         end
 
+        ##
         # Parse link_to options for give correct conditions
+        # 
         def parse_conditions(url, options)
           if options.has_key?(:if)
             condition = options.delete(:if)

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -124,7 +124,7 @@ module Padrino
 
           # Returns the human name of the field. Look that use builtin I18n.
           def field_human_name(field)
-            I18n.translate("#{object_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => [:models])
+            I18n.translate("#{object_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models)
           end
 
           # Returns the id for the given field

data/lib/padrino-helpers/form_builder/standard_form_builder.rb

@@ -14,6 +14,7 @@ module Padrino
         #   file_field_block(:photo, { :class => 'long' }, { :class => 'wide-label' })
         #   check_box_block(:remember_me, { :class => 'long' }, { :class => 'wide-label' })
         #   select_block(:color, :options => ['green', 'black'])
+        # 
         (self.field_types - [ :hidden_field, :radio_button ]).each do |field_type|
           class_eval <<-EOF
           def #{field_type}_block(field, options={}, label_options={})

data/lib/padrino-helpers/form_helpers.rb

@@ -63,13 +63,29 @@ module Padrino
       ##
       # Constructs list html for the errors for a given symbol
       # 
+      # ==== Options
+      #
+      # :header_tag:: Used for the header of the error div (default: "h2").
+      # :id:: The id of the error div (default: "errorExplanation").
+      # :class:: The class of the error div (default: "errorExplanation").
+      # :object:: The object (or array of objects) for which to display errors,
+      # if you need to escape the instance variable convention.
+      # :object_name:: The object name to use in the header, or any text that you prefer.
+      # If +:object_name+ is not set, the name of the first object will be used.
+      # :header_message:: The message in the header of the error div.  Pass +nil+
+      # or an empty string to avoid the header message altogether. (Default: "X errors
+      # prohibited this object from being saved").
+      # :message:: The explanation message after the header message and before
+      # the error list.  Pass +nil+ or an empty string to avoid the explanation message
+      # altogether. (Default: "There were problems with the following fields:").
+      # 
       # ==== Examples
       # 
       #   error_messages_for :user
       # 
-      def error_messages_for(*params)
-        options = params.extract_options!.symbolize_keys
-        objects = params.collect {|object_name| object_name.is_a?(Symbol) ? instance_variable_get("@#{object_name}") : object_name }.compact
+      def error_messages_for(*objects)
+        options = objects.extract_options!.symbolize_keys
+        objects = objects.collect {|object_name| object_name.is_a?(Symbol) ? instance_variable_get("@#{object_name}") : object_name }.compact
         count   = objects.inject(0) {|sum, object| sum + object.errors.count }
 
         unless count.zero?
@@ -79,11 +95,11 @@ module Padrino
               value = options[key]
               html[key] = value unless value.blank?
             else
-              html[key] = 'field-errors'
+              html[key] = 'field-errors' unless key == :style
             end
           end
 
-          options[:object_name] ||= params.first.class
+          options[:object_name] ||= objects.first.class
 
           I18n.with_options :locale => options[:locale], :scope => [:models, :errors, :template] do |locale|
             header_message = if options.include?(:header_message)
@@ -267,37 +283,50 @@ module Padrino
         input_tag(:image, options)
       end
 
-      protected
-        # Returns an array of option items for a select field based on the given collection
-        # fields is an array containing the fields to display from each item in the collection
-        def options_from_collection(collection, fields)
-          return '' if collection.blank?
-          collection.collect { |item| [ item.send(fields.first), item.send(fields.last) ] }
-        end
+      ##
+      # Returns an array of option items for a select field based on the given collection
+      # fields is an array containing the fields to display from each item in the collection
+      # 
+      def options_from_collection(collection, fields)
+        return '' if collection.blank?
+        collection.collect { |item| [ item.send(fields.first), item.send(fields.last) ] }
+      end
 
-        # Returns the options tags for a select based on the given option items
-        def options_for_select(option_items, selected_value=nil)
-          return '' if option_items.blank?
-          option_items.collect do |caption, value|
-            value ||= caption
-            content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
-          end
+      #
+      # Returns the options tags for a select based on the given option items
+      # 
+      def options_for_select(option_items, selected_value=nil)
+        return '' if option_items.blank?
+        option_items.collect do |caption, value|
+          value ||= caption
+          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
         end
+      end
 
-        # returns the hidden method field for 'put' and 'delete' forms
-        # Only 'get' and 'post' are allowed within browsers;
-        # 'put' and 'delete' are just specified using hidden fields with form action still 'put'.
-        # hidden_form_method_field('delete') => <input name="_method" value="delete" />
-        def hidden_form_method_field(desired_method)
-          return '' if (desired_method.to_s =~ /get|post/)
-          original_method = desired_method.to_s.dup
-          desired_method.to_s.replace('post')
-          hidden_field_tag(:_method, :value => original_method)
-        end
+      ##
+      # Returns the hidden method field for 'put' and 'delete' forms
+      # Only 'get' and 'post' are allowed within browsers;
+      # 'put' and 'delete' are just specified using hidden fields with form action still 'put'.
+      # 
+      # ==== Examples
+      # 
+      #   # Generate: <input name="_method" value="delete" />
+      #   hidden_form_method_field('delete')
+      # 
+      def hidden_form_method_field(desired_method)
+        return '' if (desired_method.to_s =~ /get|post/)
+        original_method = desired_method.to_s.dup
+        desired_method.to_s.replace('post')
+        hidden_field_tag(:_method, :value => original_method)
+      end
 
+      private
+        ##
         # Returns the FormBuilder class to use based on all available setting sources
-        # If explicitly defined, returns that, otherwise returns defaults
-        # configured_form_builder_class(nil) => StandardFormBuilder
+        # If explicitly defined, returns that, otherwise returns defaults.
+        # 
+        #   configured_form_builder_class(nil) => StandardFormBuilder
+        # 
         def configured_form_builder_class(explicit_builder=nil)
           default_builder    = self.respond_to?(:options) && self.options.default_builder
           configured_builder = explicit_builder || default_builder || 'StandardFormBuilder'

data/lib/padrino-helpers/number_helpers.rb

@@ -7,7 +7,7 @@ module Padrino
     # Methods are provided for phone numbers, currency, percentage,
     # precision, positional notation, and file size.
     # 
-    # Verbatim copy of Rails Number helper
+    # Verbatim copy of Rails Number Helpers
     # 
     module NumberHelpers
       ##
@@ -15,11 +15,12 @@ module Padrino
       # in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:precision</tt>  -  Sets the level of precision (defaults to 2).
-      # * <tt>:unit</tt>       - Sets the denomination of the currency (defaults to "$").
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      # * <tt>:format</tt>     - Sets the format of the output string (defaults to "%u%n"). The field types are:
+      # 
+      # :precision:: Sets the level of precision (defaults to 2).
+      # :unit::      Sets the denomination of the currency (defaults to "$").
+      # :separator:: Sets the separator between the units (defaults to ".").
+      # :delimiter:: Sets the thousands delimiter (defaults to ",").
+      # :format::    Sets the format of the output string (defaults to "%u%n"). The field types are:
       #
       #     %u  The currency unit
       #     %n  The number
@@ -65,9 +66,10 @@ module Padrino
       # format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      # 
+      # :precision:: Sets the level of precision (defaults to 3).
+      # :separator:: Sets the separator between the units (defaults to ".").
+      # :delimiter:: Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
       # 
@@ -102,8 +104,9 @@ module Padrino
       # customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
+      # 
+      # :delimiter:: Sets the thousands delimiter (defaults to ",").
+      # :separator:: Sets the separator between the units (defaults to ".").
       #
       # ==== Examples
       # 
@@ -145,9 +148,9 @@ module Padrino
       #
       # ==== Options
       # 
-      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 3).
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      # :precision:: Sets the level of precision (defaults to 3).
+      # :separator:: Sets the separator between the units (defaults to ".").
+      # :delimiter:: Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
       # 
@@ -196,9 +199,10 @@ module Padrino
       # format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:precision</tt>  - Sets the level of precision (defaults to 1).
-      # * <tt>:separator</tt>  - Sets the separator between the units (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
+      # 
+      # :precision:: Sets the level of precision (defaults to 1).
+      # :separator:: Sets the separator between the units (defaults to ".").
+      # :delimiter:: Sets the thousands delimiter (defaults to "").
       #
       # ==== Examples
       # 

data/lib/padrino-helpers/output_helpers.rb

@@ -77,40 +77,64 @@ module Padrino
         }.join
       end
 
-      protected
+      private
+        ##
         # Retrieves content_blocks stored by content_for or within yield_content
-        # content_blocks[:name] => ['...', '...']
+        # 
+        # ==== Examples
+        # 
+        #   content_blocks[:name] => ['...', '...']
+        # 
         def content_blocks
           @content_blocks ||= Hash.new {|h,k| h[k] = [] }
         end
 
+        ##
         # Used to capture the html from a block of erb code
-        # capture_erb(&block) => '...html...'
+        # 
+        # ==== Examples
+        # 
+        #   capture_erb(&block) => '...html...'
+        # 
         def capture_erb(*args, &block)
           erb_with_output_buffer { block_given? && block.call(*args) }
         end
 
+        ##
         # Concats directly to an erb template
-        # erb_concat("Direct to buffer")
+        # 
+        # ==== Examples
+        # 
+        #   erb_concat("Direct to buffer")
+        # 
         def erb_concat(text)
           @_out_buf << text if has_erb_buffer?
         end
 
+        ##
         # Returns true if an erb buffer is detected
-        # has_erb_buffer? => true
+        # 
+        # ==== Examples
+        # 
+        #   has_erb_buffer? => true
+        # 
         def has_erb_buffer?
           !@_out_buf.nil?
         end
 
+        ##
         # Used to determine if a block is called from ERB.
         # NOTE: This doesn't actually work yet because the variable __in_erb_template
         # hasn't been defined in ERB. We need to find a way to fix this.
+        # 
         def block_is_erb?(block)
           has_erb_buffer? || block && eval('defined? __in_erb_template', block)
         end
 
+        ##
         # Used to direct the buffer for the erb capture
-        def erb_with_output_buffer(buf = '') #:nodoc:
+        # 
+        def erb_with_output_buffer(buf = '')
           @_out_buf, old_buffer = buf, @_out_buf
           yield
           @_out_buf

data/lib/padrino-helpers/tag_helpers.rb

@@ -46,8 +46,10 @@ module Padrino
         base_tag << (open_tag ? ">" : (content ? ">#{content}</#{name}>" : " />"))
       end
 
-      protected
+      private
+        ##
         # Returns a list of attributes which can only contain an identity value (i.e selected)
+        # 
         def identity_tag_attributes
           [:checked, :disabled, :selected, :multiple]
         end

data/lib/padrino-helpers.rb

@@ -1,4 +1,6 @@
 require 'padrino-core/support_lite'
+require 'active_support/core_ext/float/rounding'
+require 'active_support/option_merger'
 require 'cgi'
 
 Dir[File.dirname(__FILE__) + '/padrino-helpers/**/*.rb'].each {|file| require file }

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.7.9"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-14}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
      "test/fixtures/render_app/views/template/haml_template.haml",
      "test/fixtures/render_app/views/template/some_template.haml",
      "test/helper.rb",
-     "test/support_helpers.rb",
      "test/test_asset_tag_helpers.rb",
      "test/test_form_builder.rb",
      "test/test_form_helpers.rb",
@@ -85,26 +84,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.9"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<webrat>, [">= 0.5.1"])

data/test/fixtures/markup_app/app.rb

@@ -55,6 +55,7 @@ end
 
 class Errors < Array
   def initialize; self << [:fake, :second, :third]; end
+  def on(fake); true if fake == :email; end
   def full_messages
     ["This is a fake error", "This is a second fake error", "This is a third fake error"]
   end

data/test/helper.rb

@@ -5,8 +5,6 @@ require 'mocha'
 require 'rack/test'
 require 'webrat'
 
-# require 'extlib' # test with extlib
-
 # We try to load the vendored padrino-core if exist
 %w(core).each do |gem|
   if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
@@ -14,9 +12,14 @@ require 'webrat'
   end
 end
 
-require 'support_helpers'
 require 'padrino-helpers'
 
+# We need some extension for do our tests
+require 'active_support/core_ext/date'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/numeric'
+require 'active_support/duration'
+
 class Test::Unit::TestCase
   include Padrino::Helpers::OutputHelpers
   include Padrino::Helpers::TagHelpers

data/test/test_form_builder.rb

@@ -129,10 +129,12 @@ class TestFormBuilder < Test::Unit::TestCase
     end
 
     should "display correct form html with valid record" do
-      actual_html = standard_builder.error_messages(:header_message => "Demo form cannot be saved")
-      assert_has_tag('div.field-errors h2', :content => "Demo form cannot be saved") { actual_html }
-      assert_has_tag('div.field-errors ul li', :content => "1") { actual_html }
-      assert_has_tag('div.field-errors ul li', :content => "2") { actual_html }
+      actual_html = standard_builder.error_messages(:header_message => "Demo form cannot be saved", :style => "foo:bar", :class => "mine")
+      assert_has_tag('#field-errors h2', :content => "Demo form cannot be saved") { actual_html }
+      assert_has_tag('#field-errors ul li', :content => "1") { actual_html }
+      assert_has_tag('#field-errors ul li', :content => "2") { actual_html }
+      assert_has_tag('#field-errors', :style => "foo:bar") { actual_html }
+      assert_has_tag('#field-errors', :class => "mine") { actual_html }
     end
 
     should "display correct form in haml" do
@@ -141,6 +143,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo div.field-errors ul li', :content => "This is a fake error"
       assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "This is a fake error"
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'x-form-invalid'
     end
 
     should "display correct form in erb" do
@@ -149,6 +152,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo div.field-errors ul li', :content => "This is a fake error"
       assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "This is a fake error"
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'x-form-invalid'
     end
   end
 

data/test/test_format_helpers.rb

@@ -53,6 +53,12 @@ class TestFormatHelpers < Test::Unit::TestCase
       actual_text = word_wrap('Once upon a time', :line_width => 1)
       assert_equal "Once\nupon\na\ntime", actual_text
     end
+    should "return proper formatting for default width" do
+      actual_text = word_wrap(1.upto(50).map.join(" "))
+      assert_equal 1.upto(30).map.join(" ") + "\n" + 31.upto(50).map.join(" "), actual_text
+      actual_text = word_wrap(1.upto(50).map.join(" "), 80)
+      assert_equal 1.upto(30).map.join(" ") + "\n" + 31.upto(50).map.join(" "), actual_text
+    end
   end
 
   context 'for #truncate method' do
@@ -88,6 +94,21 @@ class TestFormatHelpers < Test::Unit::TestCase
   end
 
   context 'for #time_ago_in_words method' do
+    should "less than 5 seconds" do
+      assert_equal 'less than 5 seconds', time_ago_in_words(Time.now, true)
+    end
+    should "less than 10 seconds" do
+      assert_equal 'less than 10 seconds', time_ago_in_words(Time.now-5, true)
+    end
+    should "less than 20 seconds" do
+      assert_equal 'less than 20 seconds', time_ago_in_words(Time.now-10, true)
+    end
+    should "less than a minute" do
+      assert_equal 'less than a minute', time_ago_in_words(Time.now-40, true)
+    end
+    should "2 minutes" do
+      assert_equal '2 minutes', time_ago_in_words(Time.now-120, true)
+    end
     should "display today" do
       assert_equal 'less than a minute', time_ago_in_words(Time.now)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.9
+        version: 0.8.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.10.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -140,7 +140,6 @@ files:
 - test/fixtures/render_app/views/template/haml_template.haml
 - test/fixtures/render_app/views/template/some_template.haml
 - test/helper.rb
-- test/support_helpers.rb
 - test/test_asset_tag_helpers.rb
 - test/test_form_builder.rb
 - test/test_form_helpers.rb

data/test/support_helpers.rb

@@ -1,21 +0,0 @@
-require 'padrino-core/support_lite'
-unless Fixnum.method_defined?(:days)
-  if Padrino.support == :extlib
-    class Object
-      # A duck-type assistant method. For example, Active Support extends Date
-      # to define an acts_like_date? method, and extends Time to define
-      # acts_like_time?. As a result, we can do "x.acts_like?(:time)" and
-      # "x.acts_like?(:date)" to do duck-type-safe comparisons, since classes that
-      # we want to act like Time simply need to define an acts_like_time? method.
-      def acts_like?(duck)
-        respond_to? "acts_like_#{duck}?"
-      end
-    end
-  else
-    require 'active_support/core_ext/object/misc'
-  end
-  require 'active_support/core_ext/date'
-  require 'active_support/core_ext/time'
-  require 'active_support/core_ext/numeric'
-  require 'active_support/duration'
-end