Merged 'develop'.

Author: gkellogg

lib/json/ld.rb

@@ -131,11 +131,10 @@ class LoadingDocumentFailed < JsonLdError; @code = "loading document failed"; en
       class LoadingRemoteContextFailed < JsonLdError; @code = "loading remote context failed"; end
       class MultipleContextLinkHeaders < JsonLdError; @code = "multiple context link headers"; end
       class RecursiveContextInclusion < JsonLdError; @code = "recursive context inclusion"; end
-    end
-
-    class InvalidFrame < Exception
-      class MultipleEmbeds < InvalidFrame; end
-      class Syntax < InvalidFrame; end
+      class InvalidFrame < JsonLdError
+        class MultipleEmbeds < InvalidFrame; end
+        class Syntax < InvalidFrame; end
+      end
     end
   end
 end

lib/json/ld/api.rb

@@ -309,7 +309,7 @@ def self.flatten(input, context, options = {})
     def self.frame(input, frame, options = {})
       result = nil
       options = {
-        base:           input.is_a?(String) ? input : '',
+        base:           (input if input.is_a?(String)),
         compactArrays:  true,
         embed:          '@last',
         explicit:       false,

lib/json/ld/context.rb

@@ -396,12 +396,12 @@ def parse(local_context, remote_contexts = [])
               end
             rescue JsonLdError::LoadingDocumentFailed => e
               #log_debug("parse") {"Failed to retrieve @context from remote document at #{context_no_base.context_base.inspect}: #{e.message}"}
-              raise JsonLdError::LoadingRemoteContextFailed, "#{context_no_base.context_base}", e.backtrace
+              raise JsonLdError::LoadingRemoteContextFailed, "#{context_no_base.context_base}: #{e.message}", e.backtrace
             rescue JsonLdError
               raise
-            rescue Exception => e
+            rescue StandardError => e
               #log_debug("parse") {"Failed to retrieve @context from remote document at #{context_no_base.context_base.inspect}: #{e.message}"}
-              raise JsonLdError::LoadingRemoteContextFailed, "#{context_no_base.context_base}", e.backtrace
+              raise JsonLdError::LoadingRemoteContextFailed, "#{context_no_base.context_base}: #{e.message}", e.backtrace
             end
 
             # 3.2.6) Set context to the result of recursively calling this algorithm, passing context no base for active context, context for local context, and remote contexts.

lib/json/ld/from_rdf.rb

@@ -78,7 +78,7 @@ def from_statements(input, useRdfType: false, useNativeTypes: false)
           # If property equals rdf:rest, the value associated to the usages member of node has exactly 1 entry, node has a rdf:first and rdf:rest property, both of which have as value an array consisting of a single element, and node has no other members apart from an optional @type member whose value is an array with a single item equal to rdf:List, node represents a well-formed list node. Continue with the following steps:
           #log_debug("list element?") {node.to_json(JSON_STATE) rescue 'malformed json'}
           while property == RDF.rest.to_s &&
-              node_usages_map[node['@id']].uniq.length == 1 &&
+              Array(node_usages_map[node['@id']]).uniq.length == 1 &&
               blank_node?(node) &&
               node.keys.none? {|k| !["@id", '@type', :usages, RDF.first.to_s, RDF.rest.to_s].include?(k)} &&
               Array(node[:usages]).length == 1 &&

script/tc

@@ -94,7 +94,7 @@ def run_tc(man, tc, options)
   rescue Interrupt
     $stderr.puts "(interrupt)"
     exit 1
-  rescue Exception => e
+  rescue StandardError => e
     result = if tc.positiveTest?
       STDERR.puts "#{"exception:" unless options[:quiet]}: #{e}"
       if options[:quiet]