ocean-rails 1.22.3 → 1.22.4
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/ocean/ocean_resource_controller.rb +18 -7
- data/lib/ocean/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 020520d54c8717cd0d5bf70d2c4d4860fdf08cd2
|
|
4
|
+
data.tar.gz: 4b3dbd8fed061ea0bd45a03f1881fa7ba8d94199
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f41324e5b2adc4a5deaec7792b7c086c337ea6b6f546bae445a2a52776a1f04467320415964b3e1075768042bba5cb1185d4e0a5dcea0f1d8c479f9f690bee94
|
|
7
|
+
data.tar.gz: ceba6e5bc72d5987cedb2e0bba8515460adf8c0556324c9681fe2acdfcd3bbe3e9eb508b51c577f58bbdae6e1685db71024cf0b400c1e3fd2b8b9a42949bf77c
|
|
@@ -19,19 +19,30 @@ module Ocean
|
|
|
19
19
|
|
|
20
20
|
included do
|
|
21
21
|
if defined? ActiveRecord
|
|
22
|
-
rescue_from
|
|
23
|
-
|
|
24
|
-
"OceanDynamo::RecordNotUnique" do |x|
|
|
22
|
+
rescue_from ActiveRecord::RecordNotUnique,
|
|
23
|
+
ActiveRecord::StatementInvalid do |x|
|
|
25
24
|
render_api_error 422, "Resource not unique"
|
|
26
25
|
end
|
|
27
26
|
|
|
28
|
-
rescue_from
|
|
29
|
-
"OceanDynamo::StaleObjectError" do |x|
|
|
27
|
+
rescue_from ActiveRecord::StaleObjectError do |x|
|
|
30
28
|
render_api_error 409, "Stale #{x.record.class.name}"
|
|
31
29
|
end
|
|
32
30
|
|
|
33
|
-
rescue_from
|
|
34
|
-
|
|
31
|
+
rescue_from ActiveRecord::RecordInvalid do |x|
|
|
32
|
+
render_validation_errors x.record, except: ocean_resource_controller_no_validation_errors_on
|
|
33
|
+
end
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
if defined? OceanDynamo
|
|
37
|
+
rescue_from OceanDynamo::RecordNotUnique do |x|
|
|
38
|
+
render_api_error 422, "Resource not unique"
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
rescue_from OceanDynamo::StaleObjectError do |x|
|
|
42
|
+
render_api_error 409, "Stale #{x.record.class.name}"
|
|
43
|
+
end
|
|
44
|
+
|
|
45
|
+
rescue_from OceanDynamo::RecordInvalid do |x|
|
|
35
46
|
render_validation_errors x.record, except: ocean_resource_controller_no_validation_errors_on
|
|
36
47
|
end
|
|
37
48
|
end
|
data/lib/ocean/version.rb
CHANGED