Add expansion tests for compact IRIs having terms with trailing ':'.

Author: gkellogg

lib/json/ld/context.rb

@@ -993,13 +993,19 @@ def expand_iri(value, documentRelative: false, vocab: false, local_context: nil,
         return RDF::Node.new(namer.get_sym(suffix)) if prefix == '_'
         return RDF::URI(value) if suffix[0,2] == '//'
 
-        # If local context is not null, it contains a key that equals prefix, and the value associated with the key that equals prefix in defined is not true, invoke the Create Term Definition algorithm, passing active context, local context, prefix as term, and defined. This will ensure that a term definition is created for prefix in active context during Context Processing.
-        if local_context && local_context.has_key?(prefix) && !defined[prefix]
-          create_term_definition(local_context, prefix, defined)
+        # If local context is not null, it contains a key that equals prefix, or prefix followed by a ':', and the value associated with the key that equals prefix in defined is not true, invoke the Create Term Definition algorithm, passing active context, local context, prefix (possibly with an added ':') as term, and defined. This will ensure that a term definition is created for prefix in active context during Context Processing.
+        if local_context
+          if local_context.has_key?(prefix + ':') && !defined[prefix + ':']
+            create_term_definition(local_context, prefix + ':', defined)
+          elsif local_context.has_key?(prefix) && !defined[prefix]
+            create_term_definition(local_context, prefix, defined)
+          end
         end
 
-        # If active context contains a term definition for prefix, return the result of concatenating the IRI mapping associated with prefix and suffix.
-        result = if (td = term_definitions[prefix])
+        # If active context contains a term definition for prefix followed by ':', or prefix, return the result of concatenating the IRI mapping associated with prefix and suffix.
+        result = if (td = term_definitions[prefix + ':'])
+          result = td.id + suffix
+        elsif (td = term_definitions[prefix])
           result = td.id + suffix
         else
           # (Otherwise) Return value as it is already an absolute IRI.

spec/context_spec.rb

@@ -747,6 +747,7 @@ def containers
         '@base' => 'http://base/',
         '@vocab' => 'http://vocab/',
         'ex' => 'http://example.org/',
+        'colon:' => 'http://example.net/',
         '' => 'http://empty/',
         '_' => 'http://underscore/'
       })
@@ -771,6 +772,7 @@ def containers
           "absolute IRI" =>  ["http://example.org/", RDF::URI("http://example.org/")],
           "term" =>          ["ex",                  RDF::URI("ex")],
           "prefix:suffix" => ["ex:suffix",           RDF::URI("http://example.org/suffix")],
+          "colon:suffix"  => ["colon:suffix",        RDF::URI("http://example.net/suffix")],
           "keyword" =>       ["@type",               "@type"],
           "empty" =>         [":suffix",             RDF::URI("http://empty/suffix")],
           "unmapped" =>      ["foo",                 RDF::URI("foo")],
@@ -792,6 +794,7 @@ def containers
           "absolute IRI" =>  ["http://example.org/", RDF::URI("http://example.org/")],
           "term" =>          ["ex",                  RDF::URI("http://base/ex")],
           "prefix:suffix" => ["ex:suffix",           RDF::URI("http://example.org/suffix")],
+          "colon:suffix"  => ["colon:suffix",        RDF::URI("http://example.net/suffix")],
           "keyword" =>       ["@type",               "@type"],
           "empty" =>         [":suffix",             RDF::URI("http://empty/suffix")],
           "unmapped" =>      ["foo",                 RDF::URI("http://base/foo")],
@@ -813,6 +816,7 @@ def containers
           "absolute IRI" =>  ["http://example.org/", RDF::URI("http://example.org/")],
           "term" =>          ["ex",                  RDF::URI("http://example.org/")],
           "prefix:suffix" => ["ex:suffix",           RDF::URI("http://example.org/suffix")],
+          "colon:suffix"  => ["colon:suffix",        RDF::URI("http://example.net/suffix")],
           "keyword" =>       ["@type",               "@type"],
           "empty" =>         [":suffix",             RDF::URI("http://empty/suffix")],
           "unmapped" =>      ["foo",                 RDF::URI("http://vocab/foo")],

spec/expand_spec.rb

@@ -83,7 +83,25 @@
       "@value with false" => {
         input: {"http://example.com/ex" => {"@value" => false}},
         output: [{"http://example.com/ex" => [{"@value" => false}]}]
-      }
+      },
+      "compact IRI" => {
+        input: {
+          "@context" => {"ex" => "http://example.com/"},
+          "ex:p" => {"@id" => "ex:Sub1"}
+        },
+        output: [{
+          "http://example.com/p" => [{"@id" => "http://example.com/Sub1"}]
+        }]
+      },
+      "compact IRI with term having trailing ':'" => {
+        input: {
+          "@context" => {"ex:" => "http://example.com/"},
+          "ex:p" => {"@id" => "ex:Sub1"}
+        },
+        output: [{
+          "http://example.com/p" => [{"@id" => "http://example.com/Sub1"}]
+        }]
+      },
     }.each_pair do |title, params|
       it(title) {run_expand params}
     end