Finish 2.1.4

Author: gkellogg

VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

bin/jsonld

@@ -8,6 +8,7 @@ $:.unshift(File.expand_path("../../lib", __FILE__))
 require 'json/ld'
 require 'getoptlong'
 require 'open-uri'
+require 'logger'
 
 def run(input, options)
   reader_class = RDF::Reader.for(options[:input_format].to_sym)
@@ -62,29 +63,39 @@ def run(input, options)
     STDERR.puts "\nParsed #{num} statements in #{secs} seconds @ #{num/secs} statements/second." unless options[:quiet]
   end
 rescue
-  fname = input.respond_to?(:path) ? input.path : "-stdin-"
+  fname = case
+  when input.respond_to?(:path) then input.path
+  when input.respond_to?(:requested_url) && input.requested_url then input.requested_url
+  when input.respond_to?(:base_uri) then input.base_uri
+  else  "-stdin-"
+  end
   STDERR.puts("Error in #{fname}")
   raise
 end
 
+logger = Logger.new(STDERR)
+logger.level = Logger::WARN
+logger.formatter = lambda {|severity, datetime, progname, msg| "#{severity}: #{msg}\n"}
+
 parser_options = {
   base:     nil,
-  progress: false,
   validate: false,
   stream:   false,
   strict:   false,
+  logger:   logger,
 }
 
 options = {
   parser_options: parser_options,
   output:         STDOUT,
   output_format:  :jsonld,
   input_format:   :jsonld,
+  logger:         logger,
 }
 input = nil
 
 OPT_ARGS = [
-  ["--dbg",           GetoptLong::NO_ARGUMENT,      "Turn on verbose debugging"],
+  ["--debug",         GetoptLong::NO_ARGUMENT,      "Turn on verbose debugging"],
   ["--compact",       GetoptLong::NO_ARGUMENT,      "Compact document, using --context"],
   ["--compactArrays", GetoptLong::OPTIONAL_ARGUMENT, "Set compactArrays option"],
   ["--context",       GetoptLong::REQUIRED_ARGUMENT,"Context to apply for expand, compact and converting from RDF"],
@@ -130,7 +141,7 @@ opts = GetoptLong.new(*OPT_ARGS.map {|o| o[0..-2]})
 
 opts.each do |opt, arg|
   case opt
-  when '--dbg'            then parser_options[:debug] = ::JSON::LD::debug = true
+  when '--debug'          then logger.level = Logger::DEBUG
   when '--compact'        then options[:compact] = true
   when "--compactArrays"  then options[:compactArrays] = (arg || 'true') == 'true'
   when '--context'        then options[:context] = arg
@@ -146,7 +157,9 @@ opts.each do |opt, arg|
   when '--output'         then options[:output] = File.open(arg, "w")
   when '--parse-only'     then options[:parse_only] = true
   when '--processingMode' then options[:processingMode] = arg
-  when '--quiet'          then options[:quiet] = true
+  when '--quiet'
+    options[:quiet] = true
+    logger.level = Logger::FATAL
   when "--rename_bnodes"  then options[:rename_bnodes] = (arg || 'true') == 'true'
   when "--requireAll"     then options[:requireAll] = (arg || 'true') == 'true'
   when '--stream'         then parser_options[:stream] = true

example-files/issue-496.rb

@@ -0,0 +1,23 @@
+require 'pp'
+require 'linkeddata'
+
+input = JSON.parse %({
+  "@context": {
+    "schema": "http://schema.org/",
+    "name": "schema:name",
+    "url": {"@id": "schema:url", "@type": "schema:URL"}
+  },
+  "name": "Jane Doe"
+})
+
+frame = JSON.parse %({
+  "@context": {
+    "schema": "http://schema.org/",
+    "name": "schema:name",
+    "url": { "@id": "schema:url", "@type": "schema:URL"}
+  },
+  "name": {},
+  "url": {"@default": {"@value": "http://example.com", "@type": "schema:URL"}}
+})
+
+pp JSON::LD::API.frame(input, frame, logger: Logger.new(STDERR))

example-files/issue-499-frame.json

@@ -0,0 +1,13 @@
+{"@context": ["http://schema.org", {
+    "maintainer": {"@type": "@id"}
+  }],
+ "@embed": "@always",
+ "author": {
+   "familyName": {},
+   "affiliation": 
+     {"@default": "@null"}
+  },
+ "maintainer": {
+   "familyName": { "@default": "none" }
+ }
+}

example-files/issue-499.json

@@ -0,0 +1,13 @@
+{
+  "@context": "http://schema.org",
+  "@type": "SoftwareSourceCode",
+  "author": 
+    {
+      "@type": "Person",
+      "givenName": "Carl",
+      "familyName": "Boettiger",
+      "email": "[email protected]",
+      "@id": "http://orcid.org/0000-0002-1642-628X"
+    },
+  "maintainer": "http://orcid.org/0000-0002-1642-628X"
+}

example-files/mitar-in.jsonld

@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@vocab": "http://example/",
+    "@version": 1.1,
+    "B": {"@context": {"c": "http://example.org/c"}}
+  },
+  "a": {
+    "@context": {"@vocab": "http://example.com/"},
+    "@type": "B",
+    "a": "A in example.com",
+    "c": "C in example.org"
+  },
+  "c": "C in example"
+}

example-files/workergnome-issue-35.rb

@@ -0,0 +1,38 @@
+require 'linkeddata'
+
+graph = RDF::Graph.new
+graph << [RDF::URI("http://www.museum.com/fish"), 
+          RDF.type, 
+          RDF::URI("http://www.cidoc-crm.org/cidoc-crm/E55_Type")]
+
+unframed_json = JSON::LD::API::fromRdf(graph)
+
+
+# Using this frame:
+frame = {
+  "@context"=> [
+    "https://linked.art/ns/context/1/full.jsonld",
+    {"crm" => "http://www.cidoc-crm.org/cidoc-crm/"}
+  ]
+}
+
+# This works
+puts JSON::LD::API.frame(unframed_json, frame, base: "http://www.example.com")
+
+# But this doesn't.
+begin
+  puts JSON::LD::API.frame(unframed_json, frame)
+rescue JSON::LD::JsonLdError::InvalidBaseIRI => e
+  puts "This doesn't work: #{e}"
+end
+
+
+# But using this frame:
+frame = {
+  "@context"=> [
+    {"crm" => "http://www.cidoc-crm.org/cidoc-crm/"}
+  ]
+}
+# Both of these work
+puts JSON::LD::API.frame(unframed_json, frame, base: "http://www.example.com")
+puts JSON::LD::API.frame(unframed_json, frame)

lib/json/ld/api.rb

@@ -136,7 +136,7 @@ def initialize(input, context, options = {}, &block)
       @context = Context.parse(context || {}, @options)
 
       # If not set explicitly, the context figures out the processing mode
-      @options[:processingMode] ||= @context.processingMode
+      @options[:processingMode] ||= @context.processingMode || "json-ld-1.0"
       @options[:validate] ||= %w(json-ld-1.0 json-ld-1.1).include?(@options[:processingMode])
 
       if block_given?

lib/json/ld/compact.rb

@@ -30,7 +30,7 @@ def compact(element, property: nil)
         # If element has a single member and the active property has no
         # @container mapping to @list or @set, the compacted value is that
         # member; otherwise the compacted value is element
-        if result.length == 1 && context.container(property).nil? && @options[:compactArrays]
+        if result.length == 1 && !context.as_array?(property) && @options[:compactArrays]
           #log_debug("=> extract single element: #{result.first.inspect}")
           result.first
         else
@@ -85,7 +85,7 @@ def compact(element, property: nil)
             compacted_value.each do |prop, value|
               if context.reverse?(prop)
                 value = [value] if !value.is_a?(Array) &&
-                  (context.container(prop) == '@set' || !@options[:compactArrays])
+                  (context.as_array?(prop) || !@options[:compactArrays])
                 #log_debug("") {"merge #{prop} => #{value.inspect}"}
 
                 merge_compacted_value(result, prop, value)
@@ -101,6 +101,17 @@ def compact(element, property: nil)
             next
           end
 
+          if expanded_property == '@preserve'
+            # Compact using `property`
+            compacted_value = compact(expanded_value, property: property)
+            #log_debug("@preserve") {"compacted_value: #{compacted_value.inspect}"}
+
+            unless compacted_value.is_a?(Array) && compacted_value.empty?
+              result['@preserve'] = compacted_value
+            end
+            next
+          end
+
           if expanded_property == '@index' && context.container(property) == '@index'
             #log_debug("@index") {"drop @index"}
             next
@@ -150,6 +161,7 @@ def compact(element, property: nil)
             end
 
             container = context.container(item_active_property)
+            as_array = context.as_array?(item_active_property)
             value = list?(expanded_item) ? expanded_item['@list'] : expanded_item
             compacted_item = compact(value, property: item_active_property)
             #log_debug("") {" => compacted key: #{item_active_property.inspect} for #{compacted_item.inspect}"}
@@ -195,14 +207,11 @@ def compact(element, property: nil)
                 end
                 compacted_item
               end
+              compacted_item = [compacted_item] if as_array && !compacted_item.is_a?(Array)
               merge_compacted_value(map_object, map_key, compacted_item)
             else
               compacted_item = [compacted_item] if
-                !compacted_item.is_a?(Array) && (
-                  !@options[:compactArrays] ||
-                  %w(@set @list).include?(container) ||
-                  %w(@list @graph).include?(expanded_property)
-                )
+                !compacted_item.is_a?(Array) && (!@options[:compactArrays] || as_array)
               merge_compacted_value(nest_result, item_active_property, compacted_item)
             end
           end