err_merchant 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +4 -0
  3. data/app/controllers/err_merchant/errors_controller.rb +2 -1
  4. data/app/views/err_merchant/errors/template.html.erb +3 -3
  5. data/lib/err_merchant/version.rb +1 -1
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 116ddfec82ffc849caddcbb7d861dea379c9b56f
4
- data.tar.gz: fbe635a5d20803ff2931462b4e2d2fc77aaaebe3
3
+ metadata.gz: 6850fb4a1684211d5c980d5eb12b86dbcc64c995
4
+ data.tar.gz: a8478381c4a3af623246e2b76d24351329c8c64a
5
5
  SHA512:
6
- metadata.gz: e3bc503ffb5cd80cd733fd47729755066fe5343263b7852d85ef186df09df729e74e4ad25de28e7305e0fe5f11ed0b0f6d4c2e07ef64478fddcf2626fa477425
7
- data.tar.gz: 441395217d60eb4e6ec14a2a831b3feecd5d520ce84a2c293054e6210ddec68416e618bd545f88481f3d6bb117855856e7f57352e067be5c4506ed1e9828a35d
6
+ metadata.gz: ee446dba8d22eeda9fe27f4ba369430755fb39bf5b823a19b2bcd4cd65cc0163a51e8f01861e9c903fa404b0c5f478ffb0a138863793b4c1721392b405233ae1
7
+ data.tar.gz: 0918384e242f95a2cd9a93325f5fe56c68034d3138dd79643263edbc2fd15e37f7d30a204fdd202569e9121820f98f0e3c10b70265ffc1bc0b7b06f51bc0fce4
data/README.rdoc CHANGED
@@ -34,6 +34,10 @@ You can translate the error messages, by default they are the same as the standa
34
34
  Please note that there are translations missing in development mode if you don't supply translations for your locale. In production however, +config.i18n.fallbacks+ is usually set to +true+, so the error messages for the default locale will be shown if the lookup is not successful.
35
35
 
36
36
  == Changelog
37
+ === 0.3.1 (2014-11-08)
38
+ * works with `pundit` now
39
+ * show error messages raw
40
+
37
41
  === 0.3.0 (2014-10-24)
38
42
  * compatible with rails 4
39
43
 
data/app/controllers/err_merchant/errors_controller.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  class ErrMerchant::ErrorsController < ApplicationController
2
2
  skip_authorization_check if defined?(::CanCan)
3
-
3
+ skip_after_filter :verify_authorized if defined?(::Pundit)
4
+
4
5
  ERRORS = {
5
6
  :internal_server_error => 500,
6
7
  :not_found => 404,
data/app/views/err_merchant/errors/template.html.erb CHANGED
@@ -1,4 +1,4 @@
1
1
  <div class='err_merchant'>
2
- <h2><%= I18n.t(:"err_merchant.#{status_code}.title", :default => :"err_merchant.500.title") %></h2>
3
- <p><%= I18n.t(:"err_merchant.#{status_code}.description", :default => :"err_merchant.500.description") %></p>
4
- </div>
2
+ <h2><%= raw I18n.t(:"err_merchant.#{status_code}.title", :default => :"err_merchant.500.title") %></h2>
3
+ <p><%= raw I18n.t(:"err_merchant.#{status_code}.description", :default => :"err_merchant.500.description") %></p>
4
+ </div>
data/lib/err_merchant/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ErrMerchant
2
- VERSION = "0.3.0"
2
+ VERSION = "0.3.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: err_merchant
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fabian Schwahn
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-24 00:00:00.000000000 Z
11
+ date: 2014-11-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
151
151
  version: '0'
152
152
  requirements: []
153
153
  rubyforge_project:
154
- rubygems_version: 2.3.0
154
+ rubygems_version: 2.4.2
155
155
  signing_key:
156
156
  specification_version: 4
157
157
  summary: Rails Engine for rendering error pages