coaster 1.3.1 → 1.3.2
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.
- checksums.yaml +4 -4
- data/lib/coaster/core_ext/standard_error.rb +4 -1
- data/lib/coaster/version.rb +1 -1
- data/test/test_standard_error.rb +13 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 25d78eb2f5780582358622b301ce8bc56b65a317bebf07bfdd5d719b18701cca
|
4
|
+
data.tar.gz: 9862b67c209853c1a049e5769e503167e0a76fe687ab479755e3272b052dca5d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c39ebfe2f732a1f44d0c9d4bdcd0b5a81c1a7fc6b3f76f150be78c83c4fccd6a90b6b4333efd91e0b57194462dd31c58c97bf8225ada59c01efcb3c43b4f313a
|
7
|
+
data.tar.gz: f9915989ceac91f5891ede0dd40ce66c7e4e26f2d6628e508123ee75cb7229e125fe0567576b26f8ecf5e1ab87445ede8699d88d313c431c3968dc2ac8a60090
|
@@ -132,7 +132,10 @@ class StandardError
|
|
132
132
|
# user friendly message, for overid
|
133
133
|
def user_message
|
134
134
|
return description if description.present?
|
135
|
-
|
135
|
+
if tkey.present?
|
136
|
+
return _translate
|
137
|
+
end
|
138
|
+
message
|
136
139
|
end
|
137
140
|
|
138
141
|
# another user friendly messages
|
data/lib/coaster/version.rb
CHANGED
data/test/test_standard_error.rb
CHANGED
@@ -27,7 +27,7 @@ module Coaster
|
|
27
27
|
assert_nil e.description
|
28
28
|
assert_nil e.desc
|
29
29
|
assert_equal 'standard error translation', e._translate
|
30
|
-
assert_equal 'standard error translation', e.user_message
|
30
|
+
assert_equal 'standard error translation (developer message)', e.user_message
|
31
31
|
assert_equal 'standard error title', e.title
|
32
32
|
e = StandardError.new(m: 'developer message', desc: 'user message')
|
33
33
|
assert_equal "user message (developer message)", e.to_s
|
@@ -46,7 +46,7 @@ module Coaster
|
|
46
46
|
assert_nil e.description
|
47
47
|
assert_nil e.desc
|
48
48
|
assert_equal 'standard error translation', e._translate
|
49
|
-
assert_equal 'standard error translation', e.user_message
|
49
|
+
assert_equal 'standard error translation (developer message)', e.user_message
|
50
50
|
assert_equal 'standard error title', e.title
|
51
51
|
e = UntitledError.new(m: 'developer message', desc: 'user message')
|
52
52
|
assert_equal "user message (developer message)", e.to_s
|
@@ -56,6 +56,14 @@ module Coaster
|
|
56
56
|
assert_equal 'user message', e._translate
|
57
57
|
assert_equal 'user message', e.user_message
|
58
58
|
assert_equal 'standard error title', e.title
|
59
|
+
e = UntitledError.new(tkey: 'no.translation')
|
60
|
+
assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.to_s
|
61
|
+
assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.message
|
62
|
+
assert_nil e.description
|
63
|
+
assert_nil e.desc
|
64
|
+
assert_equal 'translation missing: en.no.translation', e._translate
|
65
|
+
assert_equal "translation missing: en.no.translation", e.user_message
|
66
|
+
assert_equal 'standard error title', e.title
|
59
67
|
end
|
60
68
|
|
61
69
|
def test_with_translation_class
|
@@ -65,7 +73,7 @@ module Coaster
|
|
65
73
|
assert_nil e.description
|
66
74
|
assert_nil e.desc
|
67
75
|
assert_equal 'Test sample error', e._translate
|
68
|
-
assert_equal 'Test sample error', e.user_message
|
76
|
+
assert_equal 'Test sample error (Coaster::TestStandardError::SampleError)', e.user_message
|
69
77
|
assert_equal 'Test this title', e.title
|
70
78
|
e = SampleError.new(beet: 'apple')
|
71
79
|
assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.to_s
|
@@ -73,7 +81,7 @@ module Coaster
|
|
73
81
|
assert_nil e.description
|
74
82
|
assert_nil e.desc
|
75
83
|
assert_equal 'Test sample error', e._translate
|
76
|
-
assert_equal 'Test sample error', e.user_message
|
84
|
+
assert_equal 'Test sample error (Coaster::TestStandardError::SampleError)', e.user_message
|
77
85
|
assert_equal 'Test this title', e.title
|
78
86
|
e = SampleError.new('developer message')
|
79
87
|
assert_equal "Test sample error (developer message)", e.to_s
|
@@ -81,7 +89,7 @@ module Coaster
|
|
81
89
|
assert_nil e.description
|
82
90
|
assert_nil e.desc
|
83
91
|
assert_equal 'Test sample error', e._translate
|
84
|
-
assert_equal 'Test sample error', e.user_message
|
92
|
+
assert_equal 'Test sample error (developer message)', e.user_message
|
85
93
|
assert_equal 'Test this title', e.title
|
86
94
|
e = SampleError.new(m: 'developer message', desc: 'user message')
|
87
95
|
assert_equal "user message (developer message)", e.to_s
|