Update based on Rubocop auto correct (#56)

Author: Jared Pearson

.rubocop.yml

@@ -0,0 +1,9 @@
+AllCops:
+  NewCops: enable
+
+Metrics/BlockLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false

Gemfile

@@ -1,4 +1,6 @@
-source :gemcutter
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby-pardot.gemspec
 gemspec

Gemfile.lock

@@ -6,7 +6,7 @@ PATH
       httparty (= 0.18.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -44,4 +44,4 @@ DEPENDENCIES
   ruby-pardot!
 
 BUNDLED WITH
-   2.1.4
+   2.2.7

Rakefile

@@ -1,11 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-desc "Run all specs"
+desc 'Run all specs'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = "./spec/**/*_spec.rb"
+  t.pattern = './spec/**/*_spec.rb'
 end

lib/pardot/authentication.rb

@@ -1,38 +1,40 @@
 module Pardot
   module Authentication
-
     # @deprecated Use of username and password authentication is deprecated.
     def authenticate
-      raise "Authentication not available when using Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_oauth_and_connected_apps.htm for more information." if using_salesforce_access_token?
-      warn "[DEPRECATION] Use of username and password authentication is deprecated in favor of Salesforce OAuth. See https://developer.pardot.com/kb/authentication/ for more information."
-      resp = post "login", nil, nil, nil, :email => @email, :password => @password, :user_key => @user_key
-      update_version(resp["version"]) if resp && resp["version"]
-      @api_key = resp && resp["api_key"]
+      if using_salesforce_access_token?
+        raise 'Authentication not available when using Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_oauth_and_connected_apps.htm for more information.'
+      end
+
+      warn '[DEPRECATION] Use of username and password authentication is deprecated in favor of Salesforce OAuth. See https://developer.pardot.com/kb/authentication/ for more information.'
+      resp = post 'login', nil, nil, nil, email: @email, password: @password, user_key: @user_key
+      update_version(resp['version']) if resp && resp['version']
+      @api_key = resp && resp['api_key']
     end
-    
+
     def authenticated?
-      @api_key != nil || @salesforce_access_token != nil
+      !@api_key.nil? || !@salesforce_access_token.nil?
     end
 
     def using_salesforce_access_token?
       @salesforce_access_token != nil
     end
-    
+
     def reauthenticate
-      raise "Reauthentication not available when using Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information." if using_salesforce_access_token?
-      warn "[DEPRECATION] Use Salesforce OAuth to refresh the Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information."
+      if using_salesforce_access_token?
+        raise 'Reauthentication not available when using Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information.'
+      end
+
+      warn '[DEPRECATION] Use Salesforce OAuth to refresh the Salesforce access token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information.'
       @api_key = nil
       authenticate
     end
 
     private
 
-    def update_version version
-      if version.is_a? Array
-        version = version.last
-      end
+    def update_version(version)
+      version = version.last if version.is_a? Array
       @version = version if version.to_i > 3
     end
-
   end
 end

lib/pardot/client.rb

@@ -1,7 +1,5 @@
 module Pardot
-
   class Client
-
     include HTTParty
     base_uri 'https://pi.pardot.com'
     format :xml
@@ -23,14 +21,18 @@ class Client
 
     attr_accessor :email, :password, :user_key, :api_key, :version, :salesforce_access_token, :business_unit_id, :format
 
-    # @deprecated Arguments email, password and user_key are deprecated. Use salesforce_access_token with Salesforce OAuth. 
-    def initialize email = nil, password = nil, user_key = nil, version = 3, salesforce_access_token = nil, business_unit_id = nil
-      if !(email.nil? || password.nil? || user_key.nil?) then
-        warn "[DEPRECATION] Use of username and password authentication is deprecated in favor of Salesforce OAuth. See https://developer.pardot.com/kb/authentication/ for more information."
+    # @deprecated Arguments email, password and user_key are deprecated. Use salesforce_access_token with Salesforce OAuth.
+    def initialize(email = nil, password = nil, user_key = nil, version = 3, salesforce_access_token = nil, business_unit_id = nil)
+      unless email.nil? || password.nil? || user_key.nil?
+        warn '[DEPRECATION] Use of username and password authentication is deprecated in favor of Salesforce OAuth. See https://developer.pardot.com/kb/authentication/ for more information.'
       end
 
-      raise "business_unit_id required when using Salesforce access_token" if !salesforce_access_token.nil? && business_unit_id.nil?
-      raise "Invalid business_unit_id value. Expected ID to start with '0Uv' and be length of 18 characters." if !business_unit_id.nil? && (!business_unit_id.start_with?('0Uv') || business_unit_id.length != 18)
+      if !salesforce_access_token.nil? && business_unit_id.nil?
+        raise 'business_unit_id required when using Salesforce access_token'
+      end
+      if !business_unit_id.nil? && (!business_unit_id.start_with?('0Uv') || business_unit_id.length != 18)
+        raise "Invalid business_unit_id value. Expected ID to start with '0Uv' and be length of 18 characters."
+      end
 
       @email = email
       @password = password
@@ -39,8 +41,7 @@ def initialize email = nil, password = nil, user_key = nil, version = 3, salesfo
       @salesforce_access_token = salesforce_access_token
       @business_unit_id = business_unit_id
 
-      @format = "simple"
+      @format = 'simple'
     end
-
   end
 end

lib/pardot/error.rb

@@ -1,7 +1,10 @@
 module Pardot
   class Error < StandardError; end
+
   class NetError < Error; end
+
   class ExpiredApiKeyError < Error; end
+
   class AccessTokenExpiredError < Error; end
 
   class ResponseError < Error
@@ -10,11 +13,11 @@ def initialize(res)
     end
 
     def to_s
-      @res["__content__"]
+      @res['__content__']
     end
 
     def code
-      @res["code"].to_i
+      @res['code'].to_i
     end
 
     def inspect

lib/pardot/http.rb

@@ -1,88 +1,80 @@
 module Pardot
   module Http
-    
-    def get object, path, params = {}, num_retries = 0
+    def get(object, path, params = {}, num_retries = 0)
       smooth_params object, params
       full_path = fullpath object, path
       headers = create_auth_header object
-      check_response self.class.get(full_path, :query => params, :headers => headers)
-      
+      check_response self.class.get(full_path, query: params, headers: headers)
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :get, object, path, params, num_retries, e
-      
     rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
-      raise Pardot::NetError.new(e)
+      raise Pardot::NetError, e
     end
-    
-    def post object, path, params = {}, num_retries = 0, bodyParams = {}
+
+    def post(object, path, params = {}, num_retries = 0, bodyParams = {})
       smooth_params object, params
       full_path = fullpath object, path
       headers = create_auth_header object
-      check_response self.class.post(full_path, :query => params, :body => bodyParams, :headers => headers)
-      
+      check_response self.class.post(full_path, query: params, body: bodyParams, headers: headers)
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :post, object, path, params, num_retries, e
-      
     rescue SocketError, Interrupt, EOFError, SystemCallError, Timeout::Error, MultiXml::ParseError => e
-      raise Pardot::NetError.new(e)
+      raise Pardot::NetError, e
     end
-    
+
     protected
-    
-    # @deprecated With Salesforce OAuth, this method will never be invoked. 
-    def handle_expired_api_key method, object, path, params, num_retries, e
+
+    # @deprecated With Salesforce OAuth, this method will never be invoked.
+    def handle_expired_api_key(method, object, path, params, num_retries, e)
       raise e unless num_retries == 0
-      
+
       reauthenticate
-      
+
       send(method, object, path, params, 1)
     end
-    
-    def smooth_params object, params
-      return if object == "login"
-      
+
+    def smooth_params(object, params)
+      return if object == 'login'
+
       authenticate unless authenticated?
-      params.merge! :format => @format
+      params.merge! format: @format
     end
 
-    def create_auth_header object
-      return if object == "login"
-      if using_salesforce_access_token? then
-        { 
+    def create_auth_header(object)
+      return if object == 'login'
+
+      if using_salesforce_access_token?
+        {
           :Authorization => "Bearer #{@salesforce_access_token}",
           'Pardot-Business-Unit-Id' => @business_unit_id
         }
       else
-        { :Authorization => "Pardot api_key=#{@api_key}, user_key=#{@user_key}" }
+        { Authorization: "Pardot api_key=#{@api_key}, user_key=#{@user_key}" }
       end
     end
-    
-    def check_response http_response
-      rsp = http_response["rsp"]
-      
-      error = rsp["err"] if rsp
-      error ||= "Unknown Failure: #{rsp.inspect}" if rsp && rsp["stat"] == "fail"
+
+    def check_response(http_response)
+      rsp = http_response['rsp']
+
+      error = rsp['err'] if rsp
+      error ||= "Unknown Failure: #{rsp.inspect}" if rsp && rsp['stat'] == 'fail'
       content = error['__content__'] if error.is_a?(Hash)
-      
-      if [error, content].include?("access_token is invalid") && using_salesforce_access_token?
-        raise AccessTokenExpiredError.new "Access token is invalid. Use Salesforce OAuth to refresh the existing Salesforce access token or to retrieve a new token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information."
-      end  
-      if [error, content].include?("Invalid API key or user key") && @api_key
-        raise ExpiredApiKeyError.new @api_key
+
+      if [error, content].include?('access_token is invalid') && using_salesforce_access_token?
+        raise AccessTokenExpiredError,
+              'Access token is invalid. Use Salesforce OAuth to refresh the existing Salesforce access token or to retrieve a new token. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/oauth_refresh_token_flow.htm for more information.'
       end
-      
-      raise ResponseError.new error if error
-      
+      raise ExpiredApiKeyError, @api_key if [error, content].include?('Invalid API key or user key') && @api_key
+
+      raise ResponseError, error if error
+
       rsp
     end
-    
-    def fullpath object, path
-      full = File.join("/api", object, "version", @version.to_s)
-      unless path.nil?
-        full = File.join(full, path)
-      end
+
+    def fullpath(object, path)
+      full = File.join('/api', object, 'version', @version.to_s)
+      full = File.join(full, path) unless path.nil?
       full
     end
-    
   end
 end

lib/pardot/objects/custom_fields.rb

@@ -1,37 +1,33 @@
 module Pardot
   module Objects
     module CustomFields
-      
       def custom_fields
         @custom_fields ||= CustomFields.new self
       end
-      
+
       class CustomFields
-        
-        def initialize client
+        def initialize(client)
           @client = client
         end
-        
-        def query params
-          result = get "/do/query", params, "result"
-          result["total_results"] = result["total_results"].to_i if result["total_results"]
+
+        def query(params)
+          result = get '/do/query', params, 'result'
+          result['total_results'] = result['total_results'].to_i if result['total_results']
           result
         end
-        
+
         protected
-        
-        def get path, params = {}, result = "customField"
-          response = @client.get "customField", path, params
+
+        def get(path, params = {}, result = 'customField')
+          response = @client.get 'customField', path, params
           result ? response[result] : response
         end
-        
-        def post path, params = {}, result = "user"
-          response = @client.post "customField", path, params
+
+        def post(path, params = {}, result = 'user')
+          response = @client.post 'customField', path, params
           result ? response[result] : response
         end
-        
       end
-      
     end
   end
 end