jsonapi-rails 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4738972836e05a1bc9efcc9c19ceabd4ce9af7a
-  data.tar.gz: 800b0f6bb491c2e4863e8e824d081d311753e08c
+  metadata.gz: 29c73976a2fb4451e84ad275247518ed54bfe660
+  data.tar.gz: 58417d63bcfc17109fce8a6e8527ef1324c234e8
 SHA512:
-  metadata.gz: 06bd1dc83d80fae68fd62cadb624ddb9ab2028a0892ae6bfe763934e8e05660108121ddee9dbefb55a7f7c316d6bf5ce7c41fc2e862b3124fcf43a0c5a83e71d
-  data.tar.gz: 4ba8bebdf11e2cf0b455307e78ed0d70bcc950ca5d0b0e1c72f041c5ff35b41fb0e7bcc2266077a46ed849e757e0570520ff4fc7c76891daaa429934e3778c26
+  metadata.gz: ef952c74fbf3c00e06ce25bfc7775ff92faf25c59fd080b64a9ceec0755ba5235e8f883986f411e24bf664de0ad22fcd947ddd49492f2b6fb0c435f379c042c8
+  data.tar.gz: 03b7cd4763b50cab7a90e357216f21fe7df4f2c892271896e76710d4e3fc084c4a7ceabdfd4e11d4cea988422a64ccb752146de9b6cb41d206eed0d9ab1c6e2f

data/lib/jsonapi/rails/action_controller.rb

@@ -4,20 +4,11 @@ require 'jsonapi/parser'
 module JSONAPI
   module Rails
     module ActionController
-      REVERSE_MAPPING_KEY = 'jsonapi_deserializable.reverse_mapping'.freeze
+      extend ActiveSupport::Concern
 
-      def self.prepended(base)
-        base.class_eval do
-          extend ClassMethods
-        end
-      end
-
-#      def render(options = {})
-#        reverse_mapping = request.env[REVERSE_MAPPING_KEY]
-#        super(options.merge(_reverse_mapping: reverse_mapping))
-#      end
+      JSONAPI_POINTERS_KEY = 'jsonapi_deserializable.jsonapi_pointers'.freeze
 
-      module ClassMethods
+      class_methods do
         def deserializable_resource(key, options = {}, &block)
           _deserializable(key, options,
                           JSONAPI::Deserializable::Resource, &block)
@@ -32,31 +23,19 @@ module JSONAPI
         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 Deserialization
-        REQUEST_PARAMETERS_KEY =
-          'action_dispatch.request.request_parameters'.freeze
-        def initialize(app, key, klass)
-          @app = app
-          @deserializable_key = key
-          @deserializable_class = klass
-        end
-
-        def call(env)
-          request = Rack::Request.new(env)
-          body = JSON.parse(request.body.read)
-          deserializable = @deserializable_class.new(body)
-          env[REVERSE_MAPPING_KEY] = deserializable.reverse_mapping
-          (env[REQUEST_PARAMETERS_KEY] ||= {}).tap do |request_parameters|
-            request_parameters[@deserializable_key] = deserializable.to_hash
+          before_action(options) do |controller|
+            resource = klass.new(controller.params[:_jsonapi].to_unsafe_hash)
+            controller.request.env[JSONAPI_POINTERS_KEY] =
+              resource.reverse_mapping
+            controller.params[key.to_sym] = resource.to_hash
           end
-
-          @app.call(env)
         end
       end
+
+      def jsonapi_pointers
+        request.env[JSONAPI_POINTERS_KEY]
+      end
     end
   end
 end

data/lib/jsonapi/rails/parser.rb

@@ -1,13 +1,12 @@
+require 'jsonapi/deserializable'
+
 module JSONAPI
   module Rails
-    module_function
+    PARSER = lambda do |body|
+      data = JSON.parse(body)
+      hash = { _jsonapi: data }
 
-    def parser
-      lambda do |body|
-        data = JSON.parse(body)
-        data = { _json: data } unless data.is_a?(Hash)
-        data.with_indifferent_access
-      end
+      hash.with_indifferent_access
     end
   end
 end

data/lib/jsonapi/rails/railtie.rb

@@ -9,16 +9,15 @@ module JSONAPI
   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_errors: JSONAPI::Rails.rails_renderer(ErrorRenderer)
+        jsonapi:       SuccessRenderer.new,
+        jsonapi_error: ErrorsRenderer.new
       }.freeze
 
       initializer 'jsonapi-rails.action_controller' do
         ActiveSupport.on_load(:action_controller) do
           require 'jsonapi/rails/action_controller'
-          prepend ::JSONAPI::Rails::ActionController
+          include ::JSONAPI::Rails::ActionController
 
           Mime::Type.register MEDIA_TYPE, :jsonapi
 
@@ -28,8 +27,19 @@ module JSONAPI
             ::ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime[:jsonapi]] = PARSER
           end
 
-          RENDERERS.each do |key, renderer|
-            ::ActionController::Renderers.add(key, &renderer)
+          ::ActionController::Renderers.add(:jsonapi) do |resources, options|
+            self.content_type ||= Mime[:jsonapi]
+
+            RENDERERS[:jsonapi].render(resources, options).to_json
+          end
+
+          ::ActionController::Renderers.add(:jsonapi_error) do |errors, options|
+            # Renderer proc is evaluated in the controller context, so it
+            # has access to the jsonapi_pointers method.
+            options = options.merge(_jsonapi_pointers: jsonapi_pointers)
+            self.content_type ||= Mime[:jsonapi]
+
+            RENDERERS[:jsonapi_error].render(errors, options).to_json
           end
 
           JSONAPI::Deserializable::Resource.configure do |config|

data/lib/jsonapi/rails/renderer.rb

@@ -1,21 +1,15 @@
 require 'jsonapi/serializable/renderer'
 
-module Serializable
-  class ActiveModelError < JSONAPI::Serializable::Error
-    title do
-      @message
-    end
-
-    source do
-      pointer @pointer
-    end
-  end
-end
-
 module JSONAPI
   module Rails
     class SuccessRenderer
-      def self.render(resources, options, _request)
+      def initialize(renderer = JSONAPI::Serializable::SuccessRenderer.new)
+        @renderer = renderer
+
+        freeze
+      end
+
+      def render(resources, options)
         opts = options.dup
         # TODO(beauby): Move this to a global configuration.
         default_exposures = {
@@ -24,33 +18,20 @@ module JSONAPI
         opts[:expose] = default_exposures.merge!(opts[:expose] || {})
         opts[:jsonapi] = opts.delete(:jsonapi_object)
 
-        JSONAPI::Serializable::Renderer.render(resources, opts)
+        @renderer.render(resources, opts)
       end
     end
 
-    class ErrorRenderer
-      def self.render(errors, options, request)
-        reverse_mapping =
-          request.env['jsonapi_deserializable.reverse_mapping']
-        if errors.is_a?(ActiveModel::Errors)
-          errors = errors.messages.map do |attr, message|
-            pointer = reverse_mapping[attr]
-            ::Serializable::ActiveModelError.new(message: message,
-                                                 pointer: pointer)
-          end
-        end
-        JSONAPI::Serializable::ErrorRenderer.render(errors, options)
-      end
-    end
+    class ErrorsRenderer
+      def initialize(renderer = JSONAPI::Serializable::ErrorsRenderer.new)
+        @renderer = renderer
 
-    module_function
+        freeze
+      end
 
-    # @api private
-    def rails_renderer(renderer)
-      proc do |json, options|
-        json = renderer.render(json, options, request) unless json.is_a?(String)
-        self.content_type ||= Mime[:jsonapi]
-        self.response_body = json
+      def render(errors, options)
+        # TODO(beauby): SerializableError inference on AR validation errors.
+        @renderer.render(errors, options)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: dry-validation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 description: Efficient, convenient, non-intrusive JSONAPI framework for Rails.
 email:
 - lucas.hosseini@gmail.com
@@ -107,11 +93,9 @@ files:
 - lib/generators/jsonapi/serializable/templates/serializable.rb.erb
 - lib/jsonapi/rails.rb
 - lib/jsonapi/rails/action_controller.rb
-- lib/jsonapi/rails/active_record.rb
 - lib/jsonapi/rails/parser.rb
 - lib/jsonapi/rails/railtie.rb
 - lib/jsonapi/rails/renderer.rb
-- lib/jsonapi/rails/serializable_active_record_error.rb
 homepage: https://github.com/jsonapi-rb/jsonapi-rails
 licenses:
 - MIT
@@ -132,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: jsonapi-rb integrations for Rails.