swagger-diff 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddac5fb36158431f343142208ecd61a858bd66cf
-  data.tar.gz: 74fab6bd47f4cf4c52865451bb25dc0fa082591b
+  metadata.gz: 114437451eebd07149d24f784a5f40685bc66db6
+  data.tar.gz: ca0e1c64220b868549c378aa9114c56053d602c9
 SHA512:
-  metadata.gz: b23daecdda524a3181d6c321a73ddabcd6a1431320caccebd1fee8a17ff33c4cd5bc74385e1a97b268f7d2c02faecc87573ed1d8c60310076b707722b9db466b
-  data.tar.gz: 2213e486e794349ea51a0dc38fcd4d3f03748285a40050b0e1c4a070b75e22ffc65ad842742c44b1ce31576d2e3a558399dfe05238108167ec05e2887fc4aae4
+  metadata.gz: 70588382bc65dc6e55de998a3c8097f928784a80adb263b55dabcefb8cc9d932c1adf1ca0a83e924c0fd58fd6d1d1685bdf9befadcc425e50a1bb6e7ad959ecc
+  data.tar.gz: 5dde2c6cbdcec5b07febb27d290cb312318ce2ece012087a3a78a820d14500d0741b953f942fa0d56b1a0aafe8d1d278d3b979b6c5117fbb3a0a2a4ac59b091b

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.2] - 2017-09-13
+
+### Fixed
+
+* [#56](https://github.com/civisanalytics/swagger-diff/pull/56)
+  recursively parse non-ref response schemas (`properties` and `items`)
+
 ## [1.1.1] - 2017-08-23
 
 ### Added
@@ -97,7 +104,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 * Initial Release
 
-[Unreleased]: https://github.com/civisanalytics/swagger-diff/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/civisanalytics/swagger-diff/compare/v1.1.2...HEAD
+[1.1.2]: https://github.com/civisanalytics/swagger-diff/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/civisanalytics/swagger-diff/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/civisanalytics/swagger-diff/compare/v1.0.5...v1.1.0
 [1.0.5]: https://github.com/civisanalytics/swagger-diff/compare/v1.0.4...v1.0.5

data/lib/swagger/diff/specification.rb

@@ -172,19 +172,28 @@ module Swagger
         properties_for_ref(prefix, definition['name'], definition, required)
       end
 
-      def properties_for_ref(prefix, name, schema, required, list = false)
+      # rubocop:disable Metrics/ParameterLists
+      def add_property(ret, prefix, name, schema, required, list)
         key = "#{prefix}#{name}"
+        ret[:required].add(key) if required && required.include?(name)
+        loc = if schema['in']
+                schema['in']
+              else
+                'body'
+              end
+        ret[:all].add("#{key} (in: #{loc}, type: #{schema['type']}#{'[]' if list})")
+      end
+      # rubocop:enable Metrics/ParameterLists
+
+      def properties_for_ref(prefix, name, schema, required, list = false)
         ret = { required: Set.new, all: Set.new }
-        if schema.key?('$ref')
+        if schema['$ref']
           merge_refs!(ret, nested(schema['$ref'], prefix, name, list))
+        elsif schema['properties']
+          prefix = "#{name}#{'[]' if list}/"
+          merge_refs!(ret, properties(schema['properties'], schema['required'], prefix))
         else
-          ret[:required].add(key) if required && required.include?(name)
-          loc = if schema['in']
-                  schema['in']
-                else
-                  'body'
-                end
-          ret[:all].add("#{key} (in: #{loc}, type: #{schema['type']}#{'[]' if list})")
+          add_property(ret, prefix, name, schema, required, list)
         end
         ret
       end
@@ -211,16 +220,15 @@ module Swagger
         "#{key} (in: body, type: Hash[string, #{type}])"
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
       def properties(properties, required, prefix = '')
         ret = { required: Set.new, all: Set.new }
         properties.each do |name, schema|
           if schema['type'] == 'array'
             merge_refs!(ret, properties_for_ref(prefix, name, schema['items'], required, true))
-          elsif schema['type'] == 'object'
+          elsif schema['type'] == 'object' || schema['properties']
             if schema['allOf']
               # TODO: handle nested allOfs.
-            elsif schema['type'] && schema['type'] == 'object' && schema['properties']
+            elsif schema['properties']
               merge_refs!(ret, properties(schema['properties'], required, "#{prefix}#{name}/"))
             else
               ret[:all].add(hash_property(schema, prefix, name))
@@ -231,7 +239,6 @@ module Swagger
         end
         ret
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       def request_params_inner(params)
         ret = { required: Set.new, all: Set.new }

data/lib/swagger/diff/version.rb

@@ -1,5 +1,5 @@
 module Swagger
   module Diff
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger-diff
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeff Cousens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Utility for comparing two OAI (fka Swagger) specifications.