rubocop and gem lib upgrades.

Author: seth-mg

.rubocop.yml

@@ -1,4 +1 @@
 inherit_from: .rubocop_todo.yml
-
-AllCops:
-  TargetRubyVersion: 2.6

.rubocop_todo.yml

@@ -56,7 +56,6 @@ Style/IfUnlessModifier:
     - 'lib/name_deduplication_parameters.rb'
     - 'lib/name_similarity_parameters.rb'
 
-
 # Offense count: 8
 # Competes with RDoc directives.
 # https://docs.ruby-lang.org/en/2.1.0/RDoc/Markup.html
@@ -72,93 +71,6 @@ Style/CommentedKeyword:
     - 'lib/name_translation_parameters.rb'
     - 'lib/rosette_api_error.rb'
 
-
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec, 
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'rosette_api.gemspec'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/name_deduplication_parameters.rb'
-    - 'lib/name_similarity_parameters.rb'
-    - 'lib/request_builder.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'examples/entities.rb'
-    - 'lib/request_builder.rb'
-    - 'tests/tests_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/EmptyLines:
-  Exclude:
-    - 'lib/rosette_api.rb'
-    - 'rosette_api.gemspec'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'tests/tests_spec.rb'
-
-# Offense count: 18
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'examples/entities.rb'
-    - 'examples/info.rb'
-    - 'examples/language.rb'
-    - 'examples/morphology_complete.rb'
-    - 'examples/morphology_compound-components.rb'
-    - 'examples/morphology_han-readings.rb'
-    - 'examples/morphology_lemmas.rb'
-    - 'examples/morphology_parts-of-speech.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'tests/tests_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'examples/language.rb'
-    - 'rosette_api.gemspec'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBrackets: space, no_space
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'tests/tests_spec.rb'
-
 # Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: .

Gemfile

@@ -2,8 +2,8 @@
 
 source 'https://rubygems.org'
 
+gem 'rdoc', '6.2.0'
 gem 'rubysl-securerandom', '2.0.0'
-gem 'rdoc', '4.2.2'
 
-gem 'rspec', '3.4.0', group: [:test]
-gem 'webmock', '1.24.5', group: [:test]
+gem 'rspec', '3.9.0', group: [:test]
+gem 'webmock', '3.7.6', group: [:test]

examples/language.rb

@@ -13,7 +13,7 @@
 language_data = 'Por favor Señorita, says the man.'
 begin
   params = DocumentParameters.new(content: language_data)
-  params.custom_headers = { 'X-RosetteAPI-App'=> 'ruby-app' }
+  params.custom_headers = { 'X-RosetteAPI-App' => 'ruby-app' }
   response = rosette_api.get_language(params)
   puts JSON.pretty_generate(response)
 rescue RosetteAPIError => e

lib/name_deduplication_parameters.rb

@@ -27,6 +27,7 @@ def initialize(names, threshold, options = {}) #:notnew:
   def validate_params
     param_msg = 'names must be an array of name_parameter'
     raise BadRequestError.new(param_msg) unless @names.instance_of? Array
+
     float_msg = 'threshold must be a float'
     thresh_msg = 'threshold must be in the range of 0 to 1'
     if @threshold

lib/name_similarity_parameters.rb

@@ -31,8 +31,10 @@ def initialize(name1, name2, options = {}) #:notnew:
   def validate_params
     n1_msg = 'name1 option can only be an instance of a String or NameParameter'
     raise BadRequestError.new(n1_msg) if [String, NameParameter].none? { |clazz| @name1.is_a? clazz }
+
     n2_msg = 'name2 option can only be an instance of a String or NameParameter'
     raise BadRequestError.new(n2_msg) if [String, NameParameter].none? { |clazz| @name2.is_a? clazz }
+
     opt_msg = 'rosette_options can only be an instance of a Hash'
     if @rosette_options
       raise BadRequestError.new(opt_msg) unless @rosette_options.is_a? Hash

lib/request_builder.rb

@@ -31,6 +31,7 @@ def initialize(user_key, alternate_url, http_client, binding_version,
     @user_agent = 'Ruby/' + binding_version + '/' + RUBY_VERSION
 
     return unless url_parameters
+
     @alternate_url = @alternate_url + '?' + URI.encode_www_form(url_parameters)
   end
 

lib/rosette_api.rb

@@ -52,7 +52,6 @@ class RosetteAPI
   # Topics endpoint
   TOPICS_ENDPOINT = '/topics'
 
-
   # Rosette API key
   attr_accessor :user_key
   # Alternate Rosette API URL

tests/tests_spec.rb

@@ -58,7 +58,6 @@
       expect { RosetteAPI.new('0123456789').get_language(params) }
         .to raise_error(BadRequestFormatError)
     end
-
   end
 
   describe '.get_morphology_complete' do
@@ -399,7 +398,7 @@
 
   describe '.name_deduplication' do
     names = ['John Smith', 'Johnathon Smith', 'Fred Jones']
-             .map { |n| NameParameter.new(n) }
+            .map { |n| NameParameter.new(n) }
     before do
       names_json = { names: names.map(&:load_param), threshold: 0.75 }.to_json
 
@@ -760,5 +759,4 @@
       expect(response).instance_of? Hash
     end
   end
-
 end