spaceborne 0.1.38 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d742ea06ad022126a7a61fb008131b02d0f0f1db485d832570b85f845299c655
-  data.tar.gz: d7d452c83c164adebc69df71aef6aa2f12d50375be2e354463f7b7789b07c290
+  metadata.gz: 66c180d30b3917866f8729f651f22862158acb805ac7411494afd9bfcd2b8387
+  data.tar.gz: 435b8c3d85815b31eb853c71f882ae2d5ccba9597f187d21bd39b9821741d62e
 SHA512:
-  metadata.gz: 7e16b9d1bc60eabc5257afb91510d4a715bd8ce76acccc820a255a96ad4b19f87732360d98e3dfbfcfd0f53bd2d7524a72868602df29b2bc5fa871a15128e40e
-  data.tar.gz: 0bac75438755e532b9d39c10864d91430d9a7d281f7d89b9ee1d1943ab7951381432fb0e48ccd39bbc95725dafb8db93a99ba4edc9a53eebec3d6c4bc8e15e59
+  metadata.gz: 01f34ca4e5cf037f0d5a33e5739f67e542409d9ce9acb6350009e937f435cc199ad136f95ae67e2f156801d453e4f1c99a93098d9b04e7341231f90bd4092ec6
+  data.tar.gz: bb5bf155fa4f106c410c680948b796506b53e3972f6d932ae8efd51660362a7de95de858a122689da2d7b05da6f09e43839779a4701d96335445461b044602c6

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  SuggestExtensions: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -23,7 +26,7 @@ Metrics/ClassLength:
   Exclude:
     - 'bin/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - 'spec/airborne/**/*.rb'
 

data/README.md

@@ -226,15 +226,16 @@ The following example shows how extensions # 6 & 8 work
 		   { "array": [] },
 		   { "foo": "bar" }],
   "highest_array": [ null,
-		     { "array": [{ "present": "name" }]}]
+		     { "array": [{ "present": "name" }]}],
+  "not_an_array":  null
 }
 ```
 You can now validate the fact that each element in the collection has a key which is variant, but a value that has a defined format (the first and last field values are strings).
 
     expect_json_types('array_of_hashes.*.*', first: :string, last: :string)
     expect_json_types('hash_of_hashes.*', first: :string, last: :string)
-	expect_json_types(optional('lowest_array.*.array.*'), present: :string)
-	expect_json_types(optional('highest_array.*.array.*'), present: :string)
+    expect_json_types(optional('lowest_array.*.array.*'), present: :string)
+    expect_json_types(optional('highest_array.*.array.*'), present: :string)
 
 
 ## Development

data/lib/spaceborne/version.rb

@@ -1,3 +1,3 @@
 module Spaceborne
-  VERSION = '0.1.38'.freeze
+  VERSION = '0.1.42'.freeze
 end

data/lib/spaceborne.rb

@@ -156,10 +156,12 @@ module Airborne
 
   # Extend airborne's expectations
   module RequestExpectations
+    # class used for holding an optional path
     class OptionalPathExpectations
       def initialize(string)
         @string = string
       end
+
       def to_s
         @string.to_s
       end
@@ -184,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
@@ -225,7 +229,7 @@ module Airborne
       if data.is_a?(Hash)
         OptionalHashTypeExpectations.new(data)
       else
-        OptionalPathExpectations.new(data)
+        Airborne::OptionalPathExpectations.new(data)
       end
     end
   end
@@ -244,7 +248,7 @@ module Airborne
     end
 
     def handle_type(type, path, json, &block)
-      case type
+      case type.to_s
       when '*'
         handle_container(json, &block)
       when '?'
@@ -272,12 +276,17 @@ module Airborne
       end
     end
 
+    def shortcut_validation(path, json)
+      json.nil? && path.is_a?(Airborne::OptionalPathExpectations)
+    end
+
     def get_by_path(path, json, type: false, &block)
       iterate_path(path) do |parts, part, index|
+        return if shortcut_validation(path, json)
+
         if %w[* ?].include?(part.to_s)
-          ensure_array_or_hash(path, json)
           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
@@ -294,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.38
+  version: 0.1.42
 platform: ruby
 authors:
 - Keith Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport