webspicy 0.20.4 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9afe697a47ba4391d2e059f1bf3707c04f97f9d6fd50557104a59c6602dbd75c
-  data.tar.gz: 66ec4036f8e76dad7af0f8b0cf83ea139a67a7b1020aa0a304c26fdc9402d593
+  metadata.gz: cf642b32d3e6abe3f90e53c047b8e1e973910041133ba4626d9ba7c2cb5ba333
+  data.tar.gz: 95860fd2e93a11f5dcecf7e175371eee6378e073ee60e22ea266c44e69265d19
 SHA512:
-  metadata.gz: 79feb96443a47523b38f16e4cf7e7edfcd675f5a71c6b33aa452ad452aeacd5e64de1ce1ffa9ff3f5bf9cf428d59dc183e8f1455e1ce26126f2eddf9a14795fb
-  data.tar.gz: 2761eb20d67f4c697dedf7c27496cfd36ceed4f988f1f54f17809358e570102f1e40c29c47e46f614671504dcf1c877ce2fe6ccb7a72b510994a9da95bb74de1
+  metadata.gz: 8415d763e56aec8f101d7140974e1ce959da7b1b0cc405c81c64976481a49b3042b442779973fe1eac76e20d9283e8aa6abb1c1363021c7c79d8f70fae59b482
+  data.tar.gz: 8bdfbf03a2c792fb1d772ec2260227ec24b0bfc87f4df5bf70e0baf2376818ed580f43e41d6ef1b4c753e5bc3cc620dcae1479501baea2a5cc84d65ad7370394

data/bin/sandr

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'path'
+
+def sandr(file)
+  file.write file.read.gsub(ARGV[0], ARGV[1])
+end
+
+Path.dir.parent.glob("lib/**/*.rb") do |file|
+  sandr(file)
+end
+
+Path.dir.parent.glob("spec/**/*.rb") do |file|
+  sandr(file)
+end

data/bin/search

@@ -0,0 +1,2 @@
+#!/bin/bash
+grep -Rn --color $1 lib spec

data/bin/webspicy

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #/
 #/ Document & test web services as black-box operations.
-#/ (c) Enspirit SRL. Distributed under MIT licence.
+#/ Webspicy vVERSION, (c) Enspirit SRL. Distributed under MIT licence.
 #/
 #/ Usage: webspicy [options] URL                 # run default test againt url
 #/ Usage: webspicy [options] path/to/config.rb   # run whole test suite
@@ -28,7 +28,7 @@ require 'optparse'
 
 def showhelp
   file = __FILE__
-  exec "grep ^#/<'#{file}'|cut -c4-"
+  exec "grep ^#/<'#{file}'|cut -c4-|sed s/VERSION/#{Webspicy::VERSION}/g"
 end
 
 ARGV.options do |opts|

data/lib/finitio/webspicy/shared.fio

@@ -0,0 +1,10 @@
+@import finitio/data
+
+Tag = String( s | s.length > 0 )
+
+Schema =
+    .Finitio::System <fio> String
+      \( s | ::Webspicy.schema(s) )
+      \( s | raise "Unsupported"  )
+
+Params = .Array|.Hash

data/lib/webspicy.rb

@@ -7,7 +7,7 @@ require 'ostruct'
 require 'yaml'
 require 'rack/test'
 require 'mustermann'
-require 'colorized_string'
+require 'paint'
 require 'securerandom'
 require 'forwardable'
 module Webspicy
@@ -21,22 +21,10 @@ module Webspicy
   require 'webspicy/specification'
   require 'webspicy/configuration'
   require 'webspicy/tester'
-  require 'webspicy/web'
 
   class Error < StandardError; end
   class TimeoutError < Error; end
 
-  ###
-  ### Backward compatibility
-  ###
-  Client = Tester::Client
-  HttpClient = Web::HttpClient
-  RackTestClient = Web::RackTestClient
-  Resource = Specification
-  FileUpload = Specification::FileUpload
-  Scope = Configuration::Scope
-  Checker = Tester::FileChecker
-
   ###
   ### About folders
   ###
@@ -49,10 +37,11 @@ module Webspicy
   ### About formal doc and specifications defined there
   ###
   Finitio.stdlib_path(Path.dir/"finitio")
+
   DEFAULT_SYSTEM = Finitio.system(<<~FIO)
     @import webspicy/scalars
   FIO
-  FORMALDOC = Finitio.system(Path.dir/("webspicy/formaldoc.fio"))
+
 
   ###
   ### Exceptions that we let pass during testing
@@ -66,45 +55,6 @@ module Webspicy
   end
   module_function :default_scope
 
-  def specification(raw, file = nil, scope = default_scope)
-    raw = YAML.load(raw) if raw.is_a?(String)
-    with_scope(scope) do
-      r = FORMALDOC["Specification"].dress(raw)
-      r.config = scope.config
-      r.located_at!(file) if file
-      r
-    end
-  rescue Finitio::Error => ex
-    handle_finitio_error(ex, scope)
-  end
-  module_function :specification
-
-  def service(raw, scope = default_scope)
-    with_scope(scope) do
-      FORMALDOC["Service"].dress(raw)
-    end
-  rescue Finitio::Error => ex
-    handle_finitio_error(ex)
-  end
-  module_function :service
-
-  def test_case(raw, scope = default_scope)
-    with_scope(scope) do
-      FORMALDOC["TestCase"].dress(raw)
-    end
-  rescue Finitio::Error => ex
-    handle_finitio_error(ex)
-  end
-  module_function :test_case
-
-  def handle_finitio_error(ex, scope)
-    # msg = "#{ex.message}:\n    #{ex.root_cause.message}"
-    # msg = Support::Colorize.colorize_error(msg, scope.config)
-    # fatal(msg)
-    raise
-  end
-  module_function :handle_finitio_error
-
   #
   # Yields the block after having installed `scope` globally.
   #
@@ -185,4 +135,23 @@ module Webspicy
   end
   module_function :fatal
 
+  require 'webspicy/web'
+
+  ###
+  ### Backward compatibility
+  ###
+  Client = Tester::Client
+  HttpClient = Web::HttpClient
+  RackTestClient = Web::RackTestClient
+  Resource = Specification
+  FileUpload = Web::Specification::FileUpload
+  Scope = Configuration::Scope
+  Checker = Tester::FileChecker
+
+  [:specification, :service, :test_case].each do |meth|
+    define_method(meth) do |*args, &bl|
+      Webspicy::Web.send(meth, *args, &bl)
+    end
+    module_function(meth)
+  end
 end

data/lib/webspicy/configuration.rb

@@ -39,6 +39,7 @@ module Webspicy
         :success => :green
       }
       @colorize = true
+      @factory = Webspicy::Web
       @scope_factory = ->(config){ Scope.new(config) }
       @client = Web::HttpClient
       @reporter = default_reporter
@@ -109,6 +110,7 @@ module Webspicy
       end
     end
 
+    attr_accessor :factory
     attr_accessor :scope_factory
 
     def factor_scope

data/lib/webspicy/configuration/scope.rb

@@ -35,7 +35,7 @@ module Webspicy
       def each_specification(apply_filter = true, &bl)
         return enum_for(:each_specification, apply_filter) unless block_given?
         each_specification_file(apply_filter) do |file, folder|
-          yield Webspicy.specification(file.load, file, self)
+          yield config.factory.specification(file.load, file, self)
         end
       end
 
@@ -138,7 +138,7 @@ module Webspicy
           return example unless service.default_example
           h1 = service.default_example.to_info
           h2 = example.to_info
-          ex = Specification::TestCase.new(merge_maps(h1, h2))
+          ex = config.factory.test_case(merge_maps(h1, h2), self)
           ex.bind(service, example.counterexample?)
         end
 

data/lib/webspicy/configuration/single_url.rb

@@ -10,37 +10,47 @@ module Webspicy
         end
         attr_reader :url
 
-        def each_specification(&bl)
+        def each_specification_file(*args, &bl)
+          return enum_for(:each_specification_file) unless block_given?
+          yield Path.tempfile(["specification",".yml"]).tap{|f|
+            f.write(specification_src)
+          }
+        end
+
+        def each_specification(*args, &bl)
           return enum_for(:each_specification) unless block_given?
-          spec = <<~YML
+          yield config.factory.specification(specification_src, nil, self)
+        end
+
+        def specification_src
+          <<~YML.tap{|s| Webspicy.debug(s) }
           ---
-          name: |-
-            Default specification
+          description: |-
+            Getting #{url}
+
           url: |-
             #{url}
 
-          services:
-          - method: |-
-              GET
-            description: |-
-              Getting #{url}
-
-            input_schema: |-
-              Any
-            output_schema: |-
-              Any
-            error_schema: |-
-              Any
-
-            examples:
-              - description: |-
-                  it returns a 200
-                params: {}
-                expected:
-                  status: 200
+          method: |-
+            GET
+
+          input_schema: |-
+            Any
+
+          output_schema: |-
+            Any
+
+          error_schema: |-
+            Any
+
+          examples:
+
+            - description: |-
+                it returns a 200
+              params: {}
+              expected:
+                status: 200
           YML
-          Webspicy.debug(spec)
-          yield Webspicy.specification(spec, nil, self)
         end
 
       end # class SingleUrlScope

data/lib/webspicy/configuration/single_yml_file.rb

@@ -10,9 +10,14 @@ module Webspicy
         end
         attr_reader :file
 
-        def each_specification(&bl)
+        def each_specification_file(*args, &bl)
+          return enum_for(:each_specification_file) unless block_given?
+          yield(file)
+        end
+
+        def each_specification(*args, &bl)
           return enum_for(:each_specification) unless block_given?
-          yield Webspicy.specification(file.read, nil, self)
+          yield config.factory.specification(file.read, nil, self)
         end
 
       end # class SingleYmlFileScope

data/lib/webspicy/specification.rb

@@ -10,21 +10,6 @@ module Webspicy
     attr_accessor :config
     attr_reader :location
 
-    def self.info(raw)
-      new(raw)
-    end
-
-    def self.singleservice(raw)
-      converted = {
-        name: raw[:name] || "Unamed specification",
-        url: raw[:url],
-        services: [
-          Webspicy.service(raw.reject{|k| k==:url or k==:name }, Webspicy.current_scope)
-        ]
-      }
-      info(converted)
-    end
-
     def located_at!(location)
       @location = Path(location)
     end
@@ -39,51 +24,12 @@ module Webspicy
       @raw[:name]
     end
 
-    def url
-      @raw[:url]
-    end
-
-    def url_pattern
-      @url_pattern ||= Mustermann.new(url, type: :template)
-    end
-
     def services
       @raw[:services] || []
     end
 
-    def url_placeholders
-      url.scan(/\{([a-zA-Z]+(\.[a-zA-Z]+)*)\}/).map{|x| x.first }
-    end
-
-    def instantiate_url(params)
-      url, rest = self.url, params.dup
-      url_placeholders.each do |placeholder|
-        value, rest = extract_placeholder_value(rest, placeholder)
-        url = url.gsub("{#{placeholder}}", value.to_s)
-      end
-      [ url, rest ]
-    end
-
-    def to_singleservice
-      raise NotImplementedError
-    end
-
   private
 
-    def extract_placeholder_value(params, placeholder, split = nil)
-      return extract_placeholder_value(params, placeholder, placeholder.split(".")) unless split
-
-      key = [ split.first, split.first.to_sym ].find{|k| params.has_key?(k) }
-      raise "Missing URL parameter `#{placeholder}`" unless key
-
-      if split.size == 1
-        [ params[key], params.dup.delete_if{|k| k == key } ]
-      else
-        value, rest = extract_placeholder_value(params[key], placeholder, split[1..-1])
-        [ value, params.merge(key => rest) ]
-      end
-    end
-
     def bind_services
       services.each do |s|
         s.specification = self
@@ -99,4 +45,3 @@ require_relative 'specification/post'
 require_relative 'specification/err'
 require_relative 'specification/oldies'
 require_relative 'specification/test_case'
-require_relative 'specification/file_upload'

data/lib/webspicy/specification/service.rb

@@ -21,10 +21,6 @@ module Webspicy
         specification.config
       end
 
-      def method
-        @raw[:method]
-      end
-
       def description
         @raw[:description]
       end
@@ -68,7 +64,7 @@ module Webspicy
       def generated_counterexamples
         preconditions.map{|pre|
           pre.counterexamples(self).map{|tc|
-            tc = Webspicy.test_case(tc, Webspicy.current_scope)
+            tc = config.factory.test_case(tc, Webspicy.current_scope)
             tc.bind(self, true)
           }
         }.flatten

data/lib/webspicy/specification/test_case.rb

@@ -43,10 +43,6 @@ module Webspicy
         @raw[:seeds]
       end
 
-      def headers
-        @raw[:headers] ||= {}
-      end
-
       def metadata
         @raw[:metadata] ||= {}
       end
@@ -55,47 +51,10 @@ module Webspicy
         @raw[:tags] ||= []
       end
 
-      def dress_params
-        @raw.fetch(:dress_params){ true }
-      end
-      alias :dress_params? :dress_params
-
-      def params
-        @raw[:params] || {}
-      end
-
-      def body
-        @raw[:body]
-      end
-
-      def file_upload
-        @raw[:file_upload]
-      end
-
-      def located_file_upload
-        file_upload ? file_upload.locate(specification) : nil
-      end
-
       def expected
         @raw[:expected] || {}
       end
 
-      def expected_content_type
-        expected[:content_type]
-      end
-
-      def expected_status
-        expected[:status]
-      end
-
-      def is_expected_status?(status)
-        expected_status === status
-      end
-
-      def has_expected_status?
-        not expected[:status].nil?
-      end
-
       def expected_error
         expected[:error]
       end
@@ -104,14 +63,6 @@ module Webspicy
         !expected_error.nil?
       end
 
-      def expected_headers
-        expected[:headers] || {}
-      end
-
-      def has_expected_headers?
-        !expected_headers.empty?
-      end
-
       def assert
         @raw[:assert] || []
       end

data/lib/webspicy/support/colorize.rb

@@ -5,7 +5,7 @@ module Webspicy
       def colorize(str, kind, config = nil)
         return str if config && !config.colorize
         color = (config || self.config).colors[kind]
-        ColorizedString[str].colorize(color)
+        Paint[str, color]
       end
       module_function :colorize
 

data/lib/webspicy/tester.rb

@@ -98,7 +98,7 @@ module Webspicy
     def load_specification(spec_file)
       @spec_file = spec_file
       reporter.before_spec_file
-      Webspicy.specification(spec_file.load, spec_file, scope)
+      config.factory.specification(spec_file.load, spec_file, scope)
     rescue *PASSTHROUGH_EXCEPTIONS
       raise
     rescue Exception => e

data/lib/webspicy/tester/reporter/documentation.rb

@@ -7,8 +7,10 @@ module Webspicy
           INDENT = "  ".freeze
 
           def spec_file_line(spec_file)
-            relative_path = Path(spec_file).relative_to(config.folder)
-            colorize_section(">> #{relative_path}", config)
+            path = Path(spec_file).expand_path
+            path = path.relative_to(config.folder)
+            path = spec_file if path.to_s.start_with?(".")
+            colorize_section(">> #{path}", config)
           end
 
           def spec_file_error_line(spec_file, ex)

data/lib/webspicy/version.rb

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

data/lib/webspicy/web.rb

@@ -1,3 +1,49 @@
+module Webspicy
+  module Web
+
+    require_relative 'web/specification'
+
+    FORMALDOC = Finitio.system(Path.dir/("web/formaldoc.fio"))
+
+    def specification(raw, file = nil, scope = Webspicy.default_scope)
+      raw = YAML.load(raw) if raw.is_a?(String)
+      Webspicy.with_scope(scope) do
+        r = FORMALDOC["Specification"].dress(raw)
+        r.config = scope.config
+        r.located_at!(file) if file
+        r
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :specification
+
+    def service(raw, scope = Webspicy.default_scope)
+      Webspicy.with_scope(scope) do
+        FORMALDOC["Service"].dress(raw)
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :service
+
+    def test_case(raw, scope = Webspicy.default_scope)
+      Webspicy.with_scope(scope) do
+        FORMALDOC["TestCase"].dress(raw)
+      end
+    rescue Finitio::Error => ex
+      handle_finitio_error(ex)
+    end
+    module_function :test_case
+
+    def handle_finitio_error(ex)
+      puts ex.root_cause.message
+      raise ex
+    end
+    module_function :handle_finitio_error
+
+  end # module Web
+end # module Webspicy
 require_relative 'web/client'
 require_relative 'web/invocation'
 require_relative 'web/mocker'

data/lib/webspicy/{formaldoc.fio → web/formaldoc.fio}

@@ -1,23 +1,17 @@
 @import finitio/data
+@import webspicy/shared
 
 Method =
     String( s | s =~ /^(GET|POST|POST_FORM|PUT|DELETE|PATCH|PUT|OPTIONS)$/ )
 
-Tag = String( s | s.length > 0 )
-
-Schema =
-    .Finitio::System <fio> String
-      \( s | ::Webspicy.schema(s) )
-      \( s | raise "Unsupported"  )
-
 FileUpload =
-    .Webspicy::FileUpload <info> {
+    .Webspicy::Web::Specification::FileUpload <info> {
         path         :  String
         content_type :  String
         param_name   :? String
     }
 
-Specification = .Webspicy::Specification
+Specification = .Webspicy::Web::Specification
   <info> {
     name: String
     url: String
@@ -41,7 +35,7 @@ Specification = .Webspicy::Specification
   }
 
 Service =
-    .Webspicy::Specification::Service <info> {
+    .Webspicy::Web::Specification::Service <info> {
         method          :  Method
         description     :  String
         preconditions   :? [String]|String
@@ -57,7 +51,7 @@ Service =
     }
 
 TestCase =
-    .Webspicy::Specification::TestCase <info> {
+    .Webspicy::Web::Specification::TestCase <info> {
         description      :? String
         dress_params     :? Boolean
         params           :? Params
@@ -77,8 +71,6 @@ TestCase =
         tags             :? [Tag]
     }
 
-Params = .Array|.Hash
-
 StatusRange = .Webspicy::Support::StatusRange
   <int> Integer
   <str> String(s | s =~ /^\dxx$/ )

data/lib/webspicy/web/specification.rb

@@ -0,0 +1,68 @@
+module Webspicy
+  module Web
+    class Specification < Webspicy::Specification
+
+      class << self
+        def info(raw)
+          new(raw)
+        end
+
+        def singleservice(raw)
+          converted = {
+            name: raw[:name] || "Unamed specification",
+            url: raw[:url],
+            services: [
+              Webspicy::Web.service(raw.reject{|k| k==:url or k==:name }, Webspicy.current_scope)
+            ]
+          }
+          info(converted)
+        end
+      end
+
+      def url
+        @raw[:url]
+      end
+
+      def url_pattern
+        @url_pattern ||= Mustermann.new(url, type: :template)
+      end
+
+      def url_placeholders
+        url.scan(/\{([a-zA-Z]+(\.[a-zA-Z]+)*)\}/).map{|x| x.first }
+      end
+
+      def instantiate_url(params)
+        url, rest = self.url, params.dup
+        url_placeholders.each do |placeholder|
+          value, rest = extract_placeholder_value(rest, placeholder)
+          url = url.gsub("{#{placeholder}}", value.to_s)
+        end
+        [ url, rest ]
+      end
+
+      def to_singleservice
+        raise NotImplementedError
+      end
+
+    private
+
+      def extract_placeholder_value(params, placeholder, split = nil)
+        return extract_placeholder_value(params, placeholder, placeholder.split(".")) unless split
+
+        key = [ split.first, split.first.to_sym ].find{|k| params.has_key?(k) }
+        raise "Missing URL parameter `#{placeholder}`" unless key
+
+        if split.size == 1
+          [ params[key], params.dup.delete_if{|k| k == key } ]
+        else
+          value, rest = extract_placeholder_value(params[key], placeholder, split[1..-1])
+          [ value, params.merge(key => rest) ]
+        end
+      end
+
+    end # class Specification
+  end # module Web
+end # module Webspicy
+require_relative 'specification/service'
+require_relative 'specification/test_case'
+require_relative 'specification/file_upload'

data/lib/webspicy/web/specification/file_upload.rb

@@ -0,0 +1,39 @@
+module Webspicy
+  module Web
+    class Specification
+      class FileUpload
+
+        def initialize(raw)
+          @path = raw[:path]
+          @content_type = raw[:content_type]
+          @param_name = raw[:param_name] || "file"
+        end
+
+        attr_reader :path, :content_type, :param_name
+
+        def self.info(raw)
+          new(raw)
+        end
+
+        def locate(specification)
+          FileUpload.new({
+            path: specification.locate(path),
+            content_type: content_type
+          })
+        end
+
+        def to_info
+          { path: path.to_s,
+            content_type: content_type,
+            param_name: param_name }
+        end
+
+        def to_s
+          "FileUpload(#{to_info})"
+        end
+        alias :inspect :to_s
+
+      end # class FileUpload
+    end # class Specification
+  end # module Web
+end # module Webspicy

data/lib/webspicy/web/specification/service.rb

@@ -0,0 +1,13 @@
+module Webspicy
+  module Web
+    class Specification
+      class Service < Webspicy::Specification::Service
+
+        def method
+          @raw[:method]
+        end
+
+      end # class Service
+    end # class Specification
+  end # module Web
+end # module Webspicy

data/lib/webspicy/web/specification/test_case.rb

@@ -0,0 +1,58 @@
+module Webspicy
+  module Web
+    class Specification
+      class TestCase < Webspicy::Specification::TestCase
+
+        def headers
+          @raw[:headers] ||= {}
+        end
+
+        def dress_params
+          @raw.fetch(:dress_params){ true }
+        end
+        alias :dress_params? :dress_params
+
+        def params
+          @raw[:params] || {}
+        end
+
+        def body
+          @raw[:body]
+        end
+
+        def file_upload
+          @raw[:file_upload]
+        end
+
+        def located_file_upload
+          file_upload ? file_upload.locate(specification) : nil
+        end
+
+        def expected_content_type
+          expected[:content_type]
+        end
+
+        def expected_status
+          expected[:status]
+        end
+
+        def is_expected_status?(status)
+          expected_status === status
+        end
+
+        def has_expected_status?
+          not expected[:status].nil?
+        end
+
+        def expected_headers
+          expected[:headers] || {}
+        end
+
+        def has_expected_headers?
+          !expected_headers.empty?
+        end
+
+      end # class TestCase
+    end # class Specification
+  end # module Web
+end # module Webspicy

data/spec/unit/configuration/scope/test_expand_example.rb

@@ -3,11 +3,17 @@ module Webspicy
   class Configuration
     describe Scope, "expand_example" do
 
-      subject{ Scope.new({}).send(:expand_example, service, example) }
+      let(:config){
+        Configuration.new(Path.dir)
+      }
+
+      subject{
+        Scope.new(config).send(:expand_example, service, example)
+      }
 
       context 'when the service has no default example' do
         let(:service) {
-          Webspicy.service({
+          Webspicy::Web.service({
             method: "GET",
             description: "Test service",
             preconditions: "Foo",
@@ -18,7 +24,7 @@ module Webspicy
         }
 
         let(:example) {
-          Webspicy.test_case({
+          Webspicy::Web.test_case({
             description: "Hello world"
           })
         }
@@ -30,7 +36,7 @@ module Webspicy
 
       context 'when the service has a default example' do
         let(:service) {
-          Webspicy.service({
+          Webspicy::Web.service({
             method: "GET",
             description: "Test service",
             preconditions: "Foo",
@@ -44,7 +50,7 @@ module Webspicy
         }
 
         let(:example) {
-          Webspicy.test_case({
+          Webspicy::Web.test_case({
             description: "Hello world",
             expected: { content_type: "application/json" }
           })

data/spec/unit/specification/pre/test_global_request_headers.rb

@@ -15,13 +15,13 @@ module Webspicy
 
         describe "instrument" do
           it 'injects the headers' do
-            tc = TestCase.new({})
+            tc = Web::Specification::TestCase.new({})
             instrument(tc)
             expect(tc.headers['Accept']).to eql("application/json")
           end
 
           it 'keeps original headers unchanged' do
-            tc = TestCase.new({
+            tc = Web::Specification::TestCase.new({
               headers: {
                 'Content-Type' => 'text/plain'
               }
@@ -32,7 +32,7 @@ module Webspicy
           end
 
           it 'has low precedence' do
-            tc = TestCase.new({
+            tc = Web::Specification::TestCase.new({
               headers: {
                 'Accept' => 'text/plain'
               }

data/spec/unit/specification/service/test_dress_params.rb

@@ -4,7 +4,7 @@ module Webspicy
     describe Service, "dress_params" do
 
       it 'symbolizes keys' do
-        service = Webspicy.service({
+        service = Webspicy::Web.service({
           method: "GET",
           description: "Test service",
           preconditions: "Foo",
@@ -17,7 +17,7 @@ module Webspicy
       end
 
       it 'supports an array' do
-        service = Webspicy.service({
+        service = Webspicy::Web.service({
           method: "GET",
           description: "Test service",
           preconditions: "Foo",

data/spec/unit/test_configuration.rb

@@ -36,6 +36,7 @@ module Webspicy
         expect(c).to be_a(Configuration)
         expect(c.folder).to eq(Path.pwd)
         expect(c.each_scope.to_a.size).to eql(1)
+        expect(c.each_scope.to_a.first.each_specification_file.to_a.size).to eql(1)
         expect(c.each_scope.to_a.first.each_specification.to_a.size).to eql(1)
       end
 

data/spec/unit/web/specification/test_instantiate_url.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+module Webspicy
+  module Web
+    describe Specification, "instantiate_url" do
+
+      it 'does nothing when the url has no placeholder' do
+        r = Specification.new(url: "/test/a/url")
+        url, params = r.instantiate_url(foo: "bar")
+        expect(url).to eq("/test/a/url")
+        expect(params).to eq(foo: "bar")
+      end
+
+      it 'instantiates placeholders and strips corresponding params' do
+        r = Specification.new(url: "/test/{foo}/url")
+        url, params = r.instantiate_url(foo: "bar", baz: "coz")
+        expect(url).to eq("/test/bar/url")
+        expect(params).to eq(baz: "coz")
+      end
+
+      it 'instantiates placeholders and strips corresponding params even when multiple' do
+        r = Specification.new(url: "/test/{foo}/url/{bar}")
+        url, params = r.instantiate_url(foo: "bar", bar: "baz", baz: "coz")
+        expect(url).to eq("/test/bar/url/baz")
+        expect(params).to eq(baz: "coz")
+      end
+
+      it 'supports placeholders corresponding to subentities' do
+        r = Specification.new(url: "/test/{foo.id}/url")
+        url, params = r.instantiate_url(foo: {id: "bar"}, baz: "coz")
+        expect(url).to eq("/test/bar/url")
+        expect(params).to eq(foo: {}, baz: "coz")
+      end
+
+    end
+  end
+end

data/spec/unit/web/specification/test_url_placeholders.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+module Webspicy
+  module Web
+    describe Specification, "url_placeholders" do
+
+      it 'returns an empty array on none' do
+        r = Specification.new(url: "/test/a/url")
+        expect(r.url_placeholders).to eq([])
+      end
+
+      it 'returns all placeholders' do
+        r = Specification.new(url: "/test/{foo}/url/{bar}")
+        expect(r.url_placeholders).to eq(["foo", "bar"])
+      end
+
+      it 'returns all placeholders expr' do
+        r = Specification.new(url: "/test/{foo.id}/url/{bar}")
+        expect(r.url_placeholders).to eq(["foo.id", "bar"])
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.4
+  version: 0.20.5
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,19 +171,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: openapi3_parser
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,8 @@ dependencies:
 description: Webspicy helps testing web services as software operation black boxes
 email: blambeau@gmail.com
 executables:
+- sandr
+- search
 - webspicy
 extensions: []
 extra_rdoc_files: []
@@ -208,22 +210,23 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/sandr
+- bin/search
 - bin/webspicy
 - doc/1-black-box-scene.md
 - doc/2-black-box-testing.md
 - doc/3-specification-importance.md
 - doc/4-sequence-diagram.md
 - lib/finitio/webspicy/scalars.fio
+- lib/finitio/webspicy/shared.fio
 - lib/webspicy.rb
 - lib/webspicy/configuration.rb
 - lib/webspicy/configuration/scope.rb
 - lib/webspicy/configuration/single_url.rb
 - lib/webspicy/configuration/single_yml_file.rb
-- lib/webspicy/formaldoc.fio
 - lib/webspicy/specification.rb
 - lib/webspicy/specification/condition.rb
 - lib/webspicy/specification/err.rb
-- lib/webspicy/specification/file_upload.rb
 - lib/webspicy/specification/oldies.rb
 - lib/webspicy/specification/oldies/bridge.rb
 - lib/webspicy/specification/oldies/errcondition.rb
@@ -279,14 +282,16 @@ files:
 - lib/webspicy/web/client/http_client.rb
 - lib/webspicy/web/client/rack_test_client.rb
 - lib/webspicy/web/client/support.rb
+- lib/webspicy/web/formaldoc.fio
 - lib/webspicy/web/invocation.rb
 - lib/webspicy/web/mocker.rb
 - lib/webspicy/web/mocker/config.ru
 - lib/webspicy/web/openapi.rb
 - lib/webspicy/web/openapi/generator.rb
-- spec/blackbox/commandline.yml
-- spec/blackbox/fixtures/passing/config.rb
-- spec/blackbox/fixtures/passing/formaldef/get.yml
+- lib/webspicy/web/specification.rb
+- lib/webspicy/web/specification/file_upload.rb
+- lib/webspicy/web/specification/service.rb
+- lib/webspicy/web/specification/test_case.rb
 - spec/spec_helper.rb
 - spec/unit/configuration/config.rb
 - spec/unit/configuration/scope/test_each_service.rb
@@ -297,8 +302,6 @@ files:
 - spec/unit/specification/service/test_dress_params.rb
 - spec/unit/specification/test_case/test_mutate.rb
 - spec/unit/specification/test_condition.rb
-- spec/unit/specification/test_instantiate_url.rb
-- spec/unit/specification/test_url_placeholders.rb
 - spec/unit/support/hooks/test_fire_after_each.rb
 - spec/unit/support/hooks/test_fire_around.rb
 - spec/unit/support/hooks/test_fire_before_each.rb
@@ -314,13 +317,15 @@ files:
 - spec/unit/tester/test_assertions.rb
 - spec/unit/web/mocker/test_mocker.rb
 - spec/unit/web/openapi/test_generator.rb
+- spec/unit/web/specification/test_instantiate_url.rb
+- spec/unit/web/specification/test_url_placeholders.rb
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/enspirit/webspicy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -335,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.1
+signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!
 test_files: []

data/lib/webspicy/specification/file_upload.rb

@@ -1,37 +0,0 @@
-module Webspicy
-  class Specification
-    class FileUpload
-
-      def initialize(raw)
-        @path = raw[:path]
-        @content_type = raw[:content_type]
-        @param_name = raw[:param_name] || "file"
-      end
-
-      attr_reader :path, :content_type, :param_name
-
-      def self.info(raw)
-        new(raw)
-      end
-
-      def locate(specification)
-        FileUpload.new({
-          path: specification.locate(path),
-          content_type: content_type
-        })
-      end
-
-      def to_info
-        { path: path.to_s,
-          content_type: content_type,
-          param_name: param_name }
-      end
-
-      def to_s
-        "FileUpload(#{to_info})"
-      end
-      alias :inspect :to_s
-
-    end # class FileUpload
-  end # class Specification
-end # module Webspicy

data/spec/blackbox/commandline.yml

@@ -1,24 +0,0 @@
----
-command:
-  webspicy {options} {args}
-
-examples:
-
-- description: |-
-    when called on a passing path
-  args:
-  - ./fixtures/passing/config.rb
-  assert:
-    exit_code:
-      0
-    stdout: |-
-      GET /, when requested
-        v  It has a 200 response status
-        v  It has a `Content-Type: application/json` response header
-        v  Its output meets the expected data schema
-        v  Assert notEmpty
-        v  Assert pathFD('', :hello => "World" )
-
-
-      1 spec file, 1 example, 0 counterexample
-      5 assertions, 0 error, 0 failure

data/spec/blackbox/fixtures/passing/config.rb

@@ -1,9 +0,0 @@
-Webspicy::Configuration.new(Path.dir) do |c|
-  app = ->(env){
-    [ 200,
-      {"Content-Type" => "application/json"},
-      [ {hello: "World"}.to_json ]
-    ]
-  }
-  c.client = Webspicy::Tester::RackTestClient.for(app)
-end

data/spec/blackbox/fixtures/passing/formaldef/get.yml

@@ -1,30 +0,0 @@
----
-url: |-
-  /
-
-method: |-
-  GET
-
-description: |-
-  Returns hello world
-
-input_schema: |-
-  { }
-
-output_schema: |-
-  { hello: String }
-
-error_schema: |-
-  .
-
-examples:
-
-  - description: |-
-      when requested
-    params: {}
-    expected:
-      content_type: application/json
-      status: 200
-    assert:
-      - notEmpty
-      - pathFD('', :hello => "World" )

data/spec/unit/specification/test_instantiate_url.rb

@@ -1,34 +0,0 @@
-require "spec_helper"
-module Webspicy
-  describe Specification, "instantiate_url" do
-
-    it 'does nothing when the url has no placeholder' do
-      r = Specification.new(url: "/test/a/url")
-      url, params = r.instantiate_url(foo: "bar")
-      expect(url).to eq("/test/a/url")
-      expect(params).to eq(foo: "bar")
-    end
-
-    it 'instantiates placeholders and strips corresponding params' do
-      r = Specification.new(url: "/test/{foo}/url")
-      url, params = r.instantiate_url(foo: "bar", baz: "coz")
-      expect(url).to eq("/test/bar/url")
-      expect(params).to eq(baz: "coz")
-    end
-
-    it 'instantiates placeholders and strips corresponding params even when multiple' do
-      r = Specification.new(url: "/test/{foo}/url/{bar}")
-      url, params = r.instantiate_url(foo: "bar", bar: "baz", baz: "coz")
-      expect(url).to eq("/test/bar/url/baz")
-      expect(params).to eq(baz: "coz")
-    end
-
-    it 'supports placeholders corresponding to subentities' do
-      r = Specification.new(url: "/test/{foo.id}/url")
-      url, params = r.instantiate_url(foo: {id: "bar"}, baz: "coz")
-      expect(url).to eq("/test/bar/url")
-      expect(params).to eq(foo: {}, baz: "coz")
-    end
-
-  end
-end

data/spec/unit/specification/test_url_placeholders.rb

@@ -1,21 +0,0 @@
-require "spec_helper"
-module Webspicy
-  describe Specification, "url_placeholders" do
-
-    it 'returns an empty array on none' do
-      r = Specification.new(url: "/test/a/url")
-      expect(r.url_placeholders).to eq([])
-    end
-
-    it 'returns all placeholders' do
-      r = Specification.new(url: "/test/{foo}/url/{bar}")
-      expect(r.url_placeholders).to eq(["foo", "bar"])
-    end
-
-    it 'returns all placeholders expr' do
-      r = Specification.new(url: "/test/{foo.id}/url/{bar}")
-      expect(r.url_placeholders).to eq(["foo.id", "bar"])
-    end
-
-  end
-end