ocean-rails 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33316f32cdf5c4f62920230b5fc9a9dee5c0d6cb
-  data.tar.gz: 4634e081eb7394498dd21e06897e0b5a5a98a4c8
+  metadata.gz: 2c6feba83b83495464eccf885fe393675f8d7dfa
+  data.tar.gz: 5c59b3e4663bd2983e0de265848e8200ed193eda
 SHA512:
-  metadata.gz: 791989de154a2a56e06899dc6c499de22ae86f2a6c6afc8701581ac269c39453a6774413689cc03853d706e8144ebb66f0806289edd3e3149c81503433c572ed
-  data.tar.gz: 4eb65cbd9d4670a9914ee44f0bddef52250bbfd1f7526b93a129231483ed44bda27e17f8fa5a1cf6209e2a9a9d1b2713463c24f0f9d51dcb750d2746148a2bc4
+  metadata.gz: 80a5b60c2260279847f9ca9d9733f1fe94f59e3624af58a9afe5ab88556f0d06c005de2127c76ac93f08c19c002a28c05f5c9c820750ee82d049edb6c03a0e27
+  data.tar.gz: 769821c1d5e12a7884be727d8acdf7edfa9cf854b2f78873f6eae49b49aedab143992dd23e647a8b4d850ae21ffbfc47a4a590260aac7a0807cf7fe30cded8b3

data/lib/generators/ocean_scaffold_dynamo/templates/controller.rb

@@ -5,14 +5,14 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
 
-  ocean_resource_controller required_attributes: [:lock_version]
+  ocean_resource_controller
 
   before_action :find_<%= singular_table_name %>, :only => [:show, :update, :destroy]
     
   
   # GET <%= route_url %>
   def index
-    expires_in 0, 's-maxage' => 30.minutes
+    expires_in 0, 's-maxage' => DEFAULT_CACHE_TIME
     # if stale?(collection_etag(<%= class_name %>))   # collection_etag is still ActiveRecord only!
     # Instead, we get all the instances and compute the ETag manually.
     # You may wish to remove this action entirely. You may also wish to remove the caching,
@@ -28,7 +28,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # GET <%= route_url %>/a-b-c-d-e
   def show
-    expires_in 0, 's-maxage' => 30.minutes
+    expires_in 0, 's-maxage' => DEFAULT_CACHE_TIME
     if stale?(etag: @<%= singular_table_name %>.lock_version,          # NB: DynamoDB tables don't have cache_key - FIX!
               last_modified: @<%= singular_table_name %>.updated_at)
       api_render @<%= singular_table_name %>

data/lib/ocean/ocean_application_controller.rb

@@ -76,7 +76,7 @@ module OceanApplicationController
       @group_names = a['group_names'].to_set if a['group_names']
       return true
     end
-    error_messages = response.body['_api_error']
+    error_messages = response.body['_api_error'] rescue ["Not JSON: #{raw_body}"]
     render_api_error response.status, *error_messages
     expires_in 0, must_revalidate: true
     false

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "6.1.3"
+  VERSION = "6.1.4"
 end

metadata

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