spaceborne 0.1.39 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47de2c6cb6679f19995cba98157fcf914e181ca5cfc1a7c2be9f011fd593851f
-  data.tar.gz: 1d598c51e65a741cfa8431c6d603aecca8efe4e6077f4a08f39461a8f1bd980b
+  metadata.gz: 19e97691f8756aaeecafb192cd726205e85ba69c98dfc40f1990aaa1b770bf30
+  data.tar.gz: 7c3fd96cbd3c684494e7f9a28ab485aac083ddac59ab001d39d5da09ca288bca
 SHA512:
-  metadata.gz: 2d08b29b7f93b28aa1f0c1a54b9576483ac0e35d30c42c5c8f9ac62fe157ebea7832175e46df61997398b2f7c3f5f2cbc097b79dcee40b39a84d92e09c3e8167
-  data.tar.gz: ef1903aa05502a28b612046382a2b06612a6231a2582b6e9555c3f138d54b10fbee6cc2fbc5c0c1f16413f733f34d015c53f837ec1531d677de067d9b80c6e27
+  metadata.gz: bb75f8a4d79c6b4cdc76ba22d3daaa556a7d1482a3c0f8c27291bc4686c8f487e3f77539c987ca8a8fccbf573413e09ee0d318281dea561692aa345949d9df1d
+  data.tar.gz: 1bdcde6c073c90d29f8fe735fe9776b7122a20279474ceb0bdbdff87e4c153d26daaa50cf731d0314949a07208c9a1842c255986ae6fc3bc88998ac1af519264

data/lib/spaceborne/version.rb

@@ -1,3 +1,3 @@
 module Spaceborne
-  VERSION = '0.1.39'.freeze
+  VERSION = '0.1.43'.freeze
 end

data/lib/spaceborne.rb

@@ -186,7 +186,9 @@ module Airborne
 
     def exception_path_adder(args, body)
       yield
-    rescue RSpec::Expectations::ExpectationNotMetError, Airborne::ExpectationError => e
+    rescue RSpec::Expectations::ExpectationNotMetError,
+           ExpectationError,
+           Airborne::ExpectationError => e
       e.message << "\nexpect arguments: #{args}\ndata element: #{body}"
       raise e
     end
@@ -227,28 +229,28 @@ module Airborne
       if data.is_a?(Hash)
         OptionalHashTypeExpectations.new(data)
       else
-        OptionalPathExpectations.new(data)
+        Airborne::OptionalPathExpectations.new(data)
       end
     end
   end
 
   # extension to handle hash value checking
   module PathMatcher
-    def handle_container(json, &block)
+    def handle_container(path, json, &block)
       case json.class.name
       when 'Array'
         expect_all(json, &block)
       when 'Hash'
         json.each { |k, _v| yield json[k] }
       else
-        raise ExpectationError, "expected array or hash, got #{json.class.name}"
+        raise ExpectationError, "expected array or hash at #{path}, got #{json.class.name}"
       end
     end
 
     def handle_type(type, path, json, &block)
-      case type
+      case type.to_s
       when '*'
-        handle_container(json, &block)
+        handle_container(path, json, &block)
       when '?'
         expect_one(path, json, &block)
       else
@@ -275,19 +277,16 @@ module Airborne
     end
 
     def shortcut_validation(path, json)
-      return true if json.nil? && path.is_a?(Airborne::OptionalPathExpectations)
-
-      ensure_array_or_hash(path, json)
-      false
+      json.nil? && path.is_a?(Airborne::OptionalPathExpectations)
     end
 
     def get_by_path(path, json, type: false, &block)
       iterate_path(path) do |parts, part, index|
-        if %w[* ?].include?(part.to_s)
-          return if shortcut_validation(path, json)
+        return if shortcut_validation(path, json)
 
+        if %w[* ?].include?(part.to_s)
           type = part
-          walk_with_path(type, index, path, parts, json, &block) && return if index < parts.length.pred
+          walk_with_path(type.to_s, index, path, parts, json, &block) && return if index < parts.length.pred
 
           next
         end
@@ -304,14 +303,20 @@ module Airborne
             ' from JSON response'
     end
 
+    def handle_missing_errors(type, path, sub_path, element, &block)
+      exception_path_adder({ type: type, path: sub_path }, element) do
+        get_by_path(make_sub_path_optional(path, sub_path), element, &block)
+      end
+    end
+
     def walk_with_path(type, index, path, parts, json, &block)
       last_error = nil
       item_count = json.length
       error_count = 0
       json.each do |element|
+        sub_path = parts[(index.next)...(parts.length)].join('.')
         begin
-          sub_path = parts[(index.next)...(parts.length)].join('.')
-          get_by_path(make_sub_path_optional(path, sub_path), element, &block)
+          handle_missing_errors(type, path, sub_path, element, &block)
         rescue Exception => e
           last_error = e
           error_count += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.43
 platform: ruby
 authors:
 - Keith Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport