webspicy 0.21.5 → 0.21.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a55b29fa6f9f5f48358b4a050582679f7e32816b82ea818c3f8d07ee1f6e166
-  data.tar.gz: 045b1c9ea0127645ddfd8bb14a7b464daa1c9a309d0796d31898800f7629637e
+  metadata.gz: ebc6a59cdd54771817e5613d8a5ecf53651034453c801d3e505fc30d39851bed
+  data.tar.gz: e5ee25c0870072c02c69e6a90e2a6803de5dba78062b59b3bd8f1c183a7d91e4
 SHA512:
-  metadata.gz: d8d6e028b67558796b58b9a24ec27e0594b33160613838e211557a75e924447acafe9c75ead65a2d91cc4c62b55b714b8c45a9af1af3ad3d30f1ad80a379fce6
-  data.tar.gz: 251d467be2ec28bf4dd9f6026b71dae998290911bb613a53a540c888e2287ae7b9d81c57e947f35c451c7c975b096709692c44dddc1534204895dcc24613dca5
+  metadata.gz: 0f8632e1117aa06d2b717b790f2150d35a305ee37f2de912f5b412decfe969d3a78f3470f9074a7eb35c6d2180adf9c3d0f02f6629628f7e07e4c18428378640
+  data.tar.gz: 9ef40e507cfb9e50de794dc1d9f593adf4e92f318aa1fd37a6ab4a13035c1977b308ae483e0d017838a6bb9143264b3d6f6dbe34dfdbfc1808ec0076c24d9490

data/lib/webspicy/specification/service.rb

@@ -29,6 +29,10 @@ module Webspicy
         @raw[:description]
       end
 
+      def conditions
+        preconditions + postconditions
+      end
+
       def preconditions
         @preconditions ||= compile_preconditions
       end

data/lib/webspicy/version.rb

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

data/lib/webspicy/web/openapi/ext.rb

@@ -0,0 +1,18 @@
+module Webspicy
+  class Specification
+    module Pre
+
+      def contribute_to_openapi_verb(verb_defn)
+        verb_defn
+      end
+
+    end # module Pre
+    module Post
+
+      def contribute_to_openapi_verb(verb_defn)
+        verb_defn
+      end
+
+    end # module Post
+  end # class Specification
+end # module Webspicy

data/lib/webspicy/web/openapi/generator.rb

@@ -100,6 +100,13 @@ module Webspicy
             unless ['get', 'options', 'delete', 'head'].include?(verb)
               verb_defn[:requestBody] = request_body_for(service)
             end
+            verb_defn = service.conditions.inject(verb_defn) do |memo, p|
+              if p.respond_to?(:contribute_to_openapi_verb)
+                p.contribute_to_openapi_verb(memo)
+              else
+                memo
+              end
+            end
             verbs.merge({ verb => verb_defn })
           end
         end
@@ -107,10 +114,15 @@ module Webspicy
         def request_body_for(service)
           schema = actual_input_schema(service)
           example = nil # catch(:unfound) { generator.call(schema, {}) }
+          content_type = if service.method.downcase == 'post_form'
+            'application/x-www-form-urlencoded'
+          else
+            'application/json'
+          end
           {
             required: true,
             content: {
-              'application/json' => {
+              content_type => {
                 schema: schema.to_json_schema,
                 example: example
               }.compact

data/lib/webspicy/web/openapi.rb

@@ -1 +1,2 @@
 require_relative 'openapi/generator'
+require_relative 'openapi/ext'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.21.5
+  version: 0.21.7
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -351,6 +351,7 @@ files:
 - lib/webspicy/web/mocker.rb
 - lib/webspicy/web/mocker/config.ru
 - lib/webspicy/web/openapi.rb
+- lib/webspicy/web/openapi/ext.rb
 - lib/webspicy/web/openapi/generator.rb
 - lib/webspicy/web/specification.rb
 - lib/webspicy/web/specification/file_upload.rb