ocean-rails 1.14.3 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f957055559e368f6cb0c7c449f46b957c68076
-  data.tar.gz: 9cb3d11b49d425bc45bd229929d46b43361e7f18
+  metadata.gz: ce9a28ccf97e9bf1ee5c4905451a525fd31f989d
+  data.tar.gz: 9abb086155560c5c2673a0c9fc67f461edbe196d
 SHA512:
-  metadata.gz: 0091f80cdf13da6d98ae0aa052de5eac75946e7569256242b72ad2a59ec442d89c3613e81ccc175fca80390944cdfb598b70f1757e069860772d50bbe4ffcb63
-  data.tar.gz: cb1f8e078078690ee7c88d4e662e3477128a451d84d9b32d5485b56c817b5bdf20d208cd2d2e66973c412aae0b9daf3af5bc40ff120dfcd0b2a0d70dfc4e0236
+  metadata.gz: 6aa5c1b90969a5153777aaeefbc5ede1ddbfd21e6451fdbf82472eb5abc685e6e7e7f4b4396c13f20b507f568f9bbc01f0ee9aad7ff5a6ac5c8b9618f7367875
+  data.tar.gz: d5be6dbac22701ece003f860a5f55c97125231903ef70b96e25ccc2e71e45c7f0775e41bb603cfcae74dd098726c3ed66518f123bd3a20a504d8dcf2f5d34693

data/lib/ocean/ocean_resource_controller.rb

@@ -9,6 +9,18 @@ module Ocean
     extend ActiveSupport::Concern
 
     included do
+      rescue_from ActiveRecord::RecordNotUnique, 
+                  ActiveRecord::StatementInvalid do |x|
+        render_api_error 422, "#{controller_name.singularize.camelize} already exists"
+      end
+
+      rescue_from ActiveRecord::StaleObjectError do |x|
+        render_api_error 409, "Stale #{x.record.class.name}"
+      end
+
+      rescue_from ActiveRecord::RecordInvalid do |x|
+        render_validation_errors x.record
+      end
     end
 
     module ClassMethods

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.14.3"
+  VERSION = "1.15.0"
 end

data/lib/templates/rails/scaffold_controller/controller.rb

@@ -34,18 +34,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   def create
     @<%= singular_table_name %> = <%= class_name %>.new(filtered_params <%= class_name %>)
     set_updater(@<%= singular_table_name %>)
-    if @<%= singular_table_name %>.valid?
-      begin
-        @<%= singular_table_name %>.save!
-      rescue ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid, 
-             SQLite3::ConstraintException 
-        render_api_error 422, "<%= class_name %> already exists"
-        return
-      end
-      api_render @<%= singular_table_name %>, new: true
-    else
-      render_validation_errors @<%= singular_table_name %>
-    end
+    @<%= singular_table_name %>.save!
+    api_render @<%= singular_table_name %>, new: true
   end
 
 
@@ -55,19 +45,10 @@ class <%= controller_class_name %>Controller < ApplicationController
       render_api_error 422, "Missing resource attributes"
       return
     end
-    begin
-      @<%= singular_table_name %>.assign_attributes(filtered_params <%= class_name %>)
-      set_updater(@<%= singular_table_name %>)
-      @<%= singular_table_name %>.save
-    rescue ActiveRecord::StaleObjectError
-      render_api_error 409, "Stale <%= class_name %>"
-      return
-    end
-    if @<%= singular_table_name %>.valid?
-      api_render @<%= singular_table_name %>
-    else
-      render_validation_errors(@<%= singular_table_name %>)
-    end
+    @<%= singular_table_name %>.assign_attributes(filtered_params <%= class_name %>)
+    set_updater(@<%= singular_table_name %>)
+    @<%= singular_table_name %>.save!
+    api_render @<%= singular_table_name %>
   end
 
 

metadata

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