Small code improvements

Author: simonoff

.rubocop.yml

@@ -1,17 +1,105 @@
+require:
+  - rubocop/cop/internal_affairs
+  - rubocop-performance
+  - rubocop-rspec
 AllCops:
-  Include:
-    - '**/Rakefile'
+  NewCops: enable
   Exclude:
-    - 'spec/**/*'
-Metrics/LineLength:
-  Max: 99
-Naming/FileName:
+    - "bin/*"
+    - "vendor/**/*"
+    - "Rakefile"
+    - "tmp/**/*"
+    - ".git/**/*"
+  TargetRubyVersion: 2.5
+Style/Documentation:
+  Enabled: false
+Layout/LineLength:
+  Max: 1000
+Metrics/MethodLength:
+  Max: 250
+Metrics/ClassLength:
+  Max: 1000
+Metrics/AbcSize:
+  Max: 250
+Metrics/BlockLength:
+  Max: 1500
+Metrics/CyclomaticComplexity:
+  Max: 50
+Metrics/PerceivedComplexity:
+  Max: 50
+Style/ClassAndModuleChildren:
   Enabled: false
 Style/ModuleFunction:
   Enabled: false
-Style/Encoding:
+Style/ParallelAssignment:
   Enabled: false
-Documentation:
+Style/SymbolProc:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/AndOr:
+  Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
+Style/IfInsideElse:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: false
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+RSpec/ContextWording:
   Enabled: false
-Metrics/MethodLength:
-  Max: 15

Gemfile

@@ -1,17 +1,15 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pipedrive.gemspec
 gemspec
 
 group :test do
-  gem 'simplecov', :require => false
-  gem 'coveralls', :require => false
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
 end
 
 group :local_development do
-  gem 'terminal-notifier-guard', require: false if RUBY_PLATFORM.downcase.include?('darwin')
-  gem 'guard-rspec', '>= 4.3.1' ,require: false
-  gem 'guard-bundler', require: false
-  gem 'guard-rubocop', require: false
   gem 'pry'
 end

Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'active_support/core_ext/hash'
 require 'active_support/concern'
@@ -33,7 +35,7 @@ def setup
   end
 
   def logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= Logger.new($stdout)
   end
 
   reset!

lib/pipedrive.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Activity < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/activity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class ActivityType < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/activity_type.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Base
     def initialize(api_token = ::Pipedrive.api_token)
-      fail 'api_token should be set' unless api_token.present?
+      raise 'api_token should be set' unless api_token.present?
+
       @api_token = api_token
     end
 
@@ -12,7 +15,8 @@ def connection
     def make_api_call(*args)
       params = args.extract_options!
       method = args[0]
-      fail 'method param missing' unless method.present?
+      raise 'method param missing' unless method.present?
+
       url = build_url(args, params.delete(:fields_to_select))
       begin
         res = connection.__send__(method.to_sym, url, params)
@@ -26,11 +30,9 @@ def make_api_call(*args)
     end
 
     def build_url(args, fields_to_select = nil)
-      url = "/v1/#{entity_name}"
+      url = +"/v1/#{entity_name}"
       url << "/#{args[1]}" if args[1]
-      if fields_to_select.is_a?(::Array) && fields_to_select.size > 0
-        url << ":(#{fields_to_select.join(',')})"
-      end
+      url << ":(#{fields_to_select.join(',')})" if fields_to_select.is_a?(::Array) && fields_to_select.size.positive?
       url << "?api_token=#{@api_token}"
       url
     end
@@ -52,16 +54,16 @@ def failed_response(res)
                                   failed: false)
       case res.status
       when 401
-        failed_res.merge! not_authorized: true
+        failed_res[:not_authorized] = true
       when 420
-        failed_res.merge! failed: true
+        failed_res[:failed] = true
       end
       failed_res
     end
 
     def entity_name
-      class_name = self.class.name.split("::")[-1].downcase.pluralize
-      class_names = { "people" => "persons" }
+      class_name = self.class.name.split('::')[-1].downcase.pluralize
+      class_names = { 'people' => 'persons' }
       class_names[class_name] || class_name
     end
 
@@ -77,7 +79,8 @@ def faraday_options
       end
 
       # This method smells of :reek:TooManyStatements
-      def connection # :nodoc
+      # :nodoc
+      def connection
         @connection ||= Faraday.new(faraday_options) do |conn|
           conn.request :url_encoded
           conn.response :mashify

lib/pipedrive/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Deal < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/deal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class DealField < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/deal_field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class File < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Filter < Base
     include ::Pipedrive::Operations::Read

lib/pipedrive/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Goal < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/goal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Note < Base
     include ::Pipedrive::Operations::Create

lib/pipedrive/note.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   module Operations
     module Create

lib/pipedrive/operations/create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   module Operations
     module Delete

lib/pipedrive/operations/delete.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Pipedrive
   module Operations
     module Read
       extend ActiveSupport::Concern
       include ::Enumerable
       include ::Pipedrive::Utils
 
-      # This method smells of :reek:TooManyStatements but ignores them
-      def each(params = {})
+      def each(params = {}, &block)
         return to_enum(:each, params) unless block_given?
-        follow_pagination(:chunk, [], params) { |item| yield item }
+
+        follow_pagination(:chunk, [], params, &block)
       end
 
       def all(params = {})
@@ -18,6 +20,7 @@ def all(params = {})
       def chunk(params = {})
         res = make_api_call(:get, params)
         return [] unless res.success?
+
         res
       end
 

lib/pipedrive/operations/read.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   module Operations
     module Update
@@ -7,7 +9,8 @@ def update(*args)
         params = args.extract_options!
         params.symbolize_keys!
         id = params.delete(:id) || args[0]
-        fail 'id must be provided' unless id
+        raise 'id must be provided' unless id
+
         make_api_call(:put, id, params)
       end
     end

lib/pipedrive/operations/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class Organization < Base
     include ::Pipedrive::Operations::Read
@@ -6,12 +8,13 @@ class Organization < Base
     include ::Pipedrive::Operations::Delete
     include ::Pipedrive::Utils
 
-    def find_by_name(*args)
+    def find_by_name(*args, &block)
       params = args.extract_options!
       params[:term] ||= args[0]
-      fail 'term is missing' unless params[:term]
+      raise 'term is missing' unless params[:term]
       return to_enum(:find_by_name, params) unless block_given?
-      follow_pagination(:make_api_call, [:get, 'find'], params) { |item| yield item }
+
+      follow_pagination(:make_api_call, [:get, 'find'], params, &block)
     end
   end
 end

lib/pipedrive/organization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Pipedrive
   class OrganizationField < Base
     include ::Pipedrive::Operations::Read