Merge pull request #44 from richmolj/update-jsonapi-serializable

Update jsonapi serializable

Author: richmolj

Appraisals

@@ -1,11 +1,11 @@
 appraise "rails-4" do
   gem "rails", "~> 4.1"
-  gem 'jsonapi-rails', '~> 0.1.0', require: 'jsonapi/rails'
+  gem 'jsonapi-rails', '~> 0.2.0', require: 'jsonapi/rails'
   gem 'rspec-rails'
 end
 
 appraise "rails-5" do
   gem "rails", "~> 5.0"
-  gem 'jsonapi-rails', '~> 0.1.0', require: 'jsonapi/rails'
+  gem 'jsonapi-rails', '~> 0.2.0', require: 'jsonapi/rails'
   gem 'rspec-rails'
 end

gemfiles/rails_4.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1"
-gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do

gemfiles/rails_5.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0"
-gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do

lib/jsonapi_compliable/base.rb

@@ -190,7 +190,7 @@ def jsonapi_update
     # this, pass +scope: false+
     #
     # This builds relevant options and sends them to
-    # +JSONAPI::Serializable::Renderer.render+from
+    # +JSONAPI::Serializable::SuccessRenderer#render+from
     # {http://jsonapi-rb.org jsonapi-rb}
     #
     # @example Build Scope by Default
@@ -247,7 +247,9 @@ def force_includes?
     end
 
     def perform_render_jsonapi(opts)
-      JSONAPI::Serializable::Renderer.render(opts.delete(:jsonapi), opts)
+      # TODO(beauby): Reuse renderer.
+      JSONAPI::Serializable::SuccessRenderer.new
+        .render(opts.delete(:jsonapi), opts).to_json
     end
 
     def _persist

lib/jsonapi_compliable/extensions/extra_attribute.rb

@@ -57,6 +57,12 @@ def extra_attribute(name, options = {}, &blk)
 end
 
 JSONAPI::Serializable::Resource.class_eval do
-  prepend JSONAPI::Serializable::Resource::ConditionalFields
+  def self.inherited(klass)
+    super
+    klass.class_eval do
+      extend JSONAPI::Serializable::Resource::ConditionalFields
+    end
+  end
+
   include JsonapiCompliable::Extensions::ExtraAttribute
 end

spec/support/scope_helper.rb

@@ -17,7 +17,7 @@ def render(object, opts = {})
     opts[:expose] = { context: resource.context }
     opts = JsonapiCompliable::Util::RenderOptions.generate(object, query.to_hash[:authors], opts)
     resolved = opts.delete(:jsonapi)
-    raw_json = JSONAPI::Serializable::Renderer.render(resolved, opts)
+    raw_json = JSONAPI::Serializable::SuccessRenderer.new.render(resolved, opts).to_json
     JSON.parse(raw_json)
   end
 end