swagalicious 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb72dfd425ef772e7d2c0cf1ac1079d60cf9d6310b790dc9eef4454e145d7dd
-  data.tar.gz: 3c919667c104eba4d2e01d4177e68e4bcc5d57a8a0d33ee02b9fcfa79d3cf899
+  metadata.gz: b4547f3c049b8fa0f79ef3f4619497942ffcdd6d10c4f84212fcba0a88ef5986
+  data.tar.gz: a3c03a1bc18b309c315fa7e6d6fca75297b8f8cd8c6c3fbfe58fa4fa25a31666
 SHA512:
-  metadata.gz: 12939af351eaebed0316bff2af98b58fcf7f39041311920bab9338f163e5dc06d2575148fedcb22ab92581f91b9f9d8e28dbffb0bef60cc97faccc2a97bf9718
-  data.tar.gz: 8003706edc0671b7cce79a72d9098827de9d114b0d42502684ea980bf4ee22deab1a998603710a82a55321fa0c318b42414d7f047ae5a2028214ae2a8354a647
+  metadata.gz: 83bb5faf771075d0043d18e9221eab2c8be2c206d5002224a987167be39715838962629a62ca7b316509dc551966415bcf66caa2a7db9207b094a9db44488cd7
+  data.tar.gz: b30f7466d1f0c17b6e734d6453a2768310d742fcbec1aa65783acf04bb222ac3270c6a16f58abe366613bc1d8654f10866bc9bc59f0a87ce1c40f078077be2a1

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    swagalicious (1.0.0)
+    swagalicious (1.1.0)
       faraday (~> 2.0)
       faraday-rack
       json-schema
       oj (~> 3.11.0)
       ox (~> 2.14.14)
-      rack-test (~> 2.0.2)
+      rack-test
       rspec (~> 3)
 
 GEM
@@ -19,7 +19,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     byebug (11.1.3)
@@ -28,7 +28,7 @@ GEM
     diff-lcs (1.5.0)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    faraday (2.7.3)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -37,7 +37,7 @@ GEM
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    json-schema (3.0.0)
+    json-schema (4.0.0)
       addressable (>= 2.8)
     method_source (1.0.0)
     minitest (5.16.1)
@@ -52,9 +52,9 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rack (3.0.4.1)
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (12.3.3)

data/lib/swagalicious/example_helpers.rb

@@ -100,7 +100,7 @@ class Swagalicious
           (YAML.load(self.body) || {}).with_indifferent_access
         when /xml/
           (Ox.load(self.body, mode: :hash_no_attrs) || {}).with_indifferent_access
-        when "", nil
+        when "", nil, /html/
           self.body
         else
           return unless raise_on_invalid

data/lib/swagalicious/request_factory.rb

@@ -35,11 +35,11 @@ class Swagalicious
 
     def derive_security_params(metadata, swagger_doc)
       requirements = metadata[:operation][:security] || swagger_doc[:security] || []
-      scheme_names = requirements.flat_map(&:keys)
+      scheme_names = requirements.flat_map { |r| r.has_key?(:type) ? r[:type] : r.keys }
       schemes      = security_version(scheme_names, swagger_doc)
 
       schemes.map do |scheme|
-        param = (scheme[:type] == :apiKey) ? scheme.slice(:name, :in, :required) : { name: "Authorization", in: :header }
+        param = (scheme[:type] == :apiKey) ? scheme.slice(:name, :in, :required, :force_name) : { name: "Authorization", in: :header }
         param.merge(required: requirements.one?) unless param.has_key?(:required)
         param.merge(type: :string)
       end
@@ -127,7 +127,7 @@ class Swagalicious
         .map do |p|
           variable_name = p[:variable_name] || p[:name]
 
-          [p[:name], example.send(variable_name).to_s]
+          [p[:name], example.send(variable_name).to_s, p[:force_name]]
         end
 
       # Accept header
@@ -145,15 +145,16 @@ class Swagalicious
       end
 
       # Rails test infrastructure requires rackified headers
-      rackified_tuples = tuples.map do |pair|
+      rackified_tuples = tuples.map do |tuple|
         [
-          case pair[0]
+          case tuple[0]
           when "Accept" then "HTTP_ACCEPT"
           when "Content-Type" then "CONTENT_TYPE"
-          when "Authorization" then "HTTP_AUTHORIZATION"
-          else pair[0]
+          when "Authorization"
+            tuple[2] ? tuple[0] : "HTTP_AUTHORIZATION"
+          else tuple[0]
           end,
-          pair[1]
+          tuple[1]
         ]
       end
 

data/lib/swagalicious/version.rb

@@ -1,3 +1,3 @@
 class Swagalicious
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/swagalicious.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json-schema"
   spec.add_dependency "oj", "~> 3.11.0"
   spec.add_dependency "ox", "~> 2.14.14"
-  spec.add_dependency "rack-test", "~> 2.0.2"
+  spec.add_dependency "rack-test"
   spec.add_dependency "rspec", "~> 3"
 
   spec.add_development_dependency "rubocop", "~> 1.48.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagalicious
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Eugene Howe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -84,16 +84,16 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement