Skip to content

Commit a6ebe7d

Browse files
committed
Change required parameters
1 parent a466019 commit a6ebe7d

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

lib/jsonapi/operation.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FindOperation < Operation
1818
def initialize(resource_klass, options = {})
1919
@filters = options[:filters]
2020
@include_directives = options[:include_directives]
21-
@sort_criteria = options[:sort_criteria]
21+
@sort_criteria = options.fetch(:sort_criteria, [])
2222
@paginator = options[:paginator]
2323
super(resource_klass, false)
2424
end
@@ -42,7 +42,7 @@ class ShowOperation < Operation
4242

4343
def initialize(resource_klass, options = {})
4444
@id = options.fetch(:id)
45-
@include_directives = options.fetch(:include_directives)
45+
@include_directives = options[:include_directives]
4646
@transactional = false
4747
super(resource_klass, options)
4848
end
@@ -113,9 +113,9 @@ def initialize(resource_klass, options = {})
113113
@source_klass = options.fetch(:source_klass)
114114
@source_id = options.fetch(:source_id)
115115
@association_type = options.fetch(:association_type)
116-
@filters = options.fetch(:filters)
117-
@sort_criteria = options.fetch(:sort_criteria)
118-
@paginator = options.fetch(:paginator)
116+
@filters = options[:filters]
117+
@sort_criteria = options[:sort_criteria]
118+
@paginator = options[:paginator]
119119
@transactional = false
120120
super(resource_klass, options)
121121
end

lib/jsonapi/response_document.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def initialize(operation_results, options = {})
44
@operation_results = operation_results
55
@options = options
66

7-
@key_formatter = @options.fetch(:key_formatter)
7+
@key_formatter = @options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
88
end
99

1010
def contents
@@ -29,12 +29,12 @@ def status
2929
def serializer
3030
@serializer ||= JSONAPI::ResourceSerializer.new(
3131
@options.fetch(:primary_resource_klass),
32-
include: @options.fetch(:include),
33-
include_directives: @options.fetch(:include_directives),
34-
fields: @options.fetch(:fields),
35-
base_url: @options.fetch(:base_url),
32+
include: @options.fetch(:include, []),
33+
include_directives: @options[:include_directives],
34+
fields: @options[:fields],
35+
base_url: @options.fetch(:base_url, ''),
3636
key_formatter: @key_formatter,
37-
route_formatter: @options.fetch(:route_formatter)
37+
route_formatter: @options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
3838
)
3939
end
4040

0 commit comments

Comments
 (0)