ocean-rails 8.0.4 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6410275c0be170157e6066f8cb066943f4e799d7e1ed08f04f9b4af49ccc1a3e
-  data.tar.gz: 197f838aef582a7273e7fd4c90de1ceece45b9a11c827707742d64bade485e54
+  metadata.gz: bcab533eb7e89aa0b95f905ef960c9cfdb12b72b160bd4dbbf84ee44eadd284c
+  data.tar.gz: 0d693e526d8d85396a67ff368b790a9fe19b9cd34d654d40ab3222b99d25a31c
 SHA512:
-  metadata.gz: 6869bb1d90ede9a68a4d84fe3048d8e001eba8d6332de41ab08b40121af14da8a49a941cbd4c2efb171d4ed3a2b1ec8a7294aa360b153f542d000171ad902453
-  data.tar.gz: 41101939b918213a5bf914ad62f23a23c1b5005e4ae1579fd2bd45d33c99c929d21ecf3d20aa196730f6e9af950c5492dd5bf8239227776188e1854c8d35ba07
+  metadata.gz: 97c5e92ab3ac19b360ce1e1c2f0b65618c5bef1f4e2c9f56963f0db5d188a40323568e7821d6194df890216fbf6d2f3fcb283cf2f8fbb0f6bbcb4fc273b81c91
+  data.tar.gz: 773acfca0d1fa0b346aec42d87d3ef25e0dd2a3abfe87d4b276f70ff3a6f3f4751e6d76c97f4394e10acb798077f95a526ff27f2ed407b7e97287311db6b7b0e

data/app/controllers/alive_controller.rb

@@ -5,7 +5,7 @@ class AliveController < ApplicationController
 
 
   def index
-    render text: "ALIVE", status: 200
+    render plain: "ALIVE", status: 200
   end
 
 end

data/lib/ocean/ocean_application_controller.rb

@@ -10,8 +10,8 @@ module OceanApplicationController
   def default_url_options(options = nil)
     { :protocol => "https", :host => OCEAN_API_HOST }
   end
-  
-  
+
+
   #
   # Ensures that there is an +X-API-Token+ HTTP header in the request.
   # Stores the token in @x_api_token for use during authorisation of the
@@ -40,7 +40,7 @@ module OceanApplicationController
     expires_in 0, must_revalidate: true
     false
   end
-  
+
 
 
   #
@@ -65,7 +65,7 @@ module OceanApplicationController
     end
     # Create a query string and call Auth
     qs = Api.authorization_string(@@extra_actions, controller_name, action_name)
-    response = Api.permitted?(@x_api_token, query: qs)                                   
+    response = Api.permitted?(@x_api_token, query: qs)
     if response.status == 200
       a = response.body['authentication']
       @auth_api_user_id = a['user_id']  # Deprecate and remove
@@ -98,10 +98,10 @@ module OceanApplicationController
       obj.updated_by = @auth_api_user_uri
     end
   end
-  
-  
+
+
   #
-  # Renders an API level error. The body will be a JSON hash with a single key, 
+  # Renders an API level error. The body will be a JSON hash with a single key,
   # +_api_error+. The value is an array containing the +messages+.
   #
   #  render_api_error(500, "An unforeseen error occurred")
@@ -117,14 +117,14 @@ module OceanApplicationController
   def render_api_error(status_code, *messages)
     render json: {_api_error: messages}, status: status_code
   end
-  
+
   #
   # Renders a +HEAD+ response with HTTP status 204 No Content.
   #
   def render_head_204
-    render text: '', status: 204 #, content_type: 'application/json'
+    render plain: '', status: 204, content_type: 'application/json'
   end
-  
+
   #
   # Renders a HTTP 422 Unprocessable Entity response with a body enumerating
   # each invalid Rails resource attribute and all their errors. This is usually
@@ -147,7 +147,7 @@ module OceanApplicationController
     except = except.collect(&:to_sym)
     render json: r.errors.messages.except(*except), status: 422
   end
-  
+
   #
   # This is the main rendering function in Ocean. The argument +x+ can be a resource
   # or a collection of resources (which need not be of the same type).
@@ -159,9 +159,9 @@ module OceanApplicationController
   # their standard position, begin with an underscore, etc. The +ocean+ gem generator
   # for resources creates a partial in the proper location.
   #
-  def api_render(x, 
-                 new: false, 
-                 href: x.present? && url_for(params), 
+  def api_render(x,
+                 new: false,
+                 href: x.present? && url_for(params.permit!),
                  override_partial: false
                 )
     if !x.is_a?(Array) && !(defined?(ActiveRecord) && x.is_a?(ActiveRecord::Relation))
@@ -173,7 +173,7 @@ module OceanApplicationController
       end
       return
     else
-      resources = x.dup.collect { |m| render_to_string(partial: m.to_partial_path, 
+      resources = x.dup.collect { |m| render_to_string(partial: m.to_partial_path,
                                                    locals: {m.class.model_name.i18n_key => m}) }
       count = resources.count
       total_count = x.respond_to?(:unscope) ? x.unscope(:limit, :offset).count : count
@@ -198,17 +198,18 @@ module OceanApplicationController
           links['next_page'] = {href: url_for(params.merge(page: next_page)), type: 'application/json'} if next_page
         end
       end
-      
+
       attrs['_links'] = links if links
       attrs['page'] = page if page
       attrs['page_size'] = page_size if page_size
       attrs['total_pages'] = total_pages if total_pages
 
-      render text: '{"_collection":{"resources":[' + resources.join(',') + ']' + 
+      render plain: '{"_collection":{"resources":[' + resources.join(',') + ']' +
         (attrs.collect do |k, v|
            ',"' + k.to_s + '":' + v.to_json
          end).join('') +
-        '}}'
+        '}}',
+        content_type: 'application/json'
     end
   end
 
@@ -221,7 +222,7 @@ module OceanApplicationController
   #
   def filtered_params(klass)
     result = {}
-    params.each do |k, v| 
+    params.each do |k, v|
       result[k] = v if klass.accessible_attributes.include?(k)
     end
     result
@@ -229,10 +230,10 @@ module OceanApplicationController
 
 
   #
-  # Cache values for collections. Accepts a class, a scope, or an array. 
-  # The cache value is based on three components: 
-  #   (1) the name of the class, 
-  #   (2) the number of members in the collection, and 
+  # Cache values for collections. Accepts a class, a scope, or an array.
+  # The cache value is based on three components:
+  #   (1) the name of the class,
+  #   (2) the number of members in the collection, and
   #   (3) the modification time of the last updated member.
   # If an array is given, the class of the first member will be used to
   # create a scope. If the array is empty, the optional second argument

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "8.0.4"
+  VERSION = "8.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 8.0.4
+  version: 8.1.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement