erratum 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e6c5faf31997ee03d768c4550dbb14d18e7aaa603071bc4cb49f2224fc42e7
-  data.tar.gz: bd9de11bb451c959ae4de0717f4ad29691bb72a092111180bda53b78e138d3fc
+  metadata.gz: 2c03afae3ce08c9038812d6cb19326d2f3c3d0e185062cd94eceeb771c4dc63f
+  data.tar.gz: 8fd6c2d638e1ce482539b58ecb255e4c16164d7ca395074b65d24876aa9a1623
 SHA512:
-  metadata.gz: f7073c9d975cb2de901082f0b2d64f1d2068ba19d2c9e1a9505ba07ae348e7057848e0964d50ded7c1d55bb8fb3ff6447de567a347e6541c63cd57fb77bdf4ab
-  data.tar.gz: 5a18d081d56259c87a948a207c29d4952f82426f2dd615deca753900dc077ff19726b8cddbe2fc453d4502f6ceadbac841aba94f5ed6853c4008da7022fe0f15
+  metadata.gz: 94c8bc09f9dd42b01803458c44e746ff30750c52963304238e6905dc56f2c4416a72c98032982c2d0da3bdc7c99bd739c15162c98ee1fd570b34222613899cd4
+  data.tar.gz: 83298f560fe88d1b7549ab97732a1743594a02f3a2fc626650b7eb0bb09e70c8107f48d0f0370b8a1667e2556f4d6e96435000ef8a85b39277b3d9fe8df4d296

data/lib/erratum/errors/crud.rb

@@ -15,10 +15,18 @@ module  Crud
     super(**args)
   end
 
+  def source
+    {
+      'action'        => action,
+      'resource_name' => resource_name_underscored,
+      'resource_id'   => resource_id,
+    }
+  end
+
   private
 
   def resource_name_underscored
-    @resource_name_underscored ||= resource_name.gsub(/\s/, '_')
+    @resource_name_underscored ||= resource_name&.gsub(/\s/, '_')
   end
 end
 end

data/lib/erratum/errors/crud/attribute_length.rb

@@ -51,11 +51,11 @@ class   AttributeLength < RuntimeError
   end
 
   def source
-    {
+    super.merge(
       'pointer'   => pointer,
       'parameter' => attribute,
       'length'    => length,
-    }
+    )
   end
 end
 end

data/lib/erratum/errors/crud/invalid_association.rb

@@ -10,18 +10,18 @@ class   InvalidAssociation < RuntimeError
   include Errors::Crud
 
   attr_accessor :association_name,
-                :association_id,
-                :attributes
+                :association_id
 
   def self.convert(original_error, overrides = {})
     initialization_parameters = {}
 
     case original_error.class.name
     when 'ActiveRecord::InvalidForeignKey'
-      message_info_pattern = /DETAIL:  Key \((.*)_id\)=\(([a-f0-9\-]+)\)/
+      message_info_pattern = /DETAIL:  Key \((.*?)(?:_id)?\)=\(([a-f0-9\-]+)\)/
       message_info         = original_error
                                .message
-                               .match(message_info_pattern)[1..-1]
+                               .match(message_info_pattern)
+                               .captures
 
       initialization_parameters = {
         association_name: message_info[0],
@@ -41,17 +41,24 @@ class   InvalidAssociation < RuntimeError
   end
 
   def detail
-    <<~HEREDOC.chomp.tr("\n", ' ')
-      The #{association_name} that you attempted to associate with the
-      #{resource_name} was not valid.
-    HEREDOC
+    if association_name == 'id'
+      <<~HEREDOC.chomp.tr("\n", ' ')
+        You cannot #{action} this #{resource_name} because its
+        #{association_name} is still being referenced by other things.
+      HEREDOC
+    else
+      <<~HEREDOC.chomp.tr("\n", ' ')
+        The #{association_name} that you attempted to associate with the
+        #{resource_name} was not valid.
+      HEREDOC
+    end
   end
 
   def source
-    {
-      resource_name            => attributes,
-      "#{association_name} id" => association_id,
-    }
+    super.merge(
+      'association'    => association_name,
+      'association_id' => association_id,
+    )
   end
 end
 end

data/lib/erratum/errors/crud/resource_not_found.rb

@@ -9,13 +9,15 @@ class   ResourceNotFound < RuntimeError
   include Error
   include Errors::Crud
 
+  attr_accessor :missing_ids
+
   def self.convert(original_error, overrides = {})
     initialization_parameters = {}
 
     case original_error.class.name
     when 'ActiveRecord::RecordNotFound'
       initialization_parameters = {
-        resource_id: case original_error.message
+        missing_ids: case original_error.message
                      when /\ACouldn't find .* without an ID\z/
                        []
                      when /\ACouldn't find .* with \'.*\'=([a-f0-9\-]+)/
@@ -45,7 +47,9 @@ class   ResourceNotFound < RuntimeError
   end
 
   def source
-    { "#{resource_name_underscored}_id" => resource_id }
+    super.merge(
+      'missing_ids' => missing_ids,
+    )
   end
 
   def action

data/lib/erratum/errors/crud/resource_not_unique.rb

@@ -50,11 +50,11 @@ class   ResourceNotUnique < RuntimeError
   end
 
   def source
-    {
+    super.merge(
       'pointer'   => pointer,
       'parameter' => attribute,
       'value'     => value,
-    }
+    )
   end
 end
 end

data/lib/erratum/errors/crud/resource_persistence.rb

@@ -62,11 +62,11 @@ class   ResourcePersistence < RuntimeError
   end
 
   def source
-    {
+    super.merge(
       'pointer'   => pointer,
       'parameter' => attribute,
       'value'     => value,
-    }
+    )
   end
 end
 end

data/lib/erratum/errors/request/parameter_missing.rb

@@ -40,9 +40,9 @@ class   ParameterMissing < RuntimeError
   end
 
   def source
-    {
+    super.merge(
       'required_parameter' => parameter,
-    }
+    )
   end
 end
 end

data/lib/erratum/errors/request/unpermitted_parameters.rb

@@ -44,9 +44,9 @@ class   UnpermittedParameters < RuntimeError
   end
 
   def source
-    {
+    super.merge(
       'unpermitted_parameters' => parameters,
-    }
+    )
   end
 end
 end

data/lib/erratum/rescuable_resource.rb

@@ -20,6 +20,7 @@ module  RescuableResource
                   Erratum.build(
                     exception,
                     resource_name: self.class.singular_underscored_base_resource_name,
+                    resource_id:   params[:id],
                     action:        action_name,
                   ),
                 )

data/lib/erratum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Erratum
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erratum
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
   iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
   -----END CERTIFICATE-----
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apple_core