Upgrading formtastic

Can't get rid of the action_class and input_class deprecations until
finishing #114. Will need to update the formtastic initializer to add
the input class and action class initializers as explained in
https://github.com/justinfrench/formtastic/wiki/Upgrading-to-Formtastic-3.1

Gemfile

@@ -16,7 +16,7 @@ gem 'strong_parameters', '0.2.3' # Remove once issue #114 is done as this is par
 gem 'jquery-rails', '3.1.2'
 gem 'haml', '4.0.6'
 gem 'will_paginate', '3.0.7'
-gem 'formtastic', '2.2.1'
+gem 'formtastic', '3.1.2'
 gem 'inherited_resources', '1.5.1'
 gem 'has_scope', '0.6.0.rc'
 gem 'devise', '3.4.1'

Gemfile.lock

@@ -129,8 +129,8 @@ GEM
       dotenv (~> 1.0.2)
       thor (~> 0.19.1)
     formatador (0.2.5)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
+    formtastic (3.1.2)
+      actionpack (>= 3.2.13)
     goalie (0.0.4)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -376,7 +376,7 @@ DEPENDENCIES
   factory_girl_rails
   fancybox-rails (= 0.2.1)
   foreman
-  formtastic (= 2.2.1)
+  formtastic (= 3.1.2)
   goalie (= 0.0.4)
   guard-konacha!
   guard-rspec

app/views/accept_reviewers/_form.html.haml

@@ -3,7 +3,7 @@
     = p.inputs class: 'inputs preferences' do
       = p.input :track_id, as: :hidden
       = p.input :accepted, label: t(p.instance_variable_get("@object").track.title), input_html: {tabindex: autotab}
-      = p.input :audience_level_id, required: true, as: :select, collection: @audience_levels, member_label: Proc.new { |al| t(al.title) }, input_html: {tabindex: autotab}
+      = p.input :audience_level_id, required: true, as: :select, collection: @audience_levels.map{|al| [t(al.title), al.id]}, input_html: {tabindex: autotab}
       %p.inline-hints= t(p.instance_variable_get("@object").track.description)
   = form.inputs do
     = form.semantic_errors :base

app/views/organizer_sessions/index.html.haml

@@ -3,8 +3,8 @@
 
 = semantic_form_for @session_filter, url: organizer_sessions_path(@conference), method: :get do |f|
   = f.inputs do
-    = f.input :track_id, as: :select, collection: @tracks, member_label: Proc.new { |tr| t(tr.title) }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
-    = f.input :state, as: :select, collection: @states, member_label: Proc.new { |s| t("session.state.#{s}") }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :track_id, as: :select, collection: @tracks.map{|tr| [t(tr.title), tr.id]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :state, as: :select, collection: @states.map{|s| [t("session.state.#{s}"), s]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
   = f.actions do
     = f.action :submit, label: :filter_session, button_html: {tabindex: autotab}
 

app/views/organizers/_form.html.haml

@@ -1,10 +1,10 @@
 = form.inputs do
   = form.input :user_username, required: true, input_html: {tabindex: autotab}
-  = form.input :track_id, required: true, as: :select, collection: @tracks, member_label: Proc.new { |tr| t(tr.title) }, input_html: {tabindex: autotab}
+  = form.input :track_id, required: true, as: :select, collection: @tracks.map{|tr| [t(tr.title), tr.id]}, input_html: {tabindex: autotab}
 
 :javascript
   $(document).ready(function() {
     $("#organizer_user_username").autocomplete({
       source: "#{users_path(format: :js)}"
     });
-  })
+  })

app/views/review_decisions/_form.html.haml

@@ -1,7 +1,7 @@
 = form.inputs do
   = form.input :organizer_id, as: :hidden
   = form.input :session_id, as: :hidden
-  = form.input :outcome_id, required: true, as: :select, collection: Outcome.all, member_label: Proc.new { |o| t(o.title) }, input_html: {tabindex: autotab}
+  = form.input :outcome_id, required: true, as: :select, collection: Outcome.all.map{|o| [t(o.title), o.id]}, input_html: {tabindex: autotab}
   = form.input :note_to_authors, required: true, input_html: {rows: 10, tabindex: autotab}
 
   = form.actions do

app/views/reviewer_sessions/index.html.haml

@@ -3,9 +3,9 @@
 
 = semantic_form_for @session_filter, url: reviewer_sessions_path(@conference), method: :get do |f|
   = f.inputs do
-    = f.input :track_id, as: :select, collection: @tracks, member_label: Proc.new { |tr| t(tr.title) }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
-    = f.input :session_type_id, as: :select, collection: @session_types, member_label: Proc.new { |st| t(st.title) }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
-    = f.input :audience_level_id, as: :select, collection: @audience_levels, member_label: Proc.new { |al| t(al.title) }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :track_id, as: :select, collection: @tracks.map{|tr| [t(tr.title), tr.id]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :session_type_id, as: :select, collection: @session_types.map{|st| [t(st.title), st.id]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :audience_level_id, as: :select, collection: @audience_levels.map{|al| [t(al.title), al.id]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
   = f.actions do
     = f.action :submit, label: :filter_session, button_html: {tabindex: autotab}
 

app/views/reviews/new.html.haml

@@ -61,8 +61,8 @@
       %p
         %strong #{t('formtastic.labels.session.benefits')}:
         = textilize(@session.try(:benefits))
-    = form.input :proposal_quality_rating_id, required: true, as: :select, collection: Rating.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
-    = form.input :proposal_relevance_rating_id, required: true, as: :select, collection: Rating.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
+    = form.input :proposal_quality_rating_id, required: true, as: :select, collection: Rating.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
+    = form.input :proposal_relevance_rating_id, required: true, as: :select, collection: Rating.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
 
   = form.inputs :author do
     = form.input :reviewer_id, as: :hidden, input_html: {tabindex: autotab}
@@ -80,20 +80,20 @@
         %p
           %strong #{t('formtastic.labels.user.bio')} (#{h(@review.session.second_author.full_name)}):
           = textilize(@review.session.second_author.bio)
-    = form.input :author_agile_xp_rating_id, required: true, as: :select, collection: Rating.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
+    = form.input :author_agile_xp_rating_id, required: true, as: :select, collection: Rating.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
     .session_info
       %p
         %strong #{t('formtastic.labels.session.experience')}:
         = textilize(@review.session.experience)
-    = form.input :author_proposal_xp_rating_id, required: true, as: :select, collection: Rating.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
+    = form.input :author_proposal_xp_rating_id, required: true, as: :select, collection: Rating.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
 
   - if @review.is_a?(FinalReview)
     = form.inputs :conclusion do
-      = form.input :recommendation_id, required: true, as: :select, collection: Recommendation.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
+      = form.input :recommendation_id, required: true, as: :select, collection: Recommendation.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
       = form.input :justification, required: true, input_html: {rows: 10, tabindex: autotab}
 
   = form.inputs :to_organizers do
-    = form.input :reviewer_confidence_rating_id, required: true, as: :select, collection: Rating.all, member_label: Proc.new { |rating| t(rating.title) }, input_html: {tabindex: autotab}
+    = form.input :reviewer_confidence_rating_id, required: true, as: :select, collection: Rating.all.map{|r| [t(r.title), r.id]}, input_html: {tabindex: autotab}
     = form.input :comments_to_organizers, input_html: {rows: 3, tabindex: autotab}
   = form.inputs :to_authors do
     = form.input :comments_to_authors, required: true, input_html: {rows: 3, tabindex: autotab, :'data-remaining' => t('generic.char_remaining')}

app/views/sessions/_form.html.haml

@@ -1,9 +1,9 @@
 = form.inputs do
   = form.input :author_id, as: :hidden, input_html: {tabindex: autotab}
   = form.input :language, required: true, as: :select, collection: [[t('generic.en'), 'en'], [t('generic.pt'), 'pt']], input_html: {tabindex: autotab}
-  = form.input :track_id, required: true, as: :select, collection: @tracks, member_label: Proc.new { |tr| t(tr.title) }, input_html: {tabindex: autotab}, hint: t('formtastic.hints.session.track_id', year: "/#{@conference.year}")
-  = form.input :audience_level_id, required: true, as: :select, collection: @audience_levels, member_label: Proc.new { |al| t(al.title) }, input_html: {tabindex: autotab}, hint: t('formtastic.hints.session.audience_level_id', year: "/#{@conference.year}")
-  = form.input :session_type_id, required: true, as: :select, collection: @session_types, member_label: Proc.new { |st| t(st.title) }, input_html: {tabindex: autotab, data: {:"durations-to-hide" => durations_to_hide(@session_types)}}, hint: t('formtastic.hints.session.session_type_id', year: "/#{@conference.year}")
+  = form.input :track_id, required: true, as: :select, collection: @tracks.map{|tr| [t(tr.title), tr.id]}, input_html: {tabindex: autotab}, hint: t('formtastic.hints.session.track_id', year: "/#{@conference.year}")
+  = form.input :audience_level_id, required: true, as: :select, collection: @audience_levels.map{|al| [t(al.title), al.id]}, input_html: {tabindex: autotab}, hint: t('formtastic.hints.session.audience_level_id', year: "/#{@conference.year}")
+  = form.input :session_type_id, required: true, as: :select, collection: @session_types.map{|st| [t(st.title), st.id]}, input_html: {tabindex: autotab, data: {:"durations-to-hide" => durations_to_hide(@session_types)}}, hint: t('formtastic.hints.session.session_type_id', year: "/#{@conference.year}")
   = form.input :duration_mins, required: true, as: :select, collection: options_for_durations(@session_types), input_html: {tabindex: autotab}, hint: duration_mins_hint(@session_types)
   = form.input :audience_limit, input_html: {tabindex: autotab}
   = form.input :title, required: true, input_html: {tabindex: autotab}

app/views/sessions/index.html.haml

@@ -5,7 +5,7 @@
   = f.inputs do
     = f.input :tags, input_html: {tabindex: autotab, :'data-autocomplete-url' => tags_path(format: :js)}
     = f.input :username, input_html: {tabindex: autotab, :'data-autocomplete-url' => users_path(format: :js)}
-    = f.input :track_id, as: :select, collection: @tracks, member_label: Proc.new { |tr| t(tr.title) }, input_html: {tabindex: autotab}, include_blank: t("generic.all")
+    = f.input :track_id, as: :select, collection: @tracks.map{|tr| [t(tr.title), tr.id]}, input_html: {tabindex: autotab}, include_blank: t("generic.all")
   = f.actions do
     = f.action :submit, label: :filter_session, button_html: {tabindex: autotab}
 

config/initializers/formtastic.rb

@@ -75,4 +75,7 @@
 # See http://diveintohtml5.org/forms.html#validation for more info.
 # Formtastic::FormBuilder.perform_browser_validations = true
 
-Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
+Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
+
+# Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+# Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder