spaceborne 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5efd85c470ba6cc01806761449631cf025c8c292
-  data.tar.gz: bd6a6120ed5496efc901d2d0e9adb23682bc49b6
+SHA256:
+  metadata.gz: 2c343c5f42e85c4baf10f9f22b530e7e9e1474226d7b5d0d7491eacd31046a72
+  data.tar.gz: dafa9fb460a2b631d9245eaa4b0dbfdd5476c0cf4f58ead485d668a27482fe13
 SHA512:
-  metadata.gz: a99e989c2bb0620be367e6c02e4d70301c97f6480343a78ae5703f20d4e8bf2da47f5176db333ac3c9b2bf07153d569a7eba406b0175b5c793276d069b28fe69
-  data.tar.gz: 67b291bcb88be8c825f3e4d452e23ed572a86c8b617ad94ab90c4a153d103e3084fb363c43f017c9d0e5d263f612ecd2c2f1be130f641ce82019d706d656f4f2
+  metadata.gz: e3fa2aa4790c0e737205c089676186f3ebec3dde0bffde2c7d473677020e6e85f20995a2f047afc28d42985b02aa1ac990ab527becc7e9f88c8699c6d43f3d1a
+  data.tar.gz: 2de0cdcb90b4784582c51b4ad1e26e1accc59f01f0ea8f90ea197686d9a76a5b0bb1bf12648bf34e112a6f311359166089320c49143f538473a53895ecc6efe1

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.21'.freeze
+  VERSION = '0.1.26'.freeze
 end

data/spaceborne.gemspec

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'spaceborne/version'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '2.5'
   spec.name          = 'spaceborne'
   spec.version       = Spaceborne::VERSION
   spec.authors       = ['Keith Williams']
@@ -22,14 +23,13 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'airborne', '~> 0.2.13'
-  spec.add_runtime_dependency 'curlyrest', '~> 0.1.0'
+  spec.add_runtime_dependency 'curlyrest', '~> 0.1.30'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'rack-test', '~> 0.6', '>= 0.6.2'
   spec.add_runtime_dependency 'rest-client', '< 3.0', '>= 1.7.3'
   spec.add_runtime_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'webmock', '~> 0'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'byebug', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'byebug', '~> 10.0.2'
+  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.21
+  version: 0.1.26
 platform: ruby
 authors:
 - Keith Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.30
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -90,22 +90,22 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,48 +134,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 10.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 10.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
@@ -199,24 +185,23 @@ homepage: https://github.com/keithrw54/spaceborne.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Gem supporting API testing
 test_files: []