padrino-helpers 0.9.7 → 0.9.9

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'sdoc'
 
 GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
 

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.9

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_form_builder' unless defined?(AbstractFormBuilder)
+require File.expand_path(File.dirname(__FILE__) + '/abstract_form_builder') unless defined?(AbstractFormBuilder)
 
 module Padrino
   module Helpers

data/lib/padrino-helpers/form_helpers.rb

@@ -103,7 +103,7 @@ module Padrino
       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 }
+        count   = objects.inject(0) {|sum, object| sum + object.errors.size }
 
         unless count.zero?
           html = {}
@@ -122,12 +122,18 @@ module Padrino
             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)
+              object_name = options[:object_name].to_s.underscore.gsub('_', ' ')
+              object_name = I18n.t(:name, :default => object_name.humanize, :scope => [:models, object_name], :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
+            error_messages = objects.map { |object|
+              object_name = options[:object_name].to_s.underscore.gsub('_', ' ')
+              object.errors.map { |f, msg|
+                field = I18n.t(f, :default => object_name.humanize, :scope => [:models, object_name, :attributes])
+                content_tag(:li, "%s %s" % [field, msg])
+              }
+            }.join
 
             contents = ''
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
@@ -167,7 +173,8 @@ module Padrino
         if error
           options.reverse_merge!(:tag => :span, :class => :error)
           tag   = options.delete(:tag)
-          error = [options.delete(:prepend), Array(object.errors[field]).first, options.delete(:append)].compact.join(" ")
+          # Array(error).first is necessary because some orm give us an array others directly a value
+          error = [options.delete(:prepend), Array(error).first, options.delete(:append)].compact.join(" ")
           content_tag(tag, error, options)
         else
           ''

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.9.7"
+  s.version = "0.9.9"
 
   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-03-22}
+  s.date = %q{2010-03-29}
   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 = [
@@ -84,14 +84,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.7"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.9"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       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<padrino-core>, ["= 0.9.7"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/fixtures/markup_app/app.rb

@@ -41,7 +41,7 @@ class MarkupDemo < Sinatra::Base
 end
 
 class MarkupUser
-  def errors; Errors.new; end
+  def errors; { :fake => "must be valid", :second => "must be present", :third  => "must be a number", :email => "must be a email"}; end
   def session_id; 45; end
   def gender; 'male'; end
   def remember_me; '1'; end
@@ -53,14 +53,6 @@ class Permission
   def can_delete; false; end
 end
 
-class Errors < Array
-  def initialize; self << [:fake, :second, :third]; end
-  def [](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
-end
-
 module Outer
   class UserAccount; end
 end

data/test/test_asset_tag_helpers.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestAssetTagHelpers < Test::Unit::TestCase
   include Padrino::Helpers::AssetTagHelpers

data/test/test_form_builder.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestFormBuilder < Test::Unit::TestCase
   include Padrino::Helpers::FormHelpers
@@ -9,11 +9,10 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   def setup
-    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 = stub(:errors => {:a => "must be present", :b => "must be valid"}, :class => 'User', :first_name => "Joe", :session_id => 54)
     @user.stubs(:role_types => role_types, :role => "1")
-    @user_none = stub(:errors => stub(:count => 0), :class => 'User')
+    @user_none = stub(:errors => {}, :class => 'User')
   end
 
   def standard_builder(object=@user)
@@ -131,27 +130,35 @@ 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", :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 ul li', :content => "User must be valid") { actual_html }
+      assert_has_tag('#field-errors ul li', :content => "User must be present") { 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
       visit '/haml/form_for'
-      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"
+      assert_have_selector '#demo div.field-errors h2',     :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be valid"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be present"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be a number"
+      assert_have_selector '#demo2 div.field-errors h2',    :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be valid"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be present"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be a number"
       assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
     end
 
     should "display correct form in erb" do
       visit '/erb/form_for'
-      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"
+      assert_have_selector '#demo div.field-errors h2',     :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be valid"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be present"
+      assert_have_selector '#demo div.field-errors ul li',  :content => "Markup user must be a number"
+      assert_have_selector '#demo2 div.field-errors h2',    :content => "custom MarkupUser cannot be saved!"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be valid"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be present"
+      assert_have_selector '#demo2 div.field-errors ul li', :content => "Markup user must be a number"
       assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
     end
   end

data/test/test_form_helpers.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestFormHelpers < Test::Unit::TestCase
   include Padrino::Helpers::FormHelpers
@@ -76,7 +76,7 @@ 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"], :count => 2), :blank? => false)
+      user = stub(:class => "User", :errors => { :a => "1", :b => "2" }, :blank? => false)
       actual_html = error_messages_for(user)
       assert_has_tag('div.field-errors') { actual_html }
       assert_has_tag('div.field-errors h2', :content => "2 errors prohibited this User from being saved") { actual_html }
@@ -92,8 +92,10 @@ class TestFormHelpers < Test::Unit::TestCase
       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"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be valid"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be present"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be a number"
     end
 
     should "display correct error messages list in haml" do
@@ -101,10 +103,12 @@ class TestFormHelpers < Test::Unit::TestCase
       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 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 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"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be valid"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be present"
+      assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Markup user must be a number"
     end
   end
 

data/test/test_format_helpers.rb

@@ -1,11 +1,15 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestFormatHelpers < Test::Unit::TestCase
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
 
+  def setup
+    Time.stubs(:now).returns(Time.utc(1983, 11, 9, 5))
+  end
+
   include Padrino::Helpers::FormatHelpers
 
   context 'for #simple_format method' do
@@ -54,10 +58,10 @@ class TestFormatHelpers < Test::Unit::TestCase
       assert_equal "Once\nupon\na\ntime", actual_text
     end
     should "return proper formatting for default width" do
-      actual_text = word_wrap(1.upto(50).to_a.join(" "))
-      assert_equal 1.upto(30).to_a.join(" ") + "\n" + 31.upto(50).to_a.join(" "), actual_text
-      actual_text = word_wrap(1.upto(50).to_a.join(" "), 80)
-      assert_equal 1.upto(30).to_a.join(" ") + "\n" + 31.upto(50).to_a.join(" "), actual_text
+      actual_text = word_wrap((1..50).to_a.join(" "))
+      assert_equal (1..30).to_a.join(" ") + "\n" + (31..50).to_a.join(" "), actual_text
+      actual_text = word_wrap((1..50).to_a.join(" "), 80)
+      assert_equal (1..30).to_a.join(" ") + "\n" + (31..50).to_a.join(" "), actual_text
     end
   end
 

data/test/test_output_helpers.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestOutputHelpers < Test::Unit::TestCase
   def app

data/test/test_render_helpers.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/render_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/render_app/app')
 
 class TestRenderHelpers < Test::Unit::TestCase
   def app

data/test/test_tag_helpers.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/markup_app/app'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
 class TestTagHelpers < Test::Unit::TestCase
   def app

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 9
+        version: 0.9.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency