padrino-helpers 0.16.0.pre4 → 0.16.0

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

@@ -6,14 +6,14 @@
 - content_for :demo2 do |fname, lname|
   h1 This is content yielded with name #{fname + " " + lname}
 
-.demo2= yield_content :demo2, "Johnny", "Smith"
+.demo2= yield_content :demo2, 'Johnny', 'Smith'
 
 .demo_has_content= content_for?(:demo)
 .fake_has_content= content_for?(:fake)
 
 - content_for :demo3 do
   p.duplication One
-- content_for :demo3, :flush => true do
+- content_for :demo3, flush: true do
   p.duplication Two
 
 .demo3= yield_content :demo3

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

@@ -1,8 +1,8 @@
-<%= content_tag :p, "Test 1", :class => 'test', :id => "test1" %>
+<%= content_tag :p, 'Test 1', class: 'test', id: 'test1' %>
 
-<%= content_tag :p, "Test 2" %>
+<%= content_tag :p, 'Test 2' %>
 
-<% content_tag(:p, :class => 'test', :id => 'test3') do %>
+<% content_tag(:p, class: 'test', id: 'test3') do %>
   <span>Test 3</span>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-= content_tag :p, "Test 1", :class => 'test', :id => "test1"
+= content_tag :p, 'Test 1', class: 'test', id: 'test1'
 
-= content_tag :p, "Test 2"
+= content_tag :p, 'Test 2'
 
-= content_tag(:p, :class => 'test', :id => 'test3') do
+= content_tag(:p, class: 'test', id: 'test3') do
   %span Test 3
 
 = content_tag(:p) do

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

@@ -1,8 +1,8 @@
-=content_tag :p, "Test 1", :class => 'test', :id => "test1"
+=content_tag :p, 'Test 1', class: 'test', id: 'test1'
 
-=content_tag :p, "Test 2"
+=content_tag :p, 'Test 2'
 
-=content_tag(:p, :class => 'test', :id => 'test3') do
+=content_tag(:p, class: 'test', id: 'test3') do
   span Test 3
 
 =content_tag(:p) do

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

@@ -1,5 +1,5 @@
 <% @user = MarkupUser.new %>
-<% form_for @user , '/demo1', :id => 'demo-fields-for' do |f| %>
+<% form_for @user, '/demo1', id: 'demo-fields-for' do |f| %>
   <%= f.text_field :gender %>
   <% fields_for @user.permission do |permission| %>
     <%= permission.check_box :can_edit %>
@@ -14,7 +14,7 @@
     <%= child_form.text_field :name %>
     <% unless child_form.object.new_record? %>
       <%= child_form.check_box '_destroy' %>
-      <%= child_form.label '_destroy', :caption => 'Remove' %>
+      <%= child_form.label '_destroy', caption: 'Remove' %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 - @user = MarkupUser.new
-= form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+= form_for @user , '/demo1', id: 'demo-fields-for' do |f|
   = f.text_field :gender
   = fields_for @user.permission do |permission|
     = permission.check_box :can_edit
@@ -12,4 +12,4 @@
     = child_form.text_field :name
     - unless child_form.object.new_record?
       = child_form.check_box '_destroy'
-      = child_form.label '_destroy', :caption => 'Remove'
+      = child_form.label '_destroy', caption: 'Remove'

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

@@ -1,5 +1,5 @@
 - @user = MarkupUser.new
-= form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+= form_for @user , '/demo1', id: 'demo-fields-for' do |f|
   = f.text_field :gender
   = fields_for @user.permission do |permission|
     = permission.check_box :can_edit
@@ -12,4 +12,4 @@
     = child_form.text_field :name
     - unless child_form.object.new_record?
       = child_form.check_box '_destroy'
-      = child_form.label '_destroy', :caption => 'Remove'
+      = child_form.label '_destroy', caption: 'Remove'

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

@@ -1,100 +1,100 @@
-<% form_for MarkupUser.new, '/demo', :id => 'demo' do |f| %>
-  <%= f.error_messages(:header_message => "custom MarkupUser cannot be saved!") %>
+<% form_for MarkupUser.new, '/demo', id: 'demo' do |f| %>
+  <%= f.error_messages(header_message: "custom MarkupUser cannot be saved!") %>
   <%= f.hidden_field :session_id %>
   <p>
-    <%= f.label :username, :caption => "Login: ", :class => 'user-label' %>
-    <%= f.text_field :username, :class => 'user-text', :value => "John" %>
+    <%= f.label :username, caption: 'Login: ', class: 'user-label' %>
+    <%= f.text_field :username, class: 'user-text', value: 'John' %>
   </p>
   <p>
     <%= f.label :password %>
-    <%= f.password_field :password, :class => 'user-password', :value => "secret" %>
+    <%= f.password_field :password, class: 'user-password', value: 'secret' %>
   </p>
   <p>
     <%= f.label :age %>
-    <%= f.number_field :age, :class => 'numeric '%>
+    <%= f.number_field :age, class: 'numeric '%>
   </p>
   <p>
     <%= f.label :telephone %>
-    <%= f.telephone_field :telephone, :class => 'numeric' %>
+    <%= f.telephone_field :telephone, class: 'numeric' %>
   </p>
   <p>
-    <%= f.label :email, :caption => 'Email Address: ' %>
-    <%= f.email_field :email, :class => 'string' %>
+    <%= 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' %>
+    <%= f.label :webpage, caption: 'Your Web Page: ' %>
+    <%= f.url_field :webpage, class: 'string' %>
   </p>
   <p>
     <%= f.label :search %>
-    <%= f.search_field :search, :class => 'string' %>
+    <%= f.search_field :search, class: 'string' %>
   </p>
   <p>
     <%= f.label :photo %>
-    <%= f.file_field :photo, :class => 'user-photo' %>
+    <%= f.file_field :photo, class: 'user-photo' %>
   </p>
   <p>
-    <%= f.label :about, :caption => "About Me: " %>
-    <%= f.text_area :about, :class => 'user-about'  %>
+    <%= f.label :about, caption: 'About Me: ' %>
+    <%= f.text_area :about, class: 'user-about'  %>
   </p>
   <p>
-    <%= f.label :gender, :caption => "Your gender: " %>
-    <%= f.radio_button :gender, :value => 'male' %>
-    <%= f.radio_button :gender, :value => 'female' %>
+    <%= f.label :gender, caption: 'Your gender: ' %>
+    <%= f.radio_button :gender, value: 'male' %>
+    <%= f.radio_button :gender, value: 'female' %>
   </p>
   <p>
-    <%= f.label :country, :caption => "Your country" %>
-    <%= f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector' %>
+    <%= f.label :country, caption: 'Your country' %>
+    <%= f.select :country, options: ['USA', 'Canada', 'Mexico'], selected: 'USA', class: 'selector' %>
   </p>
   <p>
     <%= f.label :remember_me %>
-    <%= f.check_box :remember_me, :value => '1' %>
+    <%= f.check_box :remember_me, value: '1' %>
   </p>
   <p>
     <%= f.label :datetime %>
-    <%= f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+    <%= f.datetime_field :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0) %>
   </p>
   <p>
     <%= f.label :datetime_local %>
-    <%= f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
+    <%= f.datetime_local_field :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0) %>
   </p>
   <p>
     <%= f.label :date %>
-    <%= f.date_field :date, :max => DateTime.new(2000, 4, 1) %>
+    <%= f.date_field :date, max: DateTime.new(2000, 4, 1) %>
   </p>
   <p>
     <%= f.label :month %>
-    <%= f.month_field :month, :max => DateTime.new(2000, 4, 1) %>
+    <%= f.month_field :month, max: DateTime.new(2000, 4, 1) %>
   </p>
   <p>
     <%= f.label :week %>
-    <%= f.week_field :week, :max => DateTime.new(2000, 4, 1) %>
+    <%= f.week_field :week, max: DateTime.new(2000, 4, 1) %>
   </p>
   <p>
     <%= f.label :time %>
-    <%= f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) %>
+    <%= f.time_field :time, max: Time.new(2008, 6, 21, 13, 30, 0) %>
   </p>
   <p>
     <%= f.label :color %>
-    <%= f.color_field :color, :value => "#f00" %>
+    <%= f.color_field :color, value: '#f00' %>
   </p>
-  <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
-  <p><%= f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button' %></p>
+  <p><%= f.submit "Create", class: 'success', id: 'demo-button' %></p>
+  <p><%= f.image_submit "buttons/post.png", class: 'success', id: 'image-button' %></p>
 <% end %>
 
-<% form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f| %>
-  <%= f.error_messages :header_message => "custom MarkupUser cannot be saved!" %>
+<% form_for MarkupUser.new, '/another_demo', id: 'demo2', method: 'get' do |f| %>
+  <%= f.error_messages header_message: "custom MarkupUser cannot be saved!" %>
   <%= f.hidden_field :session_id %>
-  <%= f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' } %>
-  <%= f.password_field_block :code, { :class => 'input' } %>
-  <%= f.text_area_block :about, { :class => 'textarea' } %>
-  <%= f.file_field_block :photo, { :class => 'upload' } %>
-  <%= f.check_box_block :remember_me, { :class => 'checker' } %>
-  <%= f.select_block :state, :options => ['California', 'Texas'], :class => 'selector' %>
-  <%= f.submit_block "Create", { :class => 'button' } %>
-  <%= f.image_submit_block "buttons/ok.png", { :class => 'image' } %>
+  <%= f.text_field_block :username, { class: 'input' }, { caption: 'Nickname: ', class: 'label' } %>
+  <%= f.password_field_block :code, { class: 'input' } %>
+  <%= f.text_area_block :about, { class: 'textarea' } %>
+  <%= f.file_field_block :photo, { class: 'upload' } %>
+  <%= f.check_box_block :remember_me, { class: 'checker' } %>
+  <%= f.select_block :state, options: ['California', 'Texas'], class: 'selector' %>
+  <%= f.submit_block "Create", { class: 'button' } %>
+  <%= f.image_submit_block "buttons/ok.png", { class: 'image' } %>
 <% end %>
 
-<% form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f| %>
+<% form_for :markup_user, '/third_demo', id: 'demo3', method: 'get' do |f| %>
   <%= f.text_field_block :username %>
 <% end %>

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

@@ -1,81 +1,81 @@
-= form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
-  = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
+= form_for MarkupUser.new, '/demo', id: 'demo' do |f|
+  = f.error_messages(header_message: 'custom MarkupUser cannot be saved!')
   = f.hidden_field :session_id
   %p
-    = f.label :username, :caption => "Login: ", :class => 'user-label'
-    = f.text_field :username, :class => 'user-text', :value => "John"
+    = f.label :username, caption: 'Login: ', class: 'user-label'
+    = f.text_field :username, class: 'user-text', value: 'John'
   %p
     = f.label :password
-    = f.password_field :password, :class => 'user-password', :value => "secret"
+    = f.password_field :password, class: 'user-password', value: 'secret'
   %p
     = f.label :age
-    = f.number_field :age, :class => 'numeric'
+    = f.number_field :age, class: 'numeric'
   %p
     = f.label :telephone
-    = f.telephone_field :telephone, :class => 'numeric'
+    = f.telephone_field :telephone, class: 'numeric'
   %p
-    = f.label :email, :caption => 'Email Address: '
-    = f.email_field :email, :class => 'string'
+    = 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'
+    = f.label :webpage, caption: 'Your Web Page: '
+    = f.url_field :webpage, class: 'string'
   %p
     = f.label :search
-    = f.search_field :search, :class => 'string'
+    = f.search_field :search, class: 'string'
   %p
     = f.label :photo
-    = f.file_field :photo, :class => 'user-photo'
+    = f.file_field :photo, class: 'user-photo'
   %p
-    = f.label :about, :caption => "About Me: "
-    = f.text_area :about, :class => 'user-about'
+    = f.label :about, caption: 'About Me: '
+    = f.text_area :about, class: 'user-about'
   %p
-    = f.label :gender, :caption => "Your gender: "
-    = f.radio_button :gender, :value => 'male'
-    = f.radio_button :gender, :value => 'female'
+    = f.label :gender, caption: 'Your gender: '
+    = f.radio_button :gender, value: 'male'
+    = f.radio_button :gender, value: 'female'
   %p
-    = f.label :country, :caption => "Your country"
-    = f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector'
+    = f.label :country, caption: 'Your country'
+    = f.select :country, options: ['USA', 'Canada', 'Mexico'], selected: 'USA', class: 'selector'
   %p
     = f.label :remember_me
-    = f.check_box :remember_me, :value => "1"
+    = f.check_box :remember_me, value: '1'
   %p
     = f.label :datetime
-    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+    = f.datetime_field :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0)
   %p
     = f.label :datetime_local
-    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+    = f.datetime_local_field :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0)
   %p
     = f.label :date
-    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
+    = f.date_field :date, max: DateTime.new(2000, 4, 1)
   %p
     = f.label :month
-    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
+    = f.month_field :month, max: DateTime.new(2000, 4, 1)
   %p
     = f.label :week
-    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
+    = f.week_field :week, max: DateTime.new(2000, 4, 1)
   %p
     = f.label :time
-    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
+    = f.time_field :time, max: Time.new(2008, 6, 21, 13, 30, 0)
   %p
     = f.label :color
-    = f.color_field :color, :value => "#f00"
+    = f.color_field :color, value: '#f00'
   </p>
   %p
-    = f.submit "Create", :class => 'success', :id => 'demo-button'
+    = f.submit 'Create', class: 'success', id: 'demo-button'
   %p
-    = f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
+    = f.image_submit 'buttons/post.png', class: 'success', id: 'image-button'
 
-= form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
-  = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
+= form_for MarkupUser.new, '/another_demo', id: 'demo2', method: 'get' do |f|
+  = f.error_messages header_message: 'custom MarkupUser cannot be saved!'
   = f.hidden_field :session_id
-  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
-  = f.password_field_block :code, { :class => 'input' }
-  = f.text_area_block :about, { :class => 'textarea' }
-  = f.file_field_block :photo, { :class => 'upload' }
-  = f.check_box_block :remember_me, { :class => 'checker' }
-  = f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
-  = f.submit_block "Create", { :class => 'button' }
-  = f.image_submit_block "buttons/ok.png", { :class => 'image' }
+  = f.text_field_block :username, { class: 'input' }, { caption: 'Nickname: ', class: 'label' }
+  = f.password_field_block :code, { class: 'input' }
+  = f.text_area_block :about, { class: 'textarea' }
+  = f.file_field_block :photo, { class: 'upload' }
+  = f.check_box_block :remember_me, { class: 'checker' }
+  = f.select_block :state, options: ['California', 'Texas'], class: 'selector'
+  = f.submit_block 'Create', { class: 'button' }
+  = f.image_submit_block 'buttons/ok.png', { class: 'image' }
 
-= form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
+= form_for :markup_user, '/third_demo', id: 'demo3', method: 'get' do |f|
   = f.text_field_block :username

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

@@ -1,80 +1,79 @@
-= form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
-  = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
+= form_for MarkupUser.new, '/demo', id: 'demo' do |f|
+  = f.error_messages(header_message: 'custom MarkupUser cannot be saved!')
   = f.hidden_field :session_id
   p
-    = f.label :username, :caption => "Login: ", :class => 'user-label'
-    = f.text_field :username, :class => 'user-text', :value => "John"
+    = f.label :username, caption: 'Login: ', class: 'user-label'
+    = f.text_field :username, class: 'user-text', value: 'John'
   p
     = f.label :password
-    = f.password_field :password, :class => 'user-password', :value => "secret"
+    = f.password_field :password, class: 'user-password', value: 'secret'
   p
     = f.label :age
-    = f.number_field :age, :class => 'numeric'
+    = f.number_field :age, class: 'numeric'
   p
     = f.label :telephone
-    = f.telephone_field :telephone, :class => 'numeric'
+    = f.telephone_field :telephone, class: 'numeric'
   p
-    = f.label :email, :caption => 'Email Address: '
-    = f.email_field :email, :class => 'string'
+    = 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'
+    = f.label :webpage, caption: 'Your Web Page: '
+    = f.url_field :webpage, class: 'string'
   p
     = f.label :search
-    = f.search_field :search, :class => 'string'
+    = f.search_field :search, class: 'string'
   p
     = f.label :photo
-    = f.file_field :photo, :class => 'user-photo'
+    = f.file_field :photo, class: 'user-photo'
   p
-    = f.label :about, :caption => "About Me: "
-    = f.text_area :about, :class => 'user-about'
+    = f.label :about, caption: 'About Me: '
+    = f.text_area :about, class: 'user-about'
   p
-    = f.label :gender, :caption => "Your gender: "
-    = f.radio_button :gender, :value => 'male'
-    = f.radio_button :gender, :value => 'female'
+    = f.label :gender, caption: 'Your gender: '
+    = f.radio_button :gender, value: 'male'
+    = f.radio_button :gender, value: 'female'
   p
-    = f.label :country, :caption => "Your country"
-    = f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector'
+    = f.label :country, caption: 'Your country'
+    = f.select :country, options: ['USA', 'Canada', 'Mexico'], selected: 'USA', class: 'selector'
   p
     = f.label :remember_me
-    = f.check_box :remember_me, :value => "1"
+    = f.check_box :remember_me, value: '1'
   p
     = f.label :datetime
-    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+    = f.datetime_field :datetime, max: DateTime.new(2000, 4, 1, 12, 0, 0)
   p
     = f.label :datetime_local
-    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
+    = f.datetime_local_field :datetime_local, max: DateTime.new(2000, 4, 1, 12, 0, 0)
   p
     = f.label :date
-    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
+    = f.date_field :date, max: DateTime.new(2000, 4, 1)
   p
     = f.label :month
-    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
+    = f.month_field :month, max: DateTime.new(2000, 4, 1)
   p
     = f.label :week
-    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
+    = f.week_field :week, max: DateTime.new(2000, 4, 1)
   p
     = f.label :time
-    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
+    = f.time_field :time, max: Time.new(2008, 6, 21, 13, 30, 0)
   p
     = f.label :color
-    = f.color_field :color, :value => "#f00"
+    = f.color_field :color, value: '#f00'
   p
-    = f.submit "Create", :class => 'success', :id => 'demo-button'
+    = f.submit 'Create', class: 'success', id: 'demo-button'
   p
-    = f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
-
-= form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
-  = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
+    = f.image_submit 'buttons/post.png', class: 'success', id: 'image-button'
+= form_for MarkupUser.new, '/another_demo', id: 'demo2', method: 'get' do |f|
+  = f.error_messages header_message: 'custom MarkupUser cannot be saved!'
   = f.hidden_field :session_id
-  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
-  = f.password_field_block :code, { :class => 'input' }
-  = f.text_area_block :about, { :class => 'textarea' }
-  = f.file_field_block :photo, { :class => 'upload' }
-  = f.check_box_block :remember_me, { :class => 'checker' }
-  = f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
-  = f.submit_block "Create", { :class => 'button' }
-  = f.image_submit_block "buttons/ok.png", { :class => 'image' }
+  = f.text_field_block :username, { class: 'input' }, { caption: 'Nickname: ', class: 'label' }
+  = f.password_field_block :code, { class: 'input' }
+  = f.text_area_block :about, { class: 'textarea' }
+  = f.file_field_block :photo, { class: 'upload' }
+  = f.check_box_block :remember_me, { class: 'checker' }
+  = f.select_block :state, options: ['California', 'Texas'], class: 'selector'
+  = f.submit_block 'Create', { class: 'button' }
+  = f.image_submit_block "buttons/ok.png", { class: 'image' }
 
-= form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
+= form_for :markup_user, '/third_demo', id: 'demo3', method: 'get' do |f|
   = f.text_field_block :username