ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1289 from tchak/serialization_context

Browse Source 
rename context to serialization_context and add url helpers
This commit is contained in:
L. Preston Sego III
2015-10-29 07:56:47 -04:00
parent 65b8493e51 d08ee5994f
commit a063cbea21
7 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer/adapter/json_api.rb
View File

@@ -206,7 +206,7 @@ module ActiveModel
end
def links_for(serializer, options)
JsonApi::PaginationLinks.new(serializer.object, options[:context]).serializable_hash(options)
JsonApi::PaginationLinks.new(serializer.object, options[:serialization_context]).serializable_hash(options)
end
end
end

6
lib/active_model/serializer/adapter/json_api/pagination_links.rb
View File

@@ -41,11 +41,11 @@ module ActiveModel
end
def url(options)
@url ||= options.fetch(:links, {}).fetch(:self, nil) || original_url
@url ||= options.fetch(:links, {}).fetch(:self, nil) || request_url
end
def original_url
@original_url ||= context.original_url[/\A[^?]+/]
def request_url
@request_url ||= context.request_url
end
def query_parameters