json_schemer-rails 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e5c4230f5eb7374ab6ce0f2b030f4e9230b3a5cabf8bf3bf9ea882e68fda2e
-  data.tar.gz: d70bf354f52ff231a6a1fbe672bccccf7ebbf5a7d1cb7c2ccd095dba00fc3616
+  metadata.gz: '048c58d06a9c16f8bcac041018539e4b4c08db4b4b74a9a1eff70dbdc12719b2'
+  data.tar.gz: ba64d94c3670cc530ed0acbe5f7b3117fbca39d5f7791e65ff6ed7448a247892
 SHA512:
-  metadata.gz: 641f4f82beb73c0cf6b5791da660b33427d8099cbab1ef9a67242863a19d957f9e9765e2a538ed03dd48ef377af44d6f7381a75dab19a0e96de4a08ff21bf3e6
-  data.tar.gz: 5fb9a0fdc0d8824f34df4aa5dde5aadb04ea9da1b4c1014a642991b0a48e987bbcedeca1fbec3d3b54c87fdb91c84acb27a751b9d493108e67c8a4c04257cc84
+  metadata.gz: cbfcb80dd0a99367462f339d8fba75882aa5ba980e11b97a23b778cb8807e5648bd9907dc2aac2ae7bbdbbf4e88f96ee616375e012ad9b1bc87af80285456fa4
+  data.tar.gz: 7e30a251a6572af9cd86bc888ba4c68b23d9a8e4343b64e7c8fdb1be30abdde5c44c23221d2cb83fe0d2bfb2f7021baa94ad14440401508fafc971b0114e20c3

data/README.md

@@ -1,4 +1,4 @@
-# JsonSchemer::Rails
+# JSONSchemer::Rails
 
 [![Ruby](https://img.shields.io/badge/ruby-%3E%3D%203.4.0-ruby.svg)](https://www.ruby-lang.org/en/)
 [![Rails](https://img.shields.io/badge/rails-%3E%3D%208.0-red.svg)](https://rubyonrails.org/)
@@ -90,7 +90,7 @@ paths:
 
 ```ruby
 class UsersController < ApplicationController
-  include JsonSchemer::Rails::Controller
+  include JSONSchemer::Rails::Controller
   
   before_action :validate_from_openapi, only: [:create, :update]
 
@@ -111,7 +111,7 @@ end
 ```ruby
 class UsersController < ApplicationController
   def create
-    validator = JsonSchemer::Rails::OpenApiValidator.new(request)
+    validator = JSONSchemer::Rails::OpenApiValidator.new(request)
     
     # Validate and cast parameters
     validator.validated_params
@@ -134,7 +134,7 @@ end
 By default, the validator looks for `openapi.yml` in your Rails root. You can specify a different location:
 
 ```ruby
-validator = JsonSchemer::Rails::OpenApiValidator.new(
+validator = JSONSchemer::Rails::OpenApiValidator.new(
   request,
   open_api_filename: Rails.root.join('config', 'api_schema.yml')
 )
@@ -199,11 +199,11 @@ params[:limit]  # => "10" (String, not cast because OpenAPI handles this differe
 
 ## Error Handling
 
-When validation fails, a `JsonSchemer::Rails::RequestValidationError` is raised:
+When validation fails, a `JSONSchemer::Rails::RequestValidationError` is raised:
 
 ```ruby
 class ApplicationController < ActionController::API
-  rescue_from JsonSchemer::Rails::RequestValidationError do |exception|
+  rescue_from JSONSchemer::Rails::RequestValidationError do |exception|
     render json: { error: exception.message }, status: :unprocessable_entity
   end
 end
@@ -249,7 +249,7 @@ end
 
 ```ruby
 class UsersController < ApplicationController
-  include JsonSchemer::Rails::Controller
+  include JSONSchemer::Rails::Controller
   
   before_action :validate_from_openapi, except: [:index]
   
@@ -268,7 +268,7 @@ end
 ```ruby
 class UsersController < ApplicationController
   def create
-    validator = JsonSchemer::Rails::OpenApiValidator.new(request)
+    validator = JSONSchemer::Rails::OpenApiValidator.new(request)
     
     # Validate parameters first
     validator.validated_params
@@ -327,4 +327,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 Built with [json_schemer](https://github.com/davishmcclurg/json_schemer) by Davis W. McGuire.
 
-Developed by [Stanford Digital Library](https://library.stanford.edu/).
+Developed by [Stanford Digital Library](https://library.stanford.edu/).

data/lib/json_schemer/rails/controller.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-module JsonSchemer
+module JSONSchemer
   module Rails
     # Mixin for controllers.
     # usage:
-    #   include JsonSchemer::Rails::Controller
+    #   include JSONSchemer::Rails::Controller
     #   before_action :validate_from_openapi
     module Controller
       def validate_from_openapi

data/lib/json_schemer/rails/open_api_validator.rb

@@ -2,9 +2,8 @@
 
 require "cgi"
 require "yaml"
-require "json_schemer"
 
-module JsonSchemer
+module JSONSchemer
   module Rails
     # This validates a request against the OpenAPI specification
     class OpenApiValidator
@@ -99,7 +98,7 @@ module JsonSchemer
                                          end
       end
 
-      def validate_path_param(spec) # rubocop:disable Metrics/AbcSize
+      def validate_path_param(spec) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         result = request.path_parameters[spec["name"].to_sym]
         ref = spec.dig("schema", "$ref")
         validator = if ref
@@ -108,6 +107,12 @@ module JsonSchemer
                       JSONSchemer.schema(spec["schema"])
                     end
 
+        begin
+          result = Integer(result) if validator.fetch("type").value == "integer"
+        rescue ArgumentError
+          raise RequestValidationError, "#{result} is not an integer"
+        end
+
         errors = validator.validate(result).to_a
 
         raise RequestValidationError, errors.join(", ") unless errors.empty?
@@ -122,10 +127,12 @@ module JsonSchemer
       end
 
       def json_ref_for_path
-        params = request.path_parameters.except(:controller, :action)
+        params = request.path_parameters.except(:controller, :action, :format)
         path = CGI.unescape(request.path).tr(" ", "+")
-        params.excluding(:controller, :action, :format).each_key do |parameter|
-          path.gsub!(params[parameter], "%7B#{parameter}%7D") if params[parameter]
+        params.each_key do |parameter|
+          next unless path.match?(%r{/#{Regexp.escape(params[parameter])}(/|$)})
+
+          path.sub!("/#{params[parameter]}", "/%7B#{parameter}%7D")
         end
         path.gsub("/", "~1")
       end

data/lib/json_schemer/rails/{validation_error.rb → request_validation_error.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module JsonSchemer
+module JSONSchemer
   module Rails
     # Raised when the OpenAPI specification is violated
     class RequestValidationError < StandardError; end

data/lib/json_schemer/rails/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module JsonSchemer
+module JSONSchemer
   module Rails
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

data/lib/json_schemer/rails.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "rails/version"
-require_relative "rails/validation_error"
-require_relative "rails/open_api_validator"
-require_relative "rails/controller"
+require "json_schemer"
+require "zeitwerk"
 
-module JsonSchemer
+Zeitwerk::Loader.for_gem_extension(JSONSchemer).setup
+
+module JSONSchemer
   module Rails
     class Error < StandardError; end
     # Your code goes here...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -37,7 +37,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '8.0'
-description: Rails integration for JsonSchemer. Validates OpenAPI
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Rails integration for JSONSchemer. Validates OpenAPI
 email:
 - jcoyne@justincoyne.com
 executables: []
@@ -49,7 +63,7 @@ files:
 - lib/json_schemer/rails.rb
 - lib/json_schemer/rails/controller.rb
 - lib/json_schemer/rails/open_api_validator.rb
-- lib/json_schemer/rails/validation_error.rb
+- lib/json_schemer/rails/request_validation_error.rb
 - lib/json_schemer/rails/version.rb
 homepage: https://github.com/sul-dlss/json_schemer-rails
 licenses: []
@@ -72,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.8
 specification_version: 4
-summary: Rails integration for JsonSchemer. Validates OpenAPI
+summary: Rails integration for JSONSchemer. Validates OpenAPI
 test_files: []