human_error 2.0.0beta5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b97f5fc873078c76b8be169bf591567124bf3b
-  data.tar.gz: 1a0f066015ef29e4cbcaa2b1187e7387dfc7ad7a
+  metadata.gz: 17aba5f28df14fa69f37785ddb08659985741d9b
+  data.tar.gz: a39be0f21794151eaebf056663e327b3499b3b91
 SHA512:
-  metadata.gz: aeba38a51e63f37a7bca77b7323e43d646ed1680c79a84eeacde16e0b90a82c2ab17dd1f4063e8d83a6e79ad4670f94ef453cb4761f8ef344be1c1f22ab2b94d
-  data.tar.gz: 948255600142d7f28b0660ae40e32257e78b2fb47112f8f962824b031d360e6efa2dc18f8f942aaaefe2ed41ff2e73d39c140c966b085bed0c0a64b096d33fc5
+  metadata.gz: 88747c7a2352b0cdd2d7b9867c481f033b987f353b1af78faa649ebfeb6c015dc23fdf2b0b550eb01e63e0710d397549da10857ab72d85395ea28a2ca97bd8ec
+  data.tar.gz: 1d4b15fbb41d93ed4eb13854d21d39535a7a402ecbbcb66b4fd4c9504ebcd656534efd3ba2081214539d0832bcf0cd5ed3eccfc1350d135a8c29e1ca70b75ce7

data/lib/human_error/rescuable_resource.rb

@@ -7,14 +7,14 @@ module  RescuableResource
   module ClassMethods
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Style/GuardClause
     def rescue_resource(resource_name, from:, via:)
-      resource_class_name = resource_name.classify
-      lookup_library      = via
+      nice_resource_name = resource_name.humanize.downcase
+      lookup_library     = via
 
       if from.include? 'persistence'
         rescue_from 'ActiveRecord::RecordInvalid',
                     'ActiveRecord::RecordNotSaved' do |exception|
           human_error = lookup_library.convert(exception,
-                                               resource_name: resource_class_name,
+                                               resource_name: nice_resource_name,
                                                action:        action_name)
 
           render json:   human_error,
@@ -25,7 +25,7 @@ module  RescuableResource
       if from.include? 'not_found'
         rescue_from 'ActiveRecord::RecordNotFound' do |exception|
           human_error = lookup_library.convert(exception,
-                                               resource_name: resource_class_name,
+                                               resource_name: nice_resource_name,
                                                action:        action_name)
 
           render json:   human_error,
@@ -36,13 +36,18 @@ module  RescuableResource
       if from.include? 'association'
         rescue_from 'ActiveRecord::InvalidForeignKey' do |exception|
           human_error = lookup_library.convert(exception,
-                                               resource_name: resource_class_name,
+                                               resource_name: nice_resource_name,
                                                action:        action_name)
 
           render json:   human_error,
                  status: human_error.http_status
         end
       end
+
+      rescue_from 'HumanError::Error' do |exception|
+        render json:   exception,
+               status: exception.http_status
+      end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Style/GuardClause
   end

data/lib/human_error/verifiable_model.rb

@@ -1,20 +1,21 @@
-require 'human_error/errors/resource_not_found_error'
-
-module  HumanError
+class   HumanError
 module  VerifiableModel
   module ClassMethods
-    def verify_model_exists(model_name = nil, options = {})
-      exceptions   = options[:except] || %i{create index}
+    def verify_model_exists(model_name = nil, options = {}, via: HumanError.new)
+      exceptions     = options[:except] || %i{create index}
+      lookup_library = via
       model_name ||= name[/::(\w+)Controller\z/, 1].
-                       singularize.
-                       downcase
+                         singularize.
+                         downcase
 
       before_action except: exceptions do
         model = public_send(model_name)
 
-        resource_not_found_error = Errors::ResourceNotFoundError.new(
+        resource_not_found_error = lookup_library.build(
+          'ResourceNotFoundError',
           resource_name: model_name,
-          resource_id:   params[:id],
+          resource_id:   [params[:id]],
+          action:        action_name,
         )
 
         fail resource_not_found_error unless model.persisted?

data/lib/human_error/version.rb

@@ -1,3 +1,3 @@
 class HumanError
-  VERSION = '2.0.0beta5'
+  VERSION = '2.0.0'
 end

data/lib/human_error.rb

@@ -1,6 +1,8 @@
 require 'human_error/version'
 require 'human_error/error'
 require 'human_error/errors'
+require 'human_error/rescuable_resource'
+require 'human_error/verifiable_model'
 
 class   HumanError
   attr_accessor :configuration
@@ -36,8 +38,6 @@ class   HumanError
   end
 
   def raise(error_type, **args)
-    error = build(error_type, **args)
-
-    Kernel.raise error
+    Kernel.raise build(error_type, **args)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: human_error
 version: !ruby/object:Gem::Version
-  version: 2.0.0beta5
+  version: 2.0.0
 platform: ruby
 authors:
 - jfelchner
@@ -106,9 +106,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6