moromi-error 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 832c6cfe1cf0f2b4b4bf3986da115b1131a81fd3beedec14d282c0f29dfe8540
-  data.tar.gz: 0e1ced5d0279108a6e504087b836ee1591914eee2d812091a4e192fb83d00256
+  metadata.gz: 7b587a5b916270e9fc2f606b34cd1a1079935b3b767ad268c3c912a2ad7c11e7
+  data.tar.gz: 598fa10b9299e177b7853d87a4ee73c11a6afe6ad122eb737de3ee75aa1a6408
 SHA512:
-  metadata.gz: 876be6091b110ac574c7e8757ce37f8da74d73419b07bd1e292511cea14bbc42cc4971299382b0dee9f611e9b01eca5fe08210f9f1a2153ad8fca2f64cb19130
-  data.tar.gz: f465b512ed31e6fa28a3714a1f21cf8c1ccacbf5e6202fb837c3382fc75460d5035fe3228e04348aff582e204eb658eb3cf72349769c6411864cb7e53d21a429
+  metadata.gz: 80cef3e80a2a47ff15b94c05486828096b29084ed54511cc534b93698578a603da8bb97b14054cef04443f02fccb49013bf439b7d6be0ebc615ce3b7d6a78c87
+  data.tar.gz: e687c1014bbd4f4b7e55ec2cdbc26c382b6004d8ced4f4a386842faa85b03e1efafc11a738b9e8de99862b4a8b45711e1259036ece9d7c206173804667383f25

data/lib/moromi/error/renderer.rb

@@ -8,10 +8,12 @@ module Moromi::Error
     }.freeze
 
     included do
+      class_attribute :default_moromi_error_template_path
       class_attribute :default_moromi_error_renderer_options
       class_attribute :moromi_error_logger
 
-      self.default_moromi_error_renderer_options = {partial: ERROR_TEMPLATES[:default], layout: false}
+      self.default_moromi_error_template_path = ERROR_TEMPLATES[:default]
+      self.default_moromi_error_renderer_options = {layout: false}
       self.moromi_error_logger = Moromi::Error::DefaultLogger.new
     end
 
@@ -44,7 +46,6 @@ module Moromi::Error
     end
 
     def render_force_update(exception: Moromi::Error::NeedForceUpdate.new, options: nil, locals: {})
-      options = options || {partial: ERROR_TEMPLATES[:default], layout: false}
       render_bad_request(exception: exception, options: options, locals: locals)
     end
 
@@ -58,7 +59,8 @@ module Moromi::Error
 
     private
 
-    def render_error(status, title, exception, options: nil, locals: {})
+    def render_error(status, title, exception, options: nil, template_path: nil, locals: {})
+      template_path ||= self.class::default_moromi_error_template_path
       options = options || self.class::default_moromi_error_renderer_options
       e = Moromi::Error::Default.make(exception)
 
@@ -68,7 +70,7 @@ module Moromi::Error
       locals = {status: status, title: title, exception: e}.merge(locals)
 
       render_block = -> {
-        render options.merge({locals: locals})
+        render template_path, **options, locals: locals
       }
 
       respond_to do |format|

data/lib/moromi/error/version.rb

@@ -1,5 +1,5 @@
 module Moromi
   module Error
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moromi-error
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,10 +128,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/views/moromi/error/_default.html.erb
-- app/views/moromi/error/_default.html.slim
-- app/views/moromi/error/_default.json.jb
-- app/views/moromi/error/_default.json.jbuilder
+- app/views/moromi/error/default.html.erb
+- app/views/moromi/error/default.html.slim
+- app/views/moromi/error/default.json.jb
+- app/views/moromi/error/default.json.jbuilder
 - bin/rails
 - config/locales/moromi-error.yml
 - lib/generators/moromi/error/views_generator.rb