apiphobic-middleware 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0750500f56a1bab3de09065d90587daf224be6b84ec881d793e1de4f201b82e0
-  data.tar.gz: 5869dfd85d4f54cb069f8086e1a3a9a0eb026f223a01b08681884d88152d8da1
+  metadata.gz: ffd888d8e92f0fff36741793819ee39bced0b1bf17cb02b0e3b126e5a31790d6
+  data.tar.gz: c8dbc8d04954c9b1dfe8a5ef8919fcca36d8cd3f73a24cde2e88b12ef7f5a92e
 SHA512:
-  metadata.gz: 897ebe5d9809f845f03ef09e4df3833b1f3c228e1ea45faccc98e4527cd35989fadeae52ee474f18e4dcc291ba92c1246052c3ef86d00f43c6a6744328d48c2c
-  data.tar.gz: 418bd43b43a873507faaa91e2496c23383ba6e3e3cccba4d665696c2115b5f8c9fd9151816e5d56824ba94beba4d68462a9e6d6959d6dfc0dcf5fc41b4d6080c
+  metadata.gz: 78c4f781eaf02ae48f819828bc283cba5407ce879e2b383ab37ed2fa795cbe3776f3d555c48d89feab80a61dc1b5cfe1e8db09c9d9d290bb41daba6462660d8a
+  data.tar.gz: 59708e4a55b4c81f5b43fbdf270543fc617517023db6aa3b72fd61c8a7de712306cf1afe4ad26e65a0d9d6380d8d022ca1984704a5a576188aec8c2d02e58e1b

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 The Kompanee, Ltd
+Copyright (c) 2010-2019 The Kompanee, Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/apiphobic/errors/invalid_request_body.rb

@@ -19,7 +19,7 @@ class   InvalidRequestBody < RuntimeError
 
   def detail
     'The information you attempted to send in the request cannot be parsed as ' \
-    'a valid JSON document.'
+      'a valid JSON document.'
   end
 
   def source

data/lib/apiphobic/middleware/configuration.rb

@@ -24,7 +24,7 @@ module  Middleware
     end
 
     def allowed_subdomains
-      @allowed_subdomains || ['api']
+      @allowed_subdomains || %w{api}
     end
 
     def allowed_method_overrides
@@ -32,7 +32,7 @@ module  Middleware
     end
 
     def allowed_api_subdomains
-      @allowed_api_subdomains || ['api']
+      @allowed_api_subdomains || %w{api}
     end
 
     def default_api_version

data/lib/apiphobic/middleware/converters/request_method.rb

@@ -17,7 +17,7 @@ class   RequestMethod
     @app = app
   end
 
-  def call(env)
+  def call(env) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
     self.request      = Rack::Request.new(env)
     allowed_overrides = configuration.allowed_method_overrides
 
@@ -25,7 +25,7 @@ class   RequestMethod
       path_pattern = path_pattern
                        .gsub(':uuid', '[0-9a-f]{8}\\-(?:[0-9a-f]{4}\\-){3}[0-9a-f]{12}')
 
-      next unless env['PATH_INFO'] =~ Regexp.new("\\A#{path_pattern}\\z")
+      next unless env['PATH_INFO']&.match?(Regexp.new("\\A#{path_pattern}\\z"))
 
       method_mappings.each do |from, to|
         next unless from.include?(env['REQUEST_METHOD'].downcase)

data/lib/apiphobic/middleware/validators/accept_header.rb

@@ -29,6 +29,7 @@ class   AcceptHeader
 
     if !subdomain.matches?(subdomain_request) ||
        accept_header.matches?(accept_header_request)
+
       @app.call(env)
     else
       Responses::InvalidAcceptHeader.call(env)

data/lib/apiphobic/middleware/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Middleware
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end
 end

data/lib/apiphobic/requests/accept_header.rb

@@ -5,7 +5,7 @@ require 'apiphobic/accept_header'
 module  Apiphobic
 module  Requests
 class   AcceptHeader
-  ACCEPT_PARAM_PATTERN = /(?:\A|&)\_accept=(.+?)(?=\z|&)/
+  ACCEPT_PARAM_PATTERN = /(?:\A|&)_accept=(.+?)(?=\z|&)/
 
   attr_accessor :request
 
@@ -14,7 +14,7 @@ class   AcceptHeader
   end
 
   def self.resolve(request)
-    return request if request.class == self
+    return request if request.instance_of?(self)
 
     new(request)
   end
@@ -53,7 +53,10 @@ class   AcceptHeader
     if request.respond_to?(:params)
       request.params['_accept']
     else
-      URI.unescape(request['QUERY_STRING'][ACCEPT_PARAM_PATTERN, 1] || '') # rubocop:disable Lint/UriEscapeUnescape
+      raw_params_header = (request['QUERY_STRING'][ACCEPT_PARAM_PATTERN, 1] || '')
+                            .gsub('+', '%2B')
+
+      CGI.unescape(raw_params_header)
     end
   end
 end

data/lib/apiphobic/requests/authorization_token.rb

@@ -9,7 +9,7 @@ require 'apiphobic/tokens/json_web_tokens/null'
 module  Apiphobic
 module  Requests
 class   AuthorizationToken
-  BASE64_PATTERN                = %r{[A-Za-z0-9_/\+\=\-\.]}
+  BASE64_PATTERN                = %r{[A-Za-z0-9_/+=\-.]}
   BASE64_TOKEN_HEADER_PATTERN   = /\A(?:Basic|Bearer)\s+(.*)\z/
   BASE64_TOKEN_PARAM_NAME       = 'token_b64'
   BASE64_TOKEN_PARAM_PATTERN    = /(?:\A|&)#{BASE64_TOKEN_PARAM_NAME}=(.*)(?=\z|&)/
@@ -37,7 +37,7 @@ class   AuthorizationToken
       token_from_header
     elsif !token_from_params.blank?
       token_from_params
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       token_from_header
     end
   end

data/lib/apiphobic/requests/transform_json_api.rb

@@ -30,11 +30,11 @@ class   TransformJsonApi
   private
 
   def has_content?
-    request['CONTENT_LENGTH'].to_i.positive?
+    request['CONTENT_LENGTH'].to_i > 0
   end
 
   def json?
-    request['CONTENT_TYPE'] =~ /json/
+    request['CONTENT_TYPE'].include?('json')
   end
 
   def content_length
@@ -46,16 +46,17 @@ class   TransformJsonApi
   end
 
   def query_string_with_underscored_parameters
-    @query_string_with_underscored_parameters ||= begin
-      return query_string unless query_string.respond_to?(:gsub)
-
-      query_string.gsub(/(?<=\A|&|\?)[^=&]+/) do |parameter_name|
-        unescaped_parameter_name   = CGI.unescape(parameter_name)
-        underscored_parameter_name = unescaped_parameter_name.underscore
-
-        CGI.escape(underscored_parameter_name)
-      end
-    end
+    @query_string_with_underscored_parameters \
+      ||= if query_string.respond_to?(:gsub)
+            query_string.gsub(/(?<=\A|&|\?)[^=&]+/) do |parameter_name|
+              unescaped_parameter_name   = CGI.unescape(parameter_name)
+              underscored_parameter_name = unescaped_parameter_name.underscore
+
+              CGI.escape(underscored_parameter_name)
+            end
+          else
+            query_string
+          end
   end
 
   def underscored_request_json

data/lib/apiphobic/responses/invalid.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module  Apiphobic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-middleware
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - thegranddesign
@@ -10,49 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDqjCCApKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMREwDwYDVQQDDAhydWJ5
-  Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hvbnRoZWJsb2cxEzARBgoJ
-  kiaJk/IsZAEZFgNjb20wHhcNMTcwODAyMjI1OTM1WhcNMTgwODAyMjI1OTM1WjBN
-  MREwDwYDVQQDDAhydWJ5Z2VtczEjMCEGCgmSJomT8ixkARkWE2xpdmluZ2hpZ2hv
-  bnRoZWJsb2cxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQDtLa7+7p49gW15OgOyRZad/F92iZcMdDjZ2kAxZlviXgVe
-  PCtjfdURobH+YMdt++6eRkE25utIFqHyN51Shxfdc21T3fPQe/ZEoMyiJK4tYzbh
-  7VjNJG4ldvKKpS1p7iVz9imnyTxNwb0JaIOsOFCA04T0u6aCQi2acNvAPLviXk0q
-  xJ/CKjI4QUTZKVrBt8Q1Egrp2yzmEnSNftDuTbBb8m4vDR+w325CwbKCgycHJ1/g
-  YZ3FO76TzJuRVbsYS/bU5XKHVEpkeFmWBqEXsk4DuUIWLa6WZEJcoZf+YP+1pycG
-  7YqSbydpINtEdopD+EEI+g+zNJ4nSI8/eQcQyEjBAgMBAAGjgZQwgZEwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFDWuVrg4ve0vLu71kqiGdyBnzJGV
-  MCsGA1UdEQQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMCsG
-  A1UdEgQkMCKBIHJ1YnlnZW1zQGxpdmluZ2hpZ2hvbnRoZWJsb2cuY29tMA0GCSqG
-  SIb3DQEBBQUAA4IBAQDJIpHjbBPGiaY4wOHcXlltQ+BMmhWQNh+1fZtyajQd+7Ay
-  fv23mO7Mf25Q38gopQlpaODkfxq54Jt8FvQbr5RYRS4j+JEKb75NgrAtehd8USUd
-  CiJJGH+yvGNWug9IGZCGX91HIbTsLQ5IUUWQasC5jGP8nxXufUr9xgAJZZenewny
-  B2qKu8q1A/kj6cw62RCY7yBmUXxlcJBj8g+JKYAFbYYKUdQSzf50k9IiWLWunJM+
-  Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
-  iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
+  MIIEyjCCAzKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBVMSIwIAYDVQQDDBlsb2Nh
+  bGV1bmtub3duODEwX3J1YnlnZW1zMRowGAYKCZImiZPyLGQBGRYKcHJvdG9ubWFp
+  bDETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0yMjA3MDkwNTMxMjJaFw0yMzA3MDkw
+  NTMxMjJaMFUxIjAgBgNVBAMMGWxvY2FsZXVua25vd244MTBfcnVieWdlbXMxGjAY
+  BgoJkiaJk/IsZAEZFgpwcm90b25tYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0otlhSPyU7jLLW1p786Mo/pV
+  5cJ1Ed8D/bJK78PqGFO2h0ZUefupxT5PRMokLYNNGRPopnAAxZ0zVxJ68aOyYCBW
+  Wk3/XFcXCrtk/OcFwLTltgeMjyqCBd/zRRx6CCjY4uOfH0E3n1gQ6Fbmewjg83XJ
+  nOs7Gu/hzj5+feEQ1Exmg6z1oCM/8BTIBtK+p++HvcDK3AhJ7x3fc6P9WS+22w6j
+  7jpi3p9YtoAjrXIzw3lsobiX+bEt+N+T47e8gOATVgapuZ/QmJzNU6LWepehs4V1
+  8J+FUaIMV7nAMKmpkbYL51uHEiGV+HDx1HUdOsCFx8zD4h49KRT2t6AcumJ5P1Cj
+  c7NX2xl85ShHDNNFkozuC2c5cwj6F20EVaVjGwv2OFq0S2tUw9EJXHTN9RpfRUmn
+  IHwS9M4gcJO7IzV39a1YL6+9hrabF4+JTSYDehq8oxTdcOPLYyvH54aJWVqCrnLO
+  KNa/p6hMmwxTWNS5Vz0uxuEGyE9E0tHbtjIs2XX5AgMBAAGjgaQwgaEwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAK3RicwO0f6+puFN6lRVMOKMJuu
+  MDMGA1UdEQQsMCqBKGxvY2FsZXVua25vd244MTArcnVieWdlbXNAcHJvdG9ubWFp
+  bC5jb20wMwYDVR0SBCwwKoEobG9jYWxldW5rbm93bjgxMCtydWJ5Z2Vtc0Bwcm90
+  b25tYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAQwV6pOp5gm8141pyXeQFI/5E
+  rZYO3MvdyZM8O3HMD51LDS8mtMURceaKZM6WTambe2RVX4A++0qUiEnn9K4Fexm/
+  SEGaC/Gp+Fg9D1SKfkdq9bgdIhOEUwiGqjczgzNC806AtWZ+awI940oydFYZlpo0
+  jMQihPPJEqF1U6JBDMZYV5tX/dJYSGRl9L3s1k2tjoN98q+beNaZQDn21Amml4eK
+  KEkMeTTJ2E4GVzR9eKEETLq2LygdUWWZ5NdWOYTxJMdg1GZp3b6X8hJrwfOiizqt
+  /ANlIEh11/pOnWa6WPUVpGIMpYdquvmJXnF2LX6zxkKK1hbrebt+vAEAGczgw1Ri
+  rkLM6y+BHQdkOTj3VG4MjIU8D4h1Z73Exzxds/VbVKMEz+8JrFjGJ/tYa0PZ8U5p
+  3yXL4G6eW3rdBW/OiLF7GgG2o26d02OMzf4+ubUVS5LQDOcd4vgNPLWzJSBt1YIh
+  TgBsED7Me5YdMVXxtTWYsF1VMzaL9hReD3UXGcxe
   -----END CERTIFICATE-----
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apiphobic-tokens
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: apple_core
   requirement: !ruby/object:Gem::Requirement
@@ -71,22 +77,16 @@ dependencies:
   name: erratum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -101,20 +101,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspeckled
   requirement: !ruby/object:Gem::Requirement
@@ -179,11 +193,18 @@ files:
 - lib/apiphobic/responses/invalid_subdomain.rb
 - lib/apiphobic/responses/invalid_token.rb
 - lib/apiphobic/responses/transform_json_api.rb
-homepage: ''
+homepage: https://github.com/thekompanee/apiphobic-middleware
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/thekompanee/apiphobic-middleware/issues
+  changelog_uri: https://github.com/thekompanee/apiphobic-middleware/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/thekompanee/apiphobic-middleware/tree/releases/v1.6.0
+  homepage_uri: https://github.com/thekompanee/apiphobic-middleware
+  source_code_uri: https://github.com/thekompanee/apiphobic-middleware
+  wiki_uri: https://github.com/thekompanee/apiphobic-middleware/wiki
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -199,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Middleware to Validate API Requests