request_handler 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b3530f39b336a119b6c37b07c9e4a4cfef1033
-  data.tar.gz: b54120aaaf4c7934d4726b052405e7129a5cb68d
+  metadata.gz: 252b6dd26a2f9989d6bb8782a7cfec3c745db91d
+  data.tar.gz: 95efc2b338c327105d3bd1e6836c92848d1d51c8
 SHA512:
-  metadata.gz: 0da96498795ecef95acfa1b4136b580e77155755ed9db531fa5e172ee6a464698a7a9c7c5d496ad361b60d5473cbbdb0a148d4056c4c2ba236baa177a5ad95cc
-  data.tar.gz: 5226d3a8ba5d4dbb3dfff3cc354b644f03d176f3ba7f0084180072fde33a7f912e65ab713c74e8942292f48e1f2d9a8bd653ec53d15abd52b02e7ad7686f3706
+  metadata.gz: 348b442311e1f02780bb6e6207534dd00d23a614d443a384240fb1814853df6f996f59cad3eecd463a88763c732a16f4a1621e95a061068b6d058cebfbc56f65
+  data.tar.gz: 941fd8a4714ff60b793475125b0e74fe2187f669ca603cd2821f8bcbf59fa41191e41a32f3eb9189acbff46ed6bb3f0a4b4c2e6aaa882c50279b189208bd589a

data/.rubocop.yml

@@ -1,11 +1,14 @@
 # minitest specifics
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.1
 Metrics/LineLength:
   Max: 119
 Metrics/MethodLength:
   Exclude:
     - test/**/*
+Metrics/ClassLength:
+  Exclude:
+    - lib/request_handler/base.rb
 Style/ClassAndModuleChildren:
   Exclude:
     - test/**/*

data/.travis.yml

@@ -1,10 +1,36 @@
-sudo: false
 language: ruby
 cache: bundler
-jdk:
-  - oraclejdk8
 rvm:
+  - 2.1.10
+  - 2.2.6
   - 2.3.3
   - 2.4.0
-  - jruby-9.1.6.0
-before_install: gem install bundler -v 1.13.6
+  - jruby-9.1.7.0
+jdk:
+  - oraclejdk8
+env:
+  - "JRUBY_OPTS='--dev --debug'"
+  - "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+matrix:
+  exclude:
+    - rvm: 2.1.10
+      jdk: oraclejdk8
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+    - rvm: 2.2.6
+      jdk: oraclejdk8
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+    - rvm: 2.3.3
+      jdk: oraclejdk8
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+    - rvm: 2.4.0
+      jdk: oraclejdk8
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+  allow_failures:
+    - rvm: jruby-9.1.7.0
+      jdk: oraclejdk8
+      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
+before_install:
+  - gem update --system
+  - gem install bundler -v 1.13.6
+before_script:
+  - bundle exec danger

data/CHANGELOG.md

@@ -3,6 +3,14 @@ Changelog
 
 ## master
 
+## 0.10.0
+
+- raise an error if mandatory options are missing in the handler configuration
+- Transform param keys to string before substitution
+- make gem compatible with ruby 2.1
+- add danger
+- raise an ExternalArgumentError if the body does not contain data
+
 ## 0.9.1
 
 - fix configure method

data/Dangerfile

@@ -0,0 +1,26 @@
+# --------------------------------------------------------------------------------------------------------------------
+# Has any changes happened inside the actual library code?
+# --------------------------------------------------------------------------------------------------------------------
+has_app_changes = !git.modified_files.grep(/lib/).empty?
+has_test_changes = !git.modified_files.grep(/spec/).empty?
+is_version_bump = git.modified_files.sort == ["CHANGELOG.md", "lib/request_handler/version.rb"].sort
+
+if has_app_changes && !has_test_changes && !is_version_bump
+  warn("Tests were not updated. That's OK if you're refactoring existing code.", sticky: false)
+end
+
+if !git.modified_files.include?("CHANGELOG.md") && has_app_changes
+  fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/request_handler/request_handler/blob/master/CHANGELOG.md).")
+  message "Note, we hard-wrap at 80 chars and use 2 spaces after the last line."
+end
+
+# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
+warn("PR is classed as Work in Progress") if github.pr_title.include? "WIP"
+
+# Warn when there is a big PR
+warn("Big PR") if git.lines_of_code > 500
+
+commit_lint.check warn: :all, disable: [:subject_cap]
+
+# rubocop
+rubocop.lint "*"

data/Gemfile

@@ -3,3 +3,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dry-request_handler.gemspec
 gemspec
+
+group :development, :test do
+  gem 'danger'
+  gem 'danger-commit_lint'
+  gem 'danger-rubocop'
+end

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/request_handler.svg)](https://badge.fury.io/rb/request_handler)
 [![Build Status](https://travis-ci.org/runtastic/request_handler.svg?branch=master)](https://travis-ci.org/runtastic/request_handler)
-[![Code Climate](https://codeclimate.com/github/runtastic/request_handler/badges/gpa.svg)](https://codeclimate.com/github/runtastic/request_handler)
 [![codecov](https://codecov.io/gh/runtastic/request_handler/branch/master/graph/badge.svg)](https://codecov.io/gh/runtastic/request_handler)
 
 This gem allows easy and dry handling of requests based on the dry-validation

data/lib/request_handler/base.rb

@@ -35,7 +35,7 @@ module RequestHandler
     def page_params
       @page_params ||= PageParser.new(
         params:      params,
-        page_config: config.lookup!('page')
+        page_config: lookup!('page')
       ).run
     end
 
@@ -71,9 +71,9 @@ module RequestHandler
       defaults = fetch_defaults('filter.defaults', {})
       defaults.merge(FilterParser.new(
         params:                params,
-        schema:                config.lookup!('filter.schema'),
-        additional_url_filter: config.lookup!('filter.additional_url_filter'),
-        schema_options:        execute_options(config.lookup!('filter.options'))
+        schema:                lookup!('filter.schema'),
+        additional_url_filter: lookup('filter.additional_url_filter'),
+        schema_options:        execute_options(lookup('filter.options'))
       ).run)
     end
 
@@ -89,7 +89,7 @@ module RequestHandler
       defaults = fetch_defaults("#{type}.defaults", [])
       result = parser.new(
         params:               params,
-        allowed_options_type: config.lookup!("#{type}.allowed")
+        allowed_options_type: lookup!("#{type}.allowed")
       ).run
       result.empty? ? defaults : result
     end
@@ -98,19 +98,19 @@ module RequestHandler
       defaults = fetch_defaults('body.defaults', {})
       defaults.merge(BodyParser.new(
         request:        request,
-        schema:         config.lookup!('body.schema'),
-        schema_options: execute_options(config.lookup!('body.options'))
+        schema:         lookup!('body.schema'),
+        schema_options: execute_options(lookup('body.options'))
       ).run)
     end
 
     def parse_fieldsets_params
       FieldsetsParser.new(params:   params,
-                          allowed:  config.lookup!('fieldsets.allowed'),
-                          required: config.lookup!('fieldsets.required')).run
+                          allowed:  lookup!('fieldsets.allowed'),
+                          required: lookup!('fieldsets.required')).run
     end
 
     def fetch_defaults(key, default)
-      value = config.lookup!(key)
+      value = lookup(key)
       return default if value.nil?
       return value unless value.respond_to?(:call)
       value.call(request)
@@ -122,10 +122,22 @@ module RequestHandler
       options.call(self, request)
     end
 
+    def lookup!(key)
+      config.lookup!(key).tap do |data|
+        raise NoConfigAvailableError, key.to_sym => 'is not configured' if data.nil?
+      end
+    end
+
+    def lookup(key)
+      config.lookup!(key)
+    end
+
     def params
       raise MissingArgumentError, params: 'is missing' if request.params.nil?
       raise ExternalArgumentError, params: 'must be a Hash' unless request.params.is_a?(Hash)
-      @params ||= Helper.deep_transform_keys_in_object(request.params) { |k| k.gsub('.', ::RequestHandler.separator) }
+      @params ||= Helper.deep_transform_keys_in_object(request.params) do |k|
+        k.to_s.gsub('.', ::RequestHandler.separator)
+      end
     end
 
     def config

data/lib/request_handler/body_parser.rb

@@ -4,7 +4,7 @@ require 'request_handler/error'
 module RequestHandler
   class BodyParser < SchemaParser
     def initialize(request:, schema:, schema_options: {})
-      raise MissingArgumentError, "request.body": 'is missing' if request.body.nil?
+      raise MissingArgumentError, :"request.body" => 'is missing' if request.body.nil?
       super(schema: schema, schema_options: schema_options)
       @request = request
     end
@@ -16,7 +16,9 @@ module RequestHandler
     private
 
     def flattened_request_body
-      body = request_body['data']
+      body = request_body.fetch('data') do
+        raise ExternalArgumentError, body: 'must contain data'
+      end
       body.merge!(body.delete('attributes') { {} })
       relationships = flatten_relationship_resource_linkages(body.delete('relationships') { {} })
       body.merge!(relationships)

data/lib/request_handler/fieldsets_parser.rb

@@ -45,12 +45,12 @@ module RequestHandler
     end
 
     def raise_invalid_field_option(type)
-      return if allowed&.key?(type)
+      return if allowed.key?(type)
       raise OptionNotAllowedError, fieldsets: "fieldsets for type: #{type} not allowed"
     end
 
     def raise_missing_fields_param
-      return if required.nil? || required.empty?
+      return if required.empty?
       raise ExternalArgumentError, fieldsets: 'missing required fields options'
     end
 

data/lib/request_handler/include_option_parser.rb

@@ -14,7 +14,7 @@ module RequestHandler
       options.map do |option|
         option.gsub!('.', ::RequestHandler.separator)
         begin
-          allowed_options_type&.call(option).to_sym
+          allowed_options_type.call(option).to_sym
         rescue Dry::Types::ConstraintError
           raise OptionNotAllowedError, option.to_sym => 'is not an allowed include option'
         end

data/lib/request_handler/page_parser.rb

@@ -51,7 +51,7 @@ module RequestHandler
     def fetch_and_check_default_size(prefix)
       default_size = lookup_nested_config_key('default_size', prefix)
       raise_no_default_size(prefix) if default_size.nil?
-      raise_not_positive(prefix, 'size') unless default_size.is_a?(Integer) && default_size.positive?
+      raise_not_positive(prefix, 'size') unless default_size.is_a?(Integer) && default_size > 0
       default_size
     end
 
@@ -64,7 +64,7 @@ module RequestHandler
 
     def check_int(string:, error_msg:)
       output = Integer(string)
-      raise ExternalArgumentError, error_msg unless output.positive?
+      raise ExternalArgumentError, error_msg unless output > 0
       output
     rescue ArgumentError
       raise ExternalArgumentError, error_msg

data/lib/request_handler/schema_parser.rb

@@ -6,7 +6,7 @@ module RequestHandler
       missing_arguments = []
       missing_arguments << { schema: 'is missing' } if schema.nil?
       missing_arguments << { schema_options: 'is missing' } if schema_options.nil?
-      raise MissingArgumentError, missing_arguments if missing_arguments.length.positive?
+      raise MissingArgumentError, missing_arguments unless missing_arguments.empty?
       raise InternalArgumentError, schema: 'must be a Schema' unless schema.is_a?(Dry::Validation::Schema)
       @schema = schema
       @schema_options = schema_options

data/lib/request_handler/sort_option_parser.rb

@@ -35,7 +35,7 @@ module RequestHandler
     end
 
     def allowed_option(name)
-      allowed_options_type&.call(name)
+      allowed_options_type.call(name)
     rescue Dry::Types::ConstraintError
       raise OptionNotAllowedError, name.to_sym => 'is not an allowed sort option'
     end

data/lib/request_handler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RequestHandler
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'.freeze
 end

data/request_handler.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'shared base for request_handler using dry-* gems'
   spec.homepage      = 'https://github.com/runtastic/request_handler'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '~> 2.3'
+  spec.required_ruby_version = '~> 2.1'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_handler
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Andreas Eger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -220,6 +220,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -256,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="