jsonapi-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d03b1dcb88e6112b5b8c82e1fb400ce802fe66a5
-  data.tar.gz: cf69d3e19c4e73a5cdf1b7543e0620ee2f6d4504
+  metadata.gz: e4738972836e05a1bc9efcc9c19ceabd4ce9af7a
+  data.tar.gz: 800b0f6bb491c2e4863e8e824d081d311753e08c
 SHA512:
-  metadata.gz: 0233e1af894d9227ba5b396c669c500c9f244d258bf6ac66e85936566b93be555837d6be3ecb041b000aa989b6a699ab113eab73fac15c99aa1358bc441569fc
-  data.tar.gz: 42665fbd7fc8d29d251573d20fc3a3aba19f03e1390f7bbb86fea6a337e19dc30d9435a29ef48e6474b01da41c1213cca4d5e04c1886dc0f1d475bb6b252e763
+  metadata.gz: 06bd1dc83d80fae68fd62cadb624ddb9ab2028a0892ae6bfe763934e8e05660108121ddee9dbefb55a7f7c316d6bf5ce7c41fc2e862b3124fcf43a0c5a83e71d
+  data.tar.gz: 4ba8bebdf11e2cf0b455307e78ed0d70bcc950ca5d0b0e1c72f041c5ff35b41fb0e7bcc2266077a46ed849e757e0570520ff4fc7c76891daaa429934e3778c26

data/README.md

@@ -4,9 +4,15 @@ Rails integration for [jsonapi-rb](http://jsonapi-rb.org).
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/jsonapi-rails.svg)](https://badge.fury.io/rb/jsonapi-rails)
-[![Build Status](https://secure.travis-ci.org/jsonapi-rb/jsonapi-rails.svg?branch=master)](http://travis-ci.org/jsonapi-rb/rails?branch=master)
+[![Build Status](https://secure.travis-ci.org/jsonapi-rb/jsonapi-rails.svg?branch=master)](http://travis-ci.org/jsonapi-rb/jsonapi-rails?branch=master)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/jsonapi-rb/Lobby)
 
+## Resources
+
+* Chat: [gitter](http://gitter.im/jsonapi-rb)
+* Twitter: [@jsonapirb](http://twitter.com/jsonapirb)
+* Docs: [jsonapi-rb.org](http://jsonapi-rb.org)
+
 ## Installation
 
 Add the following to your application's Gemfile:

data/lib/jsonapi/rails/action_controller.rb

@@ -4,12 +4,19 @@ require 'jsonapi/parser'
 module JSONAPI
   module Rails
     module ActionController
-      def self.included(base)
+      REVERSE_MAPPING_KEY = 'jsonapi_deserializable.reverse_mapping'.freeze
+
+      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
+
       module ClassMethods
         def deserializable_resource(key, options = {}, &block)
           _deserializable(key, options,
@@ -41,9 +48,10 @@ module JSONAPI
         def call(env)
           request = Rack::Request.new(env)
           body = JSON.parse(request.body.read)
-          deserialized_hash = @deserializable_class.call(body)
+          deserializable = @deserializable_class.new(body)
+          env[REVERSE_MAPPING_KEY] = deserializable.reverse_mapping
           (env[REQUEST_PARAMETERS_KEY] ||= {}).tap do |request_parameters|
-            request_parameters[@deserializable_key] = deserialized_hash
+            request_parameters[@deserializable_key] = deserializable.to_hash
           end
 
           @app.call(env)

data/lib/jsonapi/rails/railtie.rb

@@ -11,14 +11,14 @@ module JSONAPI
       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)
+        jsonapi:        JSONAPI::Rails.rails_renderer(SuccessRenderer),
+        jsonapi_errors: 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
+          prepend ::JSONAPI::Rails::ActionController
 
           Mime::Type.register MEDIA_TYPE, :jsonapi
 

data/lib/jsonapi/rails/renderer.rb

@@ -1,9 +1,21 @@
 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)
+      def self.render(resources, options, _request)
         opts = options.dup
         # TODO(beauby): Move this to a global configuration.
         default_exposures = {
@@ -17,8 +29,16 @@ module JSONAPI
     end
 
     class ErrorRenderer
-      def self.render(errors, options)
-        # TODO(beauby): SerializableError inference on AR validation errors.
+      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
@@ -28,7 +48,7 @@ module JSONAPI
     # @api private
     def rails_renderer(renderer)
       proc do |json, options|
-        json = renderer.render(json, options) unless json.is_a?(String)
+        json = renderer.render(json, options, request) unless json.is_a?(String)
         self.content_type ||= Mime[:jsonapi]
         self.response_body = json
       end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -107,9 +107,11 @@ 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