lhs 15.3.1 → 15.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2605f457afa3bd87e021820937032e07a5818c4
-  data.tar.gz: eda107a74f9eae56ce91be8fc245896ddec4abd8
+  metadata.gz: 8010781e2fd91ba9ecac88aaf5894da86f1eeed4
+  data.tar.gz: c6d867261dd21b0092e028d2c575d35750eefd17
 SHA512:
-  metadata.gz: cde3a3e444e3917500d2e96a499deb3ac10d1d27292b8eaf455e7a9325d352ee7b6fc9a4b227d28f18fd8c6385cb377607a77edb717e845b3a1689672c85cecf
-  data.tar.gz: 12eeec0f97d72f5e451beb48727faa70b548b25297189a8b10a24644f80a5a491274a7c71b5d89d95eeb35d40b8cf084f0a7398e9c1b161a6f08ce6d95fb6008
+  metadata.gz: 22e05d07613f147ee2bf14955af07ea1f1f36307b7c0880c6d6e143514631f40f9fcddd2c7054ad0c72c6ed084c7260930e57123ff859f829f737dc53fc13113
+  data.tar.gz: 2fb6114404ce5fa4e089814bfd72c0b9283531c29b1aee6f04c9ced7f701a333de2db9311c514da621a0421de7e6fae9f591043b1619bfeed5e22a4ad3b1bf2b

data/.rubocop.localch.yml

@@ -1,30 +1,41 @@
 # This is master rubocop configuration.
 # DO NOT EDIT THIS FILE - it WILL be overwriten on every config update
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   DisplayStyleGuide: true
-  Include:
-    - '**/Rakefile'
-    - '**/config.ru'
-    - '**/Capfile'
   Exclude:
     - 'db/**/*'
     - 'script/**/*'
     - 'vendor/bundle/**/*'
+    - 'vendor/assets/**/*'
     - 'bin/**/*'
     - 'config/unicorn.rb'
     - 'config/compass.rb'
     - 'Rakefile'
-    - 'Gemfile'
+    - 'app/controllers/error_trap_controller.rb'
+    - 'app/controllers/hsts_controller.rb'
+    - 'spec/lib/util_spec.rb'
 
 Rails:
   Enabled: true
 
+require:
+  - rubocop-rspec
+
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/HandleExceptions:
   Exclude:
     - spec/**/*
 
+Lint/UriEscapeUnescape:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 
@@ -46,6 +57,9 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ParameterLists:
   Enabled: false
 
@@ -70,9 +84,39 @@ Performance/RedundantMerge:
 Performance/Casecmp:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/DotPosition:
+  EnforcedStyle: leading
+
+Layout/AlignParameters:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
+Layout/MultilineMethodCallBraceLayout:
+  EnforcedStyle: symmetrical
+
+Layout/EmptyLinesAroundBlockBody:
+  EnforcedStyle: no_empty_lines
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/MultilineArrayBraceLayout:
+  EnforcedStyle: symmetrical
+
+Layout/MultilineHashBraceLayout:
+  EnforcedStyle: symmetrical
+
 Style/StringLiterals:
   Enabled: false
 
@@ -80,21 +124,12 @@ Style/RegexpLiteral:
   Exclude:
     - spec/**/*
 
-Style/DotPosition:
-  EnforcedStyle: leading
-
-Style/AlignParameters:
-  Enabled: false
-
 Style/NumericLiterals:
   Enabled: false
 
 Style/WordArray:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
 Style/Next:
   Enabled: false
 
@@ -153,7 +188,7 @@ Style/Documentation:
 Style/GuardClause:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - spec/support/pages/**/*
 
@@ -166,11 +201,50 @@ Style/MutableConstant:
 Style/ConditionalAssignment:
   Enabled: false
 
-Style/IndentArray:
-  EnforcedStyle: consistent
+Style/Lambda:
+  Enabled: false
 
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: ruby19
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses_when_complex
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/RegexpLiteral:
+  AllowInnerSlashes: false
+
+Style/BlockComments:
+  Enabled: false
+
+Style/RedundantParentheses:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - Gemfile
+    - Brewfile
+    - Guardfile
+
+Style/NumericPredicate:
+  Enabled: false
 
 RSpec/DescribeClass:
   Exclude:
@@ -182,7 +256,70 @@ RSpec/DescribeClass:
 RSpec/FilePath:
   Enabled: false
 
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/HookArgument:
+  EnforcedStyle: implicit
+
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+RSpec/NestedGroups:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/LeadingSubject:
+  Enabled: false
+
+RSpec/ExpectInHook:
+  Enabled: false
+
+RSpec/ReturnFromStub:
+  Enabled: false
+
+RSpec/SubjectStub:
+  Enabled: false
+
+RSpec/EmptyLineAfterSubject:
+  Enabled: false
+
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/ImplicitExpect:
+  EnforcedStyle: is_expected
+
+RSpec/ScatteredLet:
+  Enabled: false
+
+RSpec/ContextWording:
+  Enabled: false
+
 Rails/Output:
   Exclude:
     - 'config/application.rb'
     - 'config/initializers/asset_manifest_warning.rb'
+
+Rails/DynamicFindBy:
+  Enabled: false
+
+Rails/Presence:
+  Enabled: false
+
+Capybara/CurrentPathExpectation:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false

data/.rubocop.yml

@@ -15,7 +15,10 @@ RSpec/DescribedClass:
 RSpec/AnyInstance:
   Enabled: false
 
-Style/MethodMissing:
+Style/MethodMissingSuper:
+  Enabled: false
+
+Style/MissingRespondToMissing:
   Enabled: false
 
 Rails/OutputSafety:
@@ -26,11 +29,11 @@ Style/SignalException:
 
 Rails/DynamicFindBy:
   Enabled: false
-  
+
 Metrics/BlockLength:
   Enabled: false
 
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
 RSpec/MultipleExpectations:
@@ -38,3 +41,6 @@ RSpec/MultipleExpectations:
 
 Naming/PredicateName:
   Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false

data/lhs.gemspec

@@ -1,4 +1,4 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "lhs/version"
@@ -20,18 +20,19 @@ Gem::Specification.new do |s|
   s.requirements << 'Ruby >= 2.3.0'
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'lhc', '~> 9.2'
-  s.add_dependency 'activesupport', '> 4.2'
   s.add_dependency 'activemodel'
+  s.add_dependency 'activesupport', '> 4.2'
+  s.add_dependency 'lhc', '~> 9.2'
 
-  s.add_development_dependency 'rspec-rails', '>= 3.7.0'
-  s.add_development_dependency 'rails', '>= 4.0.0'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'rubocop', '~> 0.47.0'
   s.add_development_dependency 'json', '>=  1.8.2'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'rails', '>= 4.0.0'
+  s.add_development_dependency 'rspec-rails', '>= 3.7.0'
+  s.add_development_dependency 'rubocop', '~> 0.57.1'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.26.0'
+  s.add_development_dependency 'webmock'
 
   s.license = 'GPL-3'
 end

data/lib/lhs/complex.rb

@@ -91,7 +91,7 @@ class LHS::Complex
     end
 
     # add it to the array if there was no hash to merge it
-    data.push(other) if !data.any? { |element| element.data.is_a?(Hash) }
+    data.push(other) if data.none? { |element| element.data.is_a?(Hash) }
   end
 
   def merge_into_hash!(other)

data/lib/lhs/concerns/autoload_records.rb

@@ -26,7 +26,7 @@ module AutoloadRecords
         end
 
         def self.require_records
-          Dir.glob(Rails.root.join('app/models/**/*.rb')).each do |file|
+          Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
             require_dependency file if File.read(file).match('LHS::Record')
           end
         end

data/lib/lhs/concerns/collection/handle_nested.rb

@@ -34,7 +34,7 @@ class LHS::Collection < LHS::Proxy
       # Takes configured items key to access collection of items
       # of falls back to the default key
       def items_key(record)
-        record && record.items_key || LHS::Record.items_key
+        record&.items_key || LHS::Record.items_key
       end
     end
   end

data/lib/lhs/concerns/inspect.rb

@@ -30,7 +30,7 @@ module LHS
       current = self
       path = []
       _collect_parents_for_inspect!(path, current)
-      return unless path.present?
+      return if path.blank?
       "> #{path.reverse.join(' > ')}"
     end
 

data/lib/lhs/concerns/item/validation.rb

@@ -31,7 +31,7 @@ class LHS::Item < LHS::Proxy
     end
 
     def merge_validation_params!(endpoint)
-      validates_params = endpoint.options[:validates].select { |key, _| key.to_sym != :path }
+      validates_params = endpoint.options[:validates].reject { |key, _| key.to_sym == :path }
       params = endpoint.options.fetch(:params, {}).merge(params_from_link)
       params = params.merge(validates_params) if validates_params.is_a?(Hash)
       params
@@ -52,7 +52,7 @@ class LHS::Item < LHS::Proxy
     def validation_endpoint
       endpoint = endpoint_from_link if _data.href # take embeded first
       endpoint ||= record.find_endpoint(_data._raw)
-      validates = endpoint.options && endpoint.options.fetch(:validates, false)
+      validates = endpoint.options&.fetch(:validates, false)
       raise 'Endpoint does not support validations!' unless validates
       endpoint
     end

data/lib/lhs/concerns/proxy/accessors.rb

@@ -73,7 +73,7 @@ class LHS::Proxy
     def wrap_return(value, record, name, args = nil)
       name = args.first if name == :[]
       return value unless worth_wrapping?(value)
-      data = value.is_a?(LHS::Data) || value.is_a?(LHS::Record) ? value : LHS::Data.new(value, _data)
+      data = (value.is_a?(LHS::Data) || value.is_a?(LHS::Record)) ? value : LHS::Data.new(value, _data)
       data.errors = LHS::Problems::Nested::Errors.new(errors, name) if errors.any?
       data.warnings = LHS::Problems::Nested::Warnings.new(warnings, name) if warnings.any?
       return record.new(data) if record && !value.is_a?(LHS::Record)

data/lib/lhs/concerns/proxy/problems.rb

@@ -14,7 +14,7 @@ class LHS::Proxy
     end
 
     def errors
-      response = _raw.present? && _raw.is_a?(Hash) && _raw[:field_errors] ? OpenStruct.new(body: _raw.to_json) : nil
+      response = (_raw.present? && _raw.is_a?(Hash) && _raw[:field_errors]) ? OpenStruct.new(body: _raw.to_json) : nil
       @errors ||= LHS::Problems::Errors.new(response, record)
     end
 

data/lib/lhs/concerns/record/chainable.rb

@@ -140,7 +140,7 @@ class LHS::Record
       attr_accessor :_links
 
       def self.unfold(args)
-        args.size == 1 ? args[0] : args
+        (args.size == 1) ? args[0] : args
       end
 
       def initialize(record_class, link, record = nil)

data/lib/lhs/concerns/record/endpoints.rb

@@ -71,8 +71,8 @@ class LHS::Record
       private
 
       def validates_deprecation_check!(options)
-        return unless options.present?
-        return unless options[:validates].present?
+        return if options.blank?
+        return if options[:validates].blank?
         return if options[:validates].is_a?(Hash)
         return if !options[:validates].is_a?(TrueClass) && options[:validates].match(%r{^\/})
         raise 'Validates with either true or a simple string is deprecated! See here: https://github.com/local-ch/lhs#validation'

data/lib/lhs/concerns/record/model.rb

@@ -11,7 +11,7 @@ class LHS::Record
     end
 
     def persisted?
-      !href.blank?
+      href.present?
     end
 
     included do

data/lib/lhs/concerns/record/request.rb

@@ -54,7 +54,7 @@ class LHS::Record
       end
 
       def convert_options_to_endpoint(options)
-        return unless options.present?
+        return if options.blank?
         url = options[:url]
         endpoint = LHS::Endpoint.for_url(url)
         return unless endpoint
@@ -70,7 +70,7 @@ class LHS::Record
       # and return them as a ruby hash
       def values_from_get_params(url, options)
         uri = parse_uri(url, options)
-        return {} unless uri.query.present?
+        return {} if uri.query.blank?
         params = Rack::Utils.parse_nested_query(uri.query)
         params
       end
@@ -401,7 +401,7 @@ class LHS::Record
 
       def multiple_requests(options)
         options = options.map do |option|
-          next unless option.present?
+          next if option.blank?
           process_options(option, find_endpoint(option[:params], option.fetch(:url, nil)))
         end
         data = LHC.request(options.compact).map do |response|
@@ -461,12 +461,12 @@ class LHS::Record
         ignored_errors = options[:ignored_errors]
         options = options.deep_dup
         options[:ignored_errors] = ignored_errors if ignored_errors.present?
-        options[:params].deep_symbolize_keys! if options[:params]
+        options[:params]&.deep_symbolize_keys!
         options[:error_handler] = merge_error_handlers(options[:error_handler]) if options[:error_handler]
         options = (endpoint.options || {}).deep_merge(options)
         options[:url] = compute_url!(options[:params]) unless options.key?(:url)
         merge_explicit_params!(options[:params])
-        options.delete(:params) if options[:params] && options[:params].empty?
+        options.delete(:params) if options[:params]&.empty?
         inject_request_cycle_cache!(options)
         options
       end