Fix expansion bug where a property is @reverse and the same subject has an explicit @reverse.

Author: gkellogg

lib/json/ld/expand.rb

@@ -13,7 +13,7 @@ module Expand
     KEY_ID = %w(@id).freeze
     KEYS_VALUE_LANGUAGE_TYPE_INDEX_DIRECTION = %w(@value @language @type @index @direction @annotation).freeze
     KEYS_SET_LIST_INDEX = %w(@set @list @index).freeze
-    KEYS_INCLUDED_TYPE = %w(@included @type).freeze
+    KEYS_INCLUDED_TYPE_REVERSE = %w(@included @type @reverse).freeze
 
     ##
     # Expand an Array or Object given an active context and performing local context expansion.
@@ -266,7 +266,7 @@ def expand_object(input, active_property, context, output_object,
 
           # If result has already an expanded property member (other than @type), an colliding keywords error has been detected and processing is aborted.
           raise JsonLdError::CollidingKeywords,
-                "#{expanded_property} already exists in result" if output_object.has_key?(expanded_property) && !KEYS_INCLUDED_TYPE.include?(expanded_property)
+                "#{expanded_property} already exists in result" if output_object.has_key?(expanded_property) && !KEYS_INCLUDED_TYPE_REVERSE.include?(expanded_property)
 
           expanded_value = case expanded_property
           when '@id'

spec/expand_spec.rb

@@ -3371,6 +3371,43 @@
           }),
           exception: JSON::LD::JsonLdError::InvalidReversePropertyMap,
         },
+        "Explicit and implicit @reverse in same object": {
+          input: %({
+            "@context": {
+              "fooOf": {"@reverse": "ex:foo", "@type": "@id"}
+            },
+            "@id": "ex:s",
+            "fooOf": "ex:o1",
+            "@reverse": {
+              "ex:bar": {"@id": "ex:o2"}
+            }
+          }),
+          output: %([{
+            "@id": "ex:s",
+            "@reverse": {
+              "ex:bar": [{"@id": "ex:o2"}],
+              "ex:foo": [{"@id": "ex:o1"}]
+            }
+          }])
+        },
+        "Two properties both with @reverse": {
+          input: %({
+            "@context": {
+              "fooOf": {"@reverse": "ex:foo", "@type": "@id"},
+              "barOf": {"@reverse": "ex:bar", "@type": "@id"}
+            },
+            "@id": "ex:s",
+            "fooOf": "ex:o1",
+            "barOf": "ex:o2"
+          }),
+          output: %([{
+            "@id": "ex:s",
+            "@reverse": {
+              "ex:bar": [{"@id": "ex:o2"}],
+              "ex:foo": [{"@id": "ex:o1"}]
+            }
+          }])
+        },
       }.each do |title, params|
         it(title) {run_expand params}
       end