Keep moving web specific code under Web module.

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

lib/webspicy.rb

@@ -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 @@ class TimeoutError < Error; end
   ### 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 @@ def default_scope
   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 @@ def fatal(*args, &bl)
   end
   module_function :fatal
 
+  require 'webspicy/web'
+
+  ###
+  ### Backward compatibility
+  ###
+  Client = Tester::Client
+  HttpClient = Web::HttpClient
+  RackTestClient = Web::RackTestClient
+  Resource = Specification
+  FileUpload = 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

lib/webspicy/configuration.rb

@@ -39,6 +39,7 @@ def initialize(folder = Configuration.default_folder || Path.pwd, parent = nil)
         :success => :green
       }
       @colorize = true
+      @factory = Webspicy::Web
       @scope_factory = ->(config){ Scope.new(config) }
       @client = Web::HttpClient
       @reporter = default_reporter
@@ -109,6 +110,7 @@ def each_scope(&bl)
       end
     end
 
+    attr_accessor :factory
     attr_accessor :scope_factory
 
     def factor_scope

lib/webspicy/configuration/scope.rb

@@ -35,7 +35,7 @@ def _each_specification_file(config, apply_filter = true)
       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
 

lib/webspicy/configuration/single_url.rb

@@ -19,7 +19,7 @@ def each_specification_file(*args, &bl)
 
         def each_specification(*args, &bl)
           return enum_for(:each_specification) unless block_given?
-          yield Webspicy.specification(specification_src, nil, self)
+          yield config.factory.specification(specification_src, nil, self)
         end
 
         def specification_src

lib/webspicy/configuration/single_yml_file.rb

@@ -17,7 +17,7 @@ def each_specification_file(*args, &bl)
 
         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

lib/webspicy/specification.rb

@@ -19,7 +19,7 @@ def self.singleservice(raw)
         name: raw[:name] || "Unamed specification",
         url: raw[:url],
         services: [
-          Webspicy.service(raw.reject{|k| k==:url or k==:name }, Webspicy.current_scope)
+          Webspicy::Web.service(raw.reject{|k| k==:url or k==:name }, Webspicy.current_scope)
         ]
       }
       info(converted)

lib/webspicy/specification/service.rb

@@ -68,7 +68,7 @@ def counterexamples
       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

lib/webspicy/tester.rb

@@ -98,7 +98,7 @@ def run_scope
     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

lib/webspicy/web.rb

@@ -1,3 +1,47 @@
+module Webspicy
+  module Web
+
+    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'

lib/webspicy/formaldoc.fio → lib/webspicy/web/formaldoc.fio

@@ -1,17 +1,11 @@
 @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::Specification::FileUpload <info> {
         path         :  String
         content_type :  String
         param_name   :? String
@@ -77,8 +71,6 @@ TestCase =
         tags             :? [Tag]
     }
 
-Params = .Array|.Hash
-
 StatusRange = .Webspicy::Support::StatusRange
   <int> Integer
   <str> String(s | s =~ /^\dxx$/ )

spec/unit/configuration/scope/test_expand_example.rb

@@ -7,7 +7,7 @@ class Configuration
 
       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 +18,7 @@ class Configuration
         }
 
         let(:example) {
-          Webspicy.test_case({
+          Webspicy::Web.test_case({
             description: "Hello world"
           })
         }
@@ -30,7 +30,7 @@ class Configuration
 
       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 +44,7 @@ class Configuration
         }
 
         let(:example) {
-          Webspicy.test_case({
+          Webspicy::Web.test_case({
             description: "Hello world",
             expected: { content_type: "application/json" }
           })

spec/unit/specification/service/test_dress_params.rb

@@ -4,7 +4,7 @@ class Specification
     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 @@ class Specification
       end
 
       it 'supports an array' do
-        service = Webspicy.service({
+        service = Webspicy::Web.service({
           method: "GET",
           description: "Test service",
           preconditions: "Foo",