spaceborne 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232e970030cdc9e2cc7684f87716e641e8a91282884238f65a6088d1a733a2ac
-  data.tar.gz: 540c79c202857327fa6660abdb9630ae941fe01cb87a14dff0aaa9971594946f
+  metadata.gz: 2c343c5f42e85c4baf10f9f22b530e7e9e1474226d7b5d0d7491eacd31046a72
+  data.tar.gz: dafa9fb460a2b631d9245eaa4b0dbfdd5476c0cf4f58ead485d668a27482fe13
 SHA512:
-  metadata.gz: 64a6a4e93ad545b4d8031daf0435bf14dc4537ff054bda2239baa522dbadebe7cc7972faea3abbe77822efbc1c3f05d3595f83d1743075982db8355c871ce34b
-  data.tar.gz: 52ec47b8cb939847dc0a03640b520f770190dc8aabf4f204bc1bd17998664dd90dfd9ba75a44e6f597c47cced27f88bdc34f326475dbe0e37d436d1e6a86e19a
+  metadata.gz: e3fa2aa4790c0e737205c089676186f3ebec3dde0bffde2c7d473677020e6e85f20995a2f047afc28d42985b02aa1ac990ab527becc7e9f88c8699c6d43f3d1a
+  data.tar.gz: 2de0cdcb90b4784582c51b4ad1e26e1accc59f01f0ea8f90ea197686d9a76a5b0bb1bf12648bf34e112a6f311359166089320c49143f538473a53895ecc6efe1

data/.ruby-version

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

data/lib/spaceborne.rb

@@ -118,13 +118,18 @@ 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
@@ -155,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
@@ -172,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
@@ -180,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
@@ -188,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
@@ -225,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.25'.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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Keith Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,15 +185,15 @@ 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:
   - - ">="
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Gem supporting API testing
 test_files: []