invalid_model-serializer 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d55a2f5c8261fe3af1fde8d0fc86cafd77bfaadd14bb78cb6c8e2b8a7543d4e
-  data.tar.gz: b770cad24b481b51d8af23c4901b6e21c8ee7be07a5ffb7ceb2987b646bcb56a
+  metadata.gz: 9df9c8c97e477bfe43272531f1f9a140277bfa6930954ef23679cca0d4609d94
+  data.tar.gz: c46c3cb748b469558e2537c6a20ddf7039555c0eaaf1241e0b2673121dd41cbc
 SHA512:
-  metadata.gz: 4cc2c45fd7a174c0382211e52abbc97c9d8a7f1c29cbdbbf5f4cf1cac69976d59f3966f4d770a92b185cfeaeed5350bec2786c40994a417d21411cf2e67d90db
-  data.tar.gz: 8442649071fa52c380032519f7c221c31e9b341bdbf227051081ff7954366c74d233886adbb8fad0468ace0ac75c89d99ee34ab9a913aee82cb93dffca97554f
+  metadata.gz: 4ea7f952abaa153b05dcdf912fbaf88a4ce8979c29a6add096057f9295544e9f534a1e5cc6c8e28c622246707a4e8df6c09e83c88414f30aac84c895078573b1
+  data.tar.gz: 610f619ced00bf1aa0e6969646d6ed76e8cfc875a5fd8d29b0ab3b9270c313f29ead66caeaa705451cf51839d906a562dcf0c70d67a530cc5516950a033575a4

data/lib/invalid_model/{error_serializer.rb → each_serializer.rb}

@@ -1,6 +1,7 @@
 module InvalidModel
-  class ErrorSerializer
-    def initialize(error, options = {})
+  class EachSerializer
+    def initialize(resource, error, options = {})
+      @resource = resource
       @error = error
       @options = options
     end
@@ -9,7 +10,7 @@ module InvalidModel
       {
         code:   code,
         detail: detail,
-        meta:   meta.presence,
+        meta:   meta,
         source: source,
         status: status
       }.compact
@@ -17,13 +18,14 @@ module InvalidModel
 
     private
 
-    attr_reader :error
+    attr_reader :error, :resource
 
-    delegate :attribute, :detail, :meta, :model_name, :type, to: :error
+    delegate :attribute, :type, to: :error
+    delegate :errors, :model_name, to: :resource
 
     def code
-      if @options[:code]&.respond_to?(:call)
-        @options[:code].call error
+      if @options[:code].respond_to?(:call)
+        @options[:code].call resource, error
       elsif @options[:code]
         @options[:code]
       else
@@ -35,6 +37,16 @@ module InvalidModel
       @options[:code_format] || InvalidModel::Serializer.default_code_format
     end
 
+    def detail
+      errors.full_message(attribute, errors.generate_message(attribute, type, error.options))
+    end
+
+    def meta
+      return unless error.options.present?
+
+      error.options.except(*ActiveModel::Error::CALLBACKS_OPTIONS)
+    end
+
     def source
       return @options[:source] if @options.key?(:source)
       return if attribute == :base

data/lib/invalid_model/serializer.rb

@@ -2,8 +2,8 @@
 require 'active_support'
 
 module InvalidModel
-  autoload :Error,           'invalid_model/error'
-  autoload :ErrorSerializer, 'invalid_model/error_serializer'
+  autoload :Error,          'invalid_model/error'
+  autoload :EachSerializer, 'invalid_model/each_serializer'
 
   class Serializer
     include ActiveSupport::Configurable
@@ -17,30 +17,17 @@ module InvalidModel
     end
 
     def serializable_hash
-      {
-        errors: serialized_errors
-      }
+      list = []
+      @resource.errors.each do |error|
+        list << each_serializer_klass.new(@resource, error, @options).serializable_hash
+      end
+      {errors: list}
     end
 
     private
 
     def each_serializer_klass
-      @options[:each_serializer] || ErrorSerializer
-    end
-
-    def errors_object
-      @resource.errors
-    end
-
-    def errors_list
-      list = errors_object.details.map do |key, array|
-        array.map { |error| Error.from_hash(errors_object, key, error) }
-      end
-      list.flatten
-    end
-
-    def serialized_errors
-      errors_list.map { |error| each_serializer_klass.new(error, @options).serializable_hash }
+      @options[:each_serializer] || EachSerializer
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invalid_model-serializer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - mkon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,34 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +84,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +120,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-description: 
+description:
 email:
 - konstantin@munteanu.de
 executables: []
@@ -123,14 +129,14 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/invalid_model/error.rb
-- lib/invalid_model/error_serializer.rb
+- lib/invalid_model/each_serializer.rb
 - lib/invalid_model/serializer.rb
 homepage: https://github.com/mkon/invalid_model-serializer
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +144,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Serialize models with validation errors to json-api errors.
 test_files: []

data/lib/invalid_model/error.rb

@@ -1,24 +0,0 @@
-module InvalidModel
-  class Error
-    def self.from_hash(errors_object, attribute, hash)
-      new(errors_object, attribute, hash[:error], hash.except(:error))
-    end
-
-    attr_reader :attribute, :errors_object, :type, :meta
-
-    def initialize(errors_object, attribute, type, meta)
-      @errors_object = errors_object
-      @attribute = attribute
-      @type = type
-      @meta = meta
-    end
-
-    def detail
-      @errors_object.full_message(attribute, errors_object.generate_message(attribute, type, meta))
-    end
-
-    def model_name
-      errors_object.instance_variable_get(:@base).model_name
-    end
-  end
-end