spaceborne 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b0e8ffb074901b03f8e7d2d67cbf294108c2559fabef084ac7c2949e85f087
-  data.tar.gz: bb2cbbb92cdbc25782fbcb65a80c6ab4a8ac61e6fec0c3580ea39ba5e2fa7093
+  metadata.gz: 39591d03867f81e331613646b71adc30e118a4b74b7b69d2b5217f9dfef1a4fb
+  data.tar.gz: 1b82c816bbacd0207a0ad4e19f5ba548c0807fcbab33e210655de9c40e27eda3
 SHA512:
-  metadata.gz: 4f8e39ba862e2b7877061b3dd34f6c33fb8f36c966098ce8002c4575c9d2d926bcb4c03dbb38d309d626dbecb96617f0eb161b86c29a17af0844be15e4b79e8c
-  data.tar.gz: c96f5aa29e78e05d0f384bdd938fb33610719fdfe29177a38c022771e421d306d8d5fdc38ec3a38493c0b10e3dd1ed86c408ad09b07d6eac270364ce0e06be1b
+  metadata.gz: 5c1d32293ddeac46fbd0fb20897b925ca71423a5c598255ef4353cfc41c2ebf987f7ab7448f0cf57af345574c77c707c631fa012a1b8e209a263f6a347936336
+  data.tar.gz: 2d53f4280e0d461d4cd3d1610e2e4ff95d59454b276d29c61658438b844d60d902336ce55dcd40213838c933ec3c2992fea997d149c704a8432853f3c3baf5ff

data/lib/spaceborne.rb

@@ -33,6 +33,7 @@ module Spaceborne
 
   def response_body
     return '' if response.request.method.casecmp('head').zero?
+
     str = if json?(response.headers)
             "  JSON_BODY\n#{JSON.pretty_generate(json_body)}\n"
           else
@@ -50,6 +51,7 @@ module Spaceborne
     yield
   rescue Exception => e
     raise e unless response
+
     e.message << request_info
     raise e
   end
@@ -87,17 +89,20 @@ module Airborne
       headers = base_headers.merge(options[:headers] || {})
       headers[:no_restclient_headers] = true
       return headers unless local[:is_hash]
+
       headers.delete('Content-Type') if options[:nonjson_data]
       headers
     end
 
     def handle_proxy(_options, local)
       return unless local[:proxy]
+
       RestClient.proxy = local[:proxy]
     end
 
     def calc_body(options, local)
       return '' unless options[:body]
+
       if local[:nonjson_data] || !local[:is_hash]
         options[:body]
       else
@@ -120,6 +125,8 @@ module Airborne
       hdrs = calc_headers(options, local_options)
       @request_body = calc_body(options, local_options)
       send_restclient(method, get_url(url), @request_body, hdrs)
+    rescue RestClient::ServerBrokeConnection => e
+      raise e
     rescue RestClient::Exception => e
       e.response
     end
@@ -127,7 +134,7 @@ module Airborne
     private
 
     def base_headers
-      { "Content-Type" => 'application/json' }
+      { 'Content-Type' => 'application/json' }
         .merge(Airborne.configuration.headers || {})
     end
   end
@@ -186,8 +193,37 @@ module Airborne
 
   # 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'
+        expect_all(json, &block)
+      when 'Hash'
+        json.each do |k, _v|
+          yield json[k]
+        end
+      end
+    end
+
+    def handle_type(type, path, json, &block)
+      if type == '*'
+        handle_container(json, &block)
+      elsif type == '?'
+        expect_one(path, json, &block)
+      else
+        yield json
+      end
+    end
+
     def get_by_path(path, json, &block)
       raise PathError, "Invalid Path, contains '..'" if /\.\./ =~ path
+
       type = false
       parts = path.to_s.split('.')
       parts.each_with_index do |part, index|
@@ -199,31 +235,14 @@ module Airborne
           end
           next
         end
-        begin
-          json = process_json(part, json)
-        rescue StandardError
-          raise PathError,
-                "Expected #{json.class}\nto be an object with property #{part}"
-        end
-      end
-      if type == '*'
-        case json.class.name
-        when 'Array'
-          expect_all(json, &block)
-        when 'Hash'
-          json.each do |k, _v|
-            yield json[k]
-          end
-        end
-      elsif type == '?'
-        expect_one(path, json, &block)
-      else
-        yield json
+        json = do_process_json(part, json)
       end
+      handle_type(type, path, json, &block)
     end
 
     def ensure_array_or_hash(path, json)
       return if json.class == Array || json.class == Hash
+
       raise RSpec::Expectations::ExpectationNotMetError,
             "Expected #{path} to be array or hash, got #{json.class}"\
             ' from JSON response'

data/lib/spaceborne/version.rb

@@ -1,3 +1,3 @@
 module Spaceborne
-  VERSION = '0.1.22'.freeze
+  VERSION = '0.1.23'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Keith Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport