spaceborne 0.1.23 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39591d03867f81e331613646b71adc30e118a4b74b7b69d2b5217f9dfef1a4fb
-  data.tar.gz: 1b82c816bbacd0207a0ad4e19f5ba548c0807fcbab33e210655de9c40e27eda3
+  metadata.gz: 955e28674b34b44d8264465bd6aea0473a32d24bd41ac0b7420c742d74f24105
+  data.tar.gz: 0a3a31bad0eb61d9d61d0acd85e717397a75ad8e586bb36de063c67201be2a0e
 SHA512:
-  metadata.gz: 5c1d32293ddeac46fbd0fb20897b925ca71423a5c598255ef4353cfc41c2ebf987f7ab7448f0cf57af345574c77c707c631fa012a1b8e209a263f6a347936336
-  data.tar.gz: 2d53f4280e0d461d4cd3d1610e2e4ff95d59454b276d29c61658438b844d60d902336ce55dcd40213838c933ec3c2992fea997d149c704a8432853f3c3baf5ff
+  metadata.gz: 2df85cbba09e2f1906770f968b881eaed916524faa4a9e6287a4602c753e03112880c0ca7e359680a62582a26df7f836bfdcd2f0a1414de9899038c0ec60e10c
+  data.tar.gz: 65e15247604df879cb821121c46ccc17f891a1204ae1895cf844a84d940151d68d0dc0a0bde9e6c26f1ee56bb462c75a90c4aa5f4d23aac9523c8d8c77102106

data/.ruby-version

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

data/lib/spaceborne.rb

@@ -118,17 +118,26 @@ 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
@@ -151,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 << "\nexpect 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
@@ -168,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
@@ -176,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
@@ -184,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
@@ -221,18 +230,22 @@ module Airborne
       end
     end
 
-    def get_by_path(path, json, &block)
+    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
         json = do_process_json(part, json)

data/lib/spaceborne/version.rb

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

data/spaceborne.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |spec|
   spec.description   = 'Extends brooklynDev/airborne'
   spec.homepage      = 'https://github.com/keithrw54/spaceborne.git'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '2.5.5'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'
@@ -30,5 +31,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.23
+  version: 0.1.28
 platform: ruby
 authors:
 - Keith Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-12-15 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,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.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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: []