oas_parser 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bac25d908d25e4521b132bea7d95be5e1fd77dac5a6aad7dec9a33767a5654e3
-  data.tar.gz: 7d0a3a913187ab9d16178c94b8b1ac4b2e2b6cf75886f555c0c495e28f7a091f
+  metadata.gz: 90932e82262638b9bda8a7ee10e13640df13fcefb3567f64cad1152eaa04d512
+  data.tar.gz: 832cdd7f80e01836033157bac56e256792fc4fede1b5482bb448c08a35156e4b
 SHA512:
-  metadata.gz: 5df06570805718a3d57b6b5391e9286fa4c3fb0f97dcdde26fce74e1b05f6c14005ec2033b5f7919639e72b2d338d6c747e2e42269a17994c59f747bf25f6311
-  data.tar.gz: 298f935890d0b65db1149fb15697452f5b5843326582027d97028adedd586790f95d4c3bf2f0a8fd08d0abae636eca93850c9d4e58f9ad05c5ae6c7532936bd9
+  metadata.gz: c152442f49b4ee96cc78dc11442b5adf185c9dd4e2a0d72cf6c8af355c233f9702d3b3548732a016fcd7ee7ba522defd1f18e51fc9ee03d2a7e063faa872dfd5
+  data.tar.gz: 56302889de1771833ebf9c5c2da1ecdf1782c83683f88b2da3590c612b71969c816cb469b9421a3d696f25922c1a90626f960df5503681d3c0588d30b9452e55

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.11.0)
-      activesupport (~> 5.1.2)
+    oas_parser (0.12.0)
+      activesupport (> 5.1.2, < 6)
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
@@ -13,9 +13,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.5)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
@@ -26,7 +26,7 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.23)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -42,7 +42,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (0.9.5)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     json_schema (0.15.0)
@@ -50,12 +50,12 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nenv (0.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -63,7 +63,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -72,6 +72,8 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -102,7 +104,8 @@ DEPENDENCIES
   pry (~> 0.11.3)
   rake (~> 10.0)
   rspec (~> 3.0)
+  rspec-collection_matchers (~> 1.1.3)
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/lib/oas_parser/abstract_attribute.rb

@@ -16,6 +16,10 @@ module OasParser
       raw['enum'] || (schema ? schema['enum'] : nil)
     end
 
+    def oneOf?
+      raw['oneOf'] ? true : false
+    end
+
     def array?
       type == 'array'
     end
@@ -36,6 +40,7 @@ module OasParser
     end
 
     def properties
+      return convert_property_schema_to_properties(raw) if oneOf?
       return nil unless collection?
       return [] if empty?
       return convert_property_schema_to_properties(raw['properties']) if object?

data/lib/oas_parser/endpoint.rb

@@ -49,7 +49,7 @@ module OasParser
         return parameter if parameter.name == name
       end
 
-      raise StandardError.new('So such parameter exists')
+      raise StandardError.new("No such parameter exists: '#{name}'")
     end
 
     def request_body

data/lib/oas_parser/property.rb

@@ -29,7 +29,7 @@ module OasParser
       elsif schema['subschema_property']
         schema = schema['properties'] if schema['properties']
         schema.map do |definition|
-          OasParser::Property.new(self, raw, definition.name, definition)
+          OasParser::Property.new(self, raw, definition.name, definition.raw)
         end
       else
         schema = schema['properties'] if schema['properties']

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.1'.freeze
 end

data/oas_parser.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-collection_matchers", "~> 1.1.3"
   spec.add_development_dependency "pry", "~> 0.11.3"
   spec.add_development_dependency "simplecov", "~> 0.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A parser for Open API specifications