webspicy 0.27.1 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a8b39983717af6c599f4ef9fbd88bacfa408dbd16089f7b559ca8de2b46e39
-  data.tar.gz: c899bfe6f59ef4aec92e897bff3cff3899103feb0ca1640132a0a79c3968b50b
+  metadata.gz: 06c782fc5226424943de5bedd222660c88fc0db2756894403976c0278070c16a
+  data.tar.gz: 6c4895208dc8e47a8b29e2b479ab08d0267ebe1c085a968c0f5d4804095c3ce6
 SHA512:
-  metadata.gz: ba81af580827248b93f6ca3720ed845bc8010071a5311c134b8c4090b0bda65a8927298124c4cd18e8d2af9612cca55c9f1ebc25e219fac145d4c196ed8c771f
-  data.tar.gz: 1b7fa160cda6a2b8cb412b46e928104e33c14b9fba3bebdbffd47aa68b72237b02622c3656277f19441f55f2951f140732c67568499686d60bbc038440a3a529
+  metadata.gz: 0d4ff23b65dcf8ac991f9955559424fea14c98463b5e5b7e9614a897dce943460edd7782fbe1c577b47ac1ff6db0fb577ed46252b4c2685ed8e0cecf150e302d
+  data.tar.gz: d019b8697c743b4fadf5163d8d0eab1c739d56d1ecd9708827a05b42f42a8712ea17ba154a8577a25ab3cf0105da80407828a7c3da84fc2037131c0b029b72e3

data/lib/webspicy/tester/result/error_schema_met.rb

@@ -8,7 +8,9 @@ module Webspicy
         end
 
         def must?
-          !test_case.is_expected_status?(204)
+          test_case.has_expected_status? && \
+            !test_case.is_expected_status?(204) && \
+            !test_case.is_redirect_expected_status?
         end
 
         def call

data/lib/webspicy/version.rb

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

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

@@ -15,7 +15,7 @@ module Webspicy
         attr_reader :info, :tags, :paths
 
         def ensure_tags(tags)
-          @tags = (@tags + tags).uniq.sort_by{|t| t[:name] }
+          @tags = (@tags + tags).uniq
         end
 
         def ensure_path(path)

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

@@ -16,17 +16,28 @@ module Webspicy
         def after_each
           @datastruct.ensure_tags(tags_for(specification))
           @datastruct.ensure_path(base_path_for(specification))
-          @datastruct.ensure_path(base_verb_for(service))
+          @datastruct.ensure_path(base_verb_for(test_case))
           @datastruct.ensure_path(base_request_body_for(service))
           @datastruct.ensure_path(base_request_example_for(test_case))
           @datastruct.ensure_path(base_request_response_for(invocation))
         end
 
         def report
-          json = Support::DeepMerge.deep_merge(
+          json = DataStruct::MERGER.deep_merge(
             @base,
             @datastruct.to_openapi_data,
           )
+          order = ["get", "post", "patch", "delete"]
+          json["paths"].keys.each do |path|
+            sorted = {}
+            json["paths"][path]
+              .keys
+              .sort_by{|k| order.index(k) || -1 }
+              .each do |k|
+                sorted[k] = json["paths"][path][k]
+              end
+            json["paths"][path] = sorted
+          end
           @output_file.write(JSON.pretty_generate(json))
         end
 

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

@@ -36,12 +36,13 @@ module Webspicy
           })
         end
 
-        def base_verb_for(service)
+        def base_verb_for(test_case)
+          service = test_case.service
           verb_defn = {
             summary: service.name,
             description: service.description,
             tags: tags_for(service.specification).map{|s| s[:name] },
-            parameters: parameters_for(service),
+            parameters: parameters_for(service, test_case),
           }
 
           verb_defn = service.conditions.inject(verb_defn) do |memo, p|
@@ -61,7 +62,6 @@ module Webspicy
 
           schema = actual_body_schema(service)
           return nil if empty_schema?(schema)
-          puts schema.inspect
 
           content_type = content_type_for(service)
 
@@ -120,7 +120,12 @@ module Webspicy
             content = {
               content_type => {
                 schema: schema&.to_json_schema,
-                example: example,
+                examples: {
+                  test_case.description => {
+                    description: test_case.description,
+                    value: example,
+                  },
+                },
               }.compact
             }
           end
@@ -144,17 +149,31 @@ module Webspicy
           }]
         end
 
-        def parameters_for(service)
-          schema = actual_input_schema(service)
-          params = service.specification.url_placeholders.map{|p|
-            {
-              in: 'path',
-              name: p,
-              schema: { type: 'string' },
-              required: true
+        def parameters_for(service, test_case)
+          schema = actual_parameters_schema(service)
+          if schema.is_a?(Finitio::HashBasedType)
+            schema.heading.map do |attr|
+              {
+                in: 'path',
+                name: attr.name,
+                description: attr.metadata[:description],
+                schema: attr.to_json_schema,
+                required: true,
+                example: test_case.params[attr.name.to_s]
+              }.compact
+            end
+          else
+            params = service.specification.url_placeholders.map{|p|
+              {
+                in: 'path',
+                name: p,
+                schema: { type: 'string' },
+                required: true,
+                example: test_case.params[attr.name.to_s]
+              }
             }
-          }
-          params.empty? ? nil : params
+            params.empty? ? nil : params
+          end
         end
 
         def actual_output_schema(test_case, counterexample)
@@ -169,6 +188,19 @@ module Webspicy
           service.input_schema['Main']
         end
 
+        def actual_parameters_schema(service)
+          schema = actual_input_schema(service)
+
+          a_schema = schema
+          a_schema = schema.target if schema.is_a?(Finitio::AliasType)
+          return schema unless a_schema.is_a?(Finitio::HashBasedType)
+
+          in_url = service.specification.url_placeholders.map(&:to_sym)
+          return schema if in_url.empty?
+
+          a_schema.project(in_url)
+        end
+
         def actual_body_schema(service)
           schema = actual_input_schema(service)
 

data/lib/webspicy/web/specification/test_case.rb

@@ -62,6 +62,11 @@ module Webspicy
           not expected[:status].nil?
         end
 
+        def is_redirect_expected_status?
+          start = expected_status.to_int
+          start >= 300 && start < 400
+        end
+
         def expected_headers
           expected[:headers] || {}
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake