padrino-helpers 0.10.5 → 0.10.6.a

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

@@ -5,14 +5,30 @@
     <%= f.label :username, :caption => "Login: ", :class => 'user-label' %>
     <%= f.text_field :username, :class => 'user-text', :value => "John" %>
   </p>
-  <p>
-    <%= f.label :email, :caption => "Email", :class => 'user-email' %>
-    <%= f.text_field :email %>
-  </p>
   <p>
     <%= f.label :password %>
     <%= f.password_field :password, :class => 'user-password', :value => "secret" %>
   </p>
+  <p>
+    <%= f.label :age %>
+    <%= f.number_field :age, :class => 'numeric '%>
+  </p>
+  <p>
+    <%= f.label :telephone %>
+    <%= f.telephone_field :telephone, :class => 'numeric' %>
+  </p>
+  <p>
+    <%= f.label :email, :caption => 'Email Address: ' %>
+    <%= f.email_field :email, :class => 'string' %>
+  </p>
+  <p>
+    <%= f.label :webpage, :caption => 'Your Web Page: ' %>
+    <%= f.url_field :webpage, :class => 'string' %>
+  </p>
+  <p>
+    <%= f.label :search %>
+    <%= f.search_field :search, :class => 'string' %>
+  </p>
   <p>
     <%= f.label :photo %>
     <%= f.file_field :photo, :class => 'user-photo' %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -4,12 +4,24 @@
   %p
     = f.label :username, :caption => "Login: ", :class => 'user-label'
     = f.text_field :username, :class => 'user-text', :value => "John"
-  %p
-    = f.label :email, :caption => "Email", :class => 'user-email'
-    = f.text_field :email
   %p
     = f.label :password
     = f.password_field :password, :class => 'user-password', :value => "secret"
+  %p
+    = f.label :age
+    = f.number_field :age, :class => 'numeric'
+  %p
+    = f.label :telephone
+    = f.telephone_field :telephone, :class => 'numeric'
+  %p
+    = f.label :email, :caption => 'Email Address: '
+    = f.email_field :email, :class => 'string'
+  %p
+    = f.label :webpage, :caption => 'Your Web Page: '
+    = f.url_field :webpage, :class => 'string'
+  %p
+    = f.label :search
+    = f.search_field :search, :class => 'string'
   %p
     = f.label :photo
     = f.file_field :photo, :class => 'user-photo'

data/test/fixtures/markup_app/views/form_for.slim

@@ -4,12 +4,24 @@
   p
     == f.label :username, :caption => "Login: ", :class => 'user-label'
     == f.text_field :username, :class => 'user-text', :value => "John"
-  p
-    == f.label :email, :caption => "Email", :class => 'user-email'
-    == f.text_field :email
   p
     == f.label :password
     == f.password_field :password, :class => 'user-password', :value => "secret"
+  p
+    == f.label :age
+    == f.number_field :age, :class => 'numeric'
+  p
+    == f.label :telephone
+    == f.telephone_field :telephone, :class => 'numeric'
+  p
+    == f.label :email, :caption => 'Email Address: '
+    == f.email_field :email, :class => 'string'
+  p
+    == f.label :webpage, :caption => 'Your Web Page: '
+    == f.url_field :webpage, :class => 'string'
+  p
+    == f.label :search
+    == f.search_field :search, :class => 'string'
   p
     == f.label :photo
     == f.file_field :photo, :class => 'user-photo'

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

@@ -5,6 +5,16 @@
     <%= text_field_tag :username %>
     <%= label_tag :password %>
     <%= password_field_tag :password %>
+    <%= label_tag :email %>
+    <%= email_field_tag :email %>
+    <%= label_tag :age %>
+    <%= number_field_tag :age %>
+    <%= label_tag :telephone %>
+    <%= telephone_field_tag :telephone %>
+    <%= label_tag :webpage %>
+    <%= url_field_tag :webpage %>
+    <%= label_tag :search %>
+    <%= search_field_tag :search %>
     <%= check_box_tag :remember_me %>
     <%= label_tag :gender %>
     <%= label_tag :color %>
@@ -27,6 +37,26 @@
       <%= label_tag :password, :class => 'first' %>
       <%= password_field_tag :password, :value => params[:password] %>
     </p>
+    <p>
+      <%= label_tag :email, :caption => 'Email Address' %>
+      <%= email_field_tag :email, :class => 'string' %>
+    </p>
+    <p>
+      <%= label_tag :age, :class => 'age' %>
+      <%= number_field_tag :age, :class => 'numeric' %>
+    </p>
+    <p>
+      <%= label_tag :telephone, :class => 'telephone' %>
+      <%= telephone_field_tag :telephone, :class => 'numeric' %>
+    </p>
+    <p>
+      <%= label_tag :webpage, :caption => 'Your Home Page' %>
+      <%= url_field_tag :webpage, :class => 'string' %>
+    </p>
+    <p>
+      <%= label_tag :search %>
+      <%= search_field_tag :search, :class => 'string' %>
+    </p>
     <p>
       <%= label_tag :about, :class => 'about', :caption => "About Me" %>
       <%= text_area_tag :about, :class => 'large' %>

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

@@ -6,6 +6,16 @@
     = text_field_tag :username
     = label_tag :password
     = password_field_tag :password
+    = label_tag :email
+    = email_field_tag :email
+    = label_tag :age
+    = number_field_tag :age
+    = label_tag :telephone
+    = telephone_field_tag :telephone
+    = label_tag :webpage
+    = url_field_tag :webpage
+    = label_tag :search
+    = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
     = label_tag  :gender
@@ -24,6 +34,21 @@
     %p
       = label_tag :password, :class => 'first'
       = password_field_tag :password, :value => params[:password]
+    %p
+      = label_tag :email, :caption => 'Email Address'
+      = email_field_tag :email, :class => 'string'
+    %p
+      = label_tag :age, :class => 'age'
+      = number_field_tag :age, :class => 'numeric'
+    %p
+      = label_tag :telephone, :class => 'telephone'
+      = telephone_field_tag :telephone, :class => 'numeric'
+    %p
+      = label_tag :webpage, :caption => 'Your Home Page'
+      = url_field_tag :webpage, :class => 'string'
+    %p
+      = label_tag :search
+      = search_field_tag :search, :class => 'string'
     %p
       = label_tag :about, :class => 'about', :caption => "About Me"
       = text_area_tag :about, :class => 'large'

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

@@ -6,6 +6,16 @@
     == text_field_tag :username
     == label_tag :password
     == password_field_tag :password
+    == label_tag :email
+    == email_field_tag :email
+    == label_tag :age
+    == number_field_tag :age
+    == label_tag :telephone
+    == telephone_field_tag :telephone
+    == label_tag :webpage
+    == url_field_tag :webpage
+    == label_tag :search
+    == search_field_tag :search
     == label_tag  :color
     == select_tag :color, :options => ['green', 'orange', 'purple']
     == label_tag  :gender
@@ -24,6 +34,21 @@
     p
       == label_tag :password, :class => 'first'
       == password_field_tag :password, :value => params[:password]
+    p
+      == label_tag :email, :caption => 'Email Address'
+      == email_field_tag :email, :class => 'string'
+    p
+      == label_tag :age, :class => 'age'
+      == number_field_tag :age, :class => 'numeric'
+    p
+      == label_tag :telephone, :class => 'telephone'
+      == telephone_field_tag :telephone, :class => 'numeric'
+    p
+      == label_tag :webpage, :caption => 'Your Home Page'
+      == url_field_tag :webpage, :class => 'string'
+    p
+      == label_tag :search
+      == search_field_tag :search, :class => 'string'
     p
       == label_tag :about, :class => 'about', :caption => "About Me"
       == text_area_tag :about, :class => 'large'

data/test/test_asset_tag_helpers.rb

@@ -176,11 +176,6 @@ describe "AssetTagHelpers" 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_form_builder.rb

@@ -199,7 +199,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
 
     should "display correct form in erb" do
@@ -212,7 +212,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
 
     should "display correct form in slim" do
@@ -225,7 +225,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
   end
 
@@ -325,6 +325,116 @@ describe "FormBuilder" do
     end
   end
 
+  context 'for #number_field method' do
+    should "display correct number field html" do
+      actual_html = standard_builder.number_field(:age, :class => 'numeric')
+      assert_has_tag('input.numeric[type=number]', :id => 'user_age', :name => 'user[age]') { actual_html }
+    end
+
+    should "display correct number field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+
+    should "display correct number field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+
+    should "display correct number field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+  end
+
+  context 'for #telephone_field method' do
+    should "display correct telephone field html" do
+      actual_html = standard_builder.telephone_field(:telephone, :class => 'numeric')
+      assert_has_tag('input.numeric[type=tel]', :id => 'user_telephone', :name => 'user[telephone]') { actual_html }
+    end
+
+    should "display correct telephone field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+
+    should "display correct telephone field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+
+    should "display correct telephone field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+  end
+
+  context 'for #search_field method' do
+    should "display correct search field html" do
+      actual_html = standard_builder.search_field(:search, :class => 'string')
+      assert_has_tag('input.string[type=search]', :id => 'user_search', :name => 'user[search]') { actual_html }
+    end
+
+    should "display correct search field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+
+    should "display correct search field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+
+    should "display correct search field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+  end
+
+  context 'for #email_field method' do
+    should "display correct email field html" do
+      actual_html = standard_builder.email_field(:email, :class => 'string')
+      assert_has_tag('input.string[type=email]', :id => 'user_email', :name => 'user[email]') { actual_html }
+    end
+
+    should "display correct email field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+
+    should "display correct email field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+
+    should "display correct email field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+  end
+
+  context 'for #url_field method' do
+    should "display correct url field html" do
+      actual_html = standard_builder.url_field(:webpage, :class => 'string')
+      assert_has_tag('input.string[type=url]', :id => 'user_webpage', :name => 'user[webpage]') { actual_html }
+    end
+
+    should "display correct url field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+
+    should "display correct url field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+
+    should "display correct url field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+  end
+
   context 'for #check_box method' do
     should "display correct checkbox html" do
       actual_html = standard_builder.check_box(:confirm_destroy, :class => 'large')
@@ -430,7 +540,7 @@ describe "FormBuilder" do
   context 'for #text_area method' do
     should "display correct text_area html" do
       actual_html = standard_builder.text_area(:about, :class => 'large')
-      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]', :rows => '', :cols => '') { actual_html }
+      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
     end
 
     should "display correct text_area html and content" do

data/test/test_form_helpers.rb

@@ -193,14 +193,14 @@ describe "FormHelpers" do
 
     should "display label tag in erb for simple form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
     should "display label tag in erb for advanced form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -210,7 +210,7 @@ describe "FormHelpers" do
 
     should "display label tag in haml for simple form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
@@ -218,7 +218,7 @@ describe "FormHelpers" do
 
     should "display label tag in haml for advanced form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -228,7 +228,7 @@ describe "FormHelpers" do
 
     should "display label tag in slim for simple form" do
       visit '/slim/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
@@ -236,7 +236,7 @@ describe "FormHelpers" do
 
     should "display label tag in slim for advanced form" do
       visit '/slim/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -295,10 +295,135 @@ describe "FormHelpers" do
     end
   end
 
+  context 'for #number_field_tag method' do
+    should "display number field in ruby" do
+      actual_html = number_field_tag(:age, :class => 'numeric')
+      assert_has_tag(:input, :type => 'number', :class => 'numeric', :name => 'age') { actual_html }
+    end
+
+    should "display number field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+
+    should "display number field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+
+    should "display number field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+  end
+
+  context 'for #telephone_field_tag method' do
+    should "display number field in ruby" do
+      actual_html = telephone_field_tag(:telephone, :class => 'numeric')
+      assert_has_tag(:input, :type => 'tel', :class => 'numeric', :name => 'telephone') { actual_html }
+    end
+
+    should "display telephone field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+
+    should "display telephone field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+
+    should "display telephone field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+  end
+
+  context 'for #search_field_tag method' do
+    should "display search field in ruby" do
+      actual_html = search_field_tag(:search, :class => 'string')
+      assert_has_tag(:input, :type => 'search', :class => 'string', :name => 'search') { actual_html }
+    end
+
+    should "display search field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+
+    should "display search field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+
+    should "display search field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+  end
+
+  context 'for #email_field_tag method' do
+    should "display email field in ruby" do
+      actual_html = email_field_tag(:email, :class => 'string')
+      assert_has_tag(:input, :type => 'email', :class => 'string', :name => 'email') { actual_html }
+    end
+
+    should "display email field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+
+    should "display email field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+
+    should "display email field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+  end
+
+  context 'for #url_field_tag method' do
+    should "display url field in ruby" do
+      actual_html = url_field_tag(:webpage, :class => 'string')
+      assert_has_tag(:input, :type => 'url', :class => 'string', :name => 'webpage') { actual_html }
+    end
+
+    should "display url field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+
+    should "display url field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+
+    should "display url field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+  end
+
   context 'for #text_area_tag method' do
     should "display text area in ruby" do
       actual_html = text_area_tag(:about, :class => 'long')
-      assert_has_tag(:textarea, :class => "long", :name => 'about', :rows => '', :cols => '') { actual_html }
+      assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
     end
 
     should "display text area in ruby with specified content" do