Merge pull request #41 from DripEmail/implement-rubocop

Implement rubocop

Author: will-in-wi

.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: '2.1'
   Exclude:
     - 'test/fixtures/**/*'
 
@@ -14,4 +15,16 @@ Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/BracesAroundHashParameters:
-  Enabled: false
+  Enabled: false
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Metrics/LineLength:
+  Enabled: false
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: 'indented'
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: 'indented'

.rubocop_todo.yml

@@ -1,134 +1,100 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-22 12:38:29 -0600 using RuboCop version 0.49.1.
+# on 2018-05-24 10:21:33 -0500 using RuboCop version 0.56.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: 2
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/ElseAlignment:
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'lib/drip/client.rb'
+    - 'lib/drip/collection.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'drip-ruby.gemspec'
+Metrics/AbcSize:
+  Max: 26
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
-  EnforcedStyle: consistent
+# Offense count: 5
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 46
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 173
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 26
 
 # Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
+Performance/InefficientHashSearch:
   Exclude:
+    - 'lib/drip/resource.rb'
     - 'lib/drip/response.rb'
 
-# Offense count: 1
+# Offense count: 23
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/drip/collection.rb'
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 45
+Style/Documentation:
+  Enabled: false
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
+Style/Encoding:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'drip-ruby.gemspec'
 
-# Offense count: 1
-Lint/ScriptPermission:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
   Exclude:
-    - 'Rakefile'
+    - 'drip-ruby.gemspec'
+    - 'test/test_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'lib/drip/response.rb'
+    - 'lib/drip/client.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
+Style/IfUnlessModifier:
   Exclude:
     - 'lib/drip/client.rb'
-    - 'lib/drip/collection.rb'
-
-# Offense count: 7
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 48
 
 # Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 189
-
-# Offense count: 78
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 108
-
-# Offense count: 4
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 16
-
-# Offense count: 22
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Offense count: 42
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 2
-Style/MethodMissing:
+Style/MissingRespondToMissing:
   Exclude:
     - 'lib/drip/resource.rb'
     - 'lib/drip/response.rb'
 
-# Offense count: 9
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 8
 
-# Offense count: 494
+# Offense count: 605
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'test/drip/client_test.rb'

.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 sudo: false
 rvm:
   - 2.3.4
+  - 2.1
   - jruby-19mode

Rakefile

@@ -1,12 +1,14 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
+
 Rake::TestTask.new do |t|
   t.libs << "lib"
   t.pattern = "test/**/*_test.rb"
   t.verbose = true
 end
 
 desc "Run tests"
-task default: :test
+task default: %i[rubocop test]

drip-ruby.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'drip/version'
@@ -18,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "mocha", "~> 1.1"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rubocop", "~> 0.56.0"
   spec.add_development_dependency "shoulda-context", "~> 1.0"
-  spec.add_development_dependency "mocha", "~> 1.1"
-  spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "webmock", "~> 3.4"
 end

lib/drip/client/orders.rb

@@ -27,12 +27,12 @@ def create_or_update_orders(orders)
       # Public: Create or update a refund.
       #
       # options      - Required. A Hash of refund properties
-      #                 amount	            - Required. The amount of the refund.
+      #                 amount              - Required. The amount of the refund.
       #                 provider            - Required. The provider for the Order being refunded.
       #                 order_upstream_id   - Required. The upstream_id for the Order being refunded.
-      #                 upstream_id	        - The unique id of refund in the order management system.
-      #                 note	              - A note about the refund.
-      #                 processed_at        - The String time at which the refund was processed in 
+      #                 upstream_id         - The unique id of refund in the order management system.
+      #                 note                - A note about the refund.
+      #                 processed_at        - The String time at which the refund was processed in
       #                                       ISO-8601 format.
       #
       # Returns a Drip::Response.

lib/drip/response.rb

@@ -51,10 +51,10 @@ def parse_members
           if body.is_a?(Hash)
             body.each do |key, value|
               klass = if value.is_a?(Array)
-                Drip::Collections.find_class(key)
-              else
-                Drip::Resources.find_class(key)
-              end
+                        Drip::Collections.find_class(key)
+                      else
+                        Drip::Resources.find_class(key)
+                      end
 
               members[key] = klass.new(value)
             end
@@ -65,7 +65,7 @@ def parse_members
 
     def member_map
       @member_map ||= {}.tap do |map|
-        members.each { |key, value| map[key.to_sym] = key }
+        members.each { |key, _value| map[key.to_sym] = key }
       end
     end
   end

test/drip/client/accounts_test.rb

@@ -10,8 +10,8 @@ def setup
       @response_status = 200
       @response_body = "stub"
 
-    stub_request(:get, "https://api.getdrip.com/v2/accounts").
-      to_return(status: @response_status, body: @response_body, headers: {})
+      stub_request(:get, "https://api.getdrip.com/v2/accounts").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do