jsapi 2.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d75f4e95d037fa1516504cff963dca3409cc1b45233fe6a46bab2155939e249
-  data.tar.gz: 3e6626ac1b7796eb94cbbdabe57df7f9b286947018133ef4cdac93f241e8214a
+  metadata.gz: 1f68753b0fe40a759d233878a9ca2a96d227ba769d8e1d167255f48e538eb075
+  data.tar.gz: e6ba6a151038cf393c099784ce7b3bd358685de018308e3e437af0d54cfcf438
 SHA512:
-  metadata.gz: 4fdf2b1bc207755bb94dc88f001d4d668e7b7506284358b8f08531f15869d1feb1b7eebcd5cced2277e2cba42ebdae907f254668f13f7d9295db4c42298a531a
-  data.tar.gz: 3d6a20ef5a0218e2ac75233792dc844389853bfb24167d3f9ec0f4919f00a1e7623aa7a5801c10649cb02d8c30c0eb9e781901da2d488ebc4134b3492e1bdef5
+  metadata.gz: ef47ff95a63d481af9b7eb169487ad7e05d6a653a5a6d2bdefb8499802a43531e2d729bce9a74701006b59c66f24241d9a9dae7b2a7e0f95e5788e81cc73dacb
+  data.tar.gz: 9cf392df9e3d8bd4913faa8c3594c3e10399c9600a165e96f8f8ae91c2c240f60e7e77518ac018d5d327d6c3bde4aa9e9119babda7ef0959e285a0c5365741ce

data/lib/jsapi/controller/methods.rb

@@ -185,32 +185,34 @@ module Jsapi
 
           result = _api_before_rendering(operation_name, result, api_params)
 
-          api_response = Response.new(
-            result,
-            content_model,
-            omit: omit,
-            locale: response_model.locale
-          )
-          if media_type.json?
+          if media_type == Media::Type::TEXT_PLAIN
             render(
-              json: api_response,
+              plain: result.to_s,
               status: status,
               content_type: media_type.to_s
             )
-          elsif media_type == Media::Type::TEXT_PLAIN
-            render(
-              plain: result,
-              status: status,
-              content_type: media_type.to_s
+          elsif media_type.json? || media_type.json_seq?
+            api_response = Response.new(
+              result,
+              content_model,
+              omit: omit,
+              locale: response_model.locale
             )
-          elsif media_type == Media::Type::APPLICATION_JSON_SEQ
-            self.content_type = media_type.to_s
-            response.status = status
-
-            response.stream.tap do |stream|
-              api_response.write_json_seq_to(stream)
-            ensure
-              stream.close
+            if media_type.json?
+              render(
+                json: api_response,
+                status: status,
+                content_type: media_type.to_s
+              )
+            else
+              self.content_type = media_type.to_s
+              response.status = status
+
+              response.stream.tap do |stream|
+                api_response.write_json_seq_to(stream)
+              ensure
+                stream.close
+              end
             end
           end
         end

data/lib/jsapi/dsl/base.rb

@@ -89,6 +89,11 @@ module Jsapi
 
       private
 
+      def deprecation_warning(message)
+        caller_location = caller.find { |line| line.exclude?('lib/jsapi') }
+        warn("[DEPRECATION WARNING] #{message}\nDefined at: #{caller_location}")
+      end
+
       def define(*args, &block)
         result = block.call
         result.freeze_attributes if result.respond_to?(:freeze_attributes)

data/lib/jsapi/dsl/shared_operation_methods.rb

@@ -81,6 +81,14 @@ module Jsapi
           if name && (keywords.any? || block)
 
           keywords = { ref: name } if name
+
+          if (%i[type ref schema contents].none? { |key| keywords.key?(key) }) && !block
+            deprecation_warning(
+              'Starting with Jsapi 3.0, a `request_body` without :type will no longer ' \
+              'define an :object schema. Please specify `type: :object` explicitly.'
+            )
+          end
+
           @meta_model.request_body = keywords
 
           @meta_model.request_body.tap do |request_body|
@@ -123,6 +131,13 @@ module Jsapi
             raise Error, "name can't be specified together with keywords or a block"
           end
 
+          if (%i[type ref schema contents].none? { |key| keywords.key?(key) }) && !block
+            deprecation_warning(
+              'Starting with Jsapi 3.0, a `response` without :type will no longer ' \
+              'define an :object schema. Please specify `type: :object` explicitly.'
+            )
+          end
+
           @meta_model.add_response(status, keywords).tap do |response_model|
             Response.new(response_model, &block) if block
           end

data/lib/jsapi/json/array.rb

@@ -4,9 +4,9 @@ module Jsapi
   module JSON
     # Represents a JSON array.
     class Array < Value
-      def initialize(array, schema, context: nil)
+      def initialize(value, schema, context: nil)
         super(schema)
-        @json_values = Array(array).map do |item|
+        @json_values = Array(value).map do |item|
           JSON.wrap(item, schema.items, context: context)
         end
       end

data/lib/jsapi/json/integer.rb

@@ -8,7 +8,14 @@ module Jsapi
 
       def initialize(value, schema)
         super(schema)
-        @value = schema.convert(value.to_i)
+        @value = schema.convert(
+          begin
+            value.to_i
+          rescue StandardError => _e
+            self.malformed = true
+            0
+          end
+        )
       end
     end
   end

data/lib/jsapi/json/number.rb

@@ -8,7 +8,14 @@ module Jsapi
 
       def initialize(value, schema)
         super(schema)
-        @value = schema.convert(value.to_f)
+        @value = schema.convert(
+          begin
+            value.to_f
+          rescue StandardError => _e
+            self.malformed = true
+            0.0
+          end
+        )
       end
     end
   end

data/lib/jsapi/json/object.rb

@@ -10,7 +10,15 @@ module Jsapi
 
       attr_reader :raw_additional_attributes, :raw_attributes
 
-      def initialize(hash, schema, context: nil)
+      def initialize(value, schema, context: nil)
+        hash =
+          begin
+            value.to_h
+          rescue StandardError => _e
+            self.malformed = true
+            {}
+          end
+
         schema = schema.resolve_schema(hash, context: context)
         properties = schema.resolve_properties(context: context)
 

data/lib/jsapi/json/string.rb

@@ -21,23 +21,16 @@ module Jsapi
             else
               value.to_s
             end
-          rescue StandardError => e
-            @error = e
+          rescue StandardError => _e
+            self.malformed = true
             value
           end
-        @value = schema.convert(@value) unless defined? @error
+        @value = schema.convert(@value) unless malformed?
       end
 
       def empty? # :nodoc:
         value.blank?
       end
-
-      def validate(errors) # :nodoc:
-        return super unless defined? @error
-
-        errors.add(:base, :invalid)
-        false
-      end
     end
   end
 end

data/lib/jsapi/json/value.rb

@@ -13,7 +13,7 @@ module Jsapi
         @schema = schema
       end
 
-      # Used by #validate to test whether or not it is empty.
+      # Called by #validate to test whether or not it is empty.
       # Returns false by default.
       def empty?
         false
@@ -23,7 +23,7 @@ module Jsapi
         "#<#{self.class} #{value.inspect}>"
       end
 
-      # Used by #validate to test whether or not it is null.
+      # Called by #validate to test whether or not it is null.
       # Returns false by default.
       def null?
         false
@@ -37,6 +37,10 @@ module Jsapi
       # Validates it against #schema. Returns true if it is valid, false otherwise.
       # Detected errors are added to +errors+.
       def validate(errors)
+        if malformed?
+          errors.add(:base, :invalid)
+          return false
+        end
         unless schema.existence.reach?(self)
           errors.add(:base, :blank)
           return false
@@ -47,6 +51,14 @@ module Jsapi
           validation.validate(value, errors)
         end.all?
       end
+
+      protected
+
+      attr_writer :malformed
+
+      def malformed?
+        @malformed == true
+      end
     end
   end
 end

data/lib/jsapi/json.rb

@@ -13,23 +13,23 @@ module Jsapi
   # Provides a DOM for JSON values.
   module JSON
     class << self
-      def wrap(object, schema, context: nil)
-        object = schema.default_value(context: context) if object.nil?
-        return Null.new(schema) if object.nil?
+      def wrap(value, schema, context: nil)
+        value = schema.default_value(context: context) if value.nil?
+        return Null.new(schema) if value.nil?
 
         case schema.type
         when 'array'
-          Array.new(object, schema, context: context)
+          Array.new(value, schema, context: context)
         when 'boolean'
-          Boolean.new(object, schema)
+          Boolean.new(value, schema)
         when 'integer'
-          Integer.new(object, schema)
+          Integer.new(value, schema)
         when 'number'
-          Number.new(object, schema)
+          Number.new(value, schema)
         when 'object'
-          Object.new(object, schema, context: context)
+          Object.new(value, schema, context: context)
         when 'string'
-          String.new(object, schema)
+          String.new(value, schema)
         else
           raise "invalid type: #{schema.type}"
         end

data/lib/jsapi/media/type.rb

@@ -65,6 +65,11 @@ module Jsapi
         (type.in?(%w[application text]) && subtype == 'json') ||
           subtype.end_with?('+json')
       end
+
+      # Returns true if it is <code>"application/json-seq"</code>.
+      def json_seq?
+        type == 'application' && subtype == 'json-seq'
+      end
     end
   end
 end

data/lib/jsapi/meta/schema/object.rb

@@ -100,15 +100,16 @@ module Jsapi
                 property_value = property.reader.call(value)
                 property_value = property_schema.default if property_value.nil?
 
+                property_value = property_schema.jsonify(
+                  property_value,
+                  context: context,
+                  omit: omit
+                )
                 if property_schema.omittable?
                   next if omit == :nil && property_value.nil?
                   next if omit == :empty && (property_value.nil? || property_value.try(:empty?))
                 end
-
-                properties[property.name] = property_schema.jsonify(
-                  property_value,
-                  context: context
-                )
+                properties[property.name] = property_value
               rescue JsonifyError => e
                 raise e.prepend(".#{property.name}")
               end
@@ -116,20 +117,20 @@ module Jsapi
               if additional_properties
                 additional_properties_schema = additional_properties.schema
 
-                additional_properties.source.call(value)&.each \
-                do |property_name, property_value|
+                additional_properties.source.call(value)&.each do |property_name, property_value|
                   property_name = property_name.to_s
                   next if properties.key?(property_name)
 
                   properties[property_name] = additional_properties_schema.jsonify(
                     property_value,
-                    context: context
+                    context: context,
+                    omit: omit
                   )
                 rescue JsonifyError => e
                   raise e.prepend(".#{property_name}")
                 end
               end
-            end.presence
+            end
           end
         end
 

data/lib/jsapi/version.rb

@@ -5,6 +5,6 @@ module Jsapi
     # NOTE: See https://bundler.io/guides/creating_gem.html
 
     # The current GEM version.
-    VERSION = '2.1'
+    VERSION = '2.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsapi
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.2
 platform: ruby
 authors:
 - Denis Göller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-02 00:00:00.000000000 Z
+date: 2026-10-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email: denis@dmgoeller.de