Merge pull request #676 from cerebris/rails5

Rails5

Author: dgeb

.travis.yml

@@ -2,8 +2,16 @@ language: ruby
 sudo: false
 env:
   - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=4.2.6"
+  - "RAILS_VERSION=5.0.0.beta3"
 rvm:
   - 2.0
   - 2.1
-  - 2.2
+  - 2.2.4
+  - 2.3.0
+matrix:
+  exclude:
+    - rvm: 2.0
+      env: "RAILS_VERSION=5.0.0.beta3"
+    - rvm: 2.1
+      env: "RAILS_VERSION=5.0.0.beta3"

Rakefile

@@ -1,20 +1,11 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require './test/test_helper.rb'
 
-TestApp.load_tasks
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.warning = false
+  t.test_files = FileList['test/**/*_test.rb']
+end
 
 task default: :test
-
-desc 'Run tests in isolated processes'
-namespace :test do
-  task :isolated do
-    Dir[test_task.pattern].each do |file|
-      cmd = ['ruby']
-      test_task.libs.each { |l| cmd << '-I' << l }
-      cmd << file
-      sh cmd.join(' ')
-    end
-  end
-end

lib/jsonapi/acts_as_resource_controller.rb

@@ -66,10 +66,6 @@ def process_request
 
     rescue => e
       handle_exceptions(e)
-    ensure
-      if response.body.size > 0
-        response.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
-      end
     end
 
     # set the operations processor in the configuration or override this to use another operations processor
@@ -155,7 +151,8 @@ def render_results(operation_results)
 
       render_options = {
         status: response_doc.status,
-        json:   response_doc.contents
+        json:   response_doc.contents,
+        content_type: JSONAPI::MEDIA_TYPE
       }
 
       render_options[:location] = response_doc.contents[:data]["links"][:self] if (

lib/jsonapi/mime_types.rb

@@ -1,11 +1,28 @@
 module JSONAPI
   MEDIA_TYPE = 'application/vnd.api+json'
-end
 
-Mime::Type.register JSONAPI::MEDIA_TYPE, :api_json
+  module MimeTypes
+    def self.install
+      Mime::Type.register JSONAPI::MEDIA_TYPE, :api_json
+
+      if Rails::VERSION::MAJOR >= 5
+        parsers = ActionDispatch::Request.parameter_parsers.merge(
+          Mime::Type.lookup(JSONAPI::MEDIA_TYPE).symbol => parser
+        )
+        ActionDispatch::Request.parameter_parsers = parsers
+      else
+        ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup(JSONAPI::MEDIA_TYPE)] = parser
+      end
+    end
+
+    def self.parser
+      lambda do |body|
+        data = JSON.parse(body)
+        data = {:_json => data} unless data.is_a?(Hash)
+        data.with_indifferent_access
+      end
+    end
+  end
 
-ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup(JSONAPI::MEDIA_TYPE)] = lambda do |body|
-  data = JSON.parse(body)
-  data = {:_json => data} unless data.is_a?(Hash)
-  data.with_indifferent_access
+  MimeTypes.install
 end

lib/jsonapi/request.rb

@@ -382,7 +382,8 @@ def parse_to_one_links_object(raw)
         }
       end
 
-      if !raw.is_a?(Hash) || raw.length != 2 || !(raw.key?('type') && raw.key?('id'))
+      if !(raw.is_a?(Hash) || raw.is_a?(ActionController::Parameters)) ||
+         raw.keys.length != 2 || !(raw.key?('type') && raw.key?('id'))
         fail JSONAPI::Exceptions::InvalidLinksObject.new
       end
 
@@ -476,7 +477,7 @@ def parse_to_one_relationship(link_value, relationship)
     def parse_to_many_relationship(link_value, relationship, &add_result)
       if link_value.is_a?(Array) && link_value.length == 0
         linkage = []
-      elsif link_value.is_a?(Hash)
+      elsif (link_value.is_a?(Hash) || link_value.is_a?(ActionController::Parameters))
         linkage = link_value[:data]
       else
         fail JSONAPI::Exceptions::InvalidLinksObject.new
@@ -608,7 +609,7 @@ def parse_update_relationship_operation(verified_params, relationship, parent_ke
     def parse_single_replace_operation(data, keys, id_key_presence_check_required: true)
       fail JSONAPI::Exceptions::MissingKey.new if data[:id].nil?
 
-      key = data[:id]
+      key = data[:id].to_s
       if id_key_presence_check_required && !keys.include?(key)
         fail JSONAPI::Exceptions::KeyNotIncludedInURL.new(key)
       end

lib/jsonapi/response_document.rb

@@ -90,10 +90,17 @@ def query_params(params)
       query_params[:page] = params
 
       request = @options[:request]
-      query_params[:fields] = request.params[:fields] if request.params[:fields]
+      if request.params[:fields]
+        query_params[:fields] = request.params[:fields].respond_to?(:to_unsafe_hash) ? request.params[:fields].to_unsafe_hash : request.params[:fields]
+      end
+
       query_params[:include] = request.params[:include] if request.params[:include]
       query_params[:sort] = request.params[:sort] if request.params[:sort]
-      query_params[:filter] = request.params[:filter] if request.params[:filter]
+
+      if request.params[:filter]
+        query_params[:filter] = request.params[:filter].respond_to?(:to_unsafe_hash) ? request.params[:filter].to_unsafe_hash : request.params[:filter]
+      end
+
       query_params
     end
 

lib/jsonapi/routing_ext.rb

@@ -33,12 +33,24 @@ def jsonapi_resource(*resources, &_block)
           end
 
           resource @resource_type, options do
-            @scope[:jsonapi_resource] = @resource_type
-
-            if block_given?
-              yield
+            if @scope.respond_to? :[]=
+              # Rails 4
+              @scope[:jsonapi_resource] = @resource_type
+
+              if block_given?
+                yield
+              else
+                jsonapi_relationships
+              end
             else
-              jsonapi_relationships
+              # Rails 5
+              jsonapi_resource_scope(SingletonResource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
+                if block_given?
+                  yield
+                else
+                  jsonapi_relationships
+                end
+              end
             end
           end
         end
@@ -87,12 +99,23 @@ def jsonapi_resources(*resources, &_block)
           end
 
           resources @resource_type, options do
-            @scope[:jsonapi_resource] = @resource_type
-
-            if block_given?
-              yield
+            if @scope.respond_to? :[]=
+              # Rails 4
+              @scope[:jsonapi_resource] = @resource_type
+              if block_given?
+                yield
+              else
+                jsonapi_relationships
+              end
             else
-              jsonapi_relationships
+              # Rails 5
+              jsonapi_resource_scope(Resource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
+                if block_given?
+                  yield
+                else
+                  jsonapi_relationships
+                end
+              end
             end
           end
         end
@@ -206,6 +229,16 @@ def jsonapi_related_resources(*relationship)
                                                   action: 'get_related_resources', via: [:get]
         end
 
+        protected
+
+        def jsonapi_resource_scope(resource, resource_type) #:nodoc:
+          @scope = @scope.new(scope_level_resource: resource, jsonapi_resource: resource_type)
+
+          controller(resource.resource_scope) { yield }
+        ensure
+          @scope = @scope.parent
+        end
+
         private
 
         def resource_type_with_module_prefix(resource = nil)