spaceborne 0.1.28 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955e28674b34b44d8264465bd6aea0473a32d24bd41ac0b7420c742d74f24105
-  data.tar.gz: 0a3a31bad0eb61d9d61d0acd85e717397a75ad8e586bb36de063c67201be2a0e
+  metadata.gz: f58273cad226d88a4d39c7065f1c1628990f779024ca7e4c4a5456b8381c033d
+  data.tar.gz: 19eae317b4a2cd4a69a14b5e2afe8f721c08728ead59ff6a6cba732c4722afbd
 SHA512:
-  metadata.gz: 2df85cbba09e2f1906770f968b881eaed916524faa4a9e6287a4602c753e03112880c0ca7e359680a62582a26df7f836bfdcd2f0a1414de9899038c0ec60e10c
-  data.tar.gz: 65e15247604df879cb821121c46ccc17f891a1204ae1895cf844a84d940151d68d0dc0a0bde9e6c26f1ee56bb462c75a90c4aa5f4d23aac9523c8d8c77102106
+  metadata.gz: 41c07d21fdd9bad257bff28db8c911e3339846e1691cf72ebeedb26d0ab1afd3253a731d7d847af00f9b32a15b7cf4f8e6bda9eab5271c8a32388858e9858333
+  data.tar.gz: e60a31d5d9ad75915c4ef6d31615b96e8ca45c22b40dd0eb3ad77c7f91fcf4163a6f95c1ce4abff8c98b35b717d978c6d968223a7200368849b84cef28a2e2a8

data/.gitignore

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

data/README.md

@@ -205,8 +205,9 @@ Validation for headers follows the same pattern as above, although nesting of mu
   * `expect_header_types same arguments/handling as expect_json_types`
 5. It is possible to use non-json data in a request
 6. Expectations on a response with an array of hashes with keys that are unknown, but that have a defined structure are supported (using the '*' in a path)
+7. Responses that have header with Content-Encoding of gzip are gunzip'd in json_body
 
-The following example shows how this works
+The following example shows how extension # 6 works
 
 ```ruby
 { "array_of_hashes": [

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")
@@ -59,8 +58,16 @@ end
 
 # monkeypatch Airborne
 module Airborne
+  def decode_body
+    if response.headers[:content_encoding]&.include?('gzip')
+      Zlib::Inflate.new(32 + Zlib::MAX_WBITS).inflate(response.body)
+    else
+      response.body
+    end
+  end
+
   def json_body
-    @json_body ||= JSON.parse(response.body, symbolize_names: true)
+    @json_body ||= JSON.parse(decode_body, symbolize_names: true)
   rescue StandardError
     raise InvalidJsonError, 'Api request returned invalid json'
   end
@@ -133,8 +140,8 @@ module Airborne
     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
@@ -160,16 +167,16 @@ module Airborne
       end
     end
 
-    def exception_path_adder(args)
+    def exception_path_adder(args, body)
       yield
-    rescue Airborne::ExpectationError => e
-      e.message << "\nexpect arguments: #{args}"
+    rescue RSpec::Expectations::ExpectationNotMetError, Airborne::ExpectationError => e
+      e.message << "\nexpect arguments: #{args}\ndata element: #{body}"
       raise e
     end
 
     def expect_json_types(*args)
       call_with_relative_path(json_body, args) do |param, body|
-        exception_path_adder(args) do
+        exception_path_adder(args, body) do
           expect_json_types_impl(param, body)
         end
       end
@@ -177,7 +184,7 @@ module Airborne
 
     def expect_json(*args)
       call_with_relative_path(json_body, args) do |param, body|
-        exception_path_adder(args) do
+        exception_path_adder(args, body) do
           expect_json_impl(param, body)
         end
       end
@@ -185,7 +192,7 @@ module Airborne
 
     def expect_header_types(*args)
       call_with_relative_path(response.headers, args) do |param, body|
-        exception_path_adder(args) do
+        exception_path_adder(args, body) do
           expect_json_types_impl(param, body)
         end
       end
@@ -193,7 +200,7 @@ module Airborne
 
     def expect_header(*args)
       call_with_relative_path(response.headers, args) do |param, body|
-        exception_path_adder(args) do
+        exception_path_adder(args, body) do
           expect_json_impl(param, body)
         end
       end
@@ -214,9 +221,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
 

data/lib/spaceborne/version.rb

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

data/spaceborne.gemspec

@@ -12,7 +12,7 @@ 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.required_ruby_version = '~> 2.5.5'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'airborne', '~> 0.2.13'
+  spec.add_runtime_dependency 'airborne', '~> 0.3'
   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 'rack-test', '~> 1.1', '<= 2.0'
   spec.add_runtime_dependency 'rest-client', '< 3.0', '>= 1.7.3'
-  spec.add_runtime_dependency 'rspec', '~> 3.1'
+  spec.add_runtime_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'webmock', '~> 0'
 
   spec.add_development_dependency 'byebug', '~> 10.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaceborne
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.33
 platform: ruby
 authors:
 - Keith Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: curlyrest
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +72,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '='
+  - - "~>"
     - !ruby/object:Gem::Version
       version: 2.5.5
 required_rubygems_version: !ruby/object:Gem::Requirement