swagalicious 0.4.4 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1f1a314f7e3c84ef64184ba490e5d90971fc56213f74829f5af6f0fc6b0274
-  data.tar.gz: a6e07a214f9e574c8151ea7c459d0445790ed79f1a9b6f9dc9958bab9aef9406
+  metadata.gz: 356ef7d1c57b5d2c0887ef48741926c1d15799b0dee6ec2f44c447ccad909c56
+  data.tar.gz: 3daa87a8d3b13e7b35d688b6620bf050f07eb208938a1fd257613a8bca259714
 SHA512:
-  metadata.gz: 87bc78e516ccf7ce48eb88b3aaf8045415dd147e6de880b422366fd679b86eac12fb0df34b97358578da75129e49e2dd08285297449a3f26ea85eee503c18098
-  data.tar.gz: 4b083368ef0dc6fb3cb90bb8fd39dbdbde0731de0e41df4583b188822b9387df4c53620941f91a3173b4a54e56fd99f8ba581f0b3de791672d729ed519f00e8c
+  metadata.gz: 3a9e321d4f883d71c12a05212ae97b7d55b1c403d69820c8c58236382e5abf4d1f869e3aba13dba3fe3a8134d06264145f6523b89a27f7cc4a18bb4539bb86a1
+  data.tar.gz: 80d3b8950565c86d82f4437eac5d9ed022913f0b3df4c8f2e32d1edc3ce57ea41be2925d3b1f829952e6fb93dcc9de63685d88a24c1d327a0a3228bd715dc420

data/.gitignore

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

data/Gemfile.lock

@@ -1,70 +1,71 @@
 PATH
   remote: .
   specs:
-    swagalicious (0.4.3)
-      faraday (~> 1.3.0)
-      json-schema (~> 2.8.1)
+    swagalicious (0.4.6)
+      faraday (~> 2.0)
+      faraday-rack
+      json-schema
       oj (~> 3.11.0)
-      rspec (~> 3.10.0)
+      rspec (~> 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
-    i18n (1.8.7)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    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.14.3)
-    multipart-post (2.1.1)
-    oj (3.11.3)
+    minitest (5.16.1)
+    oj (3.11.8)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
+    public_suffix (4.0.7)
+    rack (2.2.3.1)
     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.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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.1)
+      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.1)
-    ruby2_keywords (0.0.4)
+      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.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -78,4 +79,4 @@ DEPENDENCIES
   swagalicious!
 
 BUNDLED WITH
-   2.2.16
+   2.2.31

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/extended_schema.rb

@@ -12,7 +12,7 @@ class Swagalicious
 
   class ExtendedTypeAttribute < JSON::Schema::TypeV4Attribute
     def self.validate(current_schema, data, fragments, processor, validator, options={})
-      return if data.nil? && current_schema.schema["null"] == true
+      return if data.nil? && (current_schema.schema["null"] == true || current_schema.schema["nullable"] == true)
       super
     end
   end

data/lib/swagalicious/version.rb

@@ -1,3 +1,3 @@
 class Swagalicious
-  VERSION = "0.4.4"
+  VERSION = "0.4.7"
 end

data/lib/swagalicious.rb

@@ -2,6 +2,11 @@ require "rspec/core"
 
 require_relative "./swagalicious/version"
 
+begin
+  require "rspec/rails"
+rescue nil
+end
+
 class Swagalicious
   class Error < StandardError; end
 
@@ -24,6 +29,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.4
+  version: 0.4.7
 platform: ruby
 authors:
 - Eugene Howe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2022-06-21 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: []