Skip to content

Commit e18072a

Browse files
author
Lee Richmond
committed
Add AMS renderer
1 parent 6190fde commit e18072a

File tree

7 files changed

+29
-9
lines changed

7 files changed

+29
-9
lines changed

gemfiles/rails_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was generated by Appraisal
22

3-
source "http://artprod.dev.bloomberg.com/artifactory/api/gems/rubygems/"
3+
source "https://rubygems.org"
44

55
gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
66
gem "rails", "~> 4.1"

gemfiles/rails_4.gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ GIT
1111
PATH
1212
remote: ../
1313
specs:
14-
jsonapi_compliable (0.3.2)
14+
jsonapi_compliable (0.3.4)
1515
active_model_serializers (~> 0.10)
1616
jsonapi (~> 0.1.1.beta2)
1717
jsonapi_ams_extensions (~> 0.1)
1818
rails (>= 4.1, < 6)
1919

2020
GEM
21-
remote: http://artprod.dev.bloomberg.com/artifactory/api/gems/rubygems/
21+
remote: https://rubygems.org/
2222
specs:
2323
actionmailer (4.2.7.1)
2424
actionpack (= 4.2.7.1)
@@ -89,7 +89,7 @@ GEM
8989
json (1.8.3)
9090
jsonapi (0.1.1.beta2)
9191
json (~> 1.8)
92-
jsonapi_ams_extensions (0.1.0)
92+
jsonapi_ams_extensions (0.1.1)
9393
active_model_serializers (~> 0.10.x)
9494
jsonapi_spec_helpers (0.2.0)
9595
kaminari (0.17.0)

gemfiles/rails_5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was generated by Appraisal
22

3-
source "http://artprod.dev.bloomberg.com/artifactory/api/gems/rubygems/"
3+
source "https://rubygems.org"
44

55
gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
66
gem "rails", "~> 5.0"

gemfiles/rails_5.gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ GIT
1111
PATH
1212
remote: ../
1313
specs:
14-
jsonapi_compliable (0.3.2)
14+
jsonapi_compliable (0.3.4)
1515
active_model_serializers (~> 0.10)
1616
jsonapi (~> 0.1.1.beta2)
1717
jsonapi_ams_extensions (~> 0.1)
1818
rails (>= 4.1, < 6)
1919

2020
GEM
21-
remote: http://artprod.dev.bloomberg.com/artifactory/api/gems/rubygems/
21+
remote: https://rubygems.org/
2222
specs:
2323
actioncable (5.0.0.1)
2424
actionpack (= 5.0.0.1)
@@ -91,7 +91,7 @@ GEM
9191
json (1.8.3)
9292
jsonapi (0.1.1.beta2)
9393
json (~> 1.8)
94-
jsonapi_ams_extensions (0.1.0)
94+
jsonapi_ams_extensions (0.1.1)
9595
active_model_serializers (~> 0.10.x)
9696
jsonapi_spec_helpers (0.2.0)
9797
kaminari (0.17.0)

lib/jsonapi_compliable.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
require "jsonapi_compliable/util/field_params"
1818
require "jsonapi_compliable/util/scoping"
1919

20+
require 'jsonapi_compliable/railtie' if defined?(::Rails)
21+
2022
module JsonapiCompliable
2123
autoload :Base, 'jsonapi_compliable/base'
2224
autoload :Deserializable, 'jsonapi_compliable/deserializable'

lib/jsonapi_compliable/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def render_ams(scope, opts = {})
5050
scope = jsonapi_scope(scope) if Util::Scoping.apply?(self, scope, opts.delete(:scope))
5151
options = default_ams_options
5252
options[:include] = forced_includes || Util::IncludeParams.scrub(self)
53-
options[:json] = scope
53+
options[:jsonapi] = scope
5454
options[:fields] = Util::FieldParams.fieldset(params, :fields) if params[:fields]
5555
options[:extra_fields] = Util::FieldParams.fieldset(params, :extra_fields) if params[:extra_fields]
5656

lib/jsonapi_compliable/railtie.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
require 'rails/railtie'
2+
require 'action_controller'
3+
require 'action_controller/railtie'
4+
require 'action_controller/serialization'
5+
6+
module ActiveModelSerializers
7+
class Railtie < Rails::Railtie
8+
initializer 'jsonapi_compliable.register_renderer' do
9+
require 'active_model_serializers/register_jsonapi_renderer'
10+
end
11+
12+
initializer 'jsonapi_compliable.configure_ams' do
13+
if ActiveModelSerializers.config.respond_to?(:include_data_default)
14+
ActiveModelSerializers.config.include_data_default = :if_sideloaded
15+
end
16+
end
17+
end
18+
end

0 commit comments

Comments
 (0)