Merge branch 'master' into rails5

Author: lgebhardt

lib/jsonapi/acts_as_resource_controller.rb

@@ -148,7 +148,18 @@ def render_errors(errors)
 
     def render_results(operation_results)
       response_doc = create_response_document(operation_results)
-      render status: response_doc.status, json: response_doc.contents, content_type: JSONAPI::MEDIA_TYPE
+
+      render_options = {
+        status: response_doc.status,
+        json:   response_doc.contents,
+        content_type: JSONAPI::MEDIA_TYPE
+      }
+
+      render_options[:location] = response_doc.contents[:data]["links"][:self] if (
+        response_doc.status == :created && response_doc.contents[:data].class != Array
+      )
+
+      render(render_options)
     end
 
     def create_response_document(operation_results)
@@ -175,7 +186,7 @@ def handle_exceptions(e)
       when JSONAPI::Exceptions::Error
         render_errors(e.errors)
       else
-        if JSONAPI.configuration.exception_class_whitelist.any? { |k| e.class.ancestors.include?(k) }
+        if JSONAPI.configuration.exception_class_whitelisted?(e)
           fail e
         else
           internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)

lib/jsonapi/configuration.rb

@@ -95,6 +95,10 @@ def operations_processor=(operations_processor)
       @operations_processor = JSONAPI::OperationsProcessor.operations_processor_for(@operations_processor_name)
     end
 
+    def exception_class_whitelisted?(e)
+      @exception_class_whitelist.flatten.any? { |k| e.class.ancestors.include?(k) }
+    end
+
     attr_writer :allow_include, :allow_sort, :allow_filter
 
     attr_writer :default_paginator

lib/jsonapi/operations_processor.rb

@@ -92,7 +92,7 @@ def with_default_handling(&block)
       raise e
 
     rescue => e
-      if JSONAPI.configuration.exception_class_whitelist.any? { |k| e.class.ancestors.include?(k) }
+      if JSONAPI.configuration.exception_class_whitelisted?(e)
         raise e
       else
         @request.server_error_callbacks.each { |callback| safe_run_callback(callback, e) }

lib/jsonapi/resource.rb

@@ -638,7 +638,9 @@ def is_filter_relationship?(filter)
 
       def verify_filter(filter, raw, context = nil)
         filter_values = []
-        filter_values += CSV.parse_line(raw) unless raw.nil? || raw.empty?
+        if raw.present?
+          filter_values += raw.is_a?(String) ? CSV.parse_line(raw) : [raw]
+        end
 
         strategy = _allowed_filters.fetch(filter, Hash.new)[:verify]
 

test/controllers/controller_test.rb

@@ -103,6 +103,13 @@ def test_index_filter_by_title
     assert_equal 1, json_response['data'].size
   end
 
+  def test_index_filter_with_hash_values
+    get :index, {filter: {search: {title: 'New post'}}}
+    assert_response :success
+    assert json_response['data'].is_a?(Array)
+    assert_equal 1, json_response['data'].size
+  end
+
   def test_index_filter_by_ids
     get :index, params: {filter: {ids: '1,2'}}
     assert_response :success
@@ -412,6 +419,7 @@ def test_create_simple
     assert json_response['data'].is_a?(Hash)
     assert_equal 'JR is Great', json_response['data']['attributes']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
+    assert_equal json_response['data']['links']['self'], response.location
   end
 
   def test_create_link_to_missing_object
@@ -433,6 +441,7 @@ def test_create_link_to_missing_object
     assert_response :unprocessable_entity
     # TODO: check if this validation is working
     assert_match /author - can't be blank/, response.body
+    assert_equal nil, response.location
   end
 
   def test_create_extra_param
@@ -454,6 +463,7 @@ def test_create_extra_param
 
     assert_response :bad_request
     assert_match /asdfg is not allowed/, response.body
+    assert_equal nil,response.location
   end
 
   def test_create_extra_param_allow_extra_params
@@ -486,6 +496,7 @@ def test_create_extra_param_allow_extra_params
     assert_equal "Param not allowed", json_response['meta']["warnings"][0]["title"]
     assert_equal "asdfg is not allowed.", json_response['meta']["warnings"][0]["detail"]
     assert_equal '105', json_response['meta']["warnings"][0]["code"]
+    assert_equal json_response['data']['links']['self'], response.location
   ensure
     JSONAPI.configuration.raise_if_parameters_not_allowed = true
   end
@@ -515,6 +526,7 @@ def test_create_with_invalid_data
     assert_equal "/data/attributes/title", json_response['errors'][1]['source']['pointer']
     assert_equal "is too long (maximum is 35 characters)", json_response['errors'][1]['title']
     assert_equal "title - is too long (maximum is 35 characters)", json_response['errors'][1]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_multiple
@@ -551,6 +563,7 @@ def test_create_multiple
     assert_nil json_response['data'][0]['relationships']['author']['data']
     assert_match /JR is Great/, response.body
     assert_match /Ember is Great/, response.body
+    assert_equal nil, response.location
   end
 
   def test_create_multiple_wrong_case
@@ -583,6 +596,7 @@ def test_create_multiple_wrong_case
 
     assert_response :bad_request
     assert_match /Title/, json_response['errors'][0]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_simple_missing_posts
@@ -603,6 +617,7 @@ def test_create_simple_missing_posts
 
     assert_response :bad_request
     assert_match /The required parameter, data, is missing./, json_response['errors'][0]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_simple_wrong_type
@@ -623,6 +638,7 @@ def test_create_simple_wrong_type
 
     assert_response :bad_request
     assert_match /posts_spelled_wrong is not a valid resource./, json_response['errors'][0]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_simple_missing_type
@@ -642,6 +658,7 @@ def test_create_simple_missing_type
 
     assert_response :bad_request
     assert_match /The required parameter, type, is missing./, json_response['errors'][0]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_simple_unpermitted_attributes
@@ -662,6 +679,7 @@ def test_create_simple_unpermitted_attributes
 
     assert_response :bad_request
     assert_match /subject/, json_response['errors'][0]['detail']
+    assert_equal nil, response.location
   end
 
   def test_create_simple_unpermitted_attributes_allow_extra_params
@@ -696,6 +714,7 @@ def test_create_simple_unpermitted_attributes_allow_extra_params
     assert_equal "Param not allowed", json_response['meta']["warnings"][0]["title"]
     assert_equal "subject is not allowed.", json_response['meta']["warnings"][0]["detail"]
     assert_equal '105', json_response['meta']["warnings"][0]["code"]
+    assert_equal json_response['data']['links']['self'], response.location
   ensure
     JSONAPI.configuration.raise_if_parameters_not_allowed = true
   end
@@ -723,6 +742,7 @@ def test_create_with_links_to_many_type_ids
     assert_equal '3', json_response['data']['relationships']['author']['data']['id']
     assert_equal 'JR is Great', json_response['data']['attributes']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
+    assert_equal json_response['data']['links']['self'], response.location
   end
 
   def test_create_with_links_to_many_array
@@ -748,6 +768,7 @@ def test_create_with_links_to_many_array
     assert_equal '3', json_response['data']['relationships']['author']['data']['id']
     assert_equal 'JR is Great', json_response['data']['attributes']['title']
     assert_equal 'JSONAPIResources is the greatest thing since unsliced bread.', json_response['data']['attributes']['body']
+    assert_equal json_response['data']['links']['self'], response.location
   end
 
   def test_create_with_links_include_and_fields
@@ -774,6 +795,7 @@ def test_create_with_links_include_and_fields
     assert_equal '3', json_response['data']['relationships']['author']['data']['id']
     assert_equal 'JR is Great!', json_response['data']['attributes']['title']
     assert_not_nil json_response['included'].size
+    assert_equal json_response['data']['links']['self'], response.location
   end
 
   def test_update_with_links

test/fixtures/active_record.rb

@@ -956,6 +956,14 @@ def title=(title)
            records.where('id IN (?)', value)
          }
 
+  filter :search,
+    verify: ->(values, context) {
+      values.all?{|v| v.is_a?(Hash) } && values
+    },
+    apply: -> (records, values, _options) {
+      records.where(title: values.first['title'])
+    }
+
   def self.updatable_fields(context)
     super(context) - [:author, :subject]
   end