Make RuboCop pass again after upgrading

* Remove `TargetRubyVersion`

  This is an application, not a library. We specify an explicit Ruby
  version in `Gemfile`. RuboCop can read this Ruby version from
  `Gemfile.lock` since v0.54.0.

* Fix some minor complaints

  This includes:

  * whitespace issues
  * `rescue` without specifying an error
  * `YAML.load` -> `YAML.safe_load`
  * variable naming

  Thank you `--auto-correct`!

* Replace custom enum implementation with `ActiveRecord::Enum`

  Instead of just fixing the complaint about an uncommunicative
  parameter name.

  Ref: <https://api.rubyonrails.org/v4.2/classes/ActiveRecord/Enum.html>

* Update `.rubocop_todo.yml`

  Postpone addressing some of the new-found issues in order to keep the
  diff size down.

Author: Koronen

.rubocop.yml

@@ -4,7 +4,6 @@ AllCops:
   Exclude:
     - 'db/schema.rb'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.3
 
 Metrics/LineLength:
   Max: 120

.rubocop_todo.yml

@@ -1,14 +1,67 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-22 20:52:58 +0100 using RuboCop version 0.38.0.
+# on 2019-11-16 20:15:02 +0100 using RuboCop version 0.76.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 163
+# Offense count: 41
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+# Offense count: 9
+# Configuration parameters: Blacklist.
+# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'app/utils/sample_story.rb'
+    - 'spec/helpers/url_helpers_spec.rb'
+    - 'spec/utils/opml_parser_spec.rb'
+
+# Offense count: 139
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: when_needed, always
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'app/commands/stories/mark_group_as_read.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'app/helpers/authentication_helpers.rb'
+    - 'app/helpers/url_helpers.rb'
+    - 'spec/controllers/stories_controller_spec.rb'
+    - 'spec/fever_api/read_items_spec.rb'
+    - 'spec/helpers/authentications_helper_spec.rb'
+    - 'spec/helpers/url_helpers_spec.rb'
+    - 'spec/javascript/test_controller.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
+# Whitelist: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'app/controllers/feeds_controller.rb'
+    - 'app/tasks/fetch_feed.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets

Gemfile

@@ -1,4 +1,4 @@
-ruby_version_file = File.join(File.expand_path("..", __FILE__), ".ruby-version")
+ruby_version_file = File.expand_path(".ruby-version", __dir__)
 ruby File.read(ruby_version_file).chomp if File.readable?(ruby_version_file)
 source "https://rubygems.org"
 

app/commands/feeds/find_new_stories.rb

@@ -16,6 +16,7 @@ def new_stories
     @raw_feed.entries.each do |story|
       break if @latest_entry_id && story.id == @latest_entry_id
       next if story_age_exceeds_threshold?(story) || StoryRepository.exists?(story.id, @feed_id)
+
       stories << story
     end
 

app/fever_api/read_items.rb

@@ -10,7 +10,7 @@ def call(params = {})
       if params.keys.include?("items")
         item_ids = begin
                      params[:with_ids].split(",")
-                   rescue
+                   rescue StandardError
                      nil
                    end
 

app/fever_api/response.rb

@@ -40,7 +40,7 @@ def initialize(params)
       @params = params
     end
 
-    def to_json
+    def to_json(*_args)
       base_response = { api_version: API_VERSION }
       ACTIONS
         .inject(base_response) { |a, e| a.merge!(e.new.call(@params)) }

app/fever_api/write_mark_item.rb

@@ -20,8 +20,8 @@ def call(params = {})
 
     private
 
-    def mark_item_as(id, as)
-      case as
+    def mark_item_as(id, mark_as)
+      case mark_as
       when "read"
         @read_marker_class.new(id).mark_as_read
       when "unread"

app/helpers/authentication_helpers.rb

@@ -13,6 +13,7 @@ def needs_authentication?(path)
       return false unless UserRepository.setup_complete?
       return false if %w(/login /logout /heroku).include?(path)
       return false if path =~ /css|js|img/
+
       true
     end
 

app/models/feed.rb

@@ -4,18 +4,11 @@ class Feed < ActiveRecord::Base
 
   validates_uniqueness_of :url
 
-  STATUS = { green: 0, yellow: 1, red: 2 }.freeze
-
-  def status
-    STATUS.key(read_attribute(:status))
-  end
-
-  def status=(s)
-    write_attribute(:status, STATUS[s])
-  end
+  enum status: { green: 0, yellow: 1, red: 2 }
 
   def status_bubble
     return :yellow if status == :red && stories.any?
+
     status
   end
 

app/repositories/feed_repository.rb

@@ -19,10 +19,10 @@ def self.update_feed(feed, name, url, group_id = nil)
   end
 
   def self.update_last_fetched(feed, timestamp)
-    if valid_timestamp?(timestamp, feed.last_fetched)
-      feed.last_fetched = timestamp
-      feed.save
-    end
+    return unless valid_timestamp?(timestamp, feed.last_fetched)
+
+    feed.last_fetched = timestamp
+    feed.save
   end
 
   def self.delete(feed_id)

app/repositories/story_repository.rb

@@ -107,6 +107,7 @@ def self.extract_content(entry)
   def self.extract_title(entry)
     return ContentSanitizer.sanitize(entry.title) if entry.title.present?
     return ContentSanitizer.sanitize(entry.summary) if entry.summary.present?
+
     "There isn't a title for this story"
   end
 

app/tasks/fetch_feed.rb

@@ -21,10 +21,10 @@ def fetch
     end
 
     FeedRepository.set_status(:green, @feed)
-  rescue => ex
+  rescue StandardError => e
     FeedRepository.set_status(:red, @feed)
 
-    @logger.error "Something went wrong when parsing #{@feed.url}: #{ex}" if @logger
+    @logger.error "Something went wrong when parsing #{@feed.url}: #{e}" if @logger
   end
 
   private

app/utils/feed_discovery.rb

@@ -17,7 +17,7 @@ def get_feed_for_url(url, parser)
     feed = parser.fetch_and_parse(url)
     feed.feed_url ||= url
     feed
-  rescue
+  rescue StandardError
     yield if block_given?
   end
 end

app/utils/opml_parser.rb

@@ -38,7 +38,7 @@ def extract_name(attributes)
   def feed_to_hash(feed)
     {
       name: extract_name(feed.attributes).value,
-      url:  feed.attributes["xmlUrl"].value
+      url: feed.attributes["xmlUrl"].value
     }
   end
 end

app/utils/sample_story.rb

@@ -1,24 +1,24 @@
-SampleStory = Struct.new(:source, :title, :lead, :is_read, :published) do
-  BODY = <<-eos.freeze
-<p>Tofu shoreditch intelligentsia <a href="#">umami</a>, fashion axe photo booth
-try-hard terry richardson quinoa actually fingerstache meggings fixie. Aesthetic
-salvia vinyl raw denim, keffiyeh master cleanse tonx selfies mlkshk occupy twee
-street art gentrify. Quinoa PBR readymade 90's. <b>Chambray</b> Austin aesthetic
-meggings, carles vinyl intelligentsia tattooed. Keffiyeh mumblecore
-fingerstache, sartorial sriracha disrupt biodiesel cred. Skateboard yr cosby
-sweater, narwhal beard ethnic jean shorts aesthetic. Post-ironic flannel mlkshk,
-pickled VHS wolf banjo forage portland wayfarers.</p>
-<img src='https://placekitten.com/g/500/300' />
-<p>Selfies mumblecore odd future <a href="#">irony DIY messenger bag</a>.
-Authentic neutra next level selvage squid. Four loko freegan occupy, tousled
-vinyl leggings selvage messenger bag. Four loko wayfarers kale chips, next level
-banksy banh mi umami flannel hella. Street art odd future scenester,
-intelligentsia brunch fingerstache YOLO narwhal single-origin coffee tousled
-tumblr pop-up four loko you probably haven't heard of them dreamcatcher.
-Single-origin coffee direct trade retro biodiesel, truffaut fanny pack portland
-blue bottle scenester bushwick. Skateboard squid fanny pack bushwick, photo
-booth vice literally.</p>
-    eos
+SampleStory = Struct.new(:source, :title, :lead, :is_read, :published) do # rubocop:disable Metrics/BlockLength
+  BODY = <<~EOS.freeze
+    <p>Tofu shoreditch intelligentsia <a href="#">umami</a>, fashion axe photo booth
+    try-hard terry richardson quinoa actually fingerstache meggings fixie. Aesthetic
+    salvia vinyl raw denim, keffiyeh master cleanse tonx selfies mlkshk occupy twee
+    street art gentrify. Quinoa PBR readymade 90's. <b>Chambray</b> Austin aesthetic
+    meggings, carles vinyl intelligentsia tattooed. Keffiyeh mumblecore
+    fingerstache, sartorial sriracha disrupt biodiesel cred. Skateboard yr cosby
+    sweater, narwhal beard ethnic jean shorts aesthetic. Post-ironic flannel mlkshk,
+    pickled VHS wolf banjo forage portland wayfarers.</p>
+    <img src='https://placekitten.com/g/500/300' />
+    <p>Selfies mumblecore odd future <a href="#">irony DIY messenger bag</a>.
+    Authentic neutra next level selvage squid. Four loko freegan occupy, tousled
+    vinyl leggings selvage messenger bag. Four loko wayfarers kale chips, next level
+    banksy banh mi umami flannel hella. Street art odd future scenester,
+    intelligentsia brunch fingerstache YOLO narwhal single-origin coffee tousled
+    tumblr pop-up four loko you probably haven't heard of them dreamcatcher.
+    Single-origin coffee direct trade retro biodiesel, truffaut fanny pack portland
+    blue bottle scenester bushwick. Skateboard squid fanny pack bushwick, photo
+    booth vice literally.</p>
+  EOS
 
   def id
     -1 * rand(100)

config/unicorn.rb

@@ -17,7 +17,7 @@
 after_fork do |_server, _worker|
   if defined?(ActiveRecord::Base)
     env = ENV["RACK_ENV"] || "development"
-    config = YAML.load(ERB.new(File.read("config/database.yml")).result)[env]
+    config = YAML.safe_load(ERB.new(File.read("config/database.yml")).result)[env]
     ActiveRecord::Base.establish_connection(config)
   end
 end

fever_api.rb

@@ -20,6 +20,7 @@ class Endpoint < Sinatra::Base
 
     def authenticated?(api_key)
       return unless api_key
+
       user = User.first
       user.api_key && api_key.casecmp(user.api_key).zero?
     end

spec/commands/feeds/import_from_opml_spec.rb

@@ -3,7 +3,7 @@
 app_require "commands/feeds/import_from_opml"
 
 describe ImportFromOpml do
-  let(:subscriptions) { File.open(File.expand_path("../../../support/files/subscriptions.xml", __FILE__)) }
+  let(:subscriptions) { File.open(File.expand_path("../../support/files/subscriptions.xml", __dir__)) }
 
   def import
     described_class.import(subscriptions)

spec/commands/stories/mark_group_as_read_spec.rb

@@ -3,7 +3,7 @@
 app_require "commands/stories/mark_group_as_read"
 
 describe MarkGroupAsRead do
-  describe '#mark_group_as_read' do
+  describe "#mark_group_as_read" do
     let(:stories) { double }
     let(:repo) { double }
     let(:timestamp) { Time.now.to_i }

spec/factories/group_factory.rb

@@ -11,6 +11,7 @@ def as_fever_json
   def self.build(params = {})
     FakeGroup.new(
       id: rand(100),
-      name: params[:name] || Faker::Name.name + " group")
+      name: params[:name] || Faker::Name.name + " group"
+    )
   end
 end

spec/factories/user_factory.rb

@@ -6,6 +6,7 @@ class FakeUser < OpenStruct; end
   def self.build
     FakeUser.new(
       id: rand(100),
-      setup_complete: false)
+      setup_complete: false
+    )
   end
 end

spec/helpers/url_helers_spec.rb renamed to spec/helpers/url_helpers_spec.rb

@@ -17,22 +17,22 @@ class Helper
     end
 
     it "replaces relative urls in a, img and video tags" do
-      content = <<-EOS
-<div>
-<img src="https://foo">
-<a href="/bar/baz">tee</a><img src="bar/bar">
-<video src="/tee"></video>
-</div>
+      content = <<~EOS
+        <div>
+        <img src="https://foo">
+        <a href="/bar/baz">tee</a><img src="bar/bar">
+        <video src="/tee"></video>
+        </div>
       EOS
 
       result = helper.expand_absolute_urls(content, "http://oodl.io/d/")
-      expect(result.delete("\n")).to eq <<-EOS.delete("\n")
-<div>
-<img src="https://foo">
-<a href="http://oodl.io/bar/baz">tee</a>
-<img src="http://oodl.io/d/bar/bar">
-<video src="http://oodl.io/tee"></video>
-</div>
+      expect(result.delete("\n")).to eq <<~EOS.delete("\n")
+        <div>
+        <img src="https://foo">
+        <a href="http://oodl.io/bar/baz">tee</a>
+        <img src="http://oodl.io/d/bar/bar">
+        <video src="http://oodl.io/tee"></video>
+        </div>
       EOS
     end
 
@@ -41,21 +41,21 @@ class Helper
     end
 
     it "doesn't modify tags that do not have url attributes" do
-      content = <<-EOS
-<div>
-<img foo="bar">
-<a name="something"/></a>
-<video foo="bar"></video>
-</div>
+      content = <<~EOS
+        <div>
+        <img foo="bar">
+        <a name="something"/></a>
+        <video foo="bar"></video>
+        </div>
       EOS
 
       result = helper.expand_absolute_urls(content, "http://oodl.io/d/")
-      expect(result.delete("\n")).to eq <<-EOS.delete("\n")
-<div>
-<img foo="bar">
-<a name="something"></a>
-<video foo="bar"></video>
-</div>
+      expect(result.delete("\n")).to eq <<~EOS.delete("\n")
+        <div>
+        <img foo="bar">
+        <a name="something"></a>
+        <video foo="bar"></video>
+        </div>
       EOS
     end