gAuto-correct cops (#6)

* Auto-correct cops

* Check rubocop version running in ci

* Lock rubocop to version 0.76

There is a breaking change in 0.81 that changes the cop names and
namespacing

* Remove some unnecessary config

Author: adamrdavid

.github/workflows/build.yml

@@ -23,7 +23,6 @@ jobs:
     - name: Test with rspec
       run: |
         bundle exec rspec spec/
-    # TODO: finish fixing cops
-    # - name: Lint with rubocop
-    #   run: |
-    #     bundle exec rubocop
+    - name: Lint with rubocop
+      run: |
+        bundle exec rubocop --verbose && bundle exec rubocop

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-09 14:12:08 -0700 using RuboCop version 0.76.0.
+# on 2020-04-15 15:50:47 -0700 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

lib/open_api_parser/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenApiParser
   class Document
     def self.resolve(path, file_cache = OpenApiParser::FileCache.new)
@@ -34,15 +36,15 @@ def deeply_expand_refs(fragment, current_pointer)
     end
 
     def expand_refs(fragment, current_pointer)
-      if fragment.is_a?(Hash) && fragment.key?("$ref")
-        raw_uri = fragment["$ref"]
+      if fragment.is_a?(Hash) && fragment.key?('$ref')
+        raw_uri = fragment['$ref']
         ref = OpenApiParser::Reference.new(raw_uri)
         fully_resolved, referrent_document, referrent_pointer =
           ref.resolve(@path, current_pointer, @content, @file_cache)
-        unless fully_resolved
-          expand_refs(referrent_document, referrent_pointer)
-        else
+        if fully_resolved
           [referrent_document, referrent_pointer]
+        else
+          expand_refs(referrent_document, referrent_pointer)
         end
       else
         [fragment, current_pointer]

lib/open_api_parser/specification.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module OpenApiParser
   module Specification
-    META_SCHEMA_PATH = File.expand_path("../../../resources/swagger_meta_schema.json", __FILE__)
+    META_SCHEMA_PATH = File.expand_path('../../resources/swagger_meta_schema.json', __dir__)
 
     def self.resolve(path, validate_meta_schema: true)
       raw_specification = Document.resolve(path)

open_api_parser.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.76'
+  spec.add_development_dependency 'rubocop', '<= 0.76' # rubocop 0.86 has breaking change in cop names
 end

spec/open_api_parser/document_spec.rb

@@ -1,54 +1,56 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 
 RSpec.describe OpenApiParser::Document do
-  describe "self.resolve" do
-    context "yaml" do
-      it "resolves JSON pointers" do
-        path = File.expand_path("../../resources/pointer_example.yaml", __FILE__)
+  describe 'self.resolve' do
+    context 'yaml' do
+      it 'resolves JSON pointers' do
+        path = File.expand_path('../resources/pointer_example.yaml', __dir__)
         json = OpenApiParser::Document.resolve(path)
 
-        expect(json["person"]).to eq({
-          "name" => "Drew"
-        })
+        expect(json['person']).to eq(
+          'name' => 'Drew'
+        )
       end
 
-      it "resolves JSON file references" do
-        path = File.expand_path("../../resources/file_reference_example.yaml", __FILE__)
+      it 'resolves JSON file references' do
+        path = File.expand_path('../resources/file_reference_example.yaml', __dir__)
         json = OpenApiParser::Document.resolve(path)
 
-        expect(json["person"]).to eq({
-          "name" => "Drew"
-        })
+        expect(json['person']).to eq(
+          'name' => 'Drew'
+        )
 
-        expect(json["person_without_scheme"]).to eq({
-          "name" => "Drew"
-        })
+        expect(json['person_without_scheme']).to eq(
+          'name' => 'Drew'
+        )
       end
 
-      it "resolves a mix of pointers and file references" do
-        path = File.expand_path("../../resources/mixed_reference_example.yaml", __FILE__)
+      it 'resolves a mix of pointers and file references' do
+        path = File.expand_path('../resources/mixed_reference_example.yaml', __dir__)
         json = OpenApiParser::Document.resolve(path)
 
-        expect(json["person"]["greeting"]).to eq({
-          "hi" => "Drew"
-        })
+        expect(json['person']['greeting']).to eq(
+          'hi' => 'Drew'
+        )
 
-        expect(json["person"]["stats"]).to eq({
-          "age" => 34
-        })
+        expect(json['person']['stats']).to eq(
+          'age' => 34
+        )
 
-        expect(json["person_greeting"]).to eq("Drew")
+        expect(json['person_greeting']).to eq('Drew')
       end
     end
 
-    context "json" do
-      it "resolves JSON pointers" do
-        path = File.expand_path("../../resources/pointer_example.json", __FILE__)
+    context 'json' do
+      it 'resolves JSON pointers' do
+        path = File.expand_path('../resources/pointer_example.json', __dir__)
         json = OpenApiParser::Document.resolve(path)
 
-        expect(json["person"]).to eq({
-          "name" => "Drew"
-        })
+        expect(json['person']).to eq(
+          'name' => 'Drew'
+        )
       end
     end
   end