ocean-rails 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf40f66a966f7a784159d77e4848cea45371325
-  data.tar.gz: bdca4988212512230799e74df574d7e98d60c63e
+  metadata.gz: 0863495cb9e8b69a7d6c5bd8385bd1652f13d9a1
+  data.tar.gz: da30870c277cfb5ad6709dfb89a89bbdc6d37980
 SHA512:
-  metadata.gz: 6ee6d36b30ab877536cf485810881a2441400f0b7391ef360f4f47409bd2c443bbe431acb9f47257ca855b1c635c8dd2c0dd0c5b1b34577477041cf8789b7b66
-  data.tar.gz: 679e1013d4d9898aaefd98ef3e2003da3236eea143e2f130e2e375a9fe7ea99a42d51ffa722a6b766f2c7f8bf6b533b16f4fc0a3a21c86d32a79b350a392a7a9
+  metadata.gz: f1d51931c6932ab99fa294c5c6fcc0a427232707fbae00a63d558de119c2c3df8869626e2eb83c41b83f6553486214ba4add13aa483e5f8e65b1642e1c0c09a1
+  data.tar.gz: 1800dea3ebee9e095ab9461d0a565878559b6407c8c028f9f5b952dadb960bb820cacdfafe51eb38c2deec406e035d5cb1331a1233b4a9a691492f29ba3f5510

data/lib/ocean/ocean_resource_controller.rb

@@ -20,15 +20,18 @@ module Ocean
     included do
       if defined? ActiveRecord
         rescue_from ActiveRecord::RecordNotUnique, 
-                    ActiveRecord::StatementInvalid do |x|
+                    ActiveRecord::StatementInvalid,
+                    OceanDynamo::RecordNotSaved do |x|
           render_api_error 422, "Resource not unique"
         end
 
-        rescue_from ActiveRecord::StaleObjectError do |x|
+        rescue_from ActiveRecord::StaleObjectError,
+                    OceanDynamo::RecordInConflict do |x|
           render_api_error 409, "Stale #{x.record.class.name}"
         end
 
-        rescue_from ActiveRecord::RecordInvalid do |x|
+        rescue_from ActiveRecord::RecordInvalid,
+                    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.21.0"
+  VERSION = "1.22.0"
 end

metadata

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