jsapi 0.4.1 → 0.6.0

data/lib/jsapi/model/nestable.rb

@@ -3,33 +3,48 @@
 module Jsapi
   module Model
     module Nestable
-
       # Returns the value assigned to +name+.
       def [](name)
         raw_attributes[name&.to_s]&.value
       end
 
+      # Returns a hash containing the additional attributes.
+      def additional_attributes
+        raw_additional_attributes.transform_values(&:value)
+      end
+
       # Returns +true+ if +name+ is present, false +otherwise+.
       def attribute?(name)
         raw_attributes.key?(name&.to_s)
       end
 
-      # Returns a +Hash+ containing all attributes.
+      # Returns a hash containing all attributes.
       def attributes
         raw_attributes.transform_values(&:value)
       end
 
+      def inspect # :nodoc:
+        "#<#{self.class.name} #{
+          raw_attributes
+            .merge('additional_attributes' => raw_additional_attributes)
+            .map { |k, v| "#{k}: #{v.inspect}" }
+            .join(', ')
+        }>"
+      end
+
       private
 
       def validate_attributes(errors)
-        raw_attributes.map do |key, value|
-          errors.nested(key) do
-            next value.validate(errors) unless value.respond_to?(:model)
-            next true if (model = value.model).valid?
-
-            errors.merge!(model)
-            false
-          end
+        [raw_attributes, raw_additional_attributes].compact.map do |attributes|
+          attributes.map do |name, value|
+            errors.nested(name) do
+              next value.validate(errors) unless value.respond_to?(:model)
+              next true if (model = value.model).valid?
+
+              errors.merge!(model)
+              false
+            end
+          end.all?
         end.all?
       end
     end

data/lib/jsapi/model/nested_error.rb

@@ -4,10 +4,10 @@ module Jsapi
   module Model
     # Wraps an error related to a nested model.
     class NestedError
-      attr_reader :attribute, :error
-
       delegate_missing_to :error
 
+      attr_reader :attribute, :error
+
       def initialize(attribute, error)
         @attribute = attribute
         @error = error

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 = '0.4.1'
+    VERSION = '0.6.0'
   end
 end

data/lib/jsapi.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'jsapi/helpers/invalid_value_helper'
+require 'jsapi/invalid_value_error'
+require 'jsapi/invalid_argument_error'
+
 require 'jsapi/model'
 require 'jsapi/meta'
 require 'jsapi/dsl'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsapi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Denis Göller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Jsapi can be used to read requests, produce responses and create OpenAPI
   documents
@@ -26,20 +26,23 @@ files:
 - lib/jsapi/controller/parameters_invalid.rb
 - lib/jsapi/controller/response.rb
 - lib/jsapi/dsl.rb
-- lib/jsapi/dsl/callbacks.rb
 - lib/jsapi/dsl/class_methods.rb
 - lib/jsapi/dsl/definitions.rb
 - lib/jsapi/dsl/error.rb
-- lib/jsapi/dsl/examples.rb
 - lib/jsapi/dsl/node.rb
 - lib/jsapi/dsl/openapi.rb
 - lib/jsapi/dsl/openapi/callback.rb
+- lib/jsapi/dsl/openapi/callbacks.rb
+- lib/jsapi/dsl/openapi/examples.rb
 - lib/jsapi/dsl/openapi/root.rb
 - lib/jsapi/dsl/operation.rb
 - lib/jsapi/dsl/parameter.rb
 - lib/jsapi/dsl/request_body.rb
 - lib/jsapi/dsl/response.rb
 - lib/jsapi/dsl/schema.rb
+- lib/jsapi/helpers/invalid_value_helper.rb
+- lib/jsapi/invalid_argument_error.rb
+- lib/jsapi/invalid_value_error.rb
 - lib/jsapi/json.rb
 - lib/jsapi/json/array.rb
 - lib/jsapi/json/boolean.rb
@@ -50,14 +53,17 @@ files:
 - lib/jsapi/json/string.rb
 - lib/jsapi/json/value.rb
 - lib/jsapi/meta.rb
-- lib/jsapi/meta/attributes.rb
-- lib/jsapi/meta/attributes/class_methods.rb
-- lib/jsapi/meta/attributes/type_caster.rb
 - lib/jsapi/meta/base.rb
-- lib/jsapi/meta/base_reference.rb
+- lib/jsapi/meta/base/attributes.rb
+- lib/jsapi/meta/base/model.rb
+- lib/jsapi/meta/base/reference.rb
+- lib/jsapi/meta/base/type_caster.rb
+- lib/jsapi/meta/callable.rb
+- lib/jsapi/meta/callable/symbol_evaluator.rb
+- lib/jsapi/meta/callable/symbol_sequence_evaluator.rb
+- lib/jsapi/meta/defaults.rb
 - lib/jsapi/meta/definitions.rb
 - lib/jsapi/meta/existence.rb
-- lib/jsapi/meta/invalid_argument_error.rb
 - lib/jsapi/meta/openapi.rb
 - lib/jsapi/meta/openapi/callback.rb
 - lib/jsapi/meta/openapi/callback/model.rb
@@ -146,7 +152,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/dmgoeller/jsapi
-  source_code_uri: https://github.com/dmgoeller/jsapi
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/jsapi/dsl/callbacks.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module DSL
-    module Callbacks
-      # Defines an \OpenAPI callback or refers a reusable callback.
-      #
-      #   # define a callback
-      #   callback 'foo' do
-      #     operation '{$request.query.foo}'
-      #   end
-      #
-      #   # refer a reusable callback
-      #   callback ref: 'foo'
-      #
-      # Refers the reusable callback with the same name if neither any
-      # keywords nor a block is specified.
-      #
-      #   callback 'foo'
-      #
-      def callback(name = nil, **keywords, &block)
-        _define('callback', name&.inspect) do
-          name = keywords[:ref] if name.nil?
-          keywords = { ref: name } unless keywords.any? || block
-
-          callback_model = _meta_model.add_callback(name, keywords)
-          _eval(callback_model, OpenAPI::Callback, &block)
-        end
-      end
-    end
-  end
-end

data/lib/jsapi/dsl/examples.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module DSL
-    module Examples
-      # Adds an example.
-      #
-      #   example 'foo', value: 'bar'
-      #
-      #   example 'foo'
-      #
-      # The default name is <code>'default'</code>.
-      def example(name_or_value = nil, **keywords, &block)
-        _define('example', name_or_value&.inspect) do
-          if keywords.any? || block
-            # example 'foo', value: 'bar', ...
-            name = name_or_value
-          else
-            # example 'foo'
-            name = nil
-            keywords = { value: name_or_value }
-          end
-
-          example = _meta_model.add_example(name, keywords)
-          Node.new(example, &block) if block
-        end
-      end
-    end
-  end
-end

data/lib/jsapi/meta/attributes.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'attributes/type_caster'
-require_relative 'attributes/class_methods'

data/lib/jsapi/meta/base_reference.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module Meta
-    # The base reference class.
-    class BaseReference < Base
-      ##
-      # :attr: ref
-      # The name of the referred object.
-      attribute :ref, String
-
-      # Returns the name of the method to be invoked to look up the referred object
-      # in a Definitions instance.
-      def self.lookup_method_name
-        @lookup_method_name ||=
-          name.delete_suffix('::Reference').demodulize.underscore
-      end
-
-      def reference? # :nodoc:
-        true
-      end
-
-      # Resolves +ref+ by looking up the object with that name in +definitions+.
-      #
-      # Raises a ReferenceError if +ref+ could not be resolved.
-      def resolve(definitions)
-        object = definitions.send(self.class.lookup_method_name, ref)
-        raise ReferenceError, ref if object.nil?
-
-        object.resolve(definitions)
-      end
-    end
-  end
-end

data/lib/jsapi/meta/invalid_argument_error.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module Meta
-    # Raised when an argument isn't contained in the list of valid values.
-    class InvalidArgumentError < ArgumentError
-      def initialize(name, value, values)
-        super("#{name} must be one of #{values.inspect}, is #{value.inspect}")
-      end
-    end
-  end
-end