Merge pull request #2474 from alphagov/fix-auto-correctable-rubocop-violations

Fix auto-correctable Rubocop violations (feedback addressed)

Author: floehopper

.rubocop_todo.yml

@@ -18,7 +18,7 @@ def error_404; error(404); end
   def error_503(e = nil); error(503, e); end
 
   def error(status_code, exception = nil)
-    if exception and defined? Airbrake
+    if exception && defined? Airbrake
       env["airbrake.error_id"] = notify_airbrake(exception)
     end
 

app/controllers/application_controller.rb

@@ -61,7 +61,7 @@ def render_text?(presenter)
   def with_format(format, &block)
     old_formats = self.formats
     self.formats = [format]
-    result = yield
+    result = block.call
     self.formats = old_formats
     result
   end
@@ -98,7 +98,7 @@ def set_expiry(duration = 30.minutes)
     # if the artefact returned from the Content API is blank, or if
     # the request to the Content API fails, set a very short cache so
     # we don't cache an incomplete page for a while
-    duration = 5.seconds if @presenter.present? and @presenter.artefact.blank?
+    duration = 5.seconds if @presenter.present? && @presenter.artefact.blank?
 
     if Rails.configuration.set_http_cache_control_expiry_time
       expires_in(duration, public: true)

app/controllers/smart_answers_controller.rb

@@ -14,7 +14,7 @@ def self.reset_cache
   def self.all
     cache_fetch("all") do
       Services.worldwide_api.world_locations.with_subsequent_pages.map do |l|
-        new(l) if l.format == "World location" and l.details and l.details.slug.present?
+        new(l) if l.format == "World location" && l.details && l.details.slug.present?
       end.compact
     end
   end
@@ -53,7 +53,7 @@ def initialize(data)
   end
 
   def ==(other)
-    other.is_a?(self.class) and other.slug == self.slug
+    other.is_a?(self.class) && other.slug == self.slug
   end
 
   def_delegators :@data, :title, :details
@@ -65,6 +65,6 @@ def organisations
   end
 
   def fco_organisation
-    self.organisations.find { |o| o.fco_sponsored? }
+    self.organisations.find(&:fco_sponsored?)
   end
 end

app/models/world_location.rb

@@ -1,5 +1,4 @@
 class FlowRegistrationPresenter
-
   def initialize(flow)
     @flow = flow
   end
@@ -33,7 +32,7 @@ def description
   end
 
   module MethodMissingHelper
-    def method_missing(method, *args, &block)
+    def method_missing(method, *_args, &_block)
       MethodMissingObject.new(method, parent_method = nil, blank_to_s = true)
     end
   end

app/presenters/flow_registration_presenter.rb

@@ -1,5 +1,4 @@
 class GovspeakPresenter
-
   def initialize(markup)
     @markup = markup
   end

app/presenters/govspeak_presenter.rb

@@ -2,7 +2,7 @@
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.

bin/setup

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run SmartAnswers::Application

config.ru

@@ -21,7 +21,7 @@
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

config/environments/test.rb

@@ -4,5 +4,5 @@
   config.api_key = ENV["ERRBIT_API_KEY"]
   config.host    = ENV["ERRBIT_HOST"]
   config.environment_name = ENV["ERRBIT_ENV"]
-  config.secure  = ENV["ERRBIT_API_KEY"].present?
+  config.secure = ENV["ERRBIT_API_KEY"].present?
 end

config/initializers/airbrake.rb

@@ -25,7 +25,7 @@ def score(answer)
 
 class BandedWeightingScore < Struct.new(:bands, :weight)
   def score(answer)
-    range = bands.find { |b| b[:min] <= answer and (!b.has_key?(:max) or b[:max] >= answer) }[:score]
+    range = bands.find { |b| b[:min] <= answer && (!b.has_key?(:max) || b[:max] >= answer) }[:score]
     range * weight
   end
 end

lib/data/finance_weighting.rb

@@ -1,10 +1,10 @@
 module FriendlyTimeDiff
-
   def friendly_time_diff(from_time, to_time)
     FriendlyDateDiff.new(from_time.to_date, to_time.to_date).describe
   end
 
 private
+
   class FriendlyDateDiff
     include ActionView::Helpers::TextHelper
     attr_reader :from_date, :to_date
@@ -19,6 +19,7 @@ def describe
     end
 
   private
+
     def date_parts
       [
         date_part('year', whole_years_away),

lib/friendly_time_diff.rb

@@ -45,21 +45,22 @@ def to_hash
   end
 
 private
+
   def graph_label_text(node)
     text = node.class.to_s.split("::").last + "\n-\n"
     case node
     when SmartAnswer::Question::MultipleChoice
       text << word_wrap(node_title(node))
       text << "\n\n"
       text << node.permitted_options.map do |option|
-          "( ) #{option}"
-        end.join("\n")
+        "( ) #{option}"
+      end.join("\n")
     when SmartAnswer::Question::Checkbox
       text << word_wrap(node_title(node))
       text << "\n\n"
       text << node.options.map do |option|
-          "[ ] #{option}"
-        end.join("\n")
+        "[ ] #{option}"
+      end.join("\n")
     when SmartAnswer::Question::Base
       text << word_wrap(node_title(node))
     when SmartAnswer::Outcome
@@ -77,7 +78,7 @@ def word_wrap(text, line_width = 40)
   end
 
   module MethodMissingHelper
-    def method_missing(method, *args, &block)
+    def method_missing(method, *_args, &_block)
       MethodMissingObject.new(method)
     end
   end

lib/graph_presenter.rb

@@ -33,7 +33,7 @@ def label_lines
         )
       end
       attribute_clause = attrs.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
-      %Q{#{normalize_name(name)} [#{attribute_clause}]}
+      %{#{normalize_name(name)} [#{attribute_clause}]}
     end
   end
 
@@ -49,7 +49,7 @@ def edge_lines
     adjacency_list.map do |name, exits|
       exits.map do |nextnode, label|
         next unless nextnode
-        %Q{#{normalize_name(name)}->#{normalize_name(nextnode)} [label="#{label}"];}
+        %{#{normalize_name(name)}->#{normalize_name(nextnode)} [label="#{label}"];}
       end
     end.flatten
   end
@@ -58,7 +58,7 @@ def metadata_lines
     [
       'overlap=false;',
       'splines=true;',
-      %Q{label="#{escape(presenter.title)}";},
+      %{label="#{escape(presenter.title)}";},
       'fontsize=12;'
     ]
   end

lib/graphviz_presenter.rb

@@ -5,7 +5,7 @@ def initialize(method, parent_method = nil, blank_to_s = false)
     @blank_to_s = blank_to_s
   end
 
-  def method_missing(method, *args, &block)
+  def method_missing(method, *_args, &_block)
     MethodMissingObject.new(method, parent_method = self, blank_to_s = @blank_to_s)
   end
 

lib/method_missing_object.rb

@@ -1,6 +1,5 @@
 module SmartAnswer
   class AgeRelatedAllowanceChooser
-
     # created for married couples allowance calculator.
     # this could be extended for use across smart answers
     # and/or GOV.UK
@@ -40,6 +39,5 @@ def get_age_related_allowance(birth_date)
         age_related_allowance = @over_75_allowance
       end
     end
-
   end
 end

lib/smart_answer/age_related_allowance_chooser.rb

@@ -8,7 +8,7 @@ def initialize
     end
 
     def generate_url_for_download(country, field, text)
-      country_data = @data.select { |c| c["slug"] == country }.first
+      country_data = @data.find { |c| c["slug"] == country }
       return "" unless country_data
 
       url = country_data[field]
@@ -35,7 +35,7 @@ def countries_with_regions
     end
 
     def get_country_regions(slug)
-      @data.select { |c| c["slug"] == slug }.first["regions"]
+      @data.find { |c| c["slug"] == slug }["regions"]
     end
   end
 end

lib/smart_answer/calculators/arrested_abroad.rb

@@ -10,17 +10,16 @@ def initialize(match_or_due_date)
 
     def expected_week
       expected_start = @due_date - @due_date.wday
-      expected_start .. expected_start + 6.days
+      expected_start..expected_start + 6.days
     end
 
     def qualifying_week
       qualifying_start = 15.weeks.ago(expected_week.first)
-      qualifying_start .. qualifying_start + 6.days
+      qualifying_start..qualifying_start + 6.days
     end
 
     def employment_start
       25.weeks.ago(qualifying_week.last)
     end
-
   end
 end

lib/smart_answer/calculators/birth_calculator.rb

@@ -1,6 +1,5 @@
 module SmartAnswer::Calculators
   class ChildMaintenanceCalculator
-
     attr_accessor :income, :number_of_other_children, :number_of_shared_care_nights
 
     SCHEME_BASE_AMOUNT = 7.00

lib/smart_answer/calculators/child_maintenance_calculator.rb

@@ -1,6 +1,5 @@
 module SmartAnswer::Calculators
   class CommodityCodeCalculator
-
     attr_reader :matrix_data, :commodity_code_matrix
     attr_accessor :milk_protein_weight
 

lib/smart_answer/calculators/commodity_code_calculator.rb

@@ -1,6 +1,5 @@
 module SmartAnswer::Calculators
   class CountryNameFormatter
-
     COUNTRIES_WITH_DEFINITIVE_ARTICLES = %w(bahamas british-virgin-islands cayman-islands czech-republic democratic-republic-of-congo dominican-republic falkland-islands gambia maldives marshall-islands netherlands philippines seychelles solomon-islands south-georgia-and-south-sandwich-islands turks-and-caicos-islands united-arab-emirates)
 
     FRIENDLY_COUNTRY_NAME = {

lib/smart_answer/calculators/country_name_formatter.rb

@@ -99,7 +99,7 @@ def method_missing(symbol, *args)
     end
 
     def respond_to?(symbol, include_all = false)
-      formatting_method(symbol).present?
+      formatting_method(symbol).present? || super
     end
 
   private

lib/smart_answer/calculators/holiday_entitlement.rb

@@ -1,6 +1,5 @@
 module SmartAnswer::Calculators
   class LandlordImmigrationCheckCalculator
-
     VALID_COUNTRIES = %w( England )
 
     attr_reader :postcode

lib/smart_answer/calculators/landlord_immigration_check_calculator.rb

@@ -1,6 +1,5 @@
 module SmartAnswer::Calculators
   class LegalisationDocumentsDataQuery
-
     attr_reader :legalisation_document_data, :data
 
     def initialize
@@ -15,6 +14,5 @@ def find_document_data(documents)
     def self.legalisation_document_data
       @legalisation_document_data ||= YAML.load_file(Rails.root.join("lib", "data", "legalisation_documents_data.yml"))
     end
-
   end
 end

lib/smart_answer/calculators/legalisation_documents_data_query.rb

@@ -12,17 +12,17 @@ class MaternityPaternityCalculator
       :a_notice_leave, :last_payday, :pre_offset_payday, :pay_date, :paternity_leave_duration,
       :pay_day_in_month, :pay_day_in_week, :pay_method, :pay_week_in_month, :work_days, :date_of_birth, :awe
 
-    DAYS_OF_THE_WEEK = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
+    DAYS_OF_THE_WEEK = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
 
     def initialize(match_or_due_date, leave_type = "maternity")
       expected_start = match_or_due_date - match_or_due_date.wday
       qualifying_start = 15.weeks.ago(expected_start)
 
       @due_date = @match_date = match_or_due_date
       @leave_type = leave_type
-      @expected_week = @matched_week = expected_start .. expected_start + 6.days
+      @expected_week = @matched_week = expected_start..expected_start + 6.days
       @notice_of_leave_deadline = next_saturday(qualifying_start)
-      @qualifying_week = qualifying_start .. qualifying_start + 6.days
+      @qualifying_week = qualifying_start..qualifying_start + 6.days
       @employment_start = 25.weeks.ago(@qualifying_week.last)
       @a_employment_start = 25.weeks.ago(@matched_week.last)
       @leave_earliest_start_date = 11.weeks.ago(@expected_week.first)
@@ -206,7 +206,7 @@ def paydates_weekly
     def paydates_weekly_starting
       [].tap do |ary|
         pay_start_date.step(pay_end_date) do |d|
-          ary << d if d.wday == (pay_start_date - 1).wday and d > pay_start_date
+          ary << d if d.wday == (pay_start_date - 1).wday && d > pay_start_date
         end
       end
     end
@@ -217,7 +217,7 @@ def paydates_a_certain_week_day_each_month
           weekdays = weekdays_for_month(date, pay_day_in_week)
           ary << weekdays.send(pay_week_in_month)
         end
-        if ary.last and ary.last < pay_end_date
+        if ary.last && ary.last < pay_end_date
           weekdays = weekdays_for_month(1.month.since(pay_end_date), pay_day_in_week)
           ary << weekdays.send(pay_week_in_month)
         end
@@ -231,7 +231,7 @@ def statutory_rate(date)
         { min: uprating_date(2014), max: uprating_date(2015), amount: 138.18 },
         { min: uprating_date(2014), max: uprating_date(2100), amount: 139.58 } ### Change year in future
       ]
-      rate = rates.find { |r| r[:min] <= date and date < r[:max] } || rates.last
+      rate = rates.find { |r| r[:min] <= date && date < r[:max] } || rates.last
       rate[:amount]
     end
 
@@ -256,7 +256,7 @@ def months_between_dates(start_date, end_date)
     end
 
     def within_pay_date_range?(day)
-      pay_start_date <= day and day <= pay_end_date
+      pay_start_date <= day && day <= pay_end_date
     end
 
     def rate_changes?(week)
@@ -266,7 +266,7 @@ def rate_changes?(week)
     def pay_for_period(start_date, end_date)
       pay = 0.0
       (start_date..end_date).each_slice(7) do |week|
-        if week.size < 7 or !within_pay_date_range?(week.last) or rate_changes?(week)
+        if week.size < 7 || !within_pay_date_range?(week.last) || rate_changes?(week)
           # When calculating a partial SMP pay week divide the weekly rate by 7
           # truncating the result at 5 decimal places and increment the total pay
           # for each day of the partial week
@@ -322,7 +322,7 @@ def first_sunday_in_month(month, year)
     end
 
     def uprating_date(year)
-      date = first_sunday_in_month(4 , year)
+      date = first_sunday_in_month(4, year)
       date += leave_start_date.wday if leave_start_date
       date
     end