webspicy 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7e458fbf3c7ac65bd95574e127f16791f56391
-  data.tar.gz: e2cdfa60d3e9ba3831bd49cb4a6931e675752eea
+  metadata.gz: 03f975ac99f95fc2b6ce4bc70b1bebd93ca6052f
+  data.tar.gz: 59ab9a40fc6f3f8aa076b762aff29507cba7a3af
 SHA512:
-  metadata.gz: 94edf71925034c01b1297c58e049f2f4729330c80e4db0e601e24f9409b6d609f88b24b8b8f8c707d3d6e52c7cf18dc137d948d4728e222e2305bf097ca1dfd8
-  data.tar.gz: a88aecd9681674821f4953e96519635f1a2a5d452abf100de57de0fd8d01b7121f54a72f97252384be4d23e2c93dcee5d6518f1b2ff1f1ef317d8e8de07c99b0
+  metadata.gz: b5c0a7794268c727152a95a58c9af9c9cf52a6126bee5e3c00af7659e221511e14ac3e3565bbfee58db8683b57149b4647780d2b164c70041cc1addfc781b00c
+  data.tar.gz: 52eeff05d0809f8946591c6a81d456f6da89fa1203b23023f3ec96ebbd741a2b175955f3d136c89352f4d3e2f3f17982f0c221a84e6ef0c69c09134dc3b359c5

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.5.0.pre.rc0)
+    webspicy (0.5.0)
       finitio (~> 0.5.2)
       http (~> 2)
       path (~> 1.3)

data/examples/restful/app.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'path'
 require 'finitio'
 require 'rack/robustness'
+require 'csv'
 
 SCHEMA = Finitio::DEFAULT_SYSTEM.parse (Path.dir/'webspicy/schema.fio').read
 
@@ -44,14 +45,25 @@ end
 
 post '/todo/' do
   content_type :json
-  todo = SCHEMA["Todo"].dress(JSON.load(request.body.read))
-  if settings.todolist.find{|t| t[:id] == todo[:id] }
-    status 409
-    {error: "Identifier already in use"}.to_json
-  else
-    settings.todolist << todo
+  case todos = loaded_body
+  when Array
+    n = 0
+    todos.each do |todo|
+      settings.todolist << todo
+      n += 1
+    end
     status 201
-    todo.to_json
+    { count: n }.to_json
+  when Hash
+    todo = SCHEMA["Todo"].dress(todos)
+    if settings.todolist.find{|t| t[:id] == todo[:id] }
+      status 409
+      {error: "Identifier already in use"}.to_json
+    else
+      settings.todolist << todo
+      status 201
+      todo.to_json
+    end
   end
 end
 
@@ -73,7 +85,7 @@ patch '/todo/:id' do |id|
     status 404
     {error: "No such todo"}.to_json
   else
-    patch = SCHEMA["TodoPatch"].dress(JSON.load(request.body.read))
+    patch = SCHEMA["TodoPatch"].dress(loaded_body)
     patched = todo.merge(patch)
     settings.todolist = settings.todolist.reject{|todo| todo[:id] == Integer(id) }
     settings.todolist << patched
@@ -92,4 +104,18 @@ delete '/todo/:id' do |id|
     status 204
     content_type "text/plain"
   end
+end
+
+###
+
+def loaded_body
+  case ctype = request.content_type
+  when /json/
+    JSON.load(request.body.read)
+  when /csv/
+    csv = ::CSV.new(request.body.read, :headers => true, :header_converters => :symbol)
+    csv.map {|row| row.to_hash }
+  else
+    halt [415,{},["Unsupported content type"]]
+  end
 end

data/examples/restful/webspicy/todo/postCsv.yml

@@ -0,0 +1,42 @@
+---
+name: |-
+  Todo
+
+url: |-
+  /todo/
+
+services:
+- method: |-
+    POST
+
+  description: |-
+    Creates new todo items through a CSV import
+
+  preconditions: |-
+
+  input_schema: |-
+    {}
+
+  output_schema: |-
+    { count: Integer }
+
+  error_schema: |-
+    ErrorSchema
+
+  examples:
+
+    - description: |-
+        when requested with a valid CSV
+      params: {}
+      headers:
+        Content-Type: text/csv
+      body: |-
+        id,description
+        10,Write documentation
+        11,Create website
+        12,Add smart tools
+      expected:
+        content_type: application/json
+        status: 201
+      assert:
+        - "pathFD('', count: 3)"

data/lib/webspicy/client/http_client.rb

@@ -21,7 +21,7 @@ module Webspicy
       url = scope.to_real_url(url)
 
       # Invoke the service now
-      api.public_send(service.method.to_s.downcase.to_sym, url, params, headers)
+      api.public_send(service.method.to_s.downcase.to_sym, url, params, headers, test_case.body)
 
       # Return the result
       Resource::Service::Invocation.new(service, test_case, api.last_response, self)
@@ -31,7 +31,7 @@ module Webspicy
 
       attr_reader :last_response
 
-      def get(url, params = {}, headers = nil)
+      def get(url, params = {}, headers = nil, body = nil)
         Webspicy.info("GET #{url} -- #{params.inspect}")
 
         @last_response = HTTP[headers || {}].get(url, params: params)
@@ -42,10 +42,19 @@ module Webspicy
         @last_response
       end
 
-      def post(url, params = {}, headers = nil)
+      def post(url, params = {}, headers = nil, body = nil)
         Webspicy.info("POST #{url} -- #{params.inspect}")
 
-        @last_response = HTTP[headers || {}].post(url, body: params.to_json)
+        url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
+
+        headers ||= {}
+        headers['Content-Type'] ||= 'application/json'
+
+        if body
+          @last_response = HTTP[headers].post(url, body: body)
+        else
+          @last_response = HTTP[headers].post(url, body: params.to_json)
+        end
 
         Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
         Webspicy.debug("Response: #{@last_response.body}")
@@ -53,10 +62,12 @@ module Webspicy
         @last_response
       end
 
-      def patch(url, params = {}, headers = nil)
+      def patch(url, params = {}, headers = nil, body = nil)
         Webspicy.info("PATCH #{url} -- #{params.inspect}")
 
-        @last_response = HTTP[headers || {}].patch(url, body: params.to_json)
+        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.body}")
@@ -64,7 +75,7 @@ module Webspicy
         @last_response
       end
 
-      def post_form(url, params = {}, headers = nil)
+      def post_form(url, params = {}, headers = nil, body = nil)
         Webspicy.info("POST #{url} -- #{params.inspect}")
 
         @last_response = HTTP[headers || {}].post(url, form: params)
@@ -75,7 +86,7 @@ module Webspicy
         @last_response
       end
 
-      def delete(url, params = {}, headers = nil)
+      def delete(url, params = {}, headers = nil, body = nil)
         Webspicy.info("DELETE #{url} -- #{params.inspect}")
 
         @last_response = HTTP[headers || {}].delete(url, body: params.to_json)

data/lib/webspicy/client/rack_test_client.rb

@@ -17,13 +17,14 @@ module Webspicy
       # Instantiate the parameters
       headers = test_case.headers.dup
       params = test_case.dress_params? ? service.dress_params(test_case.params) : test_case.params
+      body = test_case.body
 
       # Instantiate the url and strip parameters
       url, params = resource.instantiate_url(params)
       url = scope.to_real_url(url){ url }
 
       # Invoke the service now
-      api.public_send(service.method.to_s.downcase.to_sym, url, params, headers)
+      api.public_send(service.method.to_s.downcase.to_sym, url, params, headers, body)
 
       # Return the result
       Resource::Service::Invocation.new(service, test_case, api.last_response, self)
@@ -60,7 +61,7 @@ module Webspicy
         @app = app
       end
 
-      def get(url, params = {}, headers = nil)
+      def get(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
         Webspicy.info("GET #{url} -- #{params.inspect} -- #{headers.inspect}")
@@ -74,12 +75,18 @@ module Webspicy
         @last_response
       end
 
-      def post(url, params = {}, headers = nil)
+      def post(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
+        url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
+
         Webspicy.info("POST #{url} -- #{params.inspect} -- #{headers.inspect}")
 
-        handler.post(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
+        if body
+          handler.post(url, body)
+        else
+          handler.post(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
+        end
         @last_response = handler.last_response
 
         Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
@@ -88,7 +95,7 @@ module Webspicy
         @last_response
       end
 
-      def patch(url, params = {}, headers = nil)
+      def patch(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
         Webspicy.info("PATCH #{url} -- #{params.inspect} -- #{headers.inspect}")
@@ -102,7 +109,7 @@ module Webspicy
         @last_response
       end
 
-      def post_form(url, params = {}, headers = nil)
+      def post_form(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
         Webspicy.info("POST #{url} -- #{params.inspect} -- #{headers.inspect}")
@@ -116,7 +123,7 @@ module Webspicy
         @last_response
       end
 
-      def delete(url, params = {}, headers = nil)
+      def delete(url, params = {}, headers = nil, body = nil)
         handler = get_handler(headers)
 
         Webspicy.info("DELETE #{url} -- #{params.inspect} -- #{headers.inspect}")

data/lib/webspicy/formaldoc.fio

@@ -33,6 +33,7 @@ TestCase =
         dress_params     :? Boolean
         params           : Params
         headers          :? .Hash
+        body             :? String
         seeds            :? String
         requester        :? String
         expected: {

data/lib/webspicy/resource/service/test_case.rb

@@ -37,6 +37,10 @@ module Webspicy
           @raw[:params]
         end
 
+        def body
+          @raw[:body]
+        end
+
         def expected_content_type
           @raw[:expected].fetch(:content_type){ 'application/json' }
         end

data/lib/webspicy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -144,6 +144,7 @@ files:
 - examples/restful/webspicy/todo/getTodo.yml
 - examples/restful/webspicy/todo/getTodos.yml
 - examples/restful/webspicy/todo/patchTodo.yml
+- examples/restful/webspicy/todo/postCsv.yml
 - examples/restful/webspicy/todo/postTodos.yml
 - lib/webspicy.rb
 - lib/webspicy/checker.rb
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!