Small refactor + update dependencies.

Author: beauby

jsonapi-hanami.gemspec

@@ -14,9 +14,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['README.md', 'lib/**/*']
   spec.require_path  = 'lib'
 
-  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 'rake',  '~> 11.3'
   spec.add_development_dependency 'rspec', '~> 3.5'

lib/jsonapi/hanami/deserialization.rb

@@ -1,5 +1,4 @@
 require 'jsonapi/deserializable'
-require 'jsonapi/parser'
 
 module JSONAPI
   module Hanami
@@ -9,18 +8,20 @@ def self.included(base)
       end
 
       module ClassMethods
-        def deserializable_resource(key, klass = nil, &block)
-          if klass.nil?
-            klass = Class.new(JSONAPI::Deserializable::Resource, &block)
-          end
-          use DeserializeResource, key, klass
+        def deserializable_resource(key, options = {}, &block)
+          _deserializable(key, options,
+                          JSONAPI::Deserializable::Resource, &block)
         end
 
-        def deserializable_relationship(key, klass = nil, &block)
-          if klass.nil?
-            klass = Class.new(JSONAPI::Deserializable::Relationship, &block)
-          end
-          use DeserializeRelationship, key, klass
+        def deserializable_relationship(key, options = {}, &block)
+          _deserializable(key, options,
+                          JSONAPI::Deserializable::Relationship, &block)
+        end
+
+        # @api private
+        def _deserializable(key, options, fallback, &block)
+          klass = options[:class] || Class.new(fallback, &block)
+          use DeserializationMiddleware, key, klass
         end
       end
 
@@ -37,7 +38,6 @@ def initialize(app, key, klass)
 
         def call(env)
           body = env[ROUTER_PARSED_BODY]
-          parser.parse!(body)
           deserialized_hash = @deserializable_class.call(body)
           params = env[ROUTER_PARAMS]
           # TODO(beauby): Actually replace the request body upstream instead
@@ -51,18 +51,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