Merge pull request #67 from isleofruby/feature/form_with

 Switch to Rails 5.1's form_with, misc form improvements

Author: myabc

app/views/activities/_delete_form.html.haml

@@ -1,8 +1,8 @@
-= form_tag activity_path(activity), method: :delete do
+= form_with url: activity_path(activity), method: :delete do |f|
 
   %fieldset
     %label.inline
       = check_box_tag :confirm_delete
       = t('delete_activity_form.confirmation', count: activity.participants.count)
 
-  = button_tag t('delete_activity_form.submit')
+  = f.button t('delete_activity_form.submit')

app/views/activities/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for activity, html: { id: 'new-activity' } do |f|
+= form_with model: activity, id: 'new-activity' do |f|
 
   %label.name
     = f.text_field :name, placeholder: t('activity_form.name.label'), class: 'title'
@@ -13,7 +13,7 @@
     %span.between
       = t('common.or').downcase
     %label.inline
-      = f.check_box :anytime
+      = f.check_box :anytime, id: 'activity_anytime'
       = t('activity_form.anytime.hint')
 
   %hr
@@ -47,11 +47,13 @@
       = t('activity_form.description.hint')
 
   %label.image-url
-    = f.url_field :image_url, placeholder: t('activity_form.image_url.label')
+    = f.url_field :image_url,
+        id: 'activity_image_url',
+        placeholder: t('activity_form.image_url.label')
     .preview
     %small
       = t('activity_form.image_url.hint')
 
-  %button{ type: 'submit' }>
+  = f.button do
     %span>
     = t("common.submit.#{activity.new_record? ? 'new' : 'edit'}")

app/views/passwords/new.html.haml

@@ -4,15 +4,18 @@
       Reset your password
 
   %section.form
-    = form_for resource, as: resource_name, url: password_path(resource_name), method: :post do |f|
+    = form_with model: resource, scope: resource_name,
+        url: password_path(resource_name),
+        method: :post do |f|
       -# %p Send me reset password instructions to this email address:
 
       %label.email
-        %span.label Email address
-        = f.email_field :email, placeholder: 'You email address'
+        %span.label Your email address
+        = f.email_field :email,
+            autocomplete: 'email',
+            placeholder: 'Your email address'
 
-      %button{ type: 'submit' }>
-        Send me instructions
+      = f.button 'Send me instructions'
 
       %p.info
         = succeed '.' do

app/views/registrations/edit.html.haml

@@ -4,7 +4,8 @@
       Edit profile
 
   %section.form
-    = form_for resource, as: resource_name, url: registration_path(resource_name) do |f|
+    = form_with model: resource, scope: resource_name,
+        url: registration_path(resource_name) do |f|
 
       %figure.avatar
         = image_tag(avatar_url(@user, 128))
@@ -15,7 +16,9 @@
 
       %label.email
         %span.label Your email address
-        = f.email_field :email, placeholder: 'Your email address'
+        = f.email_field :email,
+            autocomplete: 'email',
+            placeholder: 'Your email address'
 
       %label.inline.show_participation
         = f.check_box :show_participation
@@ -24,14 +27,17 @@
       - if resource.no_oauth_connected?
         %label.password
           %span.label Your password
-          = f.password_field :password, placeholder: 'Your password'
+          = f.password_field :password,
+              autocomplete: 'new-password',
+              placeholder: 'Your password'
 
         %label.password
           %span.label Your password once more
-          = f.password_field :password_confirmation, placeholder: 'Your password once more'
+          = f.password_field :password_confirmation,
+              autocomplete: 'new-password',
+              placeholder: 'Your password once more'
 
-      %button{ type: 'submit' }>
-        Update
+      = f.button 'Update'
 
       %p.divider
         %span Connect!

app/views/registrations/new.html.haml

@@ -11,28 +11,37 @@
       %p.divider
         %span or
 
-    = form_for resource, as: resource_name, url: registration_path(resource_name) do |f|
+    = form_with model: resource, scope: resource_name,
+        url: registration_path(resource_name) do |f|
       %h4= during_oauth_flow? ? 'One step more - we need your email address' : 'Register a new account'
 
       %label.name
         %span.label Name
-        = f.text_field :name, autofocus: true, placeholder: 'Name'
+        = f.text_field :name,
+            autofocus: true,
+            autocomplete: 'name',
+            placeholder: 'Name'
 
       %label.email
         %span.label Email address
-        = f.email_field :email, placeholder: 'Email address'
+        = f.email_field :email,
+            autocomplete: 'email',
+            placeholder: 'Email address'
 
       - if @user.password_required?
         %label.password
           %span.label Password
-          = f.password_field :password, placeholder: 'Password'
+          = f.password_field :password,
+              autocomplete: 'new-password',
+              placeholder: 'Password'
 
         %label.password
           %span.label Password, once more
-          = f.password_field :password_confirmation, placeholder: 'Password once more'
+          = f.password_field :password_confirmation,
+              autocomplete: 'new-password',
+              placeholder: 'Password once more'
 
-      %button{ type: 'submit' }>
-        Sign up
+      = f.button 'Sign up'
 
       %p.info
         = succeed '.' do

app/views/sessions/new.html.haml

@@ -4,18 +4,21 @@
       Sign in
 
   %section.form
-    = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+    = form_with model: resource, scope: resource_name,
+        url: session_path(resource_name) do |f|
 
       %label.email
         %span.label Your email address
-        = f.email_field :email, autofocus: true, placeholder: 'Your email address'
+        = f.email_field :email,
+            autofocus: true,
+            autocomplete: 'email',
+            placeholder: 'Your email address'
 
       %label.password
         %span.label Your password
         = f.password_field :password, placeholder: 'Your password'
 
-      %button{ type: 'submit' }>
-        Sign in
+      = f.button 'Sign in'
 
     %p.divider
       %span or

config/initializers/new_framework_defaults.rb

@@ -6,12 +6,6 @@
 #
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = false
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = false
-
 # Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
 # Previous versions had false.
 ActiveSupport.to_time_preserves_timezone = false