From 05d310aa6adf02a9fb7cc445030f57fa0d7d5d94 Mon Sep 17 00:00:00 2001 From: Larry Gebhardt Date: Tue, 14 Jul 2015 15:37:20 -0400 Subject: [PATCH 1/2] Fix issue where a nil engine name isn't being cached so it must be reevaluated repeatedly. --- lib/jsonapi/link_builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/jsonapi/link_builder.rb b/lib/jsonapi/link_builder.rb index 4cb9ffc18..b68b4d2ed 100644 --- a/lib/jsonapi/link_builder.rb +++ b/lib/jsonapi/link_builder.rb @@ -8,10 +8,11 @@ def initialize(config = {}) @base_url = config[:base_url] @primary_resource_klass = config[:primary_resource_klass] @route_formatter = config[:route_formatter] + @is_engine = !!engine_name end def engine? - !!engine_name + @is_engine end def engine_name From 8f5c7af50f6ac68ba7464642b5b57e49da5b05cb Mon Sep 17 00:00:00 2001 From: Larry Gebhardt Date: Tue, 14 Jul 2015 15:52:48 -0400 Subject: [PATCH 2/2] Move require for link_builder --- lib/jsonapi-resources.rb | 1 + lib/jsonapi/resource_serializer.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jsonapi-resources.rb b/lib/jsonapi-resources.rb index 36f47c7ac..53f76a1a7 100644 --- a/lib/jsonapi-resources.rb +++ b/lib/jsonapi-resources.rb @@ -20,3 +20,4 @@ require 'jsonapi/operation_result' require 'jsonapi/operation_results' require 'jsonapi/callbacks' +require 'jsonapi/link_builder' diff --git a/lib/jsonapi/resource_serializer.rb b/lib/jsonapi/resource_serializer.rb index fea7b947f..6d048275d 100644 --- a/lib/jsonapi/resource_serializer.rb +++ b/lib/jsonapi/resource_serializer.rb @@ -1,5 +1,3 @@ -require_relative "link_builder" - module JSONAPI class ResourceSerializer