json-ld 2.1.2 → 2.1.3

data/spec/format_spec.rb

@@ -67,7 +67,7 @@ describe JSON::LD::Format do
     end
   end
 
-  describe ".cli_commands" do
+  describe ".cli_commands", skip: ("TextMate OptionParser issues" if ENV['TM_SELECTED_FILE']) do
     require 'rdf/cli'
     let(:ttl) {File.expand_path("../test-files/test-1-rdf.ttl", __FILE__)}
     let(:json) {File.expand_path("../test-files/test-1-input.json", __FILE__)}

data/spec/frame_spec.rb

@@ -654,14 +654,11 @@ describe JSON::LD::API do
             "result": {"@id": "mf:result", "@type": "xsd:boolean"}
           },
           "@graph": [{
-            "@id": "_:b0",
             "@type": "mf:Manifest",
             "comment": "Positive processor tests",
             "entries": [{
-              "@id": "_:b1",
               "@type": "mf:ManifestEntry",
               "action": {
-                "@id": "_:b2",
                 "@type": "mq:QueryTest",
                 "data": "http://www.w3.org/TR/microdata-rdf/tests/0001.html",
                 "query": "http://www.w3.org/TR/microdata-rdf/tests/0001.ttl"
@@ -819,7 +816,7 @@ describe JSON::LD::API do
             output = ::JSON.parse(output) if output.is_a?(String)
             jld = JSON::LD::API.frame(input, frame, logger: logger)
             expect(jld).to produce(output, logger)
-          rescue JSON::LD::JsonLdError, JSON::LD::JsonLdError, JSON::LD::InvalidFrame => e
+          rescue JSON::LD::JsonLdError => e
             fail("#{e.class}: #{e.message}\n" +
               "#{logger}\n" +
               "Backtrace:\n#{e.backtrace.join("\n")}")
@@ -1135,9 +1132,7 @@ describe JSON::LD::API do
             "@graph": [{
               "@id": "urn:id-1",
               "@type": "Class",
-              "preserve": {
-                "@id": "_:b0"
-              }
+              "preserve": {}
             }]
           })
         },
@@ -1260,9 +1255,7 @@ describe JSON::LD::API do
                 "term": "foo"
               },
               "preserve": {
-                "@id": "_:b0",
                 "deep": {
-                  "@id": "_:b1",
                   "@graph": [{
                     "@id": "urn:id-3",
                     "term": "bar"
@@ -1338,23 +1331,96 @@ describe JSON::LD::API do
     end
   end
 
+  describe "pruneBlankNodeIdentifiers" do
+    it "preserves single-use bnode identifiers if option set to false" do
+      do_frame(
+        input: %({
+          "@context": {
+            "dc0": "http://purl.org/dc/terms/",
+            "dc:creator": {
+              "@type": "@id"
+            },
+            "foaf": "http://xmlns.com/foaf/0.1/",
+            "ps": "http://purl.org/payswarm#"
+          },
+          "@id": "http://example.com/asset",
+          "@type": "ps:Asset",
+          "dc:creator": {
+            "foaf:name": "John Doe"
+          }
+        }),
+        frame: %({
+          "@context": {
+            "dc": "http://purl.org/dc/terms/",
+            "dc:creator": {
+              "@type": "@id"
+            },
+            "foaf": "http://xmlns.com/foaf/0.1/",
+            "ps": "http://purl.org/payswarm#"
+          },
+          "@id": "http://example.com/asset",
+          "@type": "ps:Asset",
+          "dc:creator": {}
+        }),
+        output: %({
+          "@context": {
+            "dc": "http://purl.org/dc/terms/",
+            "dc:creator": {
+              "@type": "@id"
+            },
+            "foaf": "http://xmlns.com/foaf/0.1/",
+            "ps": "http://purl.org/payswarm#"
+          },
+          "@graph": [
+            {
+              "@id": "http://example.com/asset",
+              "@type": "ps:Asset",
+              "dc:creator": {
+                "@id": "_:b0",
+                "foaf:name": "John Doe"
+              }
+            }
+          ]
+        }),
+        prune: false
+      )
+    end
+  end
+
   context "problem cases" do
     it "pr #20" do
-      expanded = [
+      expanded = %([
         {
-          "@id"=>"_:gregg",
-          "@type"=>"http://xmlns.com/foaf/0.1/Person",
-          "http://xmlns.com/foaf/0.1/name" => "Gregg Kellogg"
+          "@id": "_:gregg",
+          "@type": "http://xmlns.com/foaf/0.1/Person",
+          "http://xmlns.com/foaf/0.1/name": "Gregg Kellogg"
         }, {
-          "@id"=>"http://manu.sporny.org/#me",
-          "@type"=> "http://xmlns.com/foaf/0.1/Person",
-          "http://xmlns.com/foaf/0.1/knows"=> {"@id"=>"_:gregg"},
-          "http://xmlns.com/foaf/0.1/name"=>"Manu Sporny"
+          "@id": "http://manu.sporny.org/#me",
+          "@type": "http://xmlns.com/foaf/0.1/Person",
+          "http://xmlns.com/foaf/0.1/knows": {"@id": "_:gregg"},
+          "http://xmlns.com/foaf/0.1/name": "Manu Sporny"
         }
-      ]
-      framed = JSON::LD::API.frame(expanded, {})
-      data = framed["@graph"].first
-      expect(data["mising_value"]).to be_nil
+      ])
+      expected = %({
+        "@graph": [
+          {
+            "@id": "_:b0",
+            "@type": "http://xmlns.com/foaf/0.1/Person",
+            "http://xmlns.com/foaf/0.1/name": "Gregg Kellogg"
+          },
+          {
+            "@id": "http://manu.sporny.org/#me",
+            "@type": "http://xmlns.com/foaf/0.1/Person",
+            "http://xmlns.com/foaf/0.1/knows": {
+              "@id": "_:b0",
+              "@type": "http://xmlns.com/foaf/0.1/Person",
+              "http://xmlns.com/foaf/0.1/name": "Gregg Kellogg"
+            },
+            "http://xmlns.com/foaf/0.1/name": "Manu Sporny"
+          }
+        ]
+      })
+      do_frame(input: expanded, frame: {}, output: expected)
     end
 
     it "issue #28" do
@@ -1417,13 +1483,13 @@ describe JSON::LD::API do
 
   def do_frame(params)
     begin
-      input, frame, output = params[:input], params[:frame], params[:output]
+      input, frame, output, prune = params[:input], params[:frame], params[:output], params.fetch(:prune, true)
       input = ::JSON.parse(input) if input.is_a?(String)
       frame = ::JSON.parse(frame) if frame.is_a?(String)
       output = ::JSON.parse(output) if output.is_a?(String)
-      jld = JSON::LD::API.frame(input, frame, logger: logger)
+      jld = JSON::LD::API.frame(input, frame, logger: logger, pruneBlankNodeIdentifiers: prune)
       expect(jld).to produce(output, logger)
-    rescue JSON::LD::JsonLdError, JSON::LD::JsonLdError, JSON::LD::InvalidFrame => e
+    rescue JSON::LD::JsonLdError => e
       fail("#{e.class}: #{e.message}\n" +
         "#{logger}\n" +
         "Backtrace:\n#{e.backtrace.join("\n")}")

data/spec/spec_helper.rb

@@ -12,8 +12,6 @@ require 'rdf/vocab'
 require 'rdf/spec'
 require 'rdf/spec/matchers'
 require 'yaml'
-require 'restclient/components'
-require 'rack/cache'
 begin
   require 'simplecov'
   require 'coveralls'
@@ -41,10 +39,6 @@ JSON_STATE = JSON::State.new(
 URI_CACHE = File.expand_path(File.join(File.dirname(__FILE__), "uri-cache"))
 Dir.mkdir(URI_CACHE) unless File.directory?(URI_CACHE)
 # Cache client requests
-RestClient.enable Rack::Cache,
-  verbose:      false, 
-  metastore:   "file:" + ::File.expand_path("../uri-cache/meta", __FILE__),
-  entitystore: "file:" + ::File.expand_path("../uri-cache/body", __FILE__)
 
 ::RSpec.configure do |c|
   c.filter_run focus: true

data/spec/streaming_writer_spec.rb

@@ -99,7 +99,7 @@ describe JSON::LD::StreamingWriter do
   end
 
 
-  context "Writes fromRdf tests to isomorphic graph", skip: ENV['CI'] do
+  context "Writes fromRdf tests to isomorphic graph" do
     require 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
     [nil, {}].each do |ctx|
@@ -124,7 +124,7 @@ describe JSON::LD::StreamingWriter do
         end
       end
     end
-  end
+  end unless ENV['CI']
 
   def parse(input, options = {})
     format = options.fetch(:format, :trig)

data/spec/suite_helper.rb

@@ -42,7 +42,7 @@ module Fixtures
       def options
         @options ||= begin
           opts = {documentLoader: Fixtures::SuiteTest.method(:documentLoader)}
-          {'processingMode' => "json-ld-1.1"}.merge(property('option') || {}).each do |k, v|
+          (property('option') || {}).each do |k, v|
             opts[k.to_sym] = v
           end
           opts
@@ -94,6 +94,7 @@ module Fixtures
         else
           self.options.dup
         end
+        options = {validate: true}.merge(options)
 
         if positiveTest?
           logger.info "expected: #{expect rescue nil}" if expect_loc
@@ -142,8 +143,6 @@ module Fixtures
             end
           rescue JSON::LD::JsonLdError => e
             fail("Processing error: #{e.message}")
-          rescue JSON::LD::InvalidFrame => e
-            fail("Invalid Frame: #{e.message}")
           end
         else
           logger.info "expected: #{property('expect')}" if property('expect')

data/spec/writer_spec.rb

@@ -190,7 +190,7 @@ describe JSON::LD::Writer do
     end
   end
 
-  context "Writes fromRdf tests to isomorphic graph", skip: ENV['CI'] do
+  context "Writes fromRdf tests to isomorphic graph" do
     require 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
     describe m.name do
@@ -212,7 +212,7 @@ describe JSON::LD::Writer do
         end
       end
     end
-  end
+  end unless ENV['CI']
 
   def parse(input, options = {})
     format = options.fetch(:format, :trig)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -94,48 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rest-client-components
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-trig
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json-ld
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.