spaceborne 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232e970030cdc9e2cc7684f87716e641e8a91282884238f65a6088d1a733a2ac
-  data.tar.gz: 540c79c202857327fa6660abdb9630ae941fe01cb87a14dff0aaa9971594946f
+  metadata.gz: 19012125b047e951b20210def0f4ea65b6c7f10542e666eb153df34e02783d34
+  data.tar.gz: dd9e9059c96a19b14baad98b4a86454a41643bb220094c7df62db213017aa99c
 SHA512:
-  metadata.gz: 64a6a4e93ad545b4d8031daf0435bf14dc4537ff054bda2239baa522dbadebe7cc7972faea3abbe77822efbc1c3f05d3595f83d1743075982db8355c871ce34b
-  data.tar.gz: 52ec47b8cb939847dc0a03640b520f770190dc8aabf4f204bc1bd17998664dd90dfd9ba75a44e6f597c47cced27f88bdc34f326475dbe0e37d436d1e6a86e19a
+  metadata.gz: 654824c04e0658652b73f32cf59274d63ffc78e44e5f2119b31f367300b70ae76fbce719b8eea06b574acd23de3a4c57571c7bd3d12000a75d713df707784b19
+  data.tar.gz: b9af3be6d62faa09701ca474bb49141e603bff8d00227fcab1c711e8461866cf7bf8c1bb1bd8bbdc56dfb334a54ae158b2cec534b5faf343e84e60462e12fc7e

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .byebug_history
+.idea/

data/.ruby-version

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

data/lib/spaceborne.rb

@@ -34,12 +34,11 @@ 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
-            "  BODY\n#{response.body}\n"
-          end
-    str
+    if json?(response.headers)
+      "  JSON_BODY\n#{JSON.pretty_generate(json_body)}\n"
+    else
+      "  BODY\n#{response.body}\n"
+    end
   end
 
   def request_info(str = "\n")
@@ -118,18 +117,23 @@ 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
-      if [301, 302].include?(e.response.code)
-        e.response.follow_redirection
+      if [301, 302].include?(e.response&.code)
+        e.response.&follow_redirection
       else
         e.response
       end
@@ -155,16 +159,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
@@ -172,7 +176,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 +184,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 +192,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
@@ -209,9 +213,9 @@ module Airborne
       when 'Array'
         expect_all(json, &block)
       when 'Hash'
-        json.each do |k, _v|
-          yield json[k]
-        end
+        json.each { |k, _v| yield json[k] }
+      else
+        raise ExpectationError, "expected array or hash, got #{json.class.name}"
       end
     end
 
@@ -225,18 +229,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.30'.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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - Keith Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-12-18 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.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: []