Small refactor + update dependencies.

Author: beauby

jsonapi-rails.gemspec

@@ -14,12 +14,11 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['README.md', 'lib/**/*']
   spec.require_path  = 'lib'
 
-  spec.add_dependency 'rails',                  '~> 5.0.0', '>= 5.0.0.1'
-  spec.add_dependency 'jsonapi-deserializable', '0.1.1.beta3'
-  spec.add_dependency 'jsonapi-parser',         '0.1.1.beta3'
-  spec.add_dependency 'jsonapi-serializable',   '0.1.1.beta4'
+  spec.add_dependency 'jsonapi-deserializable', '0.1.1'
+  spec.add_dependency 'jsonapi-serializable',   '0.1.1'
 
+  spec.add_development_dependency 'rails', '~> 5.0.0'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rake',        '>=0.9'
-  spec.add_development_dependency 'rspec-rails', '~>3.5'
+  spec.add_development_dependency 'rake',        '~> 11.3'
+  spec.add_development_dependency 'rspec-rails', '~> 3.5'
 end

lib/jsonapi/rails/action_controller.rb

@@ -11,26 +11,25 @@ def self.included(base)
       end
 
       module ClassMethods
-        def deserializable_resource(key, *args, &block)
-          klass = args.shift unless args.first.is_a?(Hash)
-          options = args.first || {}
-          if klass.nil?
-            klass = Class.new(JSONAPI::Deserializable::Resource, &block)
-          end
-          use DeserializeResource, key, klass, options
+        def deserializable_resource(key, options = {}, &block)
+          _deserializable(key, options,
+                          JSONAPI::Deserializable::Resource, &block)
         end
 
-        def deserializable_relationship(key, *args, &block)
-          klass = args.shift unless args.first.is_a?(Hash)
-          options = args.first || {}
-          if klass.nil?
-            klass = Class.new(JSONAPI::Deserializable::Relationship, &block)
-          end
-          use DeserializeResource, key, klass, options
+        def deserializable_relationship(key, options = {}, &block)
+          _deserializable(key, options,
+                          JSONAPI::Deserializable::Relationship, &block)
+        end
+
+        # @api private
+        def _deserializable(key, options, fallback, &block)
+          options = options.dup
+          klass = options.delete(:class) || Class.new(fallback, &block)
+          use Deserialization, key, klass, options
         end
       end
 
-      class DeserializationMiddleware
+      class Deserialization
         REQUEST_PARAMETERS_KEY =
           'action_dispatch.request.request_parameters'.freeze
         def initialize(app, key, klass)
@@ -42,7 +41,6 @@ def initialize(app, key, klass)
         def call(env)
           request = Rack::Request.new(env)
           body = JSON.parse(request.body.read)
-          parser.parse!(body)
           deserialized_hash = @deserializable_class.call(body)
           (env[REQUEST_PARAMETERS_KEY] ||= {}).tap do |request_parameters|
             request_parameters[@deserializable_key] = deserialized_hash
@@ -51,18 +49,6 @@ def call(env)
           @app.call(env)
         end
       end
-
-      class DeserializeResource < DeserializationMiddleware
-        def parser
-          JSONAPI::Parser::Resource
-        end
-      end
-
-      class DeserializeRelationship < DeserializationMiddleware
-        def parser
-          JSONAPI::Parser::Relationship
-        end
-      end
     end
   end
 end

lib/jsonapi/rails/deserializable/resource_extensions.rb

@@ -10,33 +10,40 @@ module Rails
     class Railtie < ::Rails::Railtie
       MEDIA_TYPE = 'application/vnd.api+json'.freeze
       PARSER = JSONAPI::Rails.parser
+      RENDERERS = {
+        jsonapi:       JSONAPI::Rails.rails_renderer(SuccessRenderer),
+        jsonapi_error: JSONAPI::Rails.rails_renderer(ErrorRenderer)
+      }.freeze
 
       initializer 'jsonapi-rails.action_controller' do
         ActiveSupport.on_load(:action_controller) do
           require 'jsonapi/rails/action_controller'
           include ::JSONAPI::Rails::ActionController
 
           Mime::Type.register MEDIA_TYPE, :jsonapi
+
           if ::Rails::VERSION::MAJOR >= 5
             ::ActionDispatch::Request.parameter_parsers[:jsonapi] = PARSER
           else
             ::ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime[:jsonapi]] = PARSER
           end
 
-          ::ActionController::Renderers.add :jsonapi do |json, options|
-            unless json.is_a?(String)
-              json = JSONAPI::Rails::Renderer.render(json, options)
-            end
-            self.content_type ||= Mime[:jsonapi]
-            self.response_body = json
+          RENDERERS.each do |key, renderer|
+            ::ActionController::Renderers.add(key, &renderer)
           end
 
-          ::ActionController::Renderers.add :jsonapi_errors do |json, options|
-            unless json.is_a?(String)
-              json = JSONAPI::Rails::ErrorRender.render_errors(json, options)
+          JSONAPI::Deserializable::Resource.configure do |config|
+            config.default_has_one do |key, _rel, id, type|
+              key  = key.to_s.singularize
+              type = type.to_s.singularize.camelize
+              { "#{key}_id".to_sym => id, "#{key}_type".to_sym => type }
+            end
+
+            config.default_has_many do |key, _rel, ids, types|
+              key   = key.to_s.singularize
+              types = types.map { |t| t.to_s.singularize.camelize }
+              { "#{key}_ids".to_sym => ids, "#{key}_types".to_sym => types }
             end
-            self.content_type ||= Mime[:jsonapi]
-            self.response_body = json
           end
         end
       end

lib/jsonapi/rails/railtie.rb

@@ -2,9 +2,8 @@
 
 module JSONAPI
   module Rails
-    class Renderer
+    class SuccessRenderer
       def self.render(resources, options)
-        # TODO(beauby): handle status option.
         opts = options.dup
         # TODO(beauby): Move this to a global configuration.
         default_exposures = {
@@ -22,5 +21,16 @@ def self.render(errors, options)
         JSONAPI::Serializable::ErrorRenderer.render(errors, options)
       end
     end
+
+    module_function
+
+    # @api private
+    def rails_renderer(renderer)
+      proc do |json, options|
+        json = renderer.render(json, options) unless json.is_a?(String)
+        self.content_type ||= Mime[:jsonapi]
+        self.response_body = json
+      end
+    end
   end
 end

lib/jsonapi/rails/renderer.rb

@@ -1,5 +1,5 @@
 class TweetsController < ActionController::Base
-  deserializable_resource :tweet, DeserializableTweet, only: [:create, :update]
+  deserializable_resource :tweet, only: [:create, :update]
 
   def index
     tweets = Tweet.all

spec/dummy/app/controllers/tweets_controller.rb

@@ -24,6 +24,14 @@ def body
         type: 'tweets',
         attributes: {
           content: 'foo'
+        },
+        relationships: {
+          author: {
+            data: {
+              id: 'foo',
+              type: 'bar'
+            }
+          }
         }
       }
     }