From d4bbaaa7e5b0a2f1826d6b738376c68bca82a0b5 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Tue, 10 Jan 2017 15:39:40 +1030
Subject: [PATCH] Rubocop: Redundant merge!

---
 .rubocop_todo.yml                 | 12 ------------
 app/helpers/application_helper.rb | 10 +++++-----
 app/inputs/date_pair_input.rb     |  2 +-
 app/inputs/date_time_input.rb     |  2 +-
 app/models/polymorphic/address.rb |  2 +-
 spec/models/setting_spec.rb       |  2 +-
 6 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2109d321ce..6a53bf2934 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -162,18 +162,6 @@ Performance/RedundantMatch:
   Exclude:
     - 'app/helpers/application_helper.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/inputs/date_pair_input.rb'
-    - 'app/inputs/date_time_input.rb'
-    - 'app/models/polymorphic/address.rb'
-    - 'spec/models/setting_spec.rb'
-
-
 # Offense count: 12
 Style/AccessorMethodName:
   Exclude:
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 46102613fe..d3bc2f29d5 100755
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -362,11 +362,11 @@ def shown_on_landing_page?
   def links_to_export(action = :index)
     token = current_user.single_access_token
     url_params = { action: action }
-    url_params.merge!(id: params[:id]) unless params[:id].blank?
-    url_params.merge!(query: params[:query]) unless params[:query].blank?
-    url_params.merge!(q: params[:q]) unless params[:q].blank?
-    url_params.merge!(view: @view) unless @view.blank? # tasks
-    url_params.merge!(id: params[:id]) unless params[:id].blank?
+    url_params[:id] = params[:id] unless params[:id].blank?
+    url_params[:query] = params[:query] unless params[:query].blank?
+    url_params[:q] = params[:q] unless params[:q].blank?
+    url_params[:view] = @view unless @view.blank? # tasks
+    url_params[:id] = params[:id] unless params[:id].blank?
 
     exports = %w(xls csv).map do |format|
       link_to(format.upcase, url_params.merge(format: format), title: I18n.t(:"to_#{format}")) unless action.to_s == "show"
diff --git a/app/inputs/date_pair_input.rb b/app/inputs/date_pair_input.rb
index 7586ac68d7..2c04e5c454 100644
--- a/app/inputs/date_pair_input.rb
+++ b/app/inputs/date_pair_input.rb
@@ -17,7 +17,7 @@ def input(wrapper_options)
       label = field == field1 ? I18n.t('pair.start') : I18n.t('pair.end')
       [:required, :disabled].each { |k| input_html_options.delete(k) } # ensure these come from field not default options
       input_html_options.merge!(field.input_options)
-      input_html_options.merge!(value: value(field))
+      input_html_options[:value] = value(field)
       out << "<label#{' class="req"' if input_html_options[:required]}>#{label}</label>".html_safe
       text = @builder.text_field(field.name, merge_wrapper_options(input_html_options, wrapper_options))
       out << text << '</div>'.html_safe
diff --git a/app/inputs/date_time_input.rb b/app/inputs/date_time_input.rb
index 9b87f751fb..b52c0a9d63 100755
--- a/app/inputs/date_time_input.rb
+++ b/app/inputs/date_time_input.rb
@@ -7,7 +7,7 @@ class DateTimeInput < SimpleForm::Inputs::DateTimeInput
   def input(wrapper_options)
     add_autocomplete!
     input_html_options.merge(input_options)
-    input_html_options.merge!(value: value)
+    input_html_options[:value] = value
     @builder.text_field(attribute_name, merge_wrapper_options(input_html_options, wrapper_options))
   end
 
diff --git a/app/models/polymorphic/address.rb b/app/models/polymorphic/address.rb
index 2bdc8e83ae..51ec5887a8 100644
--- a/app/models/polymorphic/address.rb
+++ b/app/models/polymorphic/address.rb
@@ -51,7 +51,7 @@ def blank?
   def self.reject_address(attributes)
     exists = attributes['id'].present?
     empty = %w(street1 street2 city state zipcode country full_address).map { |name| attributes[name].blank? }.all?
-    attributes.merge!(_destroy: 1) if exists && empty
+    attributes[:_destroy] = 1 if exists && empty
     (!exists && empty)
   end
 
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index 14fb72c71b..8f8d062645 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -31,7 +31,7 @@
 
   it "should use value from YAML if setting is missing from database" do
     @setting = FactoryGirl.create(:setting, name: "magoody", value: nil)
-    Setting.yaml_settings.merge!(magoody: "thingymabob")
+    Setting.yaml_settings[:magoody] = "thingymabob"
     expect(Setting[:magoody]).to eq("thingymabob")
     expect(Setting.magoody).to eq("thingymabob")
   end