open_api-rspec 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae22068105e1aac1b31e6dc0efe2e98c00cf686e74b38c0f9d100338e150e0d
-  data.tar.gz: 1b718583684a6ffd8f713656555da193c02b7ec1673febf44a31576232dd1708
+  metadata.gz: b3f3ce8bd883e699c960d0037bc9d7d6f85585708d7b156edc3253ed52f8b57f
+  data.tar.gz: b52896c54a1f4b8df2085f23a68dd914d58de9a6557586c88e78ce214d4cfcf8
 SHA512:
-  metadata.gz: 5469708795938a8458b787768f637630805abbbfc81ede6009cdb8f35da71eaeb7651e4cd1e2db813a3fedc1b3cd840b50902262ebcd296e862e3c563d569e5d
-  data.tar.gz: c29ae21d4a3e9feff6e35cd3e17aa96f25b268c6855cd4d53c6d7ae0448f5a0aa9ae403aff867c766a45ef34d61daeb1aa60f1786e018653e913dfb67073340c
+  metadata.gz: 3fd66983bd547523ed9d7321d25d2f41fec7c6d62f9d3d61c625f7d6cfa8560315c436decbf183e413e678d3134e3dd9ffefd5fde3db627e5b2378cc3fe50b84
+  data.tar.gz: a81de6ab95ed1af0b696e805b1c1e5965abb5925981ecf47654f3b73f95acf6485b0a283bce37c49c28b2321d25e83a6ea8a5094679de167d08af68f3f079e9a

data/.rubocop.yml

@@ -15,3 +15,7 @@ Style/Documentation:
 
 Metrics/LineLength:
   Max: 100
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/open_api/rspec/schema_parser.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    open_api-rspec (0.1.9)
+    open_api-rspec (0.1.10)
       activesupport
       open_api-schema_validator (>= 0.1.1)
       rspec
@@ -9,20 +9,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -34,18 +34,18 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    brakeman (4.3.1)
+    brakeman (4.5.0)
     builder (3.2.3)
-    bundler-audit (0.6.0)
-      bundler (~> 1.2)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    byebug (10.0.2)
+    byebug (11.0.1)
     codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -53,14 +53,14 @@ GEM
     docile (1.3.1)
     equalizer (0.0.11)
     erubi (1.8.0)
-    httparty (0.16.3)
+    httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.5.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaro_winkler (1.5.2)
-    json (2.1.0)
+    json (2.2.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kwalify (0.7.2)
@@ -79,27 +79,26 @@ GEM
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_xml (0.6.0)
-    nokogiri (1.10.0)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     open_api-schema_validator (0.1.1)
       json-schema
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     psych (3.1.0)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -109,10 +108,10 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     rainbow (3.0.0)
     rake (12.3.2)
-    reek (5.3.0)
+    reek (5.4.0)
       codeclimate-engine-rb (~> 0.4.0)
       kwalify (~> 0.7.0)
-      parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
+      parser (>= 2.5.0.0, < 2.7, != 2.5.1.1)
       psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
     rspec (3.8.0)
@@ -121,22 +120,21 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.62.0)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.31.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-rspec (1.32.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
     simplecov (0.16.1)
@@ -148,7 +146,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)

data/lib/open_api/rspec/schema_parser.rb

@@ -151,8 +151,20 @@ module OpenApi
                      p['schema']
                    end
 
-            body['properties'].flat_map do |k, v|
-              deep_body_keys(k, v)
+            if body['allOf']
+              scheme = body['allOf'].first['$ref'].tr('/', ' ')[2..-1].strip.split.map(&:to_s)
+              all_of_schema_properties = @openapi_schema.dig(*scheme)
+              scheme_props = all_of_schema_properties['properties'].flat_map do |k, v|
+                deep_body_keys(k, v)
+              end
+              additional_props = body['allOf'].last['properties'].flat_map do |k, v|
+                deep_body_keys(k, v)
+              end
+              scheme_props + additional_props
+            else
+              body['properties'].flat_map do |k, v|
+                deep_body_keys(k, v)
+              end
             end
           else
             p['name'].to_s

data/lib/open_api/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module OpenApi
   module RSpec
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec matchers and shared examples for OpenApi