jsapi 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1726601746ec435ff292f43b0f9e415b9d75298c3ff767d38f32e7a80ec1089
-  data.tar.gz: 33d5995c7b8dda3b74c8ab01c4c75eb481666fce3c9a63d22ea662a2b1b3d297
+  metadata.gz: f0b8caebf611ba584ebd5963fefb3e7f4600f3cdda59eeda99049225f4a17fff
+  data.tar.gz: 94db4048e68964bc70e64068631a3ae01b9ef7434fab23976e69b6368f809d37
 SHA512:
-  metadata.gz: cc78c78dd32ded46d63fb7d320378fa8b613d35a82e095473500e725bfbbe822097b0ee25d4376f9b240477181b4f00f0320ac1256515b8f24bdd025f62c2f91
-  data.tar.gz: eef5aac75b9c5094a5a9504eed38e1413fd38fd2becfc65b1830a604afb332609240a11c55db2d029c7ac0867a011a470dc4d46cf7f92e62a50a6b7a365aaf46
+  metadata.gz: 144e852da54524999df466dbdf078227cae7d5e68d3155fbc3730b298072d696a39cea1c786513c34862bcb71a14b163bd202b9c203e4736598cb0fddc28813b
+  data.tar.gz: 9d76e40aa500597eec1a5a7dc02b794ccde643f603227455ccbcea76a6e074769c246335a1e554fa19bc6d06cf8cf36ad030147a651de58f148b3c4db5c12322

data/lib/jsapi/model/base.rb

@@ -2,14 +2,32 @@
 
 module Jsapi
   module Model
-    # The base API model used to represent top-level parameters and nested object
-    # parameters by default.
+    # The base API model.
     class Base
-      extend Naming
-      include Attributes
+      extend ActiveModel::Naming
+
+      # Overrides <code>ActiveModel::Naming#model_name</code> to support anonymous
+      # model classes.
+      def self.model_name
+        @_model_name ||= begin
+          # Prevent that ActiveModel::Name::new raises an error if this is an anonymous class
+          klass = self
+          klass = klass.superclass while klass.name.nil?
+
+          # Adapted from ActiveModel::Naming#model_name
+          namespace = klass.module_parents.detect do |n|
+            n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+          end
+          ActiveModel::Name.new(klass, namespace)
+        end
+      end
+
+      extend ActiveModel::Translation
       include ActiveModel::Validations
 
-      validate :nested_validity
+      delegate :[], :additional_attributes, :attribute?, :attributes, to: :@nested
+
+      validate :_nested_validity
 
       def initialize(nested)
         @nested = nested
@@ -22,8 +40,7 @@ module Jsapi
         )
       end
 
-      # Overrides <code>ActiveModel::Validations#errors</code>
-      # to use Errors as error store.
+      # Overrides <code>ActiveModel::Validations#errors</code> to use Errors as error store.
       def errors
         @errors ||= Errors.new(self)
       end
@@ -33,11 +50,22 @@ module Jsapi
         "#{attributes.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}>"
       end
 
+      def method_missing(*args) # :nodoc:
+        name = args.first.to_s
+        _attr_readers.key?(name) ? _attr_readers[name] : super
+      end
+
+      def respond_to_missing?(param1, _param2) # :nodoc:
+        _attr_readers.key?(param1.to_s) ? true : super
+      end
+
       private
 
-      attr_reader :nested
+      def _attr_readers
+        @_attr_readers ||= attributes.transform_keys(&:underscore)
+      end
 
-      def nested_validity
+      def _nested_validity
         @nested.validate(errors)
       end
     end

data/lib/jsapi/model.rb

@@ -3,8 +3,6 @@
 require_relative 'model/error'
 require_relative 'model/nested_error'
 require_relative 'model/errors'
-require_relative 'model/attributes'
-require_relative 'model/naming'
 require_relative 'model/base'
 require_relative 'model/nestable'
 

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.7.2'
+    VERSION = '0.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsapi
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Denis Göller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Jsapi can be used to read requests, produce responses and create OpenAPI
   documents
@@ -138,11 +138,9 @@ files:
 - lib/jsapi/meta/schema/validation/multiple_of.rb
 - lib/jsapi/meta/schema/validation/pattern.rb
 - lib/jsapi/model.rb
-- lib/jsapi/model/attributes.rb
 - lib/jsapi/model/base.rb
 - lib/jsapi/model/error.rb
 - lib/jsapi/model/errors.rb
-- lib/jsapi/model/naming.rb
 - lib/jsapi/model/nestable.rb
 - lib/jsapi/model/nested_error.rb
 - lib/jsapi/version.rb

data/lib/jsapi/model/attributes.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module Model
-    module Attributes
-      def self.included(mod)
-        mod.delegate :[], :additional_attributes, :attribute?, :attributes, to: :nested
-      end
-
-      def method_missing(*args) # :nodoc:
-        name = args.first.to_s
-        _attr_readers.key?(name) ? _attr_readers[name] : super
-      end
-
-      def respond_to_missing?(param1, _param2) # :nodoc:
-        _attr_readers.key?(param1.to_s) ? true : super
-      end
-
-      private
-
-      def _attr_readers
-        @_attr_readers ||= attributes.transform_keys(&:underscore)
-      end
-    end
-  end
-end

data/lib/jsapi/model/naming.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Jsapi
-  module Model
-    module Naming
-      include ActiveModel::Naming
-      include ActiveModel::Translation
-
-      # Overrides <code>ActiveModel::Naming#model_name</code> to support anonymous
-      # model classes.
-      def model_name
-        @_model_name ||= begin
-          # Copied from ActiveModel::Naming#model_name
-          namespace = module_parents.detect do |m|
-            m.respond_to?(:use_relative_model_naming?) &&
-              m.use_relative_model_naming?
-          end
-          # Prevent that ActiveModel::Name::new raises an error if this is an anonymous class
-          klass = self
-          klass = klass.superclass while klass.name.nil?
-
-          ActiveModel::Name.new(klass, namespace)
-        end
-      end
-    end
-  end
-end