rack-json_schema 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea834b3142894728ead0af4795f018e28b76e49e
-  data.tar.gz: 4ad711b840ae6164ad75b97108b1c429a71fdec4
+SHA256:
+  metadata.gz: ce06bbcab6fe693bd6d4f1f03bb2d11b2af03bff953b5b6b7250caadf2e99842
+  data.tar.gz: e41e6794ef89f60a6a6c55891d995d6cf96ed0ac5a682dbee22807d6d5123559
 SHA512:
-  metadata.gz: 29d10eb928628fd8b5daef027e1a79e10ffd07d1ff80e2c08b35d7d043b2c676809ae61d25b5277a6cb33fba233ccd7d1e26f91471270b908e3906674b7ebb52
-  data.tar.gz: a18e18e1c587917e875514f6b626e7da6145969e3b8339bd1452658b17c0e1bfc41ca9a40a4dfa9be930d90e4aee04b26a409022cd1f8285bf2b1e0a3da14094
+  metadata.gz: c35cc8a1fab3dd7872fdadc7c8488e9c72ad230afb01f705aaae95483cbe4d45063a13085028c4242b7337477de7a84adcf3d18a86ec9365d112dafdab6d6b55
+  data.tar.gz: a2f8ed388dc27c368a6caa124d9580969edd36e3724384d93ec2489708de60985380b4f8c073a9c24f368b3b844011d6e65b4c071e1c65c20f67c5ff375137a9

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/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: .
+  specs:
+    rack-json_schema (1.5.4)
+      erubis
+      jdoc (>= 0.4.4)
+      json_schema (~> 0.2)
+      rack
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    amazing_print (1.5.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
+    bond (0.5.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
+    erubis (2.7.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    jdoc (0.4.4)
+      activesupport
+      erubis
+      json_schema
+      rack
+      redcarpet
+    json (2.7.1)
+    json_schema (0.21.0)
+    method_source (1.0.0)
+    minitest (5.21.1)
+    mutex_m (0.2.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (3.2.4)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rake (13.1.0)
+    redcarpet (3.6.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-console (0.6.1)
+      bond
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-json_matcher (0.2.0)
+      amazing_print
+      json
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    shotgun (0.9.2)
+      rack (>= 1.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (>= 1.5)
+  pry
+  rack-json_schema!
+  rack-test
+  rake
+  rspec (>= 2.14.1)
+  rspec-console
+  rspec-json_matcher
+  shotgun
+
+BUNDLED WITH
+   2.5.3

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

@@ -138,13 +138,15 @@ module Rack
 
         # @return [String] request body
         def body
-          if instance_variable_defined?(:@body)
-            @body
-          else
+          return @body if instance_variable_defined?(:@body)
+
+          if request.body
             @body = request.body.read
             request.body.rewind
-            @body
+          else
+            @body = ''
           end
+          @body
         end
 
         # @return [Hash] Request parameters decoded from JSON

data/lib/rack/json_schema/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module JsonSchema
-    VERSION = "1.5.2"
+    VERSION = "1.5.4"
   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,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-json_schema
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -30,14 +29,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 +69,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 +125,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
@@ -178,7 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - r7kamura@gmail.com
 executables:
@@ -186,10 +184,15 @@ 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
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -218,7 +221,6 @@ homepage: https://github.com/r7kamura/rack-json_schema
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -233,9 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: JSON Schema based Rack middlewares
 test_files:
@@ -245,4 +245,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