webspicy 0.15.8 → 0.17.0

data/examples/restful/webspicy/{todo/patchTodo.yml → formaldef/todo/_one/patch.yml}

@@ -36,6 +36,9 @@ services:
       params:
         id: 1
         description: 'hello world'
+      expected:
+        content_type: application/json
+        status: 200
       assert:
         - "pathFD('', description: 'hello world')"
 

data/examples/restful/webspicy/{todo → formaldef/todo}/options.yml

@@ -17,7 +17,7 @@ services:
     }
 
   output_schema: |-
-    .
+    Any
 
   error_schema: |-
     ErrorSchema

data/examples/restful/webspicy/{todo/postFile.yml → formaldef/todo/post.file.yml}

@@ -16,7 +16,7 @@ services:
     - Must be authenticated
 
   input_schema: |-
-    .
+    Any
 
   output_schema: |-
     { count: Integer }

data/examples/restful/webspicy/rack.rb

@@ -1,6 +1,6 @@
 require_relative 'config'
 webspicy_config do |c|
-  c.client = Webspicy::RackTestClient.for(::Sinatra::Application)
+  c.client = Webspicy::Tester::RackTestClient.for(::Sinatra::Application)
   c.before_each do |_,client|
     client.api.post "/reset"
   end

data/examples/restful/webspicy/real.rb

@@ -1,7 +1,7 @@
 require_relative 'config'
 webspicy_config do |c|
   c.host = "http://127.0.0.1:4567"
-  c.client = Webspicy::HttpClient
+  c.client = Webspicy::Tester::HttpClient
   c.before_each do |_,client|
     client.api.post "http://127.0.0.1:4567/reset"
   end

data/examples/restful/webspicy/schema.fio

@@ -1,4 +1,4 @@
-@import finitio/data
+@import webspicy/scalars
 
 Todo = {
   id          : Integer
@@ -6,7 +6,7 @@ Todo = {
 }
 
 TodoPatch = {
-  id          :? Integer
+  id          :  Integer
   description :? String
 }
 

data/examples/restful/webspicy/support/must_be_authenticated.rb

@@ -30,7 +30,7 @@ class MustBeAuthenticated
   def counterexample(description, role, expected, status = 401)
     YAML.load <<-YML.gsub(/^\s+[#][ ]/, "")
     # description: |-
-    #   (#{self.class.name}) #{description}
+    #   #{description} (#{self.class.name} PRE)
     # params:
     #   id: 1
     # dress_params:
@@ -41,7 +41,7 @@ class MustBeAuthenticated
     #   content_type: application/json
     #   status: #{status}
     # assert:
-    #   - "pathFD('', error: '#{expected}')" 
+    #   - "pathFD('', error: '#{expected}')"
     YML
   end
 

data/examples/restful/webspicy/support/todo_not_removed.rb

@@ -0,0 +1,21 @@
+class TodoNotRemoved
+  include Webspicy::Specification::Postcondition
+
+  def self.match(service, descr)
+    return TodoNotRemoved.new if descr =~ /If it existed, the todo has not been removed/
+  end
+
+  def check(invocation)
+    client, scope, test_case = invocation.client,
+                               invocation.client.scope,
+                               invocation.test_case
+    return if invocation.response.status == 404
+    id = test_case.params['id']
+    url = scope.to_real_url("/todo/#{id}", test_case){|url| url }
+    response = client.api.get(url, {}, {
+      "Accept" => "application/json"
+    })
+    return nil if response.status == 200
+    "Todo `#{id}` was not supposed to be deleted, it was not found"
+  end
+end

data/examples/restful/webspicy/support/todo_removed.rb

@@ -0,0 +1,20 @@
+class TodoRemoved
+  include Webspicy::Specification::Postcondition
+
+  def self.match(service, descr)
+    return TodoRemoved.new if descr =~ /The todo has been removed/
+  end
+
+  def check(invocation)
+    client, scope, test_case = invocation.client,
+                               invocation.client.scope,
+                               invocation.test_case
+    id = test_case.params['id']
+    url = scope.to_real_url("/todo/#{id}", test_case){|url| url }
+    response = client.api.get(url, {}, {
+      "Accept" => "application/json"
+    })
+    return nil if response.status == 404
+    "Todo `#{id}` was not deleted, it has been found"
+  end
+end

data/examples/single_spec/spec.yml

@@ -0,0 +1,59 @@
+---
+name: |-
+  Todo
+
+url: |-
+  http://127.0.0.1:4567/todo/{id}
+
+services:
+- method: |-
+    GET
+
+  description: |-
+    Returns a single todo item
+
+  input_schema: |-
+    {
+      id: Integer
+    }
+
+  output_schema: |-
+    {
+      id: Integer
+      description: String
+    }
+
+  error_schema: |-
+    {
+      error: String
+    }
+
+  examples:
+
+    - description: |-
+        when requested on an existing TODO
+      headers:
+        Accept: application/json
+      params:
+        id: 1
+      expected:
+        content_type: application/json
+        status: 200
+      assert:
+        - "pathFD('', id: 1)"
+        - "match('description', /Refactor/)"
+        - "notMatch('description', /Foo/)"
+
+  counterexamples:
+
+    - description: |-
+        when requested on an unexisting TODO
+      headers:
+        Accept: application/json
+      params:
+        id: 999254654
+      expected:
+        content_type: application/json
+        status: 404
+      assert:
+        - "pathFD('', error: 'No such todo')"

data/examples/website/config.rb

@@ -0,0 +1,2 @@
+Webspicy::Configuration.new{|c|
+}

data/examples/website/schema.fio

@@ -0,0 +1 @@
+@import webspicy/scalars

data/examples/website/specification/get-http.yml

@@ -0,0 +1,30 @@
+---
+url: |-
+  http://yourbackendisbroken.dev
+
+method: |-
+  GET
+
+description: |-
+  Redirects to the https version
+
+input_schema: |-
+  Any
+
+output_schema: |-
+  Any
+
+error_schema: |-
+  Any
+
+examples:
+
+  - description: |-
+      it works
+    params:
+      id: 1
+    expected:
+      content_type: text/html
+      status: 3xx
+      headers:
+        Location: https://yourbackendisbroken.dev/?id=1

data/examples/website/specification/get-https.yml

@@ -0,0 +1,30 @@
+---
+url: |-
+  https://yourbackendisbroken.dev
+
+method: |-
+  GET
+
+description: |-
+  Returns the web page
+
+input_schema: |-
+  Any
+
+output_schema: |-
+  Any
+
+error_schema: |-
+  Any
+
+examples:
+
+  - description: |-
+      it works
+    params:
+      id: 1
+    expected:
+      content_type: text/html
+      status: 200
+    assert:
+      - notEmpty

data/lib/finitio/webspicy/scalars.fio

@@ -0,0 +1,25 @@
+# Any
+Any        = .
+
+# Booleans
+Nil        = .NilClass
+True       = .TrueClass
+False      = .FalseClass
+Boolean    = .TrueClass|.FalseClass
+
+# Numbers
+Numeric = .Numeric
+Integer = .Integer
+Float   = .Float
+Real    = .Float
+
+# String
+String  = .String
+
+# Date, Time, DateTime
+Date     = .Date     <iso8601> .String \( s | Date.iso8601(s) )
+                                       \( d | d.iso8601       )
+Time     = .Time     <iso8601> .String \( s | Time.iso8601(s) )
+                                       \( t | t.iso8601       )
+DateTime = .DateTime <iso8601> .String \( s | DateTime.iso8601(s) )
+                                       \( t | t.iso8601           )

data/lib/webspicy.rb

@@ -7,25 +7,33 @@ require 'ostruct'
 require 'yaml'
 require 'rspec'
 require 'rack/test'
-require "mustermann"
+require 'mustermann'
+require 'colorized_string'
+require 'securerandom'
 module Webspicy
 
   ###
   ### Load library
   ###
 
+  require 'webspicy/version'
   require 'webspicy/support'
+  require 'webspicy/specification'
   require 'webspicy/configuration'
-  require 'webspicy/file_upload'
-  require 'webspicy/scope'
-  require 'webspicy/client'
-  require 'webspicy/resource'
-  require 'webspicy/precondition'
-  require 'webspicy/postcondition'
   require 'webspicy/checker'
   require 'webspicy/tester'
-  require 'webspicy/tester/assertions'
-  require 'webspicy/tester/asserter'
+
+  ###
+  ### Backward compatibility
+  ###
+  Client = Tester::Client
+  HttpClient = Tester::HttpClient
+  RackTestClient = Tester::RackTestClient
+  Resource = Specification
+  Precondition = Specification::Precondition
+  Postcondition = Specification::Postcondition
+  FileUpload = Specification::FileUpload
+  Scope = Configuration::Scope
 
   ###
   ### About folders
@@ -36,30 +44,39 @@ module Webspicy
   EXAMPLES_FOLDER = ROOT_FOLDER/('examples')
 
   ###
-  ### About formal doc and resources defined there
+  ### 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"))
 
   # Returns a default scope instance.
   def default_scope
-    Scope.new(Configuration.new)
+    Configuration::Scope.new(Configuration.new)
   end
   module_function :default_scope
 
-  def resource(raw, file = nil, scope = 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["Resource"].dress(raw)
+      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 :resource
+  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
 
@@ -67,9 +84,19 @@ module 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, 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.
   #
@@ -120,7 +147,7 @@ module Webspicy
     if scope = Thread.current[:webspicy_scope]
       scope.parse_schema(fio)
     else
-      Finitio.system(fio)
+      DEFAULT_SYSTEM.system(fio)
     end
   end
   module_function :schema
@@ -132,7 +159,7 @@ module Webspicy
   LOGGER = ::Logger.new(STDOUT)
   LOGGER.level = Logger.const_get(ENV['LOG_LEVEL'] || 'WARN')
   LOGGER.formatter = proc { |severity, datetime, progname, msg|
-    "      " + msg + "\n"
+    "  " + msg + "\n"
   }
 
   def info(*args, &bl)
@@ -145,4 +172,9 @@ module Webspicy
   end
   module_function :debug
 
+  def fatal(*args, &bl)
+    LOGGER && LOGGER.fatal(*args, &bl)
+  end
+  module_function :fatal
+
 end

data/lib/webspicy/checker.rb

@@ -1,25 +1,10 @@
 module Webspicy
   class Checker
 
-    def initialize(config)
-      @config = Configuration.dress(config)
+    def self.new(*args, &bl)
+      require_relative 'rspec/checker'
+      RSpecChecker.new(*args, &bl)
     end
-    attr_reader :config
 
-    def call
-      config.each_scope do |scope|
-        scope.each_resource_file do |file, folder|
-          RSpec.describe file.relative_to(folder).to_s do
-
-            it 'meets the formal doc data schema' do
-              Webspicy.resource(file.load, file, scope)
-            end
-
-          end
-        end
-      end
-      RSpec::Core::Runner.run config.rspec_options
-    end
-
-  end
-end
+  end # class Checker
+end # module Webspicy