spaceborne 0.1.22 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b0e8ffb074901b03f8e7d2d67cbf294108c2559fabef084ac7c2949e85f087
-  data.tar.gz: bb2cbbb92cdbc25782fbcb65a80c6ab4a8ac61e6fec0c3580ea39ba5e2fa7093
+  metadata.gz: 65594555f221b6872a3879ff3b950fb367dfe58e59e5fa6a783adaef06500b14
+  data.tar.gz: 2f2fcd333db9cccfd7123344a7fbdc64d6eef5881b1a6753faaa27187e5520e0
 SHA512:
-  metadata.gz: 4f8e39ba862e2b7877061b3dd34f6c33fb8f36c966098ce8002c4575c9d2d926bcb4c03dbb38d309d626dbecb96617f0eb161b86c29a17af0844be15e4b79e8c
-  data.tar.gz: c96f5aa29e78e05d0f384bdd938fb33610719fdfe29177a38c022771e421d306d8d5fdc38ec3a38493c0b10e3dd1ed86c408ad09b07d6eac270364ce0e06be1b
+  metadata.gz: 7dbff4868d6078d249e9305a09bd9538a79e6aada32de8bcf54215f4abef7a3b815086ca968ca43b7a9ad813bf048cc33d5513bc62e981befcfaf77d43482a3a
+  data.tar.gz: 0f8252b4ff5715d6abf9b34ba85de55073eb53dee854a2420e81e7f20fdf93ad18bdff1bd39785595e77a2601402e8fc6bd3fbf8945ffb4cb3816bfe9176493f

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.5.5

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
@@ -113,21 +118,32 @@ module Airborne
       end
     end
 
-    def make_request(method, url, options = {})
+    def pre_request(options)
       @json_body = nil
       local_options = split_options(options)
       handle_proxy(options, local_options)
       hdrs = calc_headers(options, local_options)
       @request_body = calc_body(options, local_options)
-      send_restclient(method, get_url(url), @request_body, hdrs)
+      [hdrs, @request_body]
+    end
+
+    def make_request(method, url, options = {})
+      hdrs, body = pre_request(options)
+      send_restclient(method, get_url(url), body, hdrs)
+    rescue RestClient::ServerBrokeConnection => e
+      raise e
     rescue RestClient::Exception => e
-      e.response
+      if [301, 302].include?(e.response.code)
+        e.response.follow_redirection
+      else
+        e.response
+      end
     end
 
     private
 
     def base_headers
-      { "Content-Type" => 'application/json' }
+      { 'Content-Type' => 'application/json' }
         .merge(Airborne.configuration.headers || {})
     end
   end
@@ -144,16 +160,16 @@ module Airborne
       end
     end
 
-    def exception_path_adder(path)
+    def exception_path_adder(args)
       yield
     rescue Airborne::ExpectationError => e
-      e.message << " at location #{path}"
+      e.message << "expect arguments: #{args}"
       raise e
     end
 
     def expect_json_types(*args)
       call_with_relative_path(json_body, args) do |param, body|
-        exception_path_adder(args[0]) do
+        exception_path_adder(args) do
           expect_json_types_impl(param, body)
         end
       end
@@ -161,7 +177,7 @@ module Airborne
 
     def expect_json(*args)
       call_with_relative_path(json_body, args) do |param, body|
-        exception_path_adder(args[0]) do
+        exception_path_adder(args) do
           expect_json_impl(param, body)
         end
       end
@@ -169,7 +185,7 @@ module Airborne
 
     def expect_header_types(*args)
       call_with_relative_path(response.headers, args) do |param, body|
-        exception_path_adder(args[0]) do
+        exception_path_adder(args) do
           expect_json_types_impl(param, body)
         end
       end
@@ -177,7 +193,7 @@ module Airborne
 
     def expect_header(*args)
       call_with_relative_path(response.headers, args) do |param, body|
-        exception_path_adder(args[0]) do
+        exception_path_adder(args) do
           expect_json_impl(param, body)
         end
       end
@@ -186,44 +202,60 @@ module Airborne
 
   # extension to handle hash value checking
   module PathMatcher
-    def get_by_path(path, json, &block)
+    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 iterate_path(path)
       raise PathError, "Invalid Path, contains '..'" if /\.\./ =~ path
-      type = false
+
       parts = path.to_s.split('.')
       parts.each_with_index do |part, index|
+        yield(parts, part, index)
+      end
+    end
+
+    def get_by_path(path, json, type = false, &block)
+      iterate_path(path) do |parts, part, index|
         if %w[* ?].include?(part)
           ensure_array_or_hash(path, json)
           type = part
-          if index < parts.length.pred
-            walk_with_path(type, index, path, parts, json, &block) && return
-          end
+          walk_with_path(type, index, path, parts, json, &block) && return if index < parts.length.pred
+
           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.27'.freeze
 end

data/spaceborne.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 0'
 
   spec.add_development_dependency 'byebug', '~> 10.0.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.27
 platform: ruby
 authors:
 - Keith Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: Extends brooklynDev/airborne
 email:
 - keithrw@comcast.net
@@ -185,7 +185,7 @@ homepage: https://github.com/keithrw54/spaceborne.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Gem supporting API testing
 test_files: []