request_handler 1.1.0 → 2.1.1

data/lib/request_handler/validation/definition_engine.rb

@@ -0,0 +1,35 @@
+require_relative 'errors'
+require_relative 'engine'
+require_relative 'result'
+require 'active_support/core_ext/hash/keys'
+
+module RequestHandler
+  module Validation
+    class DefinitionEngine < Engine
+      def self.valid_schema?(definition)
+        definition.is_a?(::Definition::Types::Base)
+      end
+
+      def self.validate(value, schema, options: {}) # rubocop:disable Lint/UnusedMethodArgument
+        value = value.deep_symbolize_keys if value.is_a?(Hash)
+        result = schema.conform(value)
+        Result.new(output: result.value, errors: result.error_hash)
+      end
+
+      def self.validate!(value, schema, options: {})
+        validate(value, schema, options).tap do |result|
+          valid = result.respond_to?(:valid?) ? result.valid? : result.success?
+          raise Validation::Error unless valid
+        end
+      end
+
+      def self.error_message(validation_error)
+        validation_error.message
+      end
+
+      def self.error_pointer(validation_error)
+        validation_error.error_path.join('/')
+      end
+    end
+  end
+end

data/lib/request_handler/validation/dry_engine.rb

@@ -0,0 +1,58 @@
+require_relative 'errors'
+require_relative 'engine'
+require_relative 'result'
+require 'active_support/core_ext/hash/keys'
+
+module RequestHandler
+  module Validation
+    class DryEngine < Engine
+      def self.valid_schema?(schema)
+        schema_instance?(schema) || schema_class?(schema)
+      end
+
+      def self.validate(value, schema, options: {})
+        value = value.deep_symbolize_keys if value.is_a?(Hash)
+        to_result(call_schema(value, schema, options))
+      rescue Dry::Types::ConstraintError => e
+        Result.new(output: nil, errors: { '' => e })
+      end
+
+      def self.call_schema(value, schema, options)
+        if options.empty?
+          schema_instance?(schema) ? schema.call(value) : schema.new.call(value)
+        else
+          schema_instance?(schema) ? schema.with(options).call(value) : schema.new(options).call(value)
+        end
+      end
+
+      def self.schema_instance?(schema)
+        schema.respond_to?(:call)
+      end
+
+      def self.schema_class?(schema)
+        schema.respond_to?(:schema)
+      end
+
+      def self.validate!(value, schema, options: {})
+        validate(value, schema, options).tap do |result|
+          valid = result.respond_to?(:valid?) ? result.valid? : result.success?
+          raise Validation::Error unless valid
+        end
+      end
+
+      def self.to_result(result)
+        output = result.respond_to?(:to_h) ? result.to_h : result
+        errors = result.respond_to?(:errors) ? result.errors.to_h : {}
+        Result.new(output: output, errors: errors)
+      end
+
+      def self.error_message(validation_error)
+        validation_error
+      end
+
+      def self.error_pointer(_validation_error)
+        nil
+      end
+    end
+  end
+end

data/lib/request_handler/validation/engine.rb

@@ -0,0 +1,32 @@
+
+require_relative 'errors'
+
+module RequestHandler
+  module Validation
+    class Engine
+      def self.valid_schema?(_schema)
+        raise NotImplementedError
+      end
+
+      def self.validate(_value, _schema, options: {}) # rubocop:disable Lint/UnusedMethodArgument
+        raise NotImplementedError
+      end
+
+      def self.validate!(_value, _schema, options: {}) # rubocop:disable Lint/UnusedMethodArgument
+        raise NotImplementedError
+      end
+
+      def self.error_message(_validation_error)
+        raise NotImplementedError
+      end
+
+      def self.error_pointer(_validation_error)
+        raise NotImplementedError
+      end
+
+      private
+
+      attr_accessor :value, :schema, :options
+    end
+  end
+end

data/lib/request_handler/validation/errors.rb

@@ -0,0 +1,5 @@
+module RequestHandler
+  module Validation
+    class Error < StandardError; end
+  end
+end

data/lib/request_handler/validation/result.rb

@@ -0,0 +1,17 @@
+
+module RequestHandler
+  module Validation
+    class Result
+      attr_accessor :errors, :output
+
+      def initialize(errors:, output:)
+        self.errors = errors
+        self.output = output
+      end
+
+      def valid?
+        errors.empty?
+      end
+    end
+  end
+end

data/lib/request_handler/version.rb

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

data/request_handler.gemspec

@@ -7,14 +7,14 @@ require 'request_handler/version'
 Gem::Specification.new do |spec|
   spec.name          = 'request_handler'
   spec.version       = RequestHandler::VERSION
-  spec.authors       = ['Andreas Eger', 'Raphael Hetzel']
-  spec.email         = ['andreas.eger@runtastic.com', 'raphael.hetzel@runtastic.com']
+  spec.authors       = ['Andreas Eger', 'Dominik Goltermann']
+  spec.email         = ['andreas.eger@runtastic.com', 'dominik.goltermann@runtastic.com']
 
   spec.summary       = 'shared base for request_handler using dry-* gems'
   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.2'
+  spec.required_ruby_version = '~> 2.4'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -23,13 +23,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dry-validation', '~> 0.11', '>= 0.11.0'
-  spec.add_dependency 'dry-types', '~> 0.11', '>= 0.11.0'
-
-  spec.add_dependency 'confstruct', '~> 1.0.2'
+  spec.add_dependency 'docile', '~> 1.3'
   spec.add_dependency 'multi_json', '~> 1.12'
+  spec.add_dependency 'activesupport', '> 4.0'
+  spec.add_dependency 'gem_config', '~> 0.3 '
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'fuubar', '~> 2.2'
@@ -44,4 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop'
 
   spec.add_development_dependency 'rack'
+
+  spec.add_development_dependency 'definition', '~> 0.5'
 end

metadata

@@ -1,98 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: request_handler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andreas Eger
-- Raphael Hetzel
-autorequire: 
+- Dominik Goltermann
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: confstruct
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -247,23 +235,38 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: definition
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: shared base for request_handler using dry-* gems
 email:
 - andreas.eger@runtastic.com
-- raphael.hetzel@runtastic.com
+- dominik.goltermann@runtastic.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Dangerfile
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/ci
@@ -271,7 +274,24 @@ files:
 - bin/setup
 - lib/request_handler.rb
 - lib/request_handler/base.rb
+- lib/request_handler/base_parser.rb
 - lib/request_handler/body_parser.rb
+- lib/request_handler/builder/base.rb
+- lib/request_handler/builder/body_builder.rb
+- lib/request_handler/builder/fieldsets_builder.rb
+- lib/request_handler/builder/fieldsets_resource_builder.rb
+- lib/request_handler/builder/filter_builder.rb
+- lib/request_handler/builder/headers_builder.rb
+- lib/request_handler/builder/include_options_builder.rb
+- lib/request_handler/builder/multipart_builder.rb
+- lib/request_handler/builder/multipart_resource_builder.rb
+- lib/request_handler/builder/options_builder.rb
+- lib/request_handler/builder/page_builder.rb
+- lib/request_handler/builder/page_resource_builder.rb
+- lib/request_handler/builder/query_builder.rb
+- lib/request_handler/builder/sort_options_builder.rb
+- lib/request_handler/concerns/config_helper.rb
+- lib/request_handler/config.rb
 - lib/request_handler/document_parser.rb
 - lib/request_handler/error.rb
 - lib/request_handler/fieldsets_parser.rb
@@ -288,13 +308,18 @@ files:
 - lib/request_handler/schema_parser.rb
 - lib/request_handler/sort_option.rb
 - lib/request_handler/sort_option_parser.rb
+- lib/request_handler/validation/definition_engine.rb
+- lib/request_handler/validation/dry_engine.rb
+- lib/request_handler/validation/engine.rb
+- lib/request_handler/validation/errors.rb
+- lib/request_handler/validation/result.rb
 - lib/request_handler/version.rb
 - request_handler.gemspec
 homepage: https://github.com/runtastic/request_handler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -302,16 +327,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: shared base for request_handler using dry-* gems
 test_files: []

data/.travis.yml

@@ -1,40 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - jruby-9.1.17.0
-  - jruby-9.2.0.0
-jdk:
-  - oraclejdk8
-env:
-  - "JRUBY_OPTS='--dev --debug'"
-  - "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-matrix:
-  exclude:
-    - rvm: 2.2.10
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.3.7
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.4.4
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.5.1
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-  allow_failures:
-    - rvm: jruby-9.1.17.0
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: jruby-9.2.0.0
-      jdk: oraclejdk8
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-before_install:
-  - gem update --system
-  - gem install bundler -v 1.16.2
-before_script:
-  - bundle exec danger