webspicy 0.20.17 → 0.20.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9ccb05ac501d744769feebb3bb41d5775727fbf11b2507cd3d2aee6d0b6f10
-  data.tar.gz: 5b314097454003e48edd6e72a94e05f439709478586ac0eefb1a31eed1192d37
+  metadata.gz: 91e515bc7abf0feb3e3aa3eba50edba87a50e4242240aaffb67aee547038d537
+  data.tar.gz: 2535c3943955ee893484c49bad9cad525c7a90f29f27fb7f891ca7c0e8cd4d33
 SHA512:
-  metadata.gz: 40dcc1ae84b4bd1146412435663e2d2198c53dc15cc858b5e88370656d6bf612b056b542cb7efef71b69dec395bbb0a36766b731f053c84b1f760c66e02ff942
-  data.tar.gz: 29744550467db7bd83ad6e102e8296fe4df99911f2b29c77af66488ef37320bbfecf8a37258e931cde4bd7b3a02715b733125e3fbefa73cbe13e72fd3bba511b
+  metadata.gz: 992437acb1f193a70e47132cdb00951d0e8dcf40d761cd93194924a2849e8c92391591995ea1d07935c1f0bebb952e5bec177e6782c2b66898c5f16d7e4e843a
+  data.tar.gz: be6fadddc53304cf9ee2111a064f81b126f9fe1560d4a89b5bb6d60623aed88770c4fa13505d9403e811ee5e784c752ad771e401988bc85fecb411be96a2e92a

data/lib/webspicy/tester.rb

@@ -118,13 +118,12 @@ module Webspicy
     def run_service
       scope.each_testcase(service) do |test_case|
         @test_case = test_case
-        reporter.before_test_case
         run_test_case
-        reporter.test_case_done
       end
     end
 
     def run_test_case
+      reporter.before_test_case
       hooks.fire_around(self) do
         reporter.before_each
         hooks.fire_before_each(self)
@@ -143,9 +142,9 @@ module Webspicy
         reporter.after_each
         hooks.fire_after_each(self)
         reporter.after_each_done
-
-        raise FailFast if !result.success? and failfast?
       end
+      reporter.test_case_done
+      raise FailFast if !result.success? && failfast?
     end
 
     def call_test_case_target

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 17
+    TINY  = 18
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/webspicy/web/inferer/config.ru

@@ -0,0 +1,8 @@
+require "webspicy"
+require "webspicy/web"
+require "webspicy/web/inferer"
+require 'logger'
+require 'rack'
+config = Webspicy::Configuration.dress(Path("/formalspec/"))
+use Rack::CommonLogger, Logger.new(STDOUT)
+run Webspicy::Web::Inferer.new(config)

data/lib/webspicy/web/inferer.rb

@@ -0,0 +1,95 @@
+require 'rack/proxy'
+module Webspicy
+  module Web
+    class Inferer < Rack::Proxy
+
+      def initialize(config, options = nil)
+        @webspicy_config = config
+        @webspicy_options = options || options_from_env
+        super(proxy_options)
+      end
+      attr_reader :webspicy_config, :webspicy_options
+
+      def rewrite_env(env)
+        env = env.merge(static_env)
+        env = handle_path_info(env)
+        env
+      end
+
+      def rewrite_response(triplet)
+        triplet
+      end
+
+      protected
+
+      def options_from_env
+        {
+          target_endpoint: ENV['PROXY_TARGET_ENDPOINT'] || config.host
+        }
+      end
+
+      def proxy_options
+        uri = target_uri
+        backend = "#{uri.scheme}://#{uri.host}"
+        backend = "#{backend}:#{uri.port}" if uri.port != 80 && uri.port != 443
+        {
+          streaming: false,
+          backend: backend
+        }
+      end
+
+      def static_env
+        @static_env ||= begin
+          e = {}
+          e['HTTP_HOST'] = target_uri.host
+          e
+        end
+      end
+
+      def target_uri
+        @target_uri ||= URI.parse(webspicy_options[:target_endpoint])
+      end
+
+      def handle_path_info(env)
+        return env if target_uri.path.nil? || target_uri.path.empty?
+
+        env['PATH_INFO'] = "#{target_uri.path}#{env['PATH_INFO']}"
+        env
+      end
+
+      def perform_request(env)
+        webspicy_dump_request(env)
+        super.tap{|triplet|
+          webspicy_dump_response(env, triplet)
+        }
+      end
+
+      def webspicy_dump_request(env)
+        base_file = webspicy_dump_basefile(env)
+        env['rack.input'].rewind
+        input = ''
+        env['rack.input'].each { |s| input << s }
+        base_file.add_ext('.body').write(input)
+        env['rack.input'].rewind
+      end
+
+      def webspicy_dump_response(env, triplet)
+        base_file = webspicy_dump_basefile(env)
+        base_file.add_ext('.env.json').write(
+          JSON.pretty_generate(env)
+        )
+        base_file.add_ext('.triplet.json').write(
+          JSON.pretty_generate(triplet)
+        )
+      end
+
+      def webspicy_dump_basefile(env)
+        path, method = env['PATH_INFO'], env['REQUEST_METHOD'].downcase
+        target_folder = (webspicy_config.folder/'inferer'/'dump')/path[1..-1]
+        target_folder.mkdir_p
+        target_folder/"#{method}.#{Time.now.to_i}"
+      end
+
+    end # class Inferer
+  end # module Web
+end # module Webspicy

data/lib/webspicy/web/openapi/generator.rb

@@ -36,19 +36,25 @@ module Webspicy
 
         def path_for(specification)
           {
-            specification.url => {
+            standardize(specification.url) => {
               summary: specification.name
             }.merge(verbs_for(specification))
           }
         end
 
+        def standardize(url)
+          url = url.gsub(/\/$/, '') if url =~ /\/$/
+          url
+        end
+
         def verbs_for(specification)
           specification.services.inject({}) do |verbs,service|
             verb = service.method.downcase
             verb_defn = {
               description: service.description,
+              parameters: parameters_for(service),
               responses: responses_for(service)
-            }
+            }.compact
             unless ["get", "options", "delete", "head"].include?(verb)
               verb_defn[:requestBody] = request_body_for(service)
             end
@@ -58,15 +64,29 @@ module Webspicy
 
         def request_body_for(service)
           schema = actual_input_schema(service)
+          example = nil # catch(:unfound) { generator.call(schema, {}) }
           {
             required: true,
             content: {
               "application/json" => {
                 schema: schema.to_json_schema,
-                example: generator.call(schema, {})
-              }
+                example: example
+              }.compact
+            }
+          }
+        end
+
+        def parameters_for(service)
+          schema = actual_input_schema(service)
+          params = service.specification.url_placeholders.map{|p|
+            {
+              in: 'path',
+              name: p,
+              schema: { type: "string" },
+              required: true
             }
           }
+          params.empty? ? nil : params
         end
 
         def responses_for(service)

data/spec/unit/web/inferer/test_inferer.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'rack/test'
+require 'webspicy/web'
+require 'webspicy/web/inferer'
+module Webspicy
+  module Web
+    describe Inferer do
+      include Rack::Test::Methods
+
+      let(:config) {
+        Configuration.dress(restful_folder)
+      }
+
+      let(:options) {{
+        :target_endpoint => "https://reqres.in/api"
+      }}
+
+      let(:app) {
+        Inferer.new(config, options)
+      }
+
+      describe 'proxy_options' do
+        it 'works' do
+          expect(app.send(:proxy_options)).to eql({
+            :streaming => false,
+            :backend => "https://reqres.in"
+          })
+        end
+      end
+
+      describe 'static_env' do
+        it 'works' do
+          expect(app.send(:static_env)).to eql({
+            "HTTP_HOST" => "reqres.in"
+          })
+        end
+      end
+
+      describe 'the proxy itself' do
+        it 'works as expected' do
+          get '/users'
+          expect(last_response.status).to eql(200)
+          expect(last_response.body).not_to be_empty
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.17
+  version: 0.20.18
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -226,6 +226,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: rack-proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Webspicy helps testing web services as software operation black boxes
 email: blambeau@gmail.com
 executables:
@@ -310,6 +324,8 @@ files:
 - lib/webspicy/web/client/rack_test_client.rb
 - lib/webspicy/web/client/support.rb
 - lib/webspicy/web/formaldoc.fio
+- lib/webspicy/web/inferer.rb
+- lib/webspicy/web/inferer/config.ru
 - lib/webspicy/web/invocation.rb
 - lib/webspicy/web/mocker.rb
 - lib/webspicy/web/mocker/config.ru
@@ -344,6 +360,7 @@ files:
 - spec/unit/tester/fakesmtp/test_email.rb
 - spec/unit/tester/test_asserter.rb
 - spec/unit/tester/test_assertions.rb
+- spec/unit/web/inferer/test_inferer.rb
 - spec/unit/web/mocker/test_mocker.rb
 - spec/unit/web/openapi/test_generator.rb
 - spec/unit/web/specification/test_instantiate_url.rb
@@ -369,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!