discerner 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437463090eedaa431f1a8f6ee6756e032c76fc66
-  data.tar.gz: 81b389a852f9dfd70614aa5ac7fbca4be56bb14b
+  metadata.gz: e2a1f2c77c1b0901c1b1dbd313a8ca37ae47b23c
+  data.tar.gz: eab9fea86140efd34e3c5329e221a388a9dd4842
 SHA512:
-  metadata.gz: 5eddf1abe8dd28965b2ef2e62ea6f51d887d0ed7b8a56f7e221da15253d841b0e6afd7b7d861e9af960a9348ffd7bf13b70bde43d6a32fa449416d552eb9bb48
-  data.tar.gz: 408d70a34b256cd287f0439cde4586c0716ecfadd400b3a4bd49a1be022f1e23f1335a9cb7ff7ba86822ece06e17388b8cc4ed3cf7092a530bc6eae8de993d1e
+  metadata.gz: fe0aab0fcd6943fe7cb6f056f4209eea050690bba725f8a5da5c2edeac15b2af197a76ca5c524d045b6e3dce91f275545986f98ac2908248539cc2d5418d4a55
+  data.tar.gz: 846b57e24bc9880a726f2d8e6064b1f207c771b100f1238a0b7c2c99260906ccc7def81bdaacda694c7d7144574090bd921a37f822e9f9f3eab919f9a142e7c2

data/Rakefile

@@ -14,7 +14,7 @@ load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
 load 'lib/tasks/discerner_tasks.rake'
 load 'test/lib/tasks/discerner_test_tasks.rake'
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec
 
 namespace :cucumber do
   Cucumber::Rake::Task.new(:wip, 'Run features that are being worked on') do |t|
@@ -26,4 +26,4 @@ namespace :cucumber do
   end
 end
 
-task :cucumber => 'cucumber:features'
+task cucumber: 'cucumber:features'

data/app/views/discerner/export_parameters/index.html.haml

@@ -1,7 +1,7 @@
 #discerner_search
   = render 'discerner/searches/summary'
   .discerner-buttons
-    = link_to 'Back to search', edit_search_path(@discerner_search), :class => "discerner-button discerner-button-positive"
+    = link_to 'Back to search', edit_search_path(@discerner_search), class: "discerner-button discerner-button-positive"
   .clear
     %hr
 
@@ -17,13 +17,13 @@
         - selected_parameters = @discerner_search.export_parameters.ordered.to_a
         - selected_parameters = @discerner_search.search_parameters.ordered.to_a + @discerner_search.nested_searches.map{|s| s.search_parameters}.flatten if selected_parameters.empty?
 
-        = form_tag assign_export_parameters_path(@discerner_search), :url => {:action => "assign"} do
+        = form_tag assign_export_parameters_path(@discerner_search), url: {action: "assign"} do
           - exportable_parameter_categories.each do |c|
             .clear
-            %div{ :class => "#{c.css_class_name}"}
+            %div{ class: "#{c.css_class_name}"}
               %h4
                 = c.name
-                %a{ :class => "select_all_parameters", :href => "#"}
+                %a{ class: "select_all_parameters", href: "#"}
                   Select all
 
               - items = exportable_parameters(@discerner_search, c)
@@ -38,17 +38,17 @@
                   - items_rendered_count = to
                   - (from...to).each do |j|
                     - export_parameter = items[j]
-                    %div{ :class => "export_parameter #{'error' if export_parameter.deleted?}"}
+                    %div{ class: "export_parameter #{'error' if export_parameter.deleted?}"}
                       - is_checked = selected_parameters.select{ |cp| cp.parameter_id == export_parameter.id }.blank? ? false : true
-                      = check_box_tag "parameter_ids[]", export_parameter.id, is_checked, :id => "parameter_ids_#{export_parameter.id}"
+                      = check_box_tag "parameter_ids[]", export_parameter.id, is_checked, id: "parameter_ids_#{export_parameter.id}"
                       = label_tag "parameter_ids_#{export_parameter.id}", export_parameter.name
 
           .clear
           .discerner-buttons
             - if @discerner_search.disabled?
-              = submit_tag 'Update and export', :class => "discerner-button discerner-button-positive"
+              = submit_tag 'Update and export', class: "discerner-button discerner-button-positive"
             - else
-              = submit_tag 'Export', :class => "discerner-button discerner-button-positive"
+              = submit_tag 'Export', class: "discerner-button discerner-button-positive"
 :javascript
   $(function () {
     new Discerner.ExportParameters.UI();

data/app/views/discerner/parameters/_values_autocompleter.html.haml

@@ -3,47 +3,47 @@
 - parameter_values = parameter_value_options(@searchable_parameter_values[parameter.id], search_parameter_value_id)
 
 - if parameter.parameter_values.categorized.any?
-  %div{:class => 'ui-widget categorized_autocompleter'}
+  %div{class: 'ui-widget categorized_autocompleter'}
 
     - if defined?(f)
-      = f.select(:parameter_value_id, parameter_values, { :include_blank => true }, {:class => 'parameter_values_combobox_autocompleter'})
+      = f.select(:parameter_value_id, parameter_values, { include_blank: true }, {class: 'parameter_values_combobox_autocompleter'})
     - else
-      = select_tag(:parameter_value_id, options_for_select(parameter_values), :include_blank => true, :class => 'parameter_values_combobox_autocompleter')
+      = select_tag(:parameter_value_id, options_for_select(parameter_values), include_blank: true, class: 'parameter_values_combobox_autocompleter')
 
-    %a{ :href => 'javascript:void(0);', :class => 'categorized_autocompleter_link collapsed_categorized_autocompleter_link' }
+    %a{ href: 'javascript:void(0);', class: 'categorized_autocompleter_link collapsed_categorized_autocompleter_link' }
       Select
-    .div-category-popup{ :style => "display: none;"}
+    .div-category-popup{ style: "display: none;"}
       .div-category-list
         - parameter.parameter_value_categories.ordered_by_display_order_and_name.each do |parameter_value_category|
           - unless parameter_value_category.parameter_values.empty?
-            = div_for parameter_value_category, :class => "#{parameter_value_category.css_class} categorized-parameter-values" do
-              %p{ :class => 'parameter_value_category_name' }
+            = div_for parameter_value_category, class: "#{parameter_value_category.css_class} categorized-parameter-values" do
+              %p{ class: 'parameter_value_category_name' }
                 = parameter_value_category.name
                 - if parameter_value_category.collapse?
-                  %a{ :class => "show-category-items", :href => "#"}
+                  %a{ class: "show-category-items", href: "#"}
                     more
                 - else
-                  %a{ :class => "hide-category-items", :href => "#"}
+                  %a{ class: "hide-category-items", href: "#"}
                     less
-              .category-items{:style => "#{parameter_value_category.collapse ? 'display:none;' : ''}"}
-                - items = parameter_value_category.parameter_values.not_deleted.ordered_by_name.to_a.map{ |pv| {:name => pv.name, :rel => searchable_object_index(pv, search_parameter_value_id)}}
+              .category-items{style: "#{parameter_value_category.collapse ? 'display:none;' : ''}"}
+                - items = parameter_value_category.parameter_values.not_deleted.ordered_by_name.to_a.map{ |pv| {name: pv.name, rel: searchable_object_index(pv, search_parameter_value_id)}}
                 - unless items.empty?
-                  = render :partial => 'discerner/shared/categorized_autocompleter_items', :locals => { :columns_count => 2, :items => items }
+                  = render partial: 'discerner/shared/categorized_autocompleter_items', locals: { columns_count: 2, items: items }
             .clear
 
-        - uncategorized_items = parameter.parameter_values.uncategorized.ordered_by_name.to_a.map{ |pv| {:name => pv.name, :rel => searchable_object_index(pv, search_parameter_value_id)}}
+        - uncategorized_items = parameter.parameter_values.uncategorized.ordered_by_name.to_a.map{ |pv| {name: pv.name, rel: searchable_object_index(pv, search_parameter_value_id)}}
         - unless uncategorized_items.empty?
           .uncategorized-parameter-values.parameter_value_category
-            %p{ :class => 'parameter_value_category_name' }
+            %p{ class: 'parameter_value_category_name' }
               Uncategorized
-              %a{ :class => "hide-category-items", :href => "#"}
+              %a{ class: "hide-category-items", href: "#"}
                 less
             .category-items
-              = render :partial => 'discerner/shared/categorized_autocompleter_items', :locals => { :columns_count => 2, :items => uncategorized_items }
+              = render partial: 'discerner/shared/categorized_autocompleter_items', locals: { columns_count: 2, items: uncategorized_items }
 
       .div-instruction-bar
 - else
   - if defined?(f)
-    = f.select(:parameter_value_id, parameter_values, { :include_blank => true },{ :class => 'parameter_values_combobox_autocompleter' })
+    = f.select(:parameter_value_id, parameter_values, { include_blank: true },{ class: 'parameter_values_combobox_autocompleter' })
   - else
-    = select_tag(:parameter_value_id, options_for_select(parameter_values), :include_blank => true, :class => 'parameter_values_combobox_autocompleter')
+    = select_tag(:parameter_value_id, options_for_select(parameter_values), include_blank: true, class: 'parameter_values_combobox_autocompleter')

data/app/views/discerner/parameters/values.html.haml

@@ -1 +1 @@
-= render :partial => 'discerner/parameters/values_autocompleter', :locals => {:parameter => @parameter, :search_parameter_value_id => @search_parameter_value_id}
+= render partial: 'discerner/parameters/values_autocompleter', locals: {parameter: @parameter, search_parameter_value_id: @search_parameter_value_id}

data/app/views/discerner/searches/_form.html.haml

@@ -1,13 +1,13 @@
 - unless @discerner_search.blank?
-  = render 'discerner/shared/error_messages', :object => @discerner_search
+  = render 'discerner/shared/error_messages', object: @discerner_search
 
   #discerner_search_form
-    = form_for @discerner_search, :html => { :id => 'search' } do |f|
-      = render :partial => 'form_header', :locals => { :f => f }
+    = form_for @discerner_search, html: { id: 'search' } do |f|
+      = render partial: 'form_header', locals: { f: f }
       - unless enable_combined_searches?.blank?
-        = render :partial => 'form_combined_searches', :locals => { :f => f }
-      = render :partial => 'form_search_parameters', :locals => { :f => f }
-      = render :partial => 'form_controls', :locals => { :f => f }
+        = render partial: 'form_combined_searches', locals: { f: f }
+      = render partial: 'form_search_parameters', locals: { f: f }
+      = render partial: 'form_controls', locals: { f: f }
   .clear
 
   :javascript

data/app/views/discerner/searches/_form_combined_searches.html.haml

@@ -1,4 +1,4 @@
-%table{ :class => 'records search_combinations' }
+%table{ class: 'records search_combinations' }
   %thead
     %tr
       %th.combined_search_operator
@@ -8,16 +8,16 @@
       %th
   %tbody.nested_records_search_combinations
     - if combined_searches_options(@discerner_search).blank?
-      %td{:colspan => '4'}
+      %td{colspan: '4'}
         No qualifying searches found
     - else
       - @discernerSearchCombinationsTemplate = generate_nested_attributes_template(f, :search_combinations, 'search_combination')
       = f.fields_for :search_combinations, f.object.search_combinations.ordered_by_display_order do |search_combination|
-        = render :partial => 'search_combination_fields', :locals => { :f => search_combination }
+        = render partial: 'search_combination_fields', locals: { f: search_combination }
 
       %tfoot
         %tr
-          %td{ :colspan => '4', :class => 'add_search_combinations_link' }
+          %td{ colspan: '4', class: 'add_search_combinations_link' }
             = link_to_add_fields "Add search", :search_combinations
 .clear
 

data/app/views/discerner/searches/_form_controls.html.haml

@@ -1,8 +1,8 @@
 .discerner-buttons
   - if @discerner_search.disabled?
-    = submit_tag 'Update search', :class => "discerner-button discerner-button-positive"
+    = submit_tag 'Update search', class: "discerner-button discerner-button-positive"
   - else
-    = submit_tag 'Search', :class => "discerner-button discerner-button-positive"
+    = submit_tag 'Search', class: "discerner-button discerner-button-positive"
   - if @discerner_search.persisted? && export_discerner_results? && discerner_export_link
     = discerner_export_link
-  = link_to 'Clear', new_search_path, :class => "discerner-button discerner-button-negative"
+  = link_to 'Clear', new_search_path, class: "discerner-button discerner-button-negative"

data/app/views/discerner/searches/_form_header.html.haml

@@ -4,10 +4,10 @@
 
     .discerner_search_dictionary
       %b Dictionary:
-      %span{ :class => "#{@discerner_search.dictionary.css_class_name}"}
+      %span{ class: "#{@discerner_search.dictionary.css_class_name}"}
         #{@discerner_search.dictionary.name}
       - if @discerner_search.dictionary.deleted?
-        %span{ :style => "color:red;"}
+        %span{ style: "color:red;"}
           %b This dictionary has been deleted. You will not be able to execute or edit this search.
 
     .discerner_search_name
@@ -15,7 +15,7 @@
       %span.discerner_search_name
         = @discerner_search.display_name
       %span.discerner_search_name_edit
-        = link_to 'Edit', '#', :class => "edit_link icon_link"
+        = link_to 'Edit', '#', class: "edit_link icon_link"
 
   - else
     .discerner_dictionary_required_message
@@ -25,11 +25,11 @@
     %div.discerner_search_dictionary
       - if @searchable_dictionaries.length > 1
         = f.label :dictionary_id
-        = f.select :dictionary_id, dictionary_options(@searchable_dictionaries), :include_blank => true
+        = f.select :dictionary_id, dictionary_options(@searchable_dictionaries), include_blank: true
       - else
         %b Dictionary:
-        = f.hidden_field :dictionary_id, :value => @searchable_dictionaries.last.id
-        %span{ :class => "#{@searchable_dictionaries.last.css_class_name}"}
+        = f.hidden_field :dictionary_id, value: @searchable_dictionaries.last.id
+        %span{ class: "#{@searchable_dictionaries.last.css_class_name}"}
           = @searchable_dictionaries.last.name
 
     %div.discerner_search_name

data/app/views/discerner/searches/_form_search_parameters.html.haml

@@ -1,4 +1,4 @@
-%table{ :class => 'records search_parameters' }
+%table{ class: 'records search_parameters' }
   %thead
     %tr
       %th.parameter_boolean_operator
@@ -9,17 +9,17 @@
         Selections
   %tbody.nested_records_search_parameters
     = f.fields_for :search_parameters, f.object.search_parameters.ordered_by_display_order do |search_parameter|
-      = render :partial => 'search_parameter_fields', :locals => { :f => search_parameter }
+      = render partial: 'search_parameter_fields', locals: { f: search_parameter }
   %tfoot
     %tr
-      %td{ :colspan => '4', :class => 'add_search_parameters_link' }
+      %td{ colspan: '4', class: 'add_search_parameters_link' }
         = link_to_add_fields "Add criteria", :search_parameters
 .clear
 
 :javascript
   $(function () {
     var discernerSearchParametersTemplate = '#{generate_nested_attributes_template(f, :search_parameters, 'search_parameter')}',
-    parametersUrl = decodeURIComponent('#{values_parameters_url(:parameter_id => ':question_id', :format => 'json')}'); // used to generate parameter values for list parameters
+    parametersUrl = decodeURIComponent('#{values_parameters_url(parameter_id: ':question_id', format: 'json')}'); // used to generate parameter values for list parameters
 
     new Discerner.SearchParameter.UI({
       searchParametersTemplate: discernerSearchParametersTemplate,

data/app/views/discerner/searches/_list.html.haml

@@ -1,4 +1,4 @@
-%table{ :class => 'records' }
+%table{ class: 'records' }
   %thead
     %tr
       %th Name
@@ -12,6 +12,6 @@
         %td
           = format_datetime(search.updated_at)
         %td
-          = link_to 'Open', edit_search_path(search), :class => 'show_link icon_link'
-          = link_to 'Export options', export_parameters_path(search), :class => 'options_link icon_link' if export_discerner_results?
-          = link_to 'Delete', search_path(search), :data => {:confirm => 'Are you sure?'}, :method => :delete, :class => "icon_link delete_link"
+          = link_to 'Open', edit_search_path(search), class: 'show_link icon_link'
+          = link_to 'Export options', export_parameters_path(search), class: 'options_link icon_link' if export_discerner_results?
+          = link_to 'Delete', search_path(search), data: {confirm: 'Are you sure?'}, method: :delete, class: "icon_link delete_link"

data/app/views/discerner/searches/_search_combination_fields.html.haml

@@ -1,22 +1,22 @@
 - if f.object.disabled? && f.object.warnings.any?
   %tr.error
     %td
-    %td.warnings{:colspan => "4"}
+    %td.warnings{colspan: "4"}
       %span
         = f.object.warnings.full_messages.join(', ')
 
 - unless f.blank?
   - search_combination_id = nested_record_id(f, :search_combination)
-  %tr{ :id => "#{search_combination_id}", :class => "search_combination fields #{'error' if f.object.warnings.any?}" }
+  %tr{ id: "#{search_combination_id}", class: "search_combination fields #{'error' if f.object.warnings.any?}" }
     %td.combined_search_operator
       %span
         restrict to
     %td.combined_search
       %div.combined_search_combobox
         = f.hidden_field :display_order
-        = f.hidden_field :operator_id, :value => Discerner::Operator.where(:symbol => 'include').first.id
+        = f.hidden_field :operator_id, value: Discerner::Operator.where(symbol: 'include').first.id
         -#= f.select(:operator_id, operator_options('search'))
-        = f.select(:combined_search_id, combined_searches_options(@discerner_search), { :include_blank => true },{ :class => 'search_combinations_combobox_autocompleter' })
+        = f.select(:combined_search_id, combined_searches_options(@discerner_search), { include_blank: true },{ class: 'search_combinations_combobox_autocompleter' })
     %td.remove
       = link_to_remove_fields 'Remove', f, :search_combinations
     %td

data/app/views/discerner/searches/_search_parameter_fields.html.haml

@@ -3,46 +3,46 @@
 - if f.object.disabled? && f.object.warnings.any?
   %tr.error
     %td
-    %td.warnings{:colspan => "4"}
+    %td.warnings{colspan: "4"}
       %span
         = f.object.warnings.full_messages.join(', ')
 
-%tr{ :id => "#{search_parameter_id}", :class => "search_parameter fields #{'error' if f.object.warnings.any?}" }
+%tr{ id: "#{search_parameter_id}", class: "search_parameter fields #{'error' if f.object.warnings.any?}" }
   %td.parameter_boolean_operator
     %span
       where
   %td.parameter
-    %div{:class => 'ui-widget categorized_autocompleter'}
+    %div{class: 'ui-widget categorized_autocompleter'}
       = f.hidden_field :display_order
-      = f.select(:parameter_id, parameter_options(@searchable_parameters, search_parameter_id), { :include_blank => true },{ :class => 'parameters_combobox_autocompleter' })
-      %a{ :href => 'javascript:void(0);', :class => 'categorized_autocompleter_link collapsed_categorized_autocompleter_link' }
+      = f.select(:parameter_id, parameter_options(@searchable_parameters, search_parameter_id), { include_blank: true },{ class: 'parameters_combobox_autocompleter' })
+      %a{ href: 'javascript:void(0);', class: 'categorized_autocompleter_link collapsed_categorized_autocompleter_link' }
         Select
-      .div-category-popup{ :style => "display: none;"}
+      .div-category-popup{ style: "display: none;"}
         .div-category-list
           - @searchable_parameter_categories.each do |parameter_category|
-            = div_for parameter_category, :class => "#{parameter_category.dictionary.css_class_name}" do
-              %p{ :class => 'parameter_category_name' }
+            = div_for parameter_category, class: "#{parameter_category.dictionary.css_class_name}" do
+              %p{ class: 'parameter_category_name' }
                 = parameter_category.name
-              - items = @searchable_parameters.select{|sp| sp.parameter_category_id == parameter_category.id}.sort{|a,b| a.name <=> b.name}.map{ |p| {:name => p.name, :rel => searchable_object_index(p, search_parameter_id)}}
+              - items = @searchable_parameters.select{|sp| sp.parameter_category_id == parameter_category.id}.sort{|a,b| a.name <=> b.name}.map{ |p| {name: p.name, rel: searchable_object_index(p, search_parameter_id)}}
               - unless items.empty?
-                = render :partial => 'discerner/shared/categorized_autocompleter_items', :locals => { :columns_count => 4, :items => items }
+                = render partial: 'discerner/shared/categorized_autocompleter_items', locals: { columns_count: 4, items: items }
 
         .div-instruction-bar
   %td.remove
     = link_to_remove_fields 'Remove', f, :search_parameters
   %td.parameter_values
     .search_parameter_values
-      %table{ :class => 'records' }
+      %table{ class: 'records' }
         %tbody.nested_records_search_parameter_values
           = f.fields_for :search_parameter_values, f.object.search_parameter_values.ordered_by_display_order do |search_parameter_value_form|
-            = render :partial => 'search_parameter_value_fields', :locals => { :f => search_parameter_value_form }
-      %span{ :class => 'add_header'}
-        = link_to_add_fields "Add selection", :search_parameter_values, {:style => "display:none;"}
+            = render partial: 'search_parameter_value_fields', locals: { f: search_parameter_value_form }
+      %span{ class: 'add_header'}
+        = link_to_add_fields "Add selection", :search_parameter_values, {style: "display:none;"}
 
 :javascript
   $(function () {
     var searchParameterValuesTemplate = '#{generate_nested_attributes_template(f, :search_parameter_values, "search_parameter_value")}',
       container = $('##{search_parameter_id}'),
-      parametersUrl = decodeURIComponent('#{values_parameters_url(:parameter_id => ':question_id', :search_parameter_value_id => ':search_parameter_value_id')}'), // used to generate parameter values for combobox parameters
+      parametersUrl = decodeURIComponent('#{values_parameters_url(parameter_id: ':question_id', search_parameter_value_id: ':search_parameter_value_id')}'), // used to generate parameter values for combobox parameters
       searchParameterUI = new Discerner.SearchParameterValue.UI({ container: container, searchParameterValuesTemplate: searchParameterValuesTemplate, parametersUrl: parametersUrl });
   });

data/app/views/discerner/searches/_search_parameter_value_fields.html.haml

@@ -2,23 +2,23 @@
 - if f.object.disabled? && f.object.warnings.any?
   %tr.error
     %td
-    %td.warnings{:colspan => "6"}
+    %td.warnings{colspan: "6"}
       %span
         = f.object.warnings.full_messages.join(', ')
 
-%tr{ :id => "#{search_parameter_value_id}", :class => "search_parameter_value fields #{'error' if f.object.warnings.any?} search_parameter_value_new" }
+%tr{ id: "#{search_parameter_value_id}", class: "search_parameter_value fields #{'error' if f.object.warnings.any?} search_parameter_value_new" }
   %td.parameter_values_boolean_operator
     = f.hidden_field :display_order
     %span
 
   - if f.object.new_record? # this part is used for rendering newly added parameter values
     %td.operator
-      = f.select(:operator_id, operator_options, { :include_blank => true })
+      = f.select(:operator_id, operator_options, { include_blank: true })
     %td.chosen
       = f.check_box :chosen
     %td.parameter_value
-      = f.hidden_field :parameter_value_id, :class => 'parameter_value_id'
-      %span{ :class => 'parameter_value_text' }
+      = f.hidden_field :parameter_value_id, class: 'parameter_value_id'
+      %span{ class: 'parameter_value_text' }
     %td.value
       = f.text_field :value
     %td.additional_value
@@ -35,15 +35,15 @@
       %td.chosen
         = f.check_box :chosen
       %td.parameter_value
-        = f.hidden_field :parameter_value_id, :class => 'parameter_value_id'
-        %span{ :class => 'parameter_value_text' }
+        = f.hidden_field :parameter_value_id, class: 'parameter_value_id'
+        %span{ class: 'parameter_value_text' }
           = f.object.parameter_value.name
-      %td{:class => "remove", :class => "invisible"}
+      %td{class: "remove", class: "invisible"}
         = link_to_remove_fields 'Remove', f, :search_parameter_values
 
     - when 'combobox'
       %td.parameter_value
-        = render :partial => 'discerner/parameters/values_autocompleter', :locals => {:parameter => parameter, :f => f, :search_parameter_value_id => search_parameter_value_id}
+        = render partial: 'discerner/parameters/values_autocompleter', locals: {parameter: parameter, f: f, search_parameter_value_id: search_parameter_value_id}
       %td.remove
         = link_to_remove_fields 'Remove', f, :search_parameter_values
 
@@ -52,11 +52,11 @@
         - selected = f.object.operator.blank? ? nil : f.object.operator.id
         = f.select(:operator_id, options_for_select([["", ""]] + operator_options(type), selected))
 
-      %td{:class => "value #{'invisible' if f.object.operator && f.object.operator.operator_type == 'presence'}"}
-        = f.text_field :value, :class => "#{type == 'date' ? 'datepicker' : nil}"
+      %td{class: "value #{'invisible' if f.object.operator && f.object.operator.operator_type == 'presence'}"}
+        = f.text_field :value, class: "#{type == 'date' ? 'datepicker' : nil}"
 
-      %td{:class => "additional_value #{'invisible' unless f.object.operator && f.object.operator.operator_type == 'range'}"}
-        = f.text_field :additional_value, :class => "#{type == 'date' ? 'datepicker' : nil}"
+      %td{class: "additional_value #{'invisible' unless f.object.operator && f.object.operator.operator_type == 'range'}"}
+        = f.text_field :additional_value, class: "#{type == 'date' ? 'datepicker' : nil}"
       %td.remove
         = link_to_remove_fields 'Remove', f, :search_parameter_values
 

data/app/views/discerner/searches/_summary.html.haml

@@ -13,7 +13,7 @@
       - search_parameters =  search_parameters.by_parameter_category(category) if category
       - unless search_parameters.blank?
         %tr.parameter_category
-          %th{:colspan => "2"}
+          %th{colspan: "2"}
             = category.name
         - search_parameters.each do |sp|
           %tr.search_parameter_summary