webspicy 0.14.0 → 0.15.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b78ed1d162fe75c83bd7bffa819b61ec7153dab
-  data.tar.gz: c5a6ba9ee1d76e1e861d1952fd135664a5e1b408
+SHA256:
+  metadata.gz: 510691d8141022c21d24de399e71457354d6ef9852463459245c66aae49cf8c7
+  data.tar.gz: a95593328ab9190d8f58b63308e31671528d4a9ef8b464772f4b80a74fee07b6
 SHA512:
-  metadata.gz: 31da61f468c86496d77f1eb659e17e4b02ec4de80ba14e6a6220a26cde324c9b0113099c4457f45a05be378ccd2acbaba172268fe60000172704c992623a8554
-  data.tar.gz: a347f32c634c884cfdb29ee92e5a4b0d6ca5134b9f9ec95ac8ee604e244ac3f332fc71b846e47c9a3744febcf63fcc631c0f7a0cf1cc452f880f25370c2a3406
+  metadata.gz: 6c2be87c7977f92f5855f3d9f8d45efe5824c30e634136df977f8c77f020725eb1b7750ec176c7f8e75313000a71b0dbc2e108a08a529db2830c0eeefb2381b6
+  data.tar.gz: 7d476d7a3ccd38f998ed54e132fb58324634de107144e858d4847918a493bf2acfc6d7aed1c6527a1056b9af5073e62d9e70cc5822b1955ada39471ab1c048fd

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.14.0)
+    webspicy (0.15.0.pre.rc1)
       finitio (>= 0.8.0)
       http (~> 2)
       mustermann (~> 1.0)
@@ -33,14 +33,15 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    mustermann (1.0.3)
-    mustermann-contrib (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
-      mustermann (= 1.0.3)
+      mustermann (= 1.1.1)
     path (1.3.3)
     public_suffix (4.0.3)
-    rack (2.0.7)
-    rack-protection (2.0.7)
+    rack (2.2.2)
+    rack-protection (2.0.8.1)
       rack
     rack-robustness (1.1.0)
     rack-test (0.6.3)
@@ -61,10 +62,11 @@ GEM
     rspec-support (3.9.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sinatra (2.0.7)
+    ruby2_keywords (0.0.2)
+    sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.7)
+      rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
     tilt (2.0.10)
     unf (0.1.4)
@@ -80,4 +82,4 @@ DEPENDENCIES
   webspicy!
 
 BUNDLED WITH
-   2.1.0.pre.1
+   2.0.2

data/lib/webspicy.rb

@@ -18,8 +18,6 @@ module Webspicy
   require 'webspicy/file_upload'
   require 'webspicy/scope'
   require 'webspicy/client'
-  require 'webspicy/client/http_client'
-  require 'webspicy/client/rack_test_client'
   require 'webspicy/resource'
   require 'webspicy/precondition'
   require 'webspicy/postcondition'
@@ -132,6 +130,9 @@ module Webspicy
 
   LOGGER = ::Logger.new(STDOUT)
   LOGGER.level = Logger.const_get(ENV['LOG_LEVEL'] || 'WARN')
+  LOGGER.formatter = proc { |severity, datetime, progname, msg|
+    "      " + msg + "\n"
+  }
 
   def info(*args, &bl)
     LOGGER && LOGGER.info(*args, &bl)

data/lib/webspicy/client.rb

@@ -56,3 +56,6 @@ module Webspicy
 
   end
 end
+require_relative 'client/support'
+require_relative 'client/http_client'
+require_relative 'client/rack_test_client'

data/lib/webspicy/client/http_client.rb

@@ -40,33 +40,32 @@ module Webspicy
     end
 
     class Api
+      include Client::Support
 
       attr_reader :last_response
 
       def options(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("OPTIONS #{url} -- #{params.inspect}")
+        info_request("OPTIONS", url, params, headers, body)
 
         @last_response = HTTP[headers || {}].options(url, params: params)
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
 
       def get(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("GET #{url} -- #{params.inspect}")
+        info_request("GET", url, params, headers, body)
 
         @last_response = HTTP[headers || {}].get(url, params: params)
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
 
       def post(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("POST #{url} -- #{params.inspect}")
+        info_request("POST", url, params, headers, body)
 
         url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
 
@@ -87,43 +86,39 @@ module Webspicy
           @last_response = HTTP[headers].post(url, body: body)
         end
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
 
       def patch(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("PATCH #{url} -- #{params.inspect}")
+        info_request("PATCH", url, params, headers, body)
 
         headers ||= {}
         headers['Content-Type'] ||= 'application/json'
         @last_response = HTTP[headers].patch(url, body: params.to_json)
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
 
       def post_form(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("POST #{url} -- #{params.inspect}")
+        info_request("POST", url, params, headers, body)
 
         @last_response = HTTP[headers || {}].post(url, form: params)
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
 
       def delete(url, params = {}, headers = nil, body = nil)
-        Webspicy.info("DELETE #{url} -- #{params.inspect}")
+        info_request("DELETE", url, params, headers, body)
 
         @last_response = HTTP[headers || {}].delete(url, body: params.to_json)
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end

data/lib/webspicy/client/rack_test_client.rb

@@ -54,6 +54,7 @@ module Webspicy
     end # class RackHandler
 
     class Api
+      include Client::Support
 
       attr_reader :last_response
 
@@ -64,13 +65,12 @@ module Webspicy
       def options(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
-        Webspicy.info("OPTIONS #{url} -- #{params.inspect} -- #{headers.inspect}")
+        info_request("OPTIONS", url, params, headers, body)
 
         handler.options(url, params)
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
@@ -79,13 +79,12 @@ module Webspicy
         handler = get_handler(headers)
 
         params = Hash[params.map{|k,v| [k, v.nil? ? "" : v] }]
-        Webspicy.info("GET #{url} -- #{params.inspect} -- #{headers.inspect}")
+        info_request("GET", url, params, headers, body)
 
         handler.get(url, params)
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
@@ -97,20 +96,19 @@ module Webspicy
 
         case body
         when NilClass
-          Webspicy.info("POST #{url} -- #{params.inspect} -- #{headers.inspect}")
+          info_request("POST", url, params, headers, body)
           handler.post(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
         when FileUpload
           file = Rack::Test::UploadedFile.new(body.path, body.content_type)
-          Webspicy.info("POST #{url} -- #{params.inspect} -- #{body}")
+          info_request("POST", url, params, headers, body)
           handler.post(url, body.param_name.to_sym => file)
         else
-          Webspicy.info("POST #{url} -- #{params.inspect} -- #{body.inspect[0..25]}")
+          info_request("POST", url, params, headers, body)
           handler.post(url, body)
         end
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
@@ -118,13 +116,12 @@ module Webspicy
       def patch(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
-        Webspicy.info("PATCH #{url} -- #{params.inspect} -- #{headers.inspect}")
+        info_request("PATCH", url, params, headers, body)
 
         handler.patch(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
@@ -132,13 +129,12 @@ module Webspicy
       def post_form(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
-        Webspicy.info("POST #{url} -- #{params.inspect} -- #{headers.inspect}")
+        info_request("POST", url, params, headers, body)
 
         handler.post(url, params)
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end
@@ -146,13 +142,12 @@ module Webspicy
       def delete(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
-        Webspicy.info("DELETE #{url} -- #{params.inspect} -- #{headers.inspect}")
+        info_request("DELETE", url, params, headers, body)
 
         handler.delete(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
         @last_response = handler.last_response
 
-        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
-        Webspicy.debug("Response (#{@last_response.status}):  #{@last_response.body}")
+        debug_response(@last_response)
 
         @last_response
       end

data/lib/webspicy/client/support.rb

@@ -0,0 +1,39 @@
+module Webspicy
+  class Client
+    module Support
+
+      def info_request(kind, url, params, headers, body)
+        Webspicy.info("#{kind} #{url}")
+        debug("Req params", JSON.pretty_generate(params)) if params
+        debug("Req headers", JSON.pretty_generate(headers)) if headers
+        debug("Req body", JSON.pretty_generate(body)) if body
+        Webspicy.debug("")
+      end
+
+      def debug_response(response)
+        debug("Res status", @last_response.status)
+        debug("Res headers", JSON.pretty_generate(last_response.headers.to_h))
+        debug("Res body", response_body_to_s(last_response))
+        Webspicy.debug("")
+      end
+
+      def debug(what, value)
+        Webspicy.debug("  #{what}: " + value_to_s(value))
+      end
+
+      def response_body_to_s(response)
+        case response.content_type.to_s
+        when /json/
+          JSON.pretty_generate(JSON.load(response.body))
+        else
+          response.body.to_s
+        end
+      end
+
+      def value_to_s(value)
+        value.to_s.gsub(/\n/, "\n        ")
+      end
+
+    end # module Support
+  end # class Client
+end # module Webspicy

data/lib/webspicy/version.rb

@@ -1,8 +1,8 @@
 module Webspicy
   module Version
     MAJOR = 0
-    MINOR = 14
-    TINY  = 0
+    MINOR = 15
+    TINY  = "0-rc1"
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0.pre.rc1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -210,6 +210,7 @@ files:
 - lib/webspicy/client.rb
 - lib/webspicy/client/http_client.rb
 - lib/webspicy/client/rack_test_client.rb
+- lib/webspicy/client/support.rb
 - lib/webspicy/configuration.rb
 - lib/webspicy/file_upload.rb
 - lib/webspicy/formaldoc.fio
@@ -255,12 +256,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!