webspicy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d404dff3afb455b57fea64ddf9b9b7ab90efe6a3
-  data.tar.gz: 7b101990a2060a96f3281e2effd2cf38839c562b
+  metadata.gz: d4aae5afefcdda4fe5593cfc4626bfdb52143c07
+  data.tar.gz: 6c0653d7ac94dacb5ea97325cdc696f458b7f73d
 SHA512:
-  metadata.gz: 5d6032e474a7d2379a93efbb0193530df7ade3bb1ac55752195bcddbbcc56b52823e7619fa5a371028d61bf8e758b3f40186efea79e71edc13310a01c5e7dc93
-  data.tar.gz: 44e5f5191c37f58d8c3623a91bab72b1b77a2f379497b77f964242e4ac37bc987220f9d01e4a305bd4e2694ac0e18885159a2a71cec9412ee32c073f060a49a3
+  metadata.gz: d013ffd5cc0eb2c1edeb8609709ffe467696d817d6beff6abc2c615697ef3d9686e30422399afb0fbb71180a76e9c6aa94a2f68961cc167e2e23403dfeb15a7f
+  data.tar.gz: 19bae47fc5674ab351403e0c338ae4a4b584f68b355aea80f57ed816fadba0e26ad0f53a9dc4f9e998eec05db8b74a9bd2cb1cb30ee98eb3b15261ca8aa8f887

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.1.0.pre.rc3)
+    webspicy (0.2.0)
       finitio (~> 0.5.2)
       http (~> 0.5)
       path (~> 1.3)

data/examples/restful/Rakefile

@@ -2,16 +2,17 @@ $LOAD_PATH.unshift File.expand_path("..", __FILE__)
 require 'app'
 require 'webspicy'
 
-namespace :webspicy do
-
-  task :check do
-    config = Webspicy::Configuration.new do |c|
-      c.add_folder Path.dir/"webspicy"
-    end
-    Webspicy::Checker.new(config).call
+desc "Checks all .yml definition files"
+task :check do
+  config = Webspicy::Configuration.new do |c|
+    c.add_folder Path.dir/"webspicy"
   end
+  Webspicy::Checker.new(config).call
+end
 
-  task :testrack do
+namespace :test do
+  desc "Run all tests directly on Sinatra application using rack/test"
+  task :rack do
     config = Webspicy::Configuration.new do |c|
       c.add_folder Path.dir/"webspicy"
       c.client = Webspicy::RackTestClient.for(::Sinatra::Application)
@@ -22,7 +23,8 @@ namespace :webspicy do
     Webspicy::Tester.new(config).call
   end
 
-  task :testreal do
+  desc "Runs all tests on the real web server (must be launched previously)"
+  task :real do
     config = Webspicy::Configuration.new do |c|
       c.host = "http://127.0.0.1:4567"
       c.add_folder Path.dir/"webspicy"
@@ -33,8 +35,10 @@ namespace :webspicy do
     end
     Webspicy::Tester.new(config).call
   end
-
 end
 
-task :test => [:"webspicy:check", :"webspicy:testrack"]
+desc "Runs all checks and tests"
+task :test => :check
+task :test => :"test:rack"
+
 task :default => :test

data/examples/restful/app.rb

@@ -55,3 +55,16 @@ get '/todo/:id' do |id|
     todo.to_json
   end
 end
+
+delete '/todo/:id' do |id|
+  content_type :json
+  todo = settings.todolist.find{|todo| todo[:id] == Integer(id) }
+  if todo.nil?
+    status 404
+    {error: "No such todo"}.to_json
+  else
+    settings.todolist = settings.todolist.reject{|todo| todo[:id] == Integer(id) }
+    status 204
+    content_type "text/plain"
+  end
+end

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

@@ -0,0 +1,50 @@
+---
+name: |-
+  Todo
+
+url: |-
+  /todo/{id}
+
+services:
+- method: |-
+    DELETE
+
+  description: |-
+    Deletes a single todo item
+
+  preconditions: |-
+
+  input_schema: |-
+    {
+      id: Integer
+    }
+
+  output_schema: |-
+    .
+
+  error_schema: |-
+    {
+      error: String
+    }
+
+  examples:
+
+    - description: |-
+        when requested on an existing TODO
+      params:
+        id: 1
+      expected:
+        content_type: ~
+        status: 204
+
+  counterexamples:
+
+    - description: |-
+        when requested on an unexisting TODO
+      params:
+        id: 999254654
+      expected:
+        content_type: application/json
+        status: 404
+      assert:
+        - "pathFD('', error: 'No such todo')"

data/lib/webspicy/client/http_client.rb

@@ -56,6 +56,15 @@ module Webspicy
         Webspicy.debug("Response: #{@last_response.body}")
       end
 
+      def delete(url, params = {}, headers = nil)
+        Webspicy.info("DELETE #{url} -- #{params.inspect}")
+
+        @last_response = HTTP[headers || {}].delete(url, body: params.to_json)
+
+        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
+        Webspicy.debug("Response: #{@last_response.body}")
+      end
+
     end
 
   end

data/lib/webspicy/client/rack_test_client.rb

@@ -91,6 +91,17 @@ module Webspicy
         Webspicy.debug("Response: #{@last_response.body}")
       end
 
+      def delete(url, params = {}, headers = nil)
+        Webspicy.info("DELETE #{url} -- #{params.inspect}")
+
+        install_headers(headers) if headers
+        handler.delete(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
+        @last_response = handler.last_response
+
+        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
+        Webspicy.debug("Response: #{@last_response.body}")
+      end
+
     private
 
       def install_headers(hs)

data/lib/webspicy/formaldoc.fio

@@ -37,7 +37,7 @@ TestCase =
         requester        :? String
         expected: {
             status       :  Integer
-            content_type :? String
+            content_type :? String|Nil
             error        :? String
             headers      :? .Hash
         }

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

@@ -58,8 +58,12 @@ module Webspicy
         def expected_content_type_unmet
           ect = test_case.expected_content_type
           got = response.content_type
-          got = got.mime_type.to_s if got.respond_to?(:mime_type)
-          ect == got ? nil : "#{ect} != #{got}"
+          got = got.mime_type if got.respond_to?(:mime_type)
+          if ect.nil?
+            got.nil? ? nil : "#{ect} != #{got}"
+          else
+            ect.to_s == got.to_s ? nil : "#{ect} != #{got}"
+          end
         end
 
         def meets_expected_content_type?

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

@@ -33,7 +33,7 @@ module Webspicy
         end
 
         def expected_content_type
-          @raw[:expected][:content_type] || 'application/json'
+          @raw[:expected].fetch(:content_type){ 'application/json' }
         end
 
         def expected_status

data/lib/webspicy/version.rb

@@ -1,7 +1,7 @@
 module Webspicy
   module Version
     TINY  = 0
-    MINOR = 1
+    MINOR = 2
     MAJOR = 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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -123,6 +123,7 @@ files:
 - examples/restful/Rakefile
 - examples/restful/app.rb
 - examples/restful/webspicy/schema.fio
+- examples/restful/webspicy/todo/deleteTodo.yml
 - examples/restful/webspicy/todo/getTodo.yml
 - examples/restful/webspicy/todo/getTodos.yml
 - examples/restful/webspicy/todo/postTodos.yml