jsonapi.rb 1.5.7 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 521d608a58983b2c99246e34faf27eae9bb38b32
-  data.tar.gz: 02a2e7a0086ede91a907d8c7d097150f0222b768
+SHA256:
+  metadata.gz: dc1e0239230a7a14a008b6344be8857fccd4db574af564a9b49342842fcc316d
+  data.tar.gz: 16615a0a1e0bd8b6f0a84ae9f2adcc16005a16b6413577b3ee945fddb6ce90c5
 SHA512:
-  metadata.gz: 23f3ebb21b586e5995b6cb4f2c2ae8f3636f93f5f0e11b9fdbbabdb4087c32850bcda172aeda4aabb8f58f762a23e8c034128f4b48bb7ed38d5ee2c573778ff4
-  data.tar.gz: b0cdb369d4265dd306a1af8206a46f837322ec00142ec2fac9c40c0ebcc6010cd4f2b7982e05f7ff2f489a960def72431ffc140f3460bffcf9ebecf65aee710d
+  metadata.gz: 2c65ee96100a9179205b0f8e220f4f42dc5cd0f03fb8c7c645cb1c70933f848e2e0fe11d600259f2001fe1a9d8760b821c4748009ee3451156e2b07a660df783
+  data.tar.gz: 26c49d61c04f3bc03eaee260137905886a421c31d6bb669c063eb4cca9bea15a77327a07e90eb63ede9bb4b0d5e4b153aa38eb6dd6167c2eeabf10a1d7fb8fd6

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in jsonapi.gemspec
 gemspec
-
-gem 'jsonapi-rspec', git: 'https://github.com/jsonapi-rb/jsonapi-rspec.git'

data/README.md

@@ -31,7 +31,7 @@ Main goals:
 
 The available features include:
 
- * object serialization (powered by Fast JSON API)
+ * object serialization (powered by JSON:API Serializer, was `fast_jsonapi`)
  * [error handling](https://jsonapi.org/format/#errors) (parameters,
    validation, generic errors)
  * fetching of the data (support for
@@ -44,7 +44,7 @@ The available features include:
 
 ## But how?
 
-Mainly by leveraging [Fast JSON API](https://github.com/Netflix/fast_jsonapi)
+Mainly by leveraging [JSON:API Serializer](https://github.com/jsonapi-serializer/jsonapi-serializer)
 and [Ransack](https://github.com/activerecord-hackery/ransack).
 
 Thanks to everyone who worked on these amazing projects!
@@ -100,7 +100,7 @@ The naming scheme follows the `ModuleName::ClassNameSerializer` for an instance
 of the `ModuleName::ClassName`.
 
 Please follow the
-[Fast JSON API guide](https://github.com/Netflix/fast_jsonapi#serializer-definition)
+[JSON:API Serializer guide](https://github.com/jsonapi-serializer/jsonapi-serializer#serializer-definition)
 on how to define a serializer.
 
 To provide a different naming scheme implement the `jsonapi_serializer_class`

data/Rakefile

@@ -24,7 +24,11 @@ RuboCop::RakeTask.new('qa:code') do |task|
 end
 
 desc('Run CI QA tasks')
-task(qa: ['qa:docs', 'qa:code'])
+if ENV['RAILS_VERSION'].to_s.include?('4')
+  task(qa: ['qa:docs'])
+else
+  task(qa: ['qa:docs', 'qa:code'])
+end
 
 RSpec::Core::RakeTask.new(spec: :qa)
 task(default: :spec)

data/jsonapi.rb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'fast_jsonapi', '~> 1.5'
+  spec.add_dependency 'jsonapi-serializer', '~> 2.0'
   spec.add_dependency 'ransack'
   spec.add_dependency 'rack'
 

data/lib/jsonapi/error_serializer.rb

@@ -1,9 +1,9 @@
-require 'fast_jsonapi'
+require 'jsonapi/serializer'
 
 module JSONAPI
   # A simple error serializer
   class ErrorSerializer
-    include FastJsonapi::ObjectSerializer
+    include JSONAPI::Serializer
 
     set_id :object_id
     set_type :error

data/lib/jsonapi/rails.rb

@@ -42,8 +42,9 @@ module JSONAPI
         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)
+        return JSONAPI::Rails.serializer_to_json(
+          JSONAPI::ErrorSerializer.new(resource, options)
+        ) unless resource.is_a?(ActiveModel::Errors)
 
         errors = []
         model = resource.instance_variable_get('@base')
@@ -66,9 +67,11 @@ module JSONAPI
           end
         end
 
-        JSONAPI::ActiveModelErrorSerializer.new(
-          errors, params: { model: model, model_serializer: model_serializer }
-        ).serialized_json
+        JSONAPI::Rails.serializer_to_json(
+          JSONAPI::ActiveModelErrorSerializer.new(
+            errors, params: { model: model, model_serializer: model_serializer }
+          )
+        )
       end
     end
 
@@ -100,13 +103,15 @@ module JSONAPI
           serializer_class = JSONAPI::Rails.serializer_class(resource, many)
         end
 
-        serializer_class.new(resource, options).serialized_json
+        JSONAPI::Rails.serializer_to_json(
+          serializer_class.new(resource, options)
+        )
       end
     end
 
     # Checks if an object is a collection
     #
-    # Stolen from [FastJsonapi::ObjectSerializer], instance method.
+    # Stolen from [JSONAPI::Serializer], instance method.
     #
     # @param resource [Object] to check
     # @param force_is_collection [NilClass] flag to overwrite
@@ -126,5 +131,17 @@ module JSONAPI
 
       "#{klass.name}Serializer".constantize
     end
+
+    # Lazily returns the serializer JSON
+    #
+    # @param serializer [Object] to evaluate
+    # @return [String]
+    def self.serializer_to_json(serializer)
+      if serializer.respond_to?(:serialized_json)
+        serializer.serialized_json
+      else
+        serializer.serializable_hash.to_json
+      end
+    end
   end
 end

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.5.7'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.6.0
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  name: jsonapi-serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -269,8 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: So you say you need JSON:API support in your API...