Finish 2.0.0.beta3

Author: gkellogg

VERSION

@@ -1 +1 @@
-2.0.0.beta2
+2.0.0.beta3

example-files/pendragon-2.jsonld

@@ -0,0 +1,11 @@
+{
+  "@context": [
+    "http://bibdata.princeton.edu/dc/context.json",
+    "http://bibdata.princeton.edu/mrel/context.json"
+  ],
+  "@id": "http://bibdata.princeton.edu/bibliographic/4609321",
+  "title": {
+    "@value": "Biblia Latina",
+    "@language": "lat"
+    }
+  }

lib/json/ld/api.rb

@@ -79,7 +79,7 @@ class API
     # @option options [Boolean] :rename_bnodes (true)
     #   Rename bnodes as part of expansion, or keep them the same.
     # @option options [Boolean]  :unique_bnodes   (false)
-    #   Use unique bnode identifiers, defaults to using the identifier which the node was originall initialized with (if any).
+    #   Use unique bnode identifiers, defaults to using the identifier which the node was originally initialized with (if any).
     # @option options [Boolean]  :simple_compact_iris   (false)
     #   When compacting IRIs, do not use terms with expanded term definitions
     # @option options [Symbol] :adapter used with MultiJson
@@ -133,7 +133,7 @@ def initialize(input, context, options = {}, &block)
       context ||= (@value['@context'] if @value.is_a?(Hash)) || context_ref
       @context = Context.new(@options)
       @context = @context.parse(context) if context
-      
+
       if block_given?
         case block.arity
           when 0, -1 then instance_eval(&block)

lib/json/ld/context.rb

@@ -265,11 +265,11 @@ def parse(local_context, remote_contexts = [])
              result = context.dup
           when IO, StringIO
             log_debug("parse") {"io: #{context}"}
-            # Load context document, if it is a string
+            # Load context document, if it is an open file
             begin
               ctx = JSON.load(context)
               raise JSON::LD::JsonLdError::InvalidRemoteContext, "Context missing @context key" if @options[:validate] && ctx['@context'].nil?
-              result = parse(ctx["@context"] ? ctx["@context"].dup : {})
+              result = result.dup.parse(ctx["@context"] ? ctx["@context"].dup : {})
               result.provided_context = ctx["@context"] if [context] == local_context
               result
             rescue JSON::ParserError => e
@@ -286,7 +286,7 @@ def parse(local_context, remote_contexts = [])
             raise JsonLdError::RecursiveContextInclusion, "#{context}" if remote_contexts.include?(context.to_s)
             remote_contexts << context.to_s
 
-            context_no_base = self.dup
+            context_no_base = result.dup
             context_no_base.base = nil
             context_no_base.context_base = context.to_s
 

lib/json/ld/utils.rb

@@ -70,7 +70,7 @@ def value?(value)
     def as_resource(id, base = nil)
       @nodes ||= {} # Re-use BNodes
       if id[0,2] == '_:'
-        (@nodes[id] ||= RDF::Node.new(id[2..-1]))
+        (@nodes[id] ||= RDF::Node.new(namer.get_sym(id)))
       elsif base
         base.join(id)
       else

lib/json/ld/writer.rb

@@ -130,7 +130,6 @@ def initialize(output = $stdout, options = {}, &block)
       options[:base_uri] ||= options[:base] if options.has_key?(:base)
       options[:base] ||= options[:base_uri] if options.has_key?(:base_uri)
       super do
-        log_statistics.clear  # FIXME: shouldn't be necessary
         @repo = RDF::Repository.new
 
         if block_given?

script/parse

@@ -2,6 +2,7 @@
 require 'rubygems'
 require "bundler/setup"
 $:.unshift(File.expand_path("../../lib", __FILE__))
+require 'rdf/turtle'
 begin
   require 'linkeddata'
 rescue LoadError

spec/context_spec.rb

@@ -109,6 +109,24 @@ def containers
           "bar" => "http://example.com/foo"
         }, logger)
       end
+
+      it "merges definitions from remote contexts" do
+        expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/context", anything).and_yield(remote_doc)
+        rd2 = JSON::LD::API::RemoteDocument.new("http://example.com/c2", %q({
+          "@context": {
+            "title": {"@id": "http://purl.org/dc/terms/title"}
+          }
+        }))
+        expect(JSON::LD::API).to receive(:documentLoader).with("http://example.com/c2", anything).and_yield(rd2)
+        ec = subject.parse(%w(http://example.com/context http://example.com/c2))
+        expect(ec.send(:mappings)).to produce({
+          "xsd"      => "http://www.w3.org/2001/XMLSchema#",
+          "name"     => "http://xmlns.com/foaf/0.1/name",
+          "homepage" => "http://xmlns.com/foaf/0.1/homepage",
+          "avatar"   => "http://xmlns.com/foaf/0.1/avatar",
+          "title"    => "http://purl.org/dc/terms/title"
+        }, logger)
+      end
     end
 
     context "Hash" do

spec/suite_to_rdf_spec.rb

@@ -11,7 +11,6 @@
         specify "#{t.property('input')}: #{t.name}#{' (negative test)' unless t.positiveTest?}" do
           skip "Native value fidelity" if %w(toRdf-0035-in.jsonld).include?(t.property('input'))
           pending "Generalized RDF" if %w(toRdf-0118-in.jsonld).include?(t.property('input'))
-          pending "Blank nodes with reverse properties" if %w(toRdf-0119-in.jsonld).include?(t.property('input'))
           t.run self
         end
       end

spec/writer_spec.rb

@@ -201,7 +201,6 @@
           logger.info "source: #{t.input}"
           t.logger = logger
           pending "Shared list BNode in different graphs" if t.property('input').include?("fromRdf-0021")
-          pending "graph comparison issue" if t.property('input').include?("fromRdf-0008")
           repo = RDF::Repository.load(t.input_loc, format: :nquads)
           jsonld = JSON::LD::Writer.buffer(logger: t.logger) do |writer|
             writer << repo