Upgrade jsonapi-serializable and jsonapi-rails dependencies. (#49)

Upgrade jsonapi-serializable and jsonapi-rails dependencies.

Author: beauby

Appraisals

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

gemfiles/rails_4.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1"
-gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", :platform => [:mri]
+  gem "pry-byebug", platform: [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0"
-gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", :platform => [:mri]
+  gem "pry-byebug", platform: [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

jsonapi_compliable.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Pinning this version until backwards-incompatibility is addressed
-  spec.add_dependency 'jsonapi-serializable', '~> 0.2.0'
+  spec.add_dependency 'jsonapi-serializable', '~> 0.3.0'
 
   spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
   spec.add_development_dependency "kaminari", '~> 0.17'

lib/jsonapi_compliable/base.rb

@@ -290,7 +290,7 @@ def force_includes?
 
     def perform_render_jsonapi(opts)
       # TODO(beauby): Reuse renderer.
-      JSONAPI::Serializable::SuccessRenderer.new
+      JSONAPI::Serializable::Renderer.new
         .render(opts.delete(:jsonapi), opts).to_json
     end
 

lib/jsonapi_compliable/util/render_options.rb

@@ -6,7 +6,14 @@ class RenderOptions
       def self.generate(object, query_hash, overrides = {})
         resolved = object.respond_to?(:resolve) ? object.resolve : object
 
+        inferrer = ::Hash.new do |h, k|
+          names = k.to_s.split('::')
+          klass = names.pop
+          h[k] = [*names, "Serializable#{klass}"].join('::').safe_constantize
+        end
+
         options            = {}
+        options[:class]    = inferrer
         options[:include]  = query_hash[:include]
         options[:jsonapi]  = resolved
         options[:fields]   = query_hash[:fields]

spec/extra_fields_spec.rb

@@ -36,7 +36,7 @@ def include_foo!
   end
 
   let(:json) do
-    render(scope.resolve, class: SerializableTestExtraFields)
+    render(scope.resolve, class: { Author: SerializableTestExtraFields })
   end
 
   it 'does not include extra fields when not requested' do

spec/fields_spec.rb

@@ -23,7 +23,7 @@ def admin?
   let!(:author) { Author.create!(first_name: 'Stephen', last_name: 'King') }
 
   def json
-    render(scope.resolve, class: SerializableTestFields)
+    render(scope.resolve, class: { Author: SerializableTestFields })
   end
 
   it 'does not limit without fields param' do

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::SuccessRenderer.new.render(resolved, opts).to_json
+    raw_json = JSONAPI::Serializable::Renderer.new.render(resolved, opts).to_json
     JSON.parse(raw_json)
   end
 end