Properly render nested relationship base errors

nicklandgrebe · Feb 13, 2017 · 17dc96f · 17dc96f
1 parent e964acb
commit 17dc96f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/caprese/adapter/json_api/json_pointer.rb b/lib/caprese/adapter/json_api/json_pointer.rb
@@ -31,7 +31,10 @@ module JsonPointer
         # @param [Object,Array<Object>]
         def new(pointer_type, record, value)
           if pointer_type == :relationship_attribute
-            value.to_s.split('.').inject('') do |pointer, v|
+            values = value.to_s.split('.')
+            last_index = values.count - 1
+
+            values.each_with_index.inject('') do |pointer, (v, i)|
               pointer +
                 if record.class.reflections.key?(v)
                   record =
@@ -41,7 +44,11 @@ def new(pointer_type, record, value)
                       record.send(v)
                     end
 
-                  format(POINTERS[:relationship_attribute], v)
+                  if i == last_index
+                    format(POINTERS[:relationship_base], v)
+                  else
+                    format(POINTERS[:relationship_attribute], v)
+                  end
                 else
                   format(POINTERS[:attribute], v)
                 end