padrino-helpers 0.5.0 → 0.6.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Padrino
+Copyright (c) 2010 Padrino
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -189,7 +189,7 @@ The list of defined helpers in the 'form helpers' category:
   * Constructs a field_set to group fields with given options
   * <tt>field_set_tag(:class => 'office-set') { }</tt>
   * <tt>field_set_tag("Office", :class => 'office-set') { }</tt>
-* <tt>error_messages_for(record, options={})</tt>
+* <tt>error_messages_for(:record, options={})</tt>
   * Constructs list html for the errors for a given object
   * <tt>error_messages_for @user</tt>
 * <tt>label_tag(name, options={}, &block)</tt>
@@ -485,4 +485,4 @@ See the wiki article for additional information: <...WIKI...>
 
 == Copyright
 
-Copyright (c) 2009 Padrino. See LICENSE for details.
+Copyright (c) 2010 Padrino. See LICENSE for details.

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'rake'
 
+GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -11,7 +13,7 @@ begin
     gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-helpers"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
-    gem.add_runtime_dependency     "padrino-core",  ">= 0.1.1"
+    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 "mocha",         ">= 0.9.7"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.1

data/lib/padrino-helpers.rb

@@ -1,4 +1,6 @@
 require 'padrino-core/support_lite'
+require 'cgi'
+
 Dir[File.dirname(__FILE__) + '/padrino-helpers/**/*.rb'].each {|file| require file }
 
 # Load our locales

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -17,15 +17,17 @@ module Padrino
       # parameters: name, url='javascript:void(0)', options={}, &block
       def link_to(*args, &block)
         options = args.extract_options!
+        anchor  = options[:anchor] ? "##{CGI.escape options.delete(:anchor).to_s}" : ""
+        options["data-remote"] = "true" if options.delete(:remote)
         if block_given?
           url = args[0] || 'javascript:void(0);'
-          options.reverse_merge!(:href => url)
+          options.reverse_merge!(:href => url + anchor)
           link_content = capture_html(&block)
           result_link = content_tag(:a, link_content, options)
           block_is_template?(block) ? concat_content(result_link) : result_link
         else
           name, url = args[0], (args[1] || 'javascript:void(0);')
-          options.reverse_merge!(:href => url)
+          options.reverse_merge!(:href => url + anchor)
           content_tag(:a, name, options)
         end
       end
@@ -75,47 +77,46 @@ module Padrino
       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
 
-      # 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
+        # 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.gsub!(/\.js$/, '')
-        source_name = source; source_name << ".js" unless source =~ /\.js\w{2,4}$/
-        result_path = source_name if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path("javascripts", source_name)
-        stamp = File.exist?(result_path) ? File.mtime(result_path) : 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)
+          stamp = File.exist?(result_path) ? File.mtime(result_path) : 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.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)
-        stamp = File.exist?(result_path) ? File.mtime(result_path) : 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)
+          stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
+          "#{result_path}?#{stamp}"
+        end
 
-      # Returns the uri root of the application, defaulting to '/'
-      # @example uri_root('javascripts')
-      def uri_root_path(*paths)
-        root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
-        File.join(root_uri || '/', *paths)
-      end
+        # Returns the uri root of the application, defaulting to '/'
+        # @example uri_root('javascripts')
+        def uri_root_path(*paths)
+          root_uri = self.class.uri_root if self.class.respond_to?(:uri_root)
+          File.join(root_uri || '/', *paths)
+        end
     end
   end
 end

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

@@ -18,7 +18,7 @@ module Padrino
 
         # f.label :username, :caption => "Nickname"
         def label(field, options={})
-          options.reverse_merge!(:caption => "#{field.to_s.titleize}: ")
+          options.reverse_merge!(:caption => "#{field_human_name(field)}: ")
           @template.label_tag(field_id(field), options)
         end
 
@@ -30,26 +30,26 @@ module Padrino
 
         # f.text_field :username, :value => "(blank)", :id => 'username'
         def text_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
           @template.text_field_tag field_name(field), options
         end
 
         # f.text_area :summary, :value => "(enter summary)", :id => 'summary'
         def text_area(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
           @template.text_area_tag field_name(field), options
         end
 
         # f.password_field :password, :id => 'password'
         def password_field(field, options={})
-          options.reverse_merge!(:value => field_value(field), :id => field_id(field))
+          options.reverse_merge!(:value => field_value(field), :id => field_id(field), :class => field_error(field, options))
           @template.password_field_tag field_name(field), options
         end
 
         # f.select :color, :options => ['red', 'green'], :include_blank => true
         # f.select :color, :collection => @colors, :fields => [:name, :id]
         def select(field, options={})
-          options.reverse_merge!(:id => field_id(field), :selected => field_value(field))
+          options.reverse_merge!(:id => field_id(field), :selected => field_value(field), :class => field_error(field, options))
           @template.select_tag field_name(field), options
         end
 
@@ -71,7 +71,7 @@ module Padrino
 
         # f.file_field :photo, :class => 'avatar'
         def file_field(field, options={})
-          options.reverse_merge!(:id => field_id(field))
+          options.reverse_merge!(:id => field_id(field), :class => field_error(field, options))
           @template.file_field_tag field_name(field), options
         end
 
@@ -86,53 +86,63 @@ module Padrino
         end
 
         protected
-
-        # Returns the known field types for a formbuilder
-        def self.field_types
-          [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
-        end
-
-        # Returns the object's models name
-        #   => user_assignment
-        def object_name
-          object.is_a?(Symbol) ? object : object.class.to_s.underscore.gsub('/', '-')
-        end
-
-        # Returns true if the value matches the value in the field
-        # field_has_value?(:gender, 'male')
-        def values_matches_field?(field, value)
-          value.present? && (field_value(field).to_s == value.to_s || field_value(field).to_s == 'true')
-        end
-
-        # Returns the value for the object's field
-        # field_value(:username) => "Joey"
-        def field_value(field)
-          @object && @object.respond_to?(field) ? @object.send(field) : ""
-        end
-
-        # Returns the name for the given field
-        # field_name(:username) => "user[username]"
-        def field_name(field)
-          "#{object_name}[#{field}]"
-        end
-
-        # Returns the id for the given field
-        # field_id(:username) => "user_username"
-        # field_id(:gender, :male) => "user_gender_male"
-        def field_id(field, value=nil)
-          value.blank? ? "#{object_name}_#{field}" : "#{object_name}_#{field}_#{value}"
-        end
-
-        # explicit_object is either a symbol or a record
-        # Returns a new record of the type specified in the object
-        def build_object(object_or_symbol)
-          object_or_symbol.is_a?(Symbol) ? object_class(object_or_symbol).new : object_or_symbol
-        end
-
-        # Returns the class type for the given object
-        def object_class(explicit_object)
-          explicit_object.is_a?(Symbol) ? explicit_object.to_s.classify.constantize : explicit_object.class
-        end
+          # Returns the known field types for a formbuilder
+          def self.field_types
+            [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
+          end
+
+          # Returns the object's models name
+          #   => user_assignment
+          def object_name
+            object.is_a?(Symbol) ? object : object.class.to_s.underscore.gsub('/', '-')
+          end
+
+          # Returns true if the value matches the value in the field
+          # field_has_value?(:gender, 'male')
+          def values_matches_field?(field, value)
+            value.present? && (field_value(field).to_s == value.to_s || field_value(field).to_s == 'true')
+          end
+
+          # Returns the value for the object's field
+          # field_value(:username) => "Joey"
+          def field_value(field)
+            @object && @object.respond_to?(field) ? @object.send(field) : ""
+          end
+
+          def field_error(field, options)
+            if @object && @object.respond_to?(:errors) && @object.errors.respond_to?(:on) && @object.errors.on(field)
+              options[:class] = ["x-form-text", "x-form-invalid", options[:class]].compact.join(" ")
+            end
+          end
+
+          # Returns the name for the given field
+          # field_name(:username) => "user[username]"
+          def field_name(field)
+            "#{object_name}[#{field}]"
+          end
+
+          # Returns the human name of the field. Look that use builtin I18n.
+          def field_human_name(field)
+            I18n.translate("#{object_name}.#{field}", :count => 1, :default => field.to_s.humanize, :scope => [:model, :attributes])
+          end
+
+          # Returns the id for the given field
+          # field_id(:username) => "user_username"
+          # field_id(:gender, :male) => "user_gender_male"
+          def field_id(field, value=nil)
+            value.blank? ? "#{object_name}_#{field}" : "#{object_name}_#{field}_#{value}"
+          end
+
+          # explicit_object is either a symbol or a record
+          # Returns a new record of the type specified in the object
+          def build_object(object_or_symbol)
+            object_or_symbol.is_a?(Symbol) ? object_class(object_or_symbol).new : object_or_symbol
+          end
+
+          # Returns the class type for the given object
+          def object_class(explicit_object)
+            explicit_object.is_a?(Symbol) ? explicit_object.to_s.classify.constantize : explicit_object.class
+          end
       end
     end
   end

data/lib/padrino-helpers/form_helpers.rb

@@ -25,6 +25,7 @@ module Padrino
       def form_tag(url, options={}, &block)
         options.reverse_merge!(:method => 'post', :action => url)
         options[:enctype] = "multipart/form-data" if options.delete(:multipart)
+        options["data-remote"] = "true" if options.delete(:remote)
         inner_form_html = hidden_form_method_field(options[:method]) + capture_html(&block)
         concat_content content_tag('form', inner_form_html, options)
       end
@@ -40,16 +41,47 @@ module Padrino
         concat_content content_tag('fieldset', field_set_content, options)
       end
 
-      # Constructs list html for the errors for a given object
-      # error_messages_for @user
-      def error_messages_for(record, options={})
-        return "" if record.blank? or record.errors.none?
-        options.reverse_merge!(:header_message => "The #{record.class.to_s.downcase} could not be saved!")
-        error_messages = record.errors.full_messages
-        error_items = error_messages.collect { |er| content_tag(:li, er) }.join("\n")
-        error_html = content_tag(:p, options.delete(:header_message))
-        error_html << content_tag(:ul, error_items, :class => 'errors-list')
-        content_tag(:div, error_html, :class => 'field-errors')
+      # Constructs list html for the errors for a given symbol
+      # 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
+        count   = objects.inject(0) {|sum, object| sum + object.errors.count }
+
+        unless count.zero?
+          html = {}
+          [:id, :class].each do |key|
+            if options.include?(key)
+              value = options[key]
+              html[key] = value unless value.blank?
+            else
+              html[key] = 'field-errors'
+            end
+          end
+
+          options[:object_name] ||= params.first.class
+
+          I18n.with_options :locale => options[:locale], :scope => [:models, :errors, :template] do |locale|
+            header_message = if options.include?(:header_message)
+              options[:header_message]
+            else
+              object_name = options[:object_name].to_s.gsub('_', ' ')
+              object_name = I18n.t(object_name, :default => object_name, :scope => :models, :count => 1)
+              locale.t :header, :count => count, :model => object_name
+            end
+            message = options.include?(:message) ? options[:message] : locale.t(:body)
+            error_messages = objects.map {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }.join
+
+            contents = ''
+            contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
+            contents << content_tag(:p, message) unless message.blank?
+            contents << content_tag(:ul, error_messages)
+
+            content_tag(:div, contents, html)
+          end
+        else
+          ''
+        end
       end
 
       # Constructs a label tag from the given options
@@ -152,43 +184,42 @@ module Padrino
       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}/)
+        # 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
-      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.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'.
+        # 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 FormBuilder class to use based on all available setting sources
-      # 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'
-        configured_builder = "Padrino::Helpers::FormBuilder::#{configured_builder}".constantize if configured_builder.is_a?(String)
-        configured_builder
-      end
+        # 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
+        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'
+          configured_builder = "Padrino::Helpers::FormBuilder::#{configured_builder}".constantize if configured_builder.is_a?(String)
+          configured_builder
+        end
     end
   end
 end

data/lib/padrino-helpers/format_helpers.rb

@@ -169,16 +169,17 @@ module Padrino
 
       # Used in xxxx.js.erb files to escape html so that it can be passed to javascript from Padrino
       # js_escape_html("<h1>Hey</h1>")
-      def js_escape_html(html_content)
+      def escape_javascript(html_content)
         return '' unless html_content
         javascript_mapping = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n' }
         javascript_mapping.merge("\r" => '\n', '"' => '\\"', "'" => "\\'")
         escaped_string = html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { javascript_mapping[$1] }
-        "\"#{escaped_string}\""
+        escaped_string
       end
 
-      alias escape_javascript js_escape_html
-      alias escape_for_javascript js_escape_html
+      def js_escape_html(html_content)
+        "\"#{escape_javascript(html_content)}\""
+      end
 
     end
   end

data/lib/padrino-helpers/locale/en.yml

@@ -102,7 +102,7 @@ en:
       minute: "Minute"
       second: "Seconds"
 
-  activemodel:
+  models:
     errors:
       template:
         header:

data/lib/padrino-helpers/output_helpers.rb

@@ -53,46 +53,45 @@ module Padrino
       end
 
       protected
+        # Retrieves content_blocks stored by content_for or within yield_content
+        # content_blocks[:name] => ['...', '...']
+        def content_blocks
+          @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+        end
 
-      # Retrieves content_blocks stored by content_for or within yield_content
-      # 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...'
-      def capture_erb(*args, &block)
-        erb_with_output_buffer { block_given? && block.call(*args) }
-      end
+        # Used to capture the html from a block of erb code
+        # 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")
-      def erb_concat(text)
-        @_out_buf << text if has_erb_buffer?
-      end
+        # Concats directly to an erb template
+        # 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
-      def has_erb_buffer?
-        !@_out_buf.nil?
-      end
+        # Returns true if an erb buffer is detected
+        # 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 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:
-        @_out_buf, old_buffer = buf, @_out_buf
-        yield
-        @_out_buf
-      ensure
-        @_out_buf = old_buffer
-      end
+        # Used to direct the buffer for the erb capture
+        def erb_with_output_buffer(buf = '') #:nodoc:
+          @_out_buf, old_buffer = buf, @_out_buf
+          yield
+          @_out_buf
+        ensure
+          @_out_buf = old_buffer
+        end
     end
   end
 end

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.5.0"
+  s.version = "0.6.1"
 
   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-01-06}
+  s.date = %q{2010-01-14}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -80,7 +80,7 @@ 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.1.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.1"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
       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.1.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -97,7 +97,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, [">= 0.1.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.1"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/markup_app/views/form_tag.erb

@@ -1,5 +1,4 @@
 <% form_tag '/simple', :class => 'simple-form' do %>
-  <%= error_messages_for(nil) %>
   <%= hidden_field_tag :session_id, :value => "__secret__" %>
   <% field_set_tag do %>
     <%= label_tag :username %>

data/test/test_asset_tag_helpers.rb

@@ -30,6 +30,10 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = link_to('Sign up', '/register', :class => 'first', :id => 'linky')
       assert_has_tag('a#linky.first', :content => "Sign up", :href => '/register') { actual_html }
     end
+    should "display link element with anchor attribute" do
+      actual_html = link_to("Anchor", "/anchor", :anchor => :foo)
+      assert_has_tag('a', :content => "Anchor", :href => '/anchor#foo') { actual_html }
+    end
     should "display link element with void url and options" do
       actual_link = link_to('Sign up', :class => "test")
       assert_has_tag('a', :content => "Sign up", :href => 'javascript:void(0);', :class => 'test') { actual_link }

data/test/test_form_builder.rb

@@ -9,11 +9,11 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   def setup
-    error_stub = stub(:full_messages => ["1", "2"], :none? => false)
+    error_stub = stub(:full_messages => ["1", "2"], :count => 2)
     role_types = [stub(:name => 'Admin', :id => 1), stub(:name => 'Moderate', :id => 2),  stub(:name => 'Limited', :id => 3)]
     @user = stub(:errors => error_stub, :class => 'User', :first_name => "Joe", :session_id => 54)
     @user.stubs(:role_types => role_types, :role => "1")
-    @user_none = stub(:errors => stub(:none? => true), :class => 'User')
+    @user_none = stub(:errors => stub(:count => 0), :class => 'User')
   end
 
   def standard_builder(object=@user)
@@ -130,25 +130,25 @@ class TestFormBuilder < Test::Unit::TestCase
 
     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 p', :content => "Demo form cannot be saved") { actual_html }
-      assert_has_tag('div.field-errors ul.errors-list li', :content => "1") { actual_html }
-      assert_has_tag('div.field-errors ul.errors-list li', :content => "2") { actual_html }
+      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 }
     end
 
     should "display correct form in haml" do
       visit '/haml/form_for'
-      assert_have_selector '#demo div.field-errors p', :content => "custom MarkupUser cannot be saved!"
-      assert_have_selector '#demo div.field-errors ul.errors-list li', :content => "This is a fake error"
-      assert_have_selector '#demo2 div.field-errors p', :content => "custom MarkupUser cannot be saved!"
-      assert_have_selector '#demo2 div.field-errors ul.errors-list li', :content => "This is a fake error"
+      assert_have_selector '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+      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"
     end
 
     should "display correct form in erb" do
       visit '/erb/form_for'
-      assert_have_selector '#demo div.field-errors p', :content => "custom MarkupUser cannot be saved!"
-      assert_have_selector '#demo div.field-errors ul.errors-list li', :content => "This is a fake error"
-      assert_have_selector '#demo2 div.field-errors p', :content => "custom MarkupUser cannot be saved!"
-      assert_have_selector '#demo2 div.field-errors ul.errors-list li', :content => "This is a fake error"
+      assert_have_selector '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+      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"
     end
   end
 
@@ -551,13 +551,13 @@ class TestFormBuilder < Test::Unit::TestCase
 
     should "display correct check box block in haml" do
       visit '/haml/form_for'
-      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember Me: "
+      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
       assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
     end
 
     should "display correct check box block in erb" do
       visit '/erb/form_for'
-      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember Me: "
+      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
       assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
     end
   end

data/test/test_form_helpers.rb

@@ -76,32 +76,35 @@ class TestFormHelpers < Test::Unit::TestCase
 
   context 'for #error_messages_for method' do
     should "display correct error messages list in ruby" do
-      user = stub(:class => "User", :errors => stub(:full_messages => ["1", "2"], :none? => false), :blank? => false)
+      user = stub(:class => "User", :errors => stub(:full_messages => ["1", "2"], :count => 2), :blank? => false)
       actual_html = error_messages_for(user)
       assert_has_tag('div.field-errors') { actual_html }
-      assert_has_tag('div.field-errors p', :content => "The user could not be saved") { actual_html }
-      assert_has_tag('div.field-errors ul.errors-list') { actual_html }
-      assert_has_tag('div.field-errors ul.errors-list li', :count => 2) { actual_html }
+      assert_has_tag('div.field-errors h2', :content => "2 errors prohibited this User from being saved") { actual_html }
+      assert_has_tag('div.field-errors p', :content => "There were problems with the following fields:") { actual_html }
+      assert_has_tag('div.field-errors ul') { actual_html }
+      assert_has_tag('div.field-errors ul li', :count => 2) { actual_html }
     end
 
     should "display correct error messages list in erb" do
       visit '/erb/form_tag'
       assert_have_no_selector 'form.simple-form .field-errors'
       assert_have_selector 'form.advanced-form .field-errors'
-      assert_have_selector 'form.advanced-form .field-errors p', :content => "There are problems with saving user!"
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list'
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :count => 3
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :content => "This is a second fake error"
+      assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+      assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
+      assert_have_selector 'form.advanced-form .field-errors ul'
+      assert_have_selector 'form.advanced-form .field-errors ul li', :count => 3
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "This is a second fake error"
     end
 
     should "display correct error messages list in haml" do
       visit '/haml/form_tag'
       assert_have_no_selector 'form.simple-form .field-errors'
       assert_have_selector 'form.advanced-form .field-errors'
-      assert_have_selector 'form.advanced-form .field-errors p', :content => "There are problems with saving user!"
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list'
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :count => 3
-      assert_have_selector 'form.advanced-form .field-errors ul.errors-list li', :content => "This is a second fake error"
+      assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+      assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
+      assert_have_selector 'form.advanced-form .field-errors ul'
+      assert_have_selector 'form.advanced-form .field-errors ul li', :count => 3
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "This is a second fake error"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml