Refine include_directives

Author: lgebhardt

lib/jsonapi/include_directives.rb

@@ -29,10 +29,6 @@ def [](name)
       @include_directives_hash[name]
     end
 
-    def include_directives_hash
-      @include_directives_hash
-    end
-
     private
 
     def parse_include(include)

lib/jsonapi/resource_serializer.rb

@@ -22,8 +22,8 @@ def initialize(primary_resource_klass, options = {})
       @primary_resource_klass = primary_resource_klass
       @fields                 = options.fetch(:fields, {})
       @include                = options.fetch(:include, [])
-      @include_directives     = options[:include_directives]
-      @include_directives     ||= JSONAPI::IncludeDirectives.new(@primary_resource_klass, @include)
+      @include_directives     = options.fetch(:include_directives,
+                                              JSONAPI::IncludeDirectives.new(@primary_resource_klass, @include))
       @key_formatter          = options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
       @id_formatter           = ValueFormatter.value_formatter_for(:id)
       @link_builder           = generate_link_builder(primary_resource_klass, options)
@@ -44,7 +44,7 @@ def initialize(primary_resource_klass, options = {})
 
     # Converts a single resource, or an array of resources to a hash, conforming to the JSONAPI structure
     def serialize_to_hash(source)
-      include_related = include_directives[:include_related] if include_directives
+      include_related = include_directives[:include_related]
       resource_set = JSONAPI::ResourceSet.new(source, include_related, options)
       resource_set.populate!(self, options[:context], options)
 

test/unit/processor/default_processor_test.rb

@@ -110,5 +110,4 @@ def test_populated_resource_set_has_one_includes_relationships_are_resolved
     assert_equal 10, $populated_resource_set_has_one_includes.resource_klasses[PersonResource][1003][:relationships][:posts].first.id
     assert_equal 12, $populated_resource_set_has_one_includes.resource_klasses[PersonResource][1004][:relationships][:posts].first.id
   end
-
 end

test/unit/serializer/include_directives_test.rb

@@ -4,7 +4,7 @@
 class IncludeDirectivesTest < ActiveSupport::TestCase
 
   def test_one_level_one_include
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -18,7 +18,7 @@ def test_one_level_one_include
   end
 
   def test_one_level_multiple_includes
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'comments', 'expense_entries']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'comments', 'expense_entries']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -38,7 +38,7 @@ def test_one_level_multiple_includes
   end
 
   def test_multiple_level_multiple_includes
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'posts.comments', 'comments', 'expense_entries']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'posts.comments', 'comments', 'expense_entries']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -63,7 +63,7 @@ def test_multiple_level_multiple_includes
 
 
   def test_two_levels_include_full_path
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts.comments']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts.comments']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -81,7 +81,7 @@ def test_two_levels_include_full_path
   end
 
   def test_two_levels_include_full_path_redundant
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'posts.comments']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts', 'posts.comments']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -99,7 +99,7 @@ def test_two_levels_include_full_path_redundant
   end
 
   def test_three_levels_include_full
-    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts.comments.tags']).include_directives_hash
+    directives = JSONAPI::IncludeDirectives.new(PersonResource, ['posts.comments.tags']).instance_variable_get(:@include_directives_hash)
 
     assert_hash_equals(
       {
@@ -127,19 +127,19 @@ def test_three_levels_include_full
   #
   def test_invalid_includes_1
     assert_raises JSONAPI::Exceptions::InvalidInclude do
-      JSONAPI::IncludeDirectives.new(PersonResource, ['../../../../']).include_directives_hash
+      JSONAPI::IncludeDirectives.new(PersonResource, ['../../../../']).instance_variable_get(:@include_directives_hash)
     end
   end
 
   def test_invalid_includes_2
     assert_raises JSONAPI::Exceptions::InvalidInclude do
-      JSONAPI::IncludeDirectives.new(PersonResource, ['posts./sdaa./........']).include_directives_hash
+      JSONAPI::IncludeDirectives.new(PersonResource, ['posts./sdaa./........']).instance_variable_get(:@include_directives_hash)
     end
   end
 
   def test_invalid_includes_3
     assert_raises JSONAPI::Exceptions::InvalidInclude do
-      JSONAPI::IncludeDirectives.new(PersonResource, ['invalid../../../../']).include_directives_hash
+      JSONAPI::IncludeDirectives.new(PersonResource, ['invalid../../../../']).instance_variable_get(:@include_directives_hash)
     end
   end
 end