invalid_model-serializer 0.1.4 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 067c71c283928d9242599a7911dc549fc1096d5366cc38b61ea06ba5f63faa43
-  data.tar.gz: b028fd253456429957c683449a51320cfa18c6bfe9ae95e3c0e3a2fbfbd70bb5
+  metadata.gz: 32775b48469a11188d19d7f43714cb1a2dc2ddcb5824aa694c2f8ff63781e8de
+  data.tar.gz: 733e2006980d7764f3d479d3ae3f0c86b7ea13b289bc65804ee2975a3e2bf994
 SHA512:
-  metadata.gz: 56515b01c79c08e300230a6c566cc632ab1b78f82d0aad54c2cd2c61f4c6dc6b9bb27ca962fa804fb027956685888b7d4225a20b1ee5627768c3d33283bb863f
-  data.tar.gz: 1a8f9885ecb304fbbc577f82a447e044049e3328620cb9344a6ae6dbf9df078e0af6900f958c6cb381aa6bc7d2389b02edf08e81d0006e0dab8c478d1ab00459
+  metadata.gz: 762f08d1c2e8d11774938372013ef919be875d883ca8f0608ba85b52d815ad41df6715d3d685f4eb8a0cb045ed19446e201e00d9bd2e309aebf8cd9e6705eb1d
+  data.tar.gz: a28294beaa509f73419cea46b34f9ad350895f04526566a88429c04f79614a2f8c67a3493353a63bd4221ea08282838692e241869109b892ea0c05ddee0b5d1e

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,14 @@ 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
+      error.options.presence
+    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.4
+  version: '0.2'
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -84,28 +84,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +129,7 @@ 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:
@@ -142,16 +141,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Serialize models with validation errors to json-api errors.

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