swagalicious 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fe701583dd2d70b9be1dd659ce40864a5724e982fb3951034135f412bdcca01
-  data.tar.gz: a78071f0d850a70b940dc8e07957241423a1742265cd026a38ca0915cfb2d4f4
+  metadata.gz: 36ac62aeb7dffb004e29a38b0141268f7b9b44f98537aee9fad8c022f09eb630
+  data.tar.gz: e2b4e39271810b7a37ab365eb0614382fd799b5ba6cffc1f5d8b1c9507e7d648
 SHA512:
-  metadata.gz: 0c306f2b4cb881e8581a4c079b4565789a4cabc3df4388955dde7ca89519eca45234f6c15d7cb9b8550df311afbc5f009a133700cfc4003de5245422ec37db02
-  data.tar.gz: 31e69267fef1575cd91652418c22a7a538c97c9698be86c147980b25b854c9f0918c02ffa26aa3c9863b875cc5912c38a40166255f326a9e9eb94031f9fdd890
+  metadata.gz: 3955a4ec404da45f989448ec940ad831f56eea5ea2c5a59e6fccf0b04afdf56c8cfabcc27c0ee9bb613d012f62da87905fb52d57048f7ee78d921a0b7f138736
+  data.tar.gz: 22e88cf6abaf4e78959bf4f43f93f3b2b5f48b6de6353f002cae46f27f381ccf461284a4a63ecc1aaa8d17ffff06a56f01076bcc94da3cf147986ff99d93e105

data/.gitignore

@@ -7,5 +7,7 @@
 /spec/reports/
 /tmp/
 
+*.gem
+
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    swagalicious (0.4.4)
-      faraday (~> 1.3.0)
-      json-schema (~> 2.8.1)
+    swagalicious (0.4.7)
+      faraday (~> 2.0)
+      faraday-rack
+      json-schema
       oj (~> 3.11.0)
-      rspec (~> 3.10.0)
+      rspec (~> 3)
 
 GEM
   remote: https://rubygems.org/
@@ -24,18 +25,18 @@ GEM
     diff-lcs (1.5.0)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    faraday (1.3.1)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.4.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (1.0.1)
+    faraday-net_http (2.1.0)
+    faraday-rack (2.0.0)
+      faraday (~> 2.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
+    json-schema (3.0.0)
+      addressable (>= 2.8)
     method_source (1.0.0)
-    minitest (5.15.0)
-    multipart-post (2.2.0)
+    minitest (5.16.1)
     oj (3.11.8)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -48,23 +49,23 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     ruby2_keywords (0.0.5)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/lib/swagalicious/example_helpers.rb

@@ -1,5 +1,5 @@
 require "faraday"
-require "faraday/adapter/rack"
+require "faraday/rack"
 require "rack"
 require "oj"
 
@@ -20,7 +20,7 @@ class Swagalicious
     end
 
     def app
-      @app ||= Rack::Builder.parse_file("config.ru").first
+      @app ||= defined?(Rails) ? Rails.application : Rack::Builder.parse_file("config.ru").first
     end
 
     def client
@@ -30,15 +30,17 @@ class Swagalicious
     end
 
     def submit_request(metadata, mocked: false, mock_name: nil)
-      request = RequestFactory.new.build_request(metadata, self)
+      request  = RequestFactory.new.build_request(metadata, self)
+      uri      = URI.parse(request[:path])
+      uri.path = uri.path.gsub("//", "/")
 
       response = if mocked
-                   file_name = File.basename(mock_name || URI.parse(request[:path]).path)
+                   file_name = File.basename(mock_name || path)
 
                    MockResponse.new(file_name)
                  else
                    client.public_send(request[:verb]) do |req|
-                     req.url request[:path].gsub("//", "/")
+                     req.url uri.to_s
                      req.headers = request[:headers]
                      req.body    = request[:payload]
                    end
@@ -68,7 +70,7 @@ class Swagalicious
           metadata[:response][:requestBody][:content][mime_type][:examples][full_title][:value] = Oj.load(request[:payload]).dup
         end
 
-        metadata[:response][:examples][mime_type] ||= {}
+        metadata[:response][:examples][mime_type]           ||= {}
         metadata[:response][:examples][mime_type][full_title] = @body
       end
 

data/lib/swagalicious/version.rb

@@ -1,3 +1,3 @@
 class Swagalicious
-  VERSION = "0.4.5"
+  VERSION = "0.4.8"
 end

data/lib/swagalicious.rb

@@ -2,6 +2,12 @@ require "rspec/core"
 
 require_relative "./swagalicious/version"
 
+begin
+  require "rspec/rails"
+rescue LoadError
+  nil
+end
+
 class Swagalicious
   class Error < StandardError; end
 
@@ -24,6 +30,11 @@ class Swagalicious
     c.add_setting :swagger_root
     c.add_setting :swagger_docs
     c.add_setting :swagger_dry_run
+
+    if defined?(Rails) && defined?(RSpec::Rails)
+      c.include RSpec::Rails::RequestExampleGroup, type: :doc
+    end
+
     c.extend Swagalicious::ExampleGroupHelpers, type: :doc
     c.include Swagalicious::ExampleHelpers, type: :doc
   end

data/swagalicious.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   spec.name          = "swagalicious"
   spec.version       = Swagalicious::VERSION
   spec.authors       = ["Eugene Howe"]
-  spec.email         = ["eugene@xtreme-computers.net"]
+  spec.email         = ["eugene.howe@protonmail.com"]
 
   spec.summary               = %q{RSwag without Rails}
   spec.description           = %q{This gem is almost a straight copy and paste of https://github.com/rswag/rswag/tree/master/rswag-specs with the Rails specific code stripped out so it can be used in Rack applications that don't use Rails.}
@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday",     "~> 1.3.0"
-  spec.add_dependency "json-schema", "~> 2.8.1"
-  spec.add_dependency "oj",          "~> 3.11.0"
-  spec.add_dependency "rspec",       "~> 3.10.0"
+  spec.add_dependency "faraday", "~> 2.0"
+  spec.add_dependency "faraday-rack"
+  spec.add_dependency "json-schema"
+  spec.add_dependency "oj",    "~> 3.11.0"
+  spec.add_dependency "rspec", "~> 3"
 
   spec.add_development_dependency "factory_bot", "~> 6.1.0"
   spec.add_development_dependency "pry-byebug",  "~> 3.9.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagalicious
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
 platform: ruby
 authors:
 - Eugene Howe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-rack
+  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'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +126,7 @@ description: This gem is almost a straight copy and paste of https://github.com/
   with the Rails specific code stripped out so it can be used in Rack applications
   that don't use Rails.
 email:
-- eugene@xtreme-computers.net
+- eugene.howe@protonmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -146,7 +160,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/ehowe/swagalicious
   source_code_uri: https://github.com/ehowe/swagalicious
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: RSwag without Rails
 test_files: []