ocean-rails 1.22.3 → 1.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3428a7d30c57bcd52d9072e7b79861f8a2a65714
-  data.tar.gz: 3297e0355f6c5b20953c9a5598dda840bc11dfeb
+  metadata.gz: 020520d54c8717cd0d5bf70d2c4d4860fdf08cd2
+  data.tar.gz: 4b3dbd8fed061ea0bd45a03f1881fa7ba8d94199
 SHA512:
-  metadata.gz: dc596c4d98a1c062da61ae6f63c8b711606b2d599fc73f33eecf8169feb963472ae694f1be83f31c65116c4c6304d804326e90586f42537b342ab67c37b1b069
-  data.tar.gz: aa885f87efa2b93ac915c6c69ab8fe96ef9d814e279d9694d9d2468c1afe283e602cf92d29d3cf89ac8929a0acff7795dec9b667b1659a1ba4c4921461f69d6c
+  metadata.gz: f41324e5b2adc4a5deaec7792b7c086c337ea6b6f546bae445a2a52776a1f04467320415964b3e1075768042bba5cb1185d4e0a5dcea0f1d8c479f9f690bee94
+  data.tar.gz: ceba6e5bc72d5987cedb2e0bba8515460adf8c0556324c9681fe2acdfcd3bbe3e9eb508b51c577f58bbdae6e1685db71024cf0b400c1e3fd2b8b9a42949bf77c

data/lib/ocean/ocean_resource_controller.rb

@@ -19,19 +19,30 @@ module Ocean
 
     included do
       if defined? ActiveRecord
-        rescue_from "ActiveRecord::RecordNotUnique", 
-                    "ActiveRecord::StatementInvalid",
-                    "OceanDynamo::RecordNotUnique" do |x|
+        rescue_from ActiveRecord::RecordNotUnique, 
+                    ActiveRecord::StatementInvalid do |x|
           render_api_error 422, "Resource not unique"
         end
 
-        rescue_from "ActiveRecord::StaleObjectError",
-                    "OceanDynamo::StaleObjectError" do |x|
+        rescue_from ActiveRecord::StaleObjectError do |x|
           render_api_error 409, "Stale #{x.record.class.name}"
         end
 
-        rescue_from "ActiveRecord::RecordInvalid",
-                    "OceanDynamo::RecordInvalid" do |x|
+        rescue_from ActiveRecord::RecordInvalid do |x|
+          render_validation_errors x.record, except: ocean_resource_controller_no_validation_errors_on
+        end
+      end
+
+      if defined? OceanDynamo
+        rescue_from OceanDynamo::RecordNotUnique do |x|
+          render_api_error 422, "Resource not unique"
+        end
+
+        rescue_from OceanDynamo::StaleObjectError do |x|
+          render_api_error 409, "Stale #{x.record.class.name}"
+        end
+
+        rescue_from OceanDynamo::RecordInvalid do |x|
           render_validation_errors x.record, except: ocean_resource_controller_no_validation_errors_on
         end
       end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.22.3"
+  VERSION = "1.22.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.22.3
+  version: 1.22.4
 platform: ruby
 authors:
 - Peter Bengtson