ocean-rails 1.22.0 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0863495cb9e8b69a7d6c5bd8385bd1652f13d9a1
-  data.tar.gz: da30870c277cfb5ad6709dfb89a89bbdc6d37980
+  metadata.gz: c3a42a43e7f34158de4bfb09d4f2d90c81d44eb0
+  data.tar.gz: 69db544e332db4166ae928f6c9ceccb65e841e8e
 SHA512:
-  metadata.gz: f1d51931c6932ab99fa294c5c6fcc0a427232707fbae00a63d558de119c2c3df8869626e2eb83c41b83f6553486214ba4add13aa483e5f8e65b1642e1c0c09a1
-  data.tar.gz: 1800dea3ebee9e095ab9461d0a565878559b6407c8c028f9f5b952dadb960bb820cacdfafe51eb38c2deec406e035d5cb1331a1233b4a9a691492f29ba3f5510
+  metadata.gz: 4caa4fca1975ebd2d6fc93c58e174694e3616943718ad48db410ead18bb3fd0f73b45c4612abd18264e3e5f2818b1da09f876e9271f9c2ce23026e1dbcd4646a
+  data.tar.gz: c955925c5de020c0e58b3a723794f597f0e981aec00d3c6fcb3b7f2b59e252bb5c5334616cf6f8ddea84c85acb8ac066df81680f8962766c14eceea091262042

data/lib/ocean/ocean_resource_controller.rb

@@ -21,12 +21,12 @@ module Ocean
       if defined? ActiveRecord
         rescue_from ActiveRecord::RecordNotUnique, 
                     ActiveRecord::StatementInvalid,
-                    OceanDynamo::RecordNotSaved do |x|
+                    OceanDynamo::RecordNotUnique do |x|
           render_api_error 422, "Resource not unique"
         end
 
         rescue_from ActiveRecord::StaleObjectError,
-                    OceanDynamo::RecordInConflict do |x|
+                    OceanDynamo::StaleObjectError do |x|
           render_api_error 409, "Stale #{x.record.class.name}"
         end
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.22.0"
+  VERSION = "1.22.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday