jsonapi.rb 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8ca17012f7d05bc83011ff1fb014a865320f75bd3b3f7cbb2fdc7a699a4b4808
-  data.tar.gz: 85a54f3af32338616644679e2a8655b8c6ce0f9481d7652e82498688170d7556
+SHA1:
+  metadata.gz: 7b246a81ea3e2cbc309f751a2c618e2bfc898a74
+  data.tar.gz: c3096701eecc967d3c125668d977baaf92fc8b40
 SHA512:
-  metadata.gz: aac2e2d9505aff33c1a5ea5560b662f227d7fb508683dd868b408b5e83fa7d1c05f94ef86f034759a641a31e1fc44f16508bc74c969c35270189dd3eec4fe742
-  data.tar.gz: d01a54d231a2b5e90378154023092c42cd6f3181ffb50efddb5e1aea311ddb9ed691962ed957762d5bc3f2045475a505211c04879c599bf06c917eef59a3ace3
+  metadata.gz: be7de562824d255df5ff03d6bee8dc7b9e4f89f6a6fb5c0bee0cbf149f15716ae3ad17225db0262021f9d43c512a89d4e60b6880d8390e897e4f1e7305daf41a
+  data.tar.gz: f227a7b8891cc6389682ed3ef478f229d8ba8375f206403e22b49fb596f3fb7e9da22d57cdf3f8a3dc8daf92706a5f7454e12cb115d04ab3c130b907920b4c29

data/Gemfile.lock

@@ -8,9 +8,10 @@ GIT
 PATH
   remote: .
   specs:
-    jsonapi.rb (1.1.2)
+    jsonapi.rb (1.2.0)
       fast_jsonapi (~> 1.5)
-      ransack (~> 2.1)
+      rack
+      ransack
 
 GEM
   remote: https://rubygems.org/

data/jsonapi.rb.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'fast_jsonapi', '~> 1.5'
   spec.add_dependency 'ransack'
+  spec.add_dependency 'rack'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rails'

data/lib/jsonapi/active_model_error_serializer.rb

@@ -11,18 +11,26 @@ module JSONAPI
     end
 
     attribute :title do
-      Net::HTTP::STATUS_CODES[422]
+      Rack::Utils::HTTP_STATUS_CODES[422]
     end
 
     attribute :code do |object|
       _, error_hash = object
-      error_hash[:error]
+      error_hash[:error] || error_hash[:message]
+        .to_s.delete("''").parameterize('_')
     end
 
     attribute :detail do |object, params|
       error_key, error_hash = object
       errors_object = params[:model].errors
-      message = errors_object.generate_message(error_key, error_hash[:error])
+
+      # Rails 4 provides just the message.
+      if error_hash[:error].present?
+        message = errors_object.generate_message(error_key, error_hash[:error])
+      else
+        message = error_hash[:message]
+      end
+
       errors_object.full_message(error_key, message)
     end
 

data/lib/jsonapi/errors.rb

@@ -1,4 +1,4 @@
-require 'net/http/status'
+require 'rack/utils'
 require 'active_support/concern'
 
 module JSONAPI
@@ -11,7 +11,7 @@ module JSONAPI
 
     included do
       rescue_from StandardError do |exception|
-        error = { status: '500', title: Net::HTTP::STATUS_CODES[500] }
+        error = { status: '500', title: Rack::Utils::HTTP_STATUS_CODES[500] }
         render jsonapi_errors: [error], status: :internal_server_error
       end
 
@@ -19,7 +19,7 @@ module JSONAPI
         ActiveRecord::RecordNotFound
       ].each do |exception_class|
         rescue_from exception_class do |exception|
-          error = { status: '404', title: Net::HTTP::STATUS_CODES[404] }
+          error = { status: '404', title: Rack::Utils::HTTP_STATUS_CODES[404] }
           render jsonapi_errors: [error], status: :not_found
         end
       end
@@ -36,7 +36,7 @@ module JSONAPI
 
           error = {
             status: '422',
-            title: Net::HTTP::STATUS_CODES[422],
+            title: Rack::Utils::HTTP_STATUS_CODES[422],
             source: source
           }
 

data/lib/jsonapi/rails.rb

@@ -17,8 +17,7 @@ module JSONAPI
         parser = ActionDispatch::Request.parameter_parsers[:json]
         ActionDispatch::Request.parameter_parsers[:jsonapi] = parser
       else
-        parser = ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime[:json]]
-        ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime[:jsonapi]] = parser
+        ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime[:jsonapi]] = :json
       end
 
       self.add_renderer!
@@ -32,17 +31,24 @@ module JSONAPI
       ActionController::Renderers.add(:jsonapi_errors) do |resource, options|
         self.content_type ||= Mime[:jsonapi]
 
-        resource = [resource] unless JSONAPI::Rails.is_collection?(resource)
+        many = JSONAPI::Rails.is_collection?(resource, options[:is_collection])
+        resource = [resource] unless many
 
         return JSONAPI::ErrorSerializer.new(resource, options)
           .serialized_json unless resource.is_a?(ActiveModel::Errors)
 
         errors = []
-        model = resource.marshal_dump.first
-        model_serializer = JSONAPI::Rails.serializer_class(model)
+        model = resource.instance_variable_get('@base')
+        model_serializer = JSONAPI::Rails.serializer_class(model, false)
 
-        resource.details.each do |error_key, error_hashes|
+        details = resource.messages
+        details = resource.details if resource.respond_to?(:details)
+
+        details.each do |error_key, error_hashes|
           error_hashes.each do |error_hash|
+            # Rails 4 provides just the message.
+            error_hash = { message: error_hash } unless error_hash.is_a?(Hash)
+
             errors << [ error_key, error_hash ]
           end
         end
@@ -67,7 +73,8 @@ module JSONAPI
         )
 
         # If it's an empty collection, return it directly.
-        if JSONAPI::Rails.is_collection?(resource) && !resource.any?
+        many = JSONAPI::Rails.is_collection?(resource, options[:is_collection])
+        if many && !resource.any?
           return options.slice(:meta, :links).merge(data: []).to_json
         end
 
@@ -76,25 +83,30 @@ module JSONAPI
         options[:include] ||= (
           jsonapi_include if respond_to?(:jsonapi_include, true))
 
-        serializer_class = JSONAPI::Rails.serializer_class(resource)
+        serializer_class = JSONAPI::Rails.serializer_class(resource, many)
         serializer_class.new(resource, options).serialized_json
       end
     end
 
     # Checks if an object is a collection
     #
-    # @param object [Object] to check
+    # Stollen from [FastJsonapi::ObjectSerializer], instance method.
+    #
+    # @param resource [Object] to check
+    # @param force_is_collection [NilClass] flag to overwrite
     # @return [TrueClass] upon success
-    def self.is_collection?(object)
-      object.is_a?(Enumerable) && !object.respond_to?(:each_pair)
+    def self.is_collection?(resource, force_is_collection = nil)
+      return force_is_collection unless force_is_collection.nil?
+
+      resource.respond_to?(:size) && !resource.respond_to?(:each_pair)
     end
 
     # Resolves resource serializer class
     #
     # @return [Class]
-    def self.serializer_class(resource)
+    def self.serializer_class(resource, is_collection)
       klass = resource.class
-      klass = resource.first.class if self.is_collection?(resource)
+      klass = resource.first.class if is_collection
 
       "#{klass.name}Serializer".constantize
     end

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: So you say you need JSON:API support in your API...