sinatra-validation 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f97a8559e2ec07afa81d651f62678c47842d09b
-  data.tar.gz: b2fe39fbf25d859a68ae006f43f94ccb803ea356
+  metadata.gz: 3c6d73fb93ce10147af36e30aa8a529bc54f64ed
+  data.tar.gz: 23600a4dc99a57383bede5a0ac0eca8910c9b996
 SHA512:
-  metadata.gz: 5dc1fe1ce6fb7d6d8e00c3da2559b6294326f9b8b7c8287492ef4937218be8705a8a86288332257edc9de74cd8935e439137cfbb2c8eaa68061a5e6addd9cf83
-  data.tar.gz: 45eebe75d08e1d74266fca0ce7568ab64038a7658bf0f1ebf998b2c80cbeac6a169609eff1029f6ce0a0e56059fe3bc8a175c02e4254931d3a27a6a003cc3719
+  metadata.gz: d05baea6fe7d4d6ba0b9690e0b4827bf64ab0dc60a0cf3aa4f67e8ef3756d08f6b3869903f0eb8be216ed8fba6c75d59cd08677c6c2f9becc340d5d32caa66a9
+  data.tar.gz: 9cbed7f024c8ab78218fe4c14995e12ec4883c893296489cd7880d76c885586dc6d656dace9cbda66ff4a1dd608b16d2ba1381a6e1e2af5a92cd0b1287a0f801

data/.circleci/config.yml

@@ -4,7 +4,24 @@ jobs:
   build:
     docker:
       - image: circleci/ruby:2.4.4-jessie
+        environment:
+          BUNDLER_VERSION: 2.0.2
+
+    working_directory: ~/repo
+
     steps:
       - checkout
-      - run: bundle install
+
+      - run:
+          name: setup bundler 2
+          command: |
+            sudo gem update --system
+            sudo gem uninstall -ax bundler
+            sudo gem install bundler
+
+      - run: 
+          name: install deps
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
       - run: bundle exec rake spec

data/README.md

@@ -29,8 +29,10 @@ Now you can use `validates` helper in your routes. The validation logic itself i
 ```ruby
   get '/basic' do
     validates do
-      required("name").filled(:str?)
-      required("age").filled(:str?)
+      params do
+        required("name").filled(:str?)
+        required("age").filled(:str?)
+      end
     end
 
     ...
@@ -43,8 +45,10 @@ You can suppress the default behavior which `validates` helper halts with 400 wh
 ```ruby
   get '/silent' do
     result = validates silent: true do
-      required("name").filled(:str?)
-      required("age").filled(:str?)
+      params do
+        required("name").filled(:str?)
+        required("age").filled(:str?)
+      end
     end
 
     p result # <struct Sinatra::Validation::Result params={"name"=>"justine"}, messages=["age is missing"]>
@@ -59,10 +63,12 @@ By default, `validates` helper halts with 400, but if you set the option `raise`
   get '/raise' do
     begin
       validates raise: true do
-        required("name").filled(:str?)
+        params do
+          required("name").filled(:str?)
+        end
       end
-    rescue => exception
-      p exception # <Sinatra::Validation::InvalidParameterError: {:params=>{}, :messages=>["name is missing"]}>
+    rescue => e
+      p e.result # <Sinatra::Validation::InvalidParameterError: {:params=>{}, :messages=>["name is missing"]}>
     end
 
     ...
@@ -73,7 +79,7 @@ if you want to enable this option to all validations, you can do `enable :raise_
   enable :raise_sinatra_validation_exception
 
   error Sinatra::Validation::InvalidParameterError do
-    # do something
+    # do anything you want
   end
 ```
 

data/example/app.rb

@@ -9,7 +9,9 @@ class Application < Sinatra::Base
 
   get '/basic' do
     validates do
-      required('name').filled(:str?)
+      params do
+        required(:name).filled(:str?)
+      end
     end
 
     'ok'
@@ -19,22 +21,24 @@ class Application < Sinatra::Base
     content_type :json
 
     result = validates silent: true do
-      required('name').filled(:str?)
+      params do
+        required(:name).filled(:str?)
+      end
     end
 
-    p result
-
     'ok'
   end
 
   get '/raise' do
     begin
       validates raise: true do
-        required('name').filled(:str?)
+        params do
+          required(:name).filled(:str?)
+        end
       end
 
       'ok'
-    rescue Sinatra::Validation::InvalidParameterError
+    rescue Sinatra::Validation::InvalidParameterError => e
       halt 500, 'invalid'
     end
   end

data/lib/sinatra/validation.rb

@@ -4,33 +4,46 @@ require "dry-validation"
 module Sinatra
   module Validation
     class InvalidParameterError < StandardError
-      attr_accessor :params, :messages
+      attr_reader :result
+
+      def initialize(result) 
+        @result = result
+      end
     end
 
-    class Result < Struct.new("Result", :params, :messages)
+    class Result
+      attr_reader :params, :messages
+
+      def initialize(params)
+        @params = params
+      end
+
+      def with_message(errors)
+        @messages = errors.to_h.map { |key, message| "#{key.to_s} #{message.first}" }
+        self
+      end
     end
 
     module Helpers
       def validates(options = {}, &block)
-        schema = Dry::Validation.Schema(&block)
+        schema = Class.new(Dry::Validation::Contract, &block).new
         validation = schema.call(params)
+        result = Result.new(params).with_message(validation.errors)
 
-        if validation.success?
-          return Result.new(validation.output)
-        end
-
-        errors = validation.messages(full: true).values.flatten;
         if options[:silent] || settings.silent_validation
-          return Result.new(validation.output, errors)
+          return result
         end
 
-        raise InvalidParameterError.new(params: validation.output, messages: errors)
+        if validation.failure?
+          raise InvalidParameterError.new(result)
+        end
       rescue InvalidParameterError => exception
         if options[:raise] || settings.raise_sinatra_validation_exception
           raise exception
         end
 
-        error = exception.to_s
+        errors = exception.result.messages
+        error = errors.first
 
         if content_type && content_type.match(mime_type(:json))
           error = { errors: errors }.to_json

data/lib/sinatra/validation/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Validation
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/sinatra-validation.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sinatra', '~> 2.0.2'
-  spec.add_dependency 'dry-validation'
+  spec.add_dependency 'sinatra', '~> 2.0.7'
+  spec.add_dependency 'rack', '>= 2.0.6'
+  spec.add_dependency 'dry-validation', '~> 1.3'
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler", "~> 2.0.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rack-test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-validation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - IzumiSy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement