rack-json_schema 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e1bc0b3aeb691e9f03410743681b3aeb47636727
-  data.tar.gz: 78f4809fbaa6d7732b5ba700f464be4187ad6263
+SHA256:
+  metadata.gz: 70e38b4eab95187d2cea6df66ed016359ee63c41a6d799f0869be1afc98d3f43
+  data.tar.gz: 0a3c28a4c87c2f7bc919743ecfa4024c4b95a7f2af1eae69092bb3c8d6c883f8
 SHA512:
-  metadata.gz: 82933f6a328ccb1f7809880262f4f2119c19962c6830082ca188b768c995a55701f58f2e6f6d003c2522a3667d43f7eee91237bd844e4ccdc30da52733feb643
-  data.tar.gz: 694562757728e378acf77e615247bc480f51048b9f649eb4ccc9b503889a1a545d39ad5af3ce860cb485e390186ddcce14853dd55c35a97ccceac606b21da49d
+  metadata.gz: dd5955fe62d144704178caba3fbff9dcb890ea27d9f912e40b0008a3defd0a33db38a84eda83b97b3813add8dff77ce9efe5775be00813927c8b95da6ace0976
+  data.tar.gz: a4af6c165d5c466da9a1469e3f4e512c56850cdb96563f8a6354e3cd1cb94a62d1655c78e84d385d7956c0addc2a59178d4724a38c2ab968c7e61de8668492a2

data/.github/release.yml

@@ -0,0 +1,23 @@
+changelog:
+  categories:
+    - title: Added
+      labels:
+        - add
+    - title: Changed
+      labels:
+        - change
+    - title: Deprecated
+      labels:
+        - deprecate
+    - title: Fixed
+      labels:
+        - fix
+    - title: Removed
+      labels:
+        - remove
+    - title: Security
+      labels:
+        - security
+    - title: Others
+      labels:
+        - "*"

data/.github/workflows/bump-request.yml

@@ -0,0 +1,26 @@
+name: bump-request
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to change to.
+        required: true
+        type: string
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+      - uses: r7kamura/bump-request@v0
+        with:
+          command: |
+            sed -i -r 's/([0-9]+\.[0-9]+\.[0-9]+)/${{ inputs.version }}/' lib/rack/json_schema/version.rb
+            bundle install
+          version: ${{ inputs.version }}

data/.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '3.3'
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake

data/.github/workflows/github-label-sync.yml

@@ -0,0 +1,18 @@
+name: github-label-sync
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - .github/workflows/github-label-sync.yml
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: r7kamura/github-label-sync-action@v0
+        with:
+          source_path: labels-keepachangelog.yml
+          source_repository: r7kamura/github-label-presets

data/.github/workflows/release.yml

@@ -0,0 +1,14 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: softprops/action-gh-release@v1
+        with:
+          generate_release_notes: true

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.5.2
+- Fix bug on handling empty request body handling (e.g. GET)
+
 ## 1.5.1
 - Fix error when request body is an Array in JSON
 

data/README.md

@@ -1,4 +1,7 @@
-# Rack::JsonSchema [![Build Status](https://travis-ci.org/r7kamura/rack-json_schema.svg?branch=master)](https://travis-ci.org/r7kamura/rack-json_schema)
+# Rack::JsonSchema
+
+[![CI](https://github.com/r7kamura/rack-json_schema/actions/workflows/ci.yml/badge.svg)](https://github.com/r7kamura/rack-json_schema/actions/workflows/ci.yml)
+
 [JSON Schema](http://json-schema.org/) based Rack middlewares.
 
 * [Rack::JsonSchema::RequestValidation](#rackjsonschemarequestvalidation)
@@ -57,10 +60,10 @@ $ curl http://localhost:8080/apps -H "Content-Type: application/json" -d '{"name
 ```
 
 ### Rack::JsonSchema::ResponseValidation
-Validates request and raises errors below.
+Validates response and raises errors below.
 
-* Rack::JsonSchema::RequestValidation::InvalidResponseContentType
-* Rack::JsonSchema::RequestValidation::InvalidResponseType
+* Rack::JsonSchema::ResponseValidation::InvalidResponseContentType
+* Rack::JsonSchema::ResponseValidation::InvalidResponseType
 
 ```sh
 $ curl http://localhost:8080/apps

data/lib/rack/json_schema/base_request_handler.rb

@@ -3,8 +3,8 @@ module Rack
     # Base class for providing some utility methods to handle Rack env and JSON Schema
     class BaseRequestHandler
       # Utility wrapper method
-      def self.call(**args)
-        new(**args).call
+      def self.call(*args, **kwargs)
+        new(*args, **kwargs).call
       end
 
       # @param env [Hash] Rack env

data/lib/rack/json_schema/docs.rb

@@ -34,8 +34,8 @@ module Rack
       end
 
       class DocumentGenerator
-        def self.call(*args)
-          new(*args).call
+        def self.call(*args, **kwargs)
+          new(*args, **kwargs).call
         end
 
         # @param app [Object] Rack application

data/lib/rack/json_schema/request_validation.rb

@@ -55,12 +55,10 @@ module Rack
               case
               when content_type_json? && has_body? && !has_valid_json?
                 raise InvalidJson
+              when content_type_json? && has_schema? && !has_hash_request_body?
+                raise InvalidParameter, "Invalid request. Request body must be an Object in JSON."
               when content_type_json? && has_schema? && !has_valid_parameter?
-                if has_hash_request_body?
-                  raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
-                else
-                  raise InvalidParameter, "Invalid request. Request body must be an Object in JSON."
-                end
+                raise InvalidParameter, "Invalid request.\n#{schema_validation_error_message}"
               end
             end
           elsif !ignore_missing_path?
@@ -71,7 +69,7 @@ module Rack
         private
 
         def has_hash_request_body?
-          parsed_body.is_a?(Hash)
+          parameters_from_body.is_a?(Hash)
         end
 
         def has_valid_json?
@@ -83,7 +81,7 @@ module Rack
 
         # @return [true, false] True if request parameters are all valid
         def has_valid_parameter?
-          parsed_body.is_a?(Hash) && schema_validation_result[0]
+          !!schema_validation_result[0]
         end
 
         # @return [true, false] True if any schema is defined for the current action

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.5.1"
+    VERSION = "1.5.3"
   end
 end

data/rack-json_schema.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "erubis"
-  spec.add_dependency "jdoc", ">= 0.1.4"
+  spec.add_dependency "jdoc", ">= 0.4.4"
   spec.add_dependency "json_schema", "~> 0.2"
   spec.add_dependency "rack"
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "2.14.1"
+  spec.add_development_dependency "rspec", ">= 2.14.1"
   spec.add_development_dependency "rspec-console"
   spec.add_development_dependency "rspec-json_matcher"
   spec.add_development_dependency "shotgun"

data/spec/rack/spec/docs_spec.rb

@@ -60,7 +60,7 @@ describe Rack::JsonSchema::Docs do
 
       it "generates API documentation and returns it to request to GET /docs" do
         should == 200
-        response.body.should include("Example API")
+        expect(response.body).to include("Example API")
       end
     end
 
@@ -75,7 +75,7 @@ describe Rack::JsonSchema::Docs do
 
       it "responds to specified path" do
         should == 200
-        response.body.should_not == "dummy"
+        expect(response.body).not_to eq("dummy")
       end
     end
 
@@ -86,7 +86,7 @@ describe Rack::JsonSchema::Docs do
 
       it "delegates request to inner app" do
         should == 200
-        response.body.should == "dummy"
+        expect(response.body).to eq("dummy")
       end
     end
 
@@ -97,7 +97,7 @@ describe Rack::JsonSchema::Docs do
 
       it "also accepts GET /docs.md" do
         should == 200
-        response.body.should_not == "dummy"
+        expect(response.body).not_to eq("dummy")
       end
     end
   end

data/spec/rack/spec/mock_spec.rb

@@ -56,7 +56,7 @@ describe Rack::JsonSchema::Mock do
 
       it "returns Array dummy response" do
         should == 200
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           [
             {
               id: schema["definitions"]["app"]["definitions"]["id"]["example"],
@@ -78,7 +78,7 @@ describe Rack::JsonSchema::Mock do
 
       it "returns dummy response" do
         should == 200
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           {
             id: schema["definitions"]["app"]["definitions"]["id"]["example"],
             name: schema["definitions"]["app"]["definitions"]["name"]["example"],
@@ -116,7 +116,7 @@ describe Rack::JsonSchema::Mock do
 
       it "returns example_not_found error" do
         should == 500
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "example_not_found",
           message: "No example found for #/definitions/app/id",
         )

data/spec/rack/spec/schema_provider_spec.rb

@@ -60,7 +60,7 @@ describe Rack::JsonSchema::SchemaProvider do
 
       it "returns JSON Schema to request to GET /schema" do
         should == 200
-        response.body.should include("app")
+        expect(response.body).to include("app")
       end
     end
 
@@ -75,7 +75,7 @@ describe Rack::JsonSchema::SchemaProvider do
 
       it "responds to specified path" do
         should == 200
-        response.body.should_not == "dummy"
+        expect(response.body).not_to eq("dummy")
       end
     end
 
@@ -86,7 +86,7 @@ describe Rack::JsonSchema::SchemaProvider do
 
       it "delegates request to inner app" do
         should == 200
-        response.body.should == "dummy"
+        expect(response.body).to eq("dummy")
       end
     end
   end

data/spec/rack/spec_spec.rb

@@ -114,7 +114,7 @@ describe Rack::JsonSchema do
 
       it "returns link_not_found error" do
         should == 404
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "link_not_found",
           message: "Could not find the link definition for request path #{path}.",
         )
@@ -138,7 +138,7 @@ describe Rack::JsonSchema do
 
       it "returns invalid_content_type error" do
         should == 400
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "invalid_content_type",
           message: "Invalid content type",
         )
@@ -181,7 +181,7 @@ describe Rack::JsonSchema do
 
       it "returns invalid_parameter error" do
         should == 400
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "invalid_parameter",
           message: String,
         )
@@ -216,7 +216,7 @@ describe Rack::JsonSchema do
 
       it "returns invalid_parameter error" do
         should == 400
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "invalid_json",
           message: "Request body wasn't valid JSON",
         )
@@ -255,7 +255,7 @@ describe Rack::JsonSchema do
       context "when mediaType is not specified" do
         it "returns invalid_response_content_type error" do
           should == 500
-          response.body.should be_json_as(
+          expect(response.body).to be_json_as(
             id: "invalid_response_content_type",
             message: "Response Content-Type wasn't for JSON",
           )
@@ -270,7 +270,7 @@ describe Rack::JsonSchema do
 
       it "returns invalid_response_type error" do
         should == 500
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "invalid_response_type",
           message: String,
         )
@@ -284,7 +284,7 @@ describe Rack::JsonSchema do
 
       it "returns invalid_response_type error" do
         should == 500
-        response.body.should be_json_as(
+        expect(response.body).to be_json_as(
           id: "invalid_response_type",
           message: String,
         )

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require "rack/test"
 require "rspec/json_matcher"
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.include RSpec::JsonMatcher

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: json_schema
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
@@ -186,8 +186,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/release.yml"
+- ".github/workflows/bump-request.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/github-label-sync.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -233,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: JSON Schema based Rack middlewares
@@ -245,4 +248,3 @@ test_files:
 - spec/rack/spec/schema_provider_spec.rb
 - spec/rack/spec_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-- 2.0.0