padrino-helpers 0.9.16 → 0.9.17

data/lib/padrino-helpers/form_helpers.rb

@@ -40,11 +40,13 @@ module Padrino
       def form_tag(url, options={}, &block)
         desired_method = options[:method]
         data_method = options.delete(:method) if options[:method].to_s !~ /get|post/i
-        options.reverse_merge!(:method => 'post', :action => url)
+        options.reverse_merge!(:method => "post", :action => url)
         options[:enctype] = "multipart/form-data" if options.delete(:multipart)
         options["data-remote"] = "true" if options.delete(:remote)
         options["data-method"] = data_method if data_method
-        inner_form_html = hidden_form_method_field(desired_method) + capture_html(&block)
+        options["accept-charset"] = "UTF-8"
+        inner_form_html  = hidden_form_method_field(desired_method)
+        inner_form_html += hidden_field_tag(:"_utf8", :value => "☃") + capture_html(&block)
         concat_content content_tag('form', inner_form_html, options)
       end
 
@@ -375,13 +377,13 @@ module Padrino
           configured_builder
         end
 
-        
+
         #
         # Returns whether the option should be selected or not
         #
         def option_is_selected?(value, caption, selected_value)
           if selected_value.is_a? Array
-            selected_value.any? do |selected| 
+            selected_value.any? do |selected|
               selected.to_s =~ /^(#{value}|#{caption})$/
             end
           else

data/test/test_form_builder.rb

@@ -21,54 +21,54 @@ class TestFormBuilder < Test::Unit::TestCase
 
   context 'for #form_for method' do
     should "display correct form html" do
-      actual_html = form_for(@user, '/register', :id => 'register', :method => 'post') { "Demo" }
-      assert_has_tag('form', :action => '/register', :id => 'register', :method => 'post', :content => "Demo") { actual_html }
+      actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "utf-8", :method => 'post') { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/register', :id => 'register', :method => 'post', :content => "Demo") { actual_html }
       assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
     end
 
     should "display correct form html with fake object" do
-      actual_html = form_for(:markup_user, '/register', :id => 'register', :method => 'post') { |f| f.text_field :username }
-      assert_has_tag('form', :action => '/register', :id => 'register', :method => 'post') { actual_html }
+      actual_html = form_for(:markup_user, '/register', :id => 'register', :"accept-charset" => "utf-8", :method => 'post') { |f| f.text_field :username }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/register', :id => 'register', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'text', :name => 'markup_user[username]') { actual_html }
       assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
     end
 
     should "display correct form html for namespaced object" do
-      actual_html = form_for(Outer::UserAccount.new, '/register', :method => 'post') { |f| f.text_field :username }
-      assert_has_tag('form', :action => '/register', :method => 'post') { actual_html }
+      actual_html = form_for(Outer::UserAccount.new, '/register', :"accept-charset" => "utf-8", :method => 'post') { |f| f.text_field :username }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/register', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'text', :name => 'outer-user_account[username]') { actual_html }
     end
 
     should "display correct form html with remote option" do
-      actual_html = form_for(@user, '/update', :remote => true) { "Demo" }
-      assert_has_tag('form', :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
+      actual_html = form_for(@user, '/update', :"accept-charset" => "utf-8", :remote => true) { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
     end
 
     should "display correct form html with remote option and method put" do
-      actual_html = form_for(@user, '/update', :remote => true, :method => 'put') { "Demo" }
-      assert_has_tag('form', :method => 'post', "data-method" => 'put', "data-remote" => 'true') { actual_html }
+      actual_html = form_for(@user, '/update', :"accept-charset" => "utf-8", :remote => true, :method => 'put') { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :method => 'post', "data-method" => 'put', "data-remote" => 'true') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
     should "display correct form html with method :put" do
-      actual_html = form_for(@user, '/update', :method => 'put') { "Demo" }
-      assert_has_tag('form', :action => '/update', :method => 'post') { actual_html }
+      actual_html = form_for(@user, '/update', :"accept-charset" => "utf-8", :method => 'put') { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/update', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
     should "display correct form html with method :delete" do
-      actual_html = form_for(@user, '/destroy', :method => 'delete') { "Demo" }
-      assert_has_tag('form', :action => '/destroy', :method => 'post') { actual_html }
+      actual_html = form_for(@user, '/destroy', :"accept-charset" => "utf-8", :method => 'delete') { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/destroy', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'delete') { actual_html }
     end
 
     should "display correct form html with multipart" do
-      actual_html = form_for(@user, '/register', :multipart => true) { "Demo" }
-      assert_has_tag('form', :action => '/register', :enctype => "multipart/form-data") { actual_html }
+      actual_html = form_for(@user, '/register', :"accept-charset" => "utf-8", :multipart => true) { "Demo" }
+      assert_has_tag('form', :"accept-charset" => "utf-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
     end
 
     should "support changing form builder type" do
-      form_html = proc { form_for(@user, '/register', :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
+      form_html = proc { form_for(@user, '/register', :"accept-charset" => "utf-8", :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
       assert_raise(NoMethodError) { form_html.call }
     end
 

data/test/test_form_helpers.rb

@@ -10,42 +10,49 @@ class TestFormHelpers < Test::Unit::TestCase
 
   context 'for #form_tag method' do
     should "display correct forms in ruby" do
-      actual_html = form_tag('/register', :class => 'test', :method => "post") { "Demo" }
-      assert_has_tag(:form, :class => "test") { actual_html }
+      actual_html = form_tag('/register', :"accept-charset" => "utf-8", :class => 'test', :method => "post") { "Demo" }
+      assert_has_tag(:form, :"accept-charset" => "utf-8", :class => "test") { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => '_method', :count => 0) { actual_html }
     end
 
     should "display correct text inputs within form_tag" do
-      actual_html = form_tag('/register', :class => 'test') { text_field_tag(:username) }
+      actual_html = form_tag('/register', :"accept-charset" => "utf-8", :class => 'test') { text_field_tag(:username) }
       assert_has_tag('form input', :type => 'text', :name => "username") { actual_html }
     end
 
     should "display correct form with remote" do
-      actual_html = form_tag('/update', :class => 'put-form', :remote => true) { "Demo" }
-      assert_has_tag(:form, :class => "put-form", "data-remote" => 'true') { actual_html }
+      actual_html = form_tag('/update', :"accept-charset" => "utf-8", :class => 'put-form', :remote => true) { "Demo" }
+      assert_has_tag(:form, :class => "put-form", :"accept-charset" => "utf-8", "data-remote" => 'true') { actual_html }
       assert_has_no_tag(:form, "data-method" => 'post') { actual_html }
     end
 
     should "display correct form with remote and method is put" do
-      actual_html = form_tag('/update', :method => 'put', :remote => true) { "Demo" }
-      assert_has_tag(:form, "data-remote" => 'true', "data-method" => 'put') { actual_html }
+      actual_html = form_tag('/update', :"accept-charset" => "utf-8", :method => 'put', :remote => true) { "Demo" }
+      assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "utf-8", "data-method" => 'put') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
     should "display correct form with method :put" do
-      actual_html = form_tag('/update', :class => 'put-form', :method => "put") { "Demo" }
-      assert_has_tag(:form, :class => "put-form", :method => 'post') { actual_html }
+      actual_html = form_tag('/update', :"accept-charset" => "utf-8", :class => 'put-form', :method => "put") { "Demo" }
+      assert_has_tag(:form, :class => "put-form", :"accept-charset" => "utf-8", :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
-    should "display correct form with method :delete" do
-      actual_html = form_tag('/remove', :class => 'delete-form', :method => "delete") { "Demo" }
-      assert_has_tag(:form, :class => "delete-form", :method => 'post') { actual_html }
+    should "display correct form with method :delete and charset" do
+      actual_html = form_tag('/remove', :"accept-charset" => "utf-8", :class => 'delete-form', :method => "delete") { "Demo" }
+      assert_has_tag(:form, :class => "delete-form", :"accept-charset" => "utf-8", :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'delete') { actual_html }
+      assert_has_tag('form input', :type => 'hidden', :name => "_utf8") { actual_html }
+    end
+
+    should "display correct form with charset" do
+      actual_html = form_tag('/charset', :"accept-charset" => "utf-8", :class => 'charset-form') { "Demo" }
+      assert_has_tag(:form, :class => "charset-form", :"accept-charset" => "utf-8", :method => 'post') { actual_html }
+      assert_has_tag('form input', :type => 'hidden', :name => "_utf8") { actual_html }
     end
 
     should "display correct form with multipart encoding" do
-      actual_html = form_tag('/remove', :multipart => true) { "Demo" }
+      actual_html = form_tag('/remove', :"accept-charset" => "utf-8", :multipart => true) { "Demo" }
       assert_has_tag(:form, :enctype => "multipart/form-data") { actual_html }
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 9
-  - 16
-  version: 0.9.16
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 9
-        - 16
-        version: 0.9.16
+        - 17
+        version: 0.9.17
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency