padrino-helpers 0.9.19 → 0.9.20

data/lib/padrino-helpers.rb

@@ -43,4 +43,4 @@ module Padrino
       alias :included :registered
     end
   end # Helpers
-end # Padrino
+end # Padrino

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -223,7 +223,7 @@ module Padrino
           when :js  then 'javascripts'
           else kind.to_s
         end
-        source = source.to_s.gsub(/\s/, '')
+        source = source.to_s.gsub(/\s/, '%20')
         ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
         source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
         result_path   = source if source =~ %r{^/} # absolute path

data/lib/padrino-helpers/dom_helpers.rb

@@ -1,11 +1,11 @@
 module Padrino
   module Helpers
-    module DomHelpers 
+    module DomHelpers
       ##
       # Create DOM id from given object. You can also specify optional prefix.
       #
       # ==== Examples
-      # 
+      #
       #   @user = User.new
       #   dom_id(@user, "new")  # => "new_user"
       #
@@ -13,7 +13,7 @@ module Padrino
       #   @user.id              # => 10
       #   dom_id(@user)         # => user_10
       #   dom_id(@user, "edit") # => edit_user_10
-      #   
+      #
       def dom_id(object, prefix=nil)
         chain = []
         chain << prefix if prefix
@@ -21,11 +21,11 @@ module Padrino
         chain << object.id if object.respond_to?('id') && object.id
         chain.join('_')
       end
-      
+
       ##
-      # Create DOM class name from given object. You can also specify optional 
+      # Create DOM class name from given object. You can also specify optional
       # prefix.
-      # 
+      #
       # ==== Examples
       #
       #   @user = User.new
@@ -43,4 +43,4 @@ module Padrino
       end
     end # DomHelpers
   end # Helpers
-end # Padrino
+end # Padrino

data/lib/padrino-helpers/form_helpers.rb

@@ -44,7 +44,7 @@ module Padrino
         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
-        options["accept-charset"] = "UTF-8"
+        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)
@@ -392,4 +392,4 @@ module Padrino
         end
     end # FormHelpers
   end # Helpers
-end # Padrino
+end # Padrino

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

@@ -100,4 +100,4 @@ cz:
         header:
           one:    "Při ukládání %{model} došlo k chybě a nebylo jej možné uložit"
           other:  "Při ukládání %{model} došlo ke %{count} chybám a nebylo možné jej uložit"
-        body: "Následující pole obsahují chybně vyplněné údaje:"
+        body: "Následující pole obsahují chybně vyplněné údaje:"

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

@@ -75,4 +75,4 @@ nl:
         header:
           one: "1 fout verhindert het opslaan van dit %{model} object"
           other:  "%{count} fouten verhinderen het opslaan van dit %{model} object"
-        body: "Controleer alstublieft de volgende velden:"
+        body: "Controleer alstublieft de volgende velden:"

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

@@ -88,5 +88,4 @@
         header:
           one:    "En feil forhindrer %{model} å bli lagret"
           other:  "%{count} feil forhindrer denne %{model} i å bli lagret"
-        body: "Det er problemer med følgende felter:"
-
+        body: "Det er problemer med følgende felter:"

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

@@ -92,4 +92,4 @@ pl:
         header:
           one:    "%{model} nie został zachowany z powodu jednego błędu"
           other:  "%{model} nie został zachowany z powodu %{count} błędów"
-        body: "Błędy dotyczą następujących pól:"
+        body: "Błędy dotyczą następujących pól:"

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

@@ -100,4 +100,4 @@ ru:
         header:
           one:    "Данные «%{model}» не могут быть сохранены из-за 1 ошибки"
           other:  "Данные «%{model}» не могут быть сохранены из-за %{count} ошибок"
-        body: "Допущены ошибки в следующих полях:"
+        body: "Допущены ошибки в следующих полях:"

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

@@ -100,4 +100,4 @@ tr:
         header:
           one:    "1 hata oluştu; %{model} kaydedilemedi"
           other:  "%{count} hata oluştu; %{model} kaydedilemedi"
-        body: "Hata oluşan alanlar:"
+        body: "Hata oluşan alanlar:"

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

@@ -100,4 +100,4 @@ uk:
         header:
           one:    "Дані «%{model}» не можуть бути збережені через 1 помилки"
           other:  "Дані «%{model}» не можуть бути збережені через %{count} помилок"
-        body: "Допущені помилки в наступних полях:"
+        body: "Допущені помилки в наступних полях:"

data/test/test_asset_tag_helpers.rb

@@ -80,9 +80,9 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     should "display link element for mail to with caption and mail options" do
       actual_html = mail_to('test@demo.com', "My Email", :subject => 'demo test', :class => 'demo', :cc => 'foo@test.com')
       assert_has_tag(:a, :class => 'demo') { actual_html }
-      assert_match /mailto\:test\@demo.com\?/, actual_html
-      assert_match /cc=foo\@test\.com/, actual_html
-      assert_match /subject\=demo\%20test/, actual_html
+      assert_match %r{mailto\:test\@demo.com\?}, actual_html
+      assert_match %r{cc=foo\@test\.com}, actual_html
+      assert_match %r{subject\=demo\%20test}, actual_html
     end
 
     should "display mail link element in haml" do
@@ -140,13 +140,17 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     end
     should "display image tag relative link with incorrect spacing" do
       time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") {
+      assert_has_tag('img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}") {
         image_tag(' relative/ pic.gif  ', :class => 'photo') }
     end
     should "not use a timestamp if stamp setting is false" do
       self.class.expects(:asset_stamp).returns(false)
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
+    should "have xhtml convention tag" do
+      self.class.expects(:asset_stamp).returns(false)
+      assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
+    end
   end
 
   context 'for #stylesheet_link_tag method' do

data/test/test_dom_helpers.rb

@@ -25,7 +25,7 @@ class TestDomHelpers < Test::Unit::TestCase
       assert_equal dom_id(test_obj), "test_object_10"
     end
   end
-  
+
   context 'for #dom_class method' do
     should "return DOM class name based on name of given object" do
       assert_equal dom_class(TestObject.new), "test_object"
@@ -34,4 +34,4 @@ class TestDomHelpers < Test::Unit::TestCase
       assert_equal dom_class(TestObject.new, "new"), "new_test_object"
     end
   end
-end
+end

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', :"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 }
+      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', :"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 }
+      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', :"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 }
+      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', :"accept-charset" => "utf-8", :remote => true) { "Demo" }
-      assert_has_tag('form', :"accept-charset" => "utf-8", :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', :"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 }
+      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', :"accept-charset" => "utf-8", :method => 'put') { "Demo" }
-      assert_has_tag('form', :"accept-charset" => "utf-8", :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', :"accept-charset" => "utf-8", :method => 'delete') { "Demo" }
-      assert_has_tag('form', :"accept-charset" => "utf-8", :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', :"accept-charset" => "utf-8", :multipart => true) { "Demo" }
-      assert_has_tag('form', :"accept-charset" => "utf-8", :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', :"accept-charset" => "utf-8", :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
 
@@ -685,4 +685,4 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
-end
+end

data/test/test_form_helpers.rb

@@ -10,49 +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', :"accept-charset" => "utf-8", :class => 'test', :method => "post") { "Demo" }
-      assert_has_tag(:form, :"accept-charset" => "utf-8", :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', :"accept-charset" => "utf-8", :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', :"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 }
+      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', :"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 }
+      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', :"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 }
+      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 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 }
+      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 }
+      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', :"accept-charset" => "utf-8", :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: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 9
-        - 19
-        version: 0.9.19
+        - 20
+        version: 0.9.20
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency