sinatra-validation 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a3b4d0dc2f17aabdeda813e847a8f0a6c36a0c7012aea5a84180d268a13269
-  data.tar.gz: c3a8eeef5e8cd2c20d359a742024293b5c8866a8a9574115150e73566446555b
+  metadata.gz: e6a851a8606cd5ce9ac0f3134b79baea64e2ec1e19f5465c2d286ad1f0bd29b9
+  data.tar.gz: c2eabc80d34f383250e49d8d677205da9232b9b235713c38b998e36de47e7253
 SHA512:
-  metadata.gz: 03dfa9b1447d46cdd6dceeefab0eacde3238bbe1972d49b4093457ad196bd1f5073046761f461a85c895d95ca0c8ec0863bb53058e0ab06b064fd95726e2105d
-  data.tar.gz: 673c1b8c9ba84a068e4b6473cc483f06f195e935185999d6de67d565736372b994557b43677ba0f01c59ca2fe3c28b9a93a0de46dc916d8eb14d5002b344b9ec
+  metadata.gz: 19a7e50006a9117db3edcc5bb245e6da91aee562b2c8d617be856e73add4ff090863765e8621ec5b0fa61df36b12181421c0c3d7ab5bd6554a4f0c019b7457f2
+  data.tar.gz: a47a509e600fadecc6f8c6689bbc4516e32b71e297a58cde4139fa3b49df44c521cbd83f6c3cd1bd1bb3cdd29d165134fc0d55ec53d95b8e5f967941f680af24

data/.circleci/config.yml

@@ -3,18 +3,18 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.6.6
+      - image: ruby:3.3.0
 
     working_directory: ~/repo
 
     steps:
       - checkout
-      - run: 
+      - run:
           name: install deps
           command: |
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
-      - run: 
+      - run:
           name: run tests
           command: |
             bundle exec rake spec

data/.gitignore

@@ -6,6 +6,7 @@
 /doc/
 /pkg/
 /spec/reports/
+/vendor/
 /tmp/
 
 # rspec failure tracking

data/.ruby-version

@@ -0,0 +1 @@
+3.3.3

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.6.6'
+ruby '3.3.3'
 
 # Specify your gem's dependencies in sinatra-validation.gemspec
 gemspec

data/README.md

@@ -89,6 +89,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Test
+
+```bash
+$ bundle install
+$ rake
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/IzumiSy/sinatra-validation. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/example/Gemfile.lock

@@ -1,65 +1,57 @@
 PATH
-  remote: /Users/seiya/Devs/sinatra-validation
+  remote: /Users/izumi/Devs/sinatra-validation
   specs:
-    sinatra-validation (0.3.0)
+    sinatra-validation (0.3.2)
       dry-validation (~> 1.3)
       rack (>= 2.0.6)
-      sinatra (~> 2.0.7)
+      sinatra (~> 2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.6)
-    dry-configurable (0.11.5)
+    concurrent-ruby (1.1.9)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.3)
-    dry-logic (1.0.6)
+    dry-inflector (0.2.1)
+    dry-initializer (3.0.4)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-schema (1.5.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (1.8.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
-      dry-types (~> 1.4)
-    dry-types (1.4.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.5.0)
+    dry-validation (1.7.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.5)
+      dry-schema (~> 1.8, >= 1.8.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    rack (2.2.2)
-    rack-contrib (2.2.0)
-      rack (~> 2.0)
-    rack-protection (2.0.8.1)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    ruby2_keywords (0.0.2)
-    sinatra (2.0.8.1)
+    ruby2_keywords (0.0.5)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     tilt (2.0.10)
 
@@ -67,12 +59,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rack-contrib
   sinatra
   sinatra-validation!
 
-RUBY VERSION
-   ruby 2.6.6p146
-
 BUNDLED WITH
    1.17.2

data/example/app.rb

@@ -58,4 +58,36 @@ class Application < Sinatra::Base
       halt 500, 'invalid'
     end
   end
+
+  get '/rule/:value' do
+    validates do
+      params do
+        optional(:value).filled(:str?)
+      end
+      rule(:value) do
+        key.failure('Invalid param') unless value.match?(/^[a-z]+$/)
+      end
+    end
+
+    'ok'
+  end
+
+  get '/filter' do
+    validates filter_unpermitted_params: true do
+      params do
+        optional(:allowed).filled(:str?)
+      end
+    end
+    params.map{|k, v| "#{k}=#{v}"}.join(' ')
+  end
+
+  get '/result' do
+    result = validates do
+      params do
+        optional(:allowed).filled(:str?)
+      end
+    end
+    result.params.map{|k, v| "#{k}=#{v}"}.join(' ')
+  end
+
 end

data/lib/sinatra/validation/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Validation
-    VERSION = "0.3.1"
+    VERSION = '0.4.0'
   end
 end

data/lib/sinatra/validation.rb

@@ -28,7 +28,12 @@ module Sinatra
       def validates(options = {}, &block)
         schema = Class.new(Dry::Validation::Contract, &block).new
         validation = schema.call(params)
-        result = Result.new(params).with_message(validation.errors)
+        result = Result.new(Sinatra::IndifferentHash[validation.to_h])
+          .with_message(validation.errors)
+
+        if options[:filter_unpermitted_params] || settings.filter_unpermitted_params
+          params.replace validation.to_h
+        end
 
         if options[:silent] || settings.silent_validation
           return result
@@ -37,6 +42,8 @@ module Sinatra
         if validation.failure?
           raise InvalidParameterError.new(result)
         end
+
+        result
       rescue InvalidParameterError => exception
         if options[:raise] || settings.raise_sinatra_validation_exception
           raise exception
@@ -57,6 +64,7 @@ module Sinatra
       app.helpers Validation::Helpers
       app.set :silent_validation, false
       app.set :raise_sinatra_validation_exception, false
+      app.set :filter_unpermitted_params, false
     end
   end
 end

data/sinatra-validation.gemspec

@@ -21,12 +21,12 @@ 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.7'
-  spec.add_dependency 'rack', '>= 2.0.6'
-  spec.add_dependency 'dry-validation', '~> 1.3'
+  spec.add_dependency 'sinatra', '~> 4.0.0'
+  spec.add_dependency 'rack', '>= 3.0.9'
+  spec.add_dependency 'dry-validation', '~> 1.10'
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.1"
+  spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "rack-contrib"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-validation
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - IzumiSy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -150,7 +151,7 @@ homepage: https://github.com/IzumiSy/sinatra-validation
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: '"Sinatra extension for request parameter validation"'
 test_files: []