Switch to render_jsonapi

This makes more sense as we are moving off of AMS

Author: Lee Richmond

Gemfile

@@ -2,7 +2,11 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in jsonapi_compliable.gemspec
 gemspec
+gem 'jsonapi-parser', path: '../jsonapi-parser'
+gem 'jsonapi-rb', path: '../jsonapi-rb'
+gem 'jsonapi-rails', path: '../jsonapi-rails', require: 'jsonapi/rails'
 gem 'jsonapi-serializable', path: '../serializable'
+gem 'jsonapi-deserializable', path: '../jsonapi-deserializable'
 
 group :test do
   gem 'appraisal'

jsonapi_compliable.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ['>= 4.1', '< 6']
-  spec.add_dependency "jsonapi", '~> 0.1.1.beta2'
 
   spec.add_dependency 'jsonapi-rails'
 

lib/jsonapi_compliable/base.rb

@@ -51,7 +51,7 @@ def parse_fieldsets!
       Util::FieldParams.parse!(params, :extra_fields)
     end
 
-    def render_ams(scope, opts = {})
+    def render_jsonapi(scope, opts = {})
       scoped = Util::Scoping.apply?(self, scope, opts.delete(:scope)) ? jsonapi_scope(scope) : scope
       options = default_ams_options
       options[:include] = forced_includes || Util::IncludeParams.scrub(self)
@@ -67,7 +67,7 @@ def render_ams(scope, opts = {})
       render(options)
     end
 
-    # render_ams(foo) equivalent to
+    # render_jsonapi(foo) equivalent to
     # render json: foo, ams_default_options
     def default_ams_options
       {}.tap do |options|

lib/jsonapi_compliable/extensions/boolean_attribute.rb

@@ -1,5 +1,3 @@
-require 'jsonapi/serializable/conditional_fields'
-
 module JsonapiCompliable
   module Extensions
     module BooleanAttribute

lib/jsonapi_compliable/extensions/extra_attribute.rb

@@ -1,4 +1,4 @@
-require 'jsonapi/serializable/conditional_fields'
+require 'jsonapi/serializable/resource/conditional_fields'
 
 module JsonapiCompliable
   module Extensions
@@ -29,6 +29,6 @@ def extra_attribute(name, options = {}, &blk)
 end
 
 JSONAPI::Serializable::Resource.class_eval do
-  prepend JSONAPI::Serializable::ConditionalFields
+  prepend JSONAPI::Serializable::Resource::ConditionalFields
   include JsonapiCompliable::Extensions::ExtraAttribute
 end

spec/create_update_spec.rb

@@ -10,7 +10,7 @@ def create
       author = Author.new(author_params.except(:state_attributes))
       author.state = State.find_or_initialize_by(author_params[:state_attributes])
       author.save!(validate: false)
-      render_ams(author, scope: false)
+      render_jsonapi(author, scope: false)
     end
 
     def update
@@ -21,7 +21,7 @@ def update
       end
       author.association(:books).loaded!
       author.save!
-      render_ams(author, scope: false)
+      render_jsonapi(author, scope: false)
     end
 
     private

spec/extra_fields_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
-require 'jsonapi/serializable/conditional_fields'
 
 RSpec.describe 'extra_fields', type: :controller do
   class SerializableTestExtraFields < JSONAPI::Serializable::Resource
-    prepend JSONAPI::Serializable::ConditionalFields
     type 'authors'
     attributes :first_name, :last_name
     extra_attribute :net_worth, if: proc { @context.allow_net_worth? } do
@@ -23,7 +21,7 @@ def allow_net_worth?
     end
 
     def index
-      render_ams(Author.all, class: SerializableTestExtraFields)
+      render_jsonapi(Author.all, class: SerializableTestExtraFields)
     end
   end
 

spec/fields_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
-require 'jsonapi/serializable/conditional_fields'
 
 RSpec.describe 'fields', type: :controller do
   controller(ApplicationController) do
     jsonapi {}
 
     class SerializableTestFields < JSONAPI::Serializable::Resource
-      prepend JSONAPI::Serializable::ConditionalFields
       type 'authors'
 
       attribute :first_name
@@ -24,7 +22,7 @@ def admin?
     end
 
     def index
-      render_ams(Author.all, class: SerializableTestFields)
+      render_jsonapi(Author.all, class: SerializableTestFields)
     end
 
     def current_user

spec/filtering_spec.rb

@@ -12,7 +12,7 @@
     end
 
     def index
-      render_ams(Author.all)
+      render_jsonapi(Author.all)
     end
 
     def can_filter_first_name?

spec/jsonapi_compliable_spec.rb

@@ -6,7 +6,7 @@
 
     def index
       scope = Author.all
-      render_ams(scope)
+      render_jsonapi(scope)
     end
   end
 
@@ -46,15 +46,15 @@ def index
     end
   end
 
-  describe '#render_ams' do
+  describe '#render_jsonapi' do
     it 'is able to override options' do
       author = Author.create!(first_name: 'Stephen', last_name: 'King')
       author.books.create(title: "The Shining", genre: Genre.new(name: 'horror'))
 
       controller.class_eval do
         def index
           scope = Author.all
-          render_ams(scope, include: { books: :genre })
+          render_jsonapi(scope, include: { books: :genre })
         end
       end
 
@@ -67,7 +67,7 @@ def index
         controller.class_eval do
           def index
             people = jsonapi_scope(Author.all).to_a
-            render_ams(people)
+            render_jsonapi(people)
           end
         end
       end
@@ -97,7 +97,7 @@ def index
         controller.class_eval do
           def index
             people = Author.all
-            render_ams(people, scope: false)
+            render_jsonapi(people, scope: false)
           end
         end
       end