spaceborne 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8713e4121c4170d47c98acc0c85efbd98bdc8d891f7f977fc792cbeddacc7435
-  data.tar.gz: 147f591492eb63348d02e0c88cb19086fd39e8d61851e6d82d86d0f3d45ae62d
+  metadata.gz: d742ea06ad022126a7a61fb008131b02d0f0f1db485d832570b85f845299c655
+  data.tar.gz: d7d452c83c164adebc69df71aef6aa2f12d50375be2e354463f7b7789b07c290
 SHA512:
-  metadata.gz: a29ff847e0b2c67e3d55799b3b933e6d448cc817a6a2e1365b23f0b92a1cb65fc8ece56d6142cb8eaf13baf1e84e090875b17fc641137942669174b78761ce66
-  data.tar.gz: 77b947419bc8c04318e0cb07ac47d122844f5e0a3ad1c0ceb993264f4966e99e54b0ca38b974a112dc9d94578b8a29547b0acaa9a09f2083546899d04d5b3276
+  metadata.gz: 7e16b9d1bc60eabc5257afb91510d4a715bd8ce76acccc820a255a96ad4b19f87732360d98e3dfbfcfd0f53bd2d7524a72868602df29b2bc5fa871a15128e40e
+  data.tar.gz: 0bac75438755e532b9d39c10864d91430d9a7d281f7d89b9ee1d1943ab7951381432fb0e48ccd39bbc95725dafb8db93a99ba4edc9a53eebec3d6c4bc8e15e59

data/lib/spaceborne.rb

@@ -156,6 +156,22 @@ module Airborne
 
   # Extend airborne's expectations
   module RequestExpectations
+    class OptionalPathExpectations
+      def initialize(string)
+        @string = string
+      end
+      def to_s
+        @string.to_s
+      end
+    end
+
+    def do_process_json(part, json)
+      json = process_json(part, json)
+    rescue StandardError
+      raise PathError,
+            "Expected #{json.class}\nto be an object with property #{part}"
+    end
+
     def call_with_relative_path(data, args)
       if args.length == 2
         get_by_path(args[0], data) do |json_chunk|
@@ -204,17 +220,18 @@ module Airborne
         end
       end
     end
+
+    def optional(data)
+      if data.is_a?(Hash)
+        OptionalHashTypeExpectations.new(data)
+      else
+        OptionalPathExpectations.new(data)
+      end
+    end
   end
 
   # extension to handle hash value checking
   module PathMatcher
-    def do_process_json(part, json)
-      json = process_json(part, json)
-    rescue StandardError
-      raise PathError,
-            "Expected #{json.class}\nto be an object with property #{part}"
-    end
-
     def handle_container(json, &block)
       case json.class.name
       when 'Array'
@@ -237,38 +254,34 @@ module Airborne
       end
     end
 
-    def path_to_s(path)
-      path.is_a?(Airborne::OptionalHashTypeExpectations) ? path.hash.to_s : path
-    end
-
-    def make_path_optional(path, sub_path)
-      if path.is_a?(Airborne::OptionalHashTypeExpectations)
-        Airborne::OptionalHashTypeExpectations.new(sub_path)
+    def make_sub_path_optional(path, sub_path)
+      if path.is_a?(Airborne::OptionalPathExpectations)
+        Airborne::OptionalPathExpectations.new(sub_path)
       else
         sub_path
       end
     end
 
     def iterate_path(path)
-      raise PathError, "Invalid Path, contains '..'" if /\.\./ =~ path_to_s(path)
+      raise PathError, "Invalid Path, contains '..'" if /\.\./ =~ path.to_s
 
-      parts = path_to_s(path).to_s.split('.')
+      parts = path.to_s.split('.')
       parts.each_with_index do |part, index|
-        use_part = make_path_optional(path, part)
+        use_part = make_sub_path_optional(path, part)
         yield(parts, use_part, index)
       end
     end
 
     def get_by_path(path, json, type: false, &block)
       iterate_path(path) do |parts, part, index|
-        if %w[* ?].include?(path_to_s(part))
+        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
 
           next
         end
-        json = do_process_json(path_to_s(part), json)
+        json = do_process_json(part.to_s, json)
       end
       handle_type(type, path, json, &block)
     end
@@ -288,7 +301,7 @@ module Airborne
       json.each do |element|
         begin
           sub_path = parts[(index.next)...(parts.length)].join('.')
-          get_by_path(make_path_optional(path, sub_path), element, &block)
+          get_by_path(make_sub_path_optional(path, sub_path), element, &block)
         rescue Exception => e
           last_error = e
           error_count += 1

data/lib/spaceborne/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Keith Williams