json-ld 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e160cdefa8e2b74088deae22decfcb6e4676bb1f
-  data.tar.gz: 7910c785d852f65ea62214573c53e6aaf07854ad
+  metadata.gz: f1c1389086ba31e386a000da8030526ae1ea6e8e
+  data.tar.gz: 499467568e4eceedea6d0617c5c1abef5416b532
 SHA512:
-  metadata.gz: 945604edd6ddf16aaf768d2e028d71724fd167d182fd997d431e6efc5b11db1aecff8a37d6fa9400b2c16f85a3c2b664ee4a31f3a1b666dfac4b588c94096c4a
-  data.tar.gz: 3062bba010e1170ed9626280e346b988d8b5369cece0aba57addcfdc6111ba46326759f0d9c698581657e35b92412a9bc9905f870b39933105879a21b8e5d786
+  metadata.gz: 2d5c24e2bc724dfa18413f801893b8bf2fdbd2cef0dc228f037f2b746c8dc9bf9a0de854a182467302d75f3716327b8058754615b479dc5855e2f51d695fd063
+  data.tar.gz: 71c39dc45f62e606fb49a43ef73f7b1f05316aca43d995dbd2f5bf93f617766c6dfb10f785187843915d344c3694b4e83049dd23331dfa407651c832f9b8ed51

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/json/ld/api.rb

@@ -72,6 +72,8 @@ module JSON::LD
     #   If set to `true`, the JSON-LD processor will treat `rdf:type` like a normal property instead of using `@type`.
     # @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).
     # @yield [api]
     # @yieldparam [API]
     def initialize(input, context, options = {}, &block)
@@ -79,7 +81,7 @@ module JSON::LD
       @options[:validate] = true if @options[:processingMode] == "json-ld-1.0"
       @options[:documentLoader] ||= self.class.method(:documentLoader)
       options[:rename_bnodes] ||= true
-      @namer = options[:rename_bnodes] ? BlankNodeNamer.new("b") : BlankNodeMapper.new
+      @namer = options[:unique_bnodes] ? BlankNodeUniqer.new : (options[:rename_bnodes] ? BlankNodeNamer.new("b") : BlankNodeMapper.new)
       @value = case input
       when Array, Hash then input.dup
       when IO, StringIO

data/lib/json/ld/from_rdf.rb

@@ -62,7 +62,7 @@ module JSON::LD
         next unless nil_var = graph_object[RDF.nil.to_s]
 
         # For each item usage in the usages member of nil, perform the following steps:
-        nil_var[:usages].each do |usage|
+        nil_var.fetch(:usages, []).each do |usage|
           node, property, head = usage[:node], usage[:property], usage[:value]
           list, list_nodes = [], []
 

data/lib/json/ld/resource.rb

@@ -167,7 +167,7 @@ module JSON::LD
         when Array
           obj.map {|o| update_obj(o, reference_map)}
         when Hash
-          if obj.node_ref?
+          if node_reference?(obj)
             reference_map[obj['id']] ||= Resource.new(obj,
               :context => @context_name,
               :clean => false,

data/lib/json/ld/utils.rb

@@ -163,6 +163,23 @@ module JSON::LD
     end
   end
 
+  class BlankNodeUniqer < BlankNodeMapper
+    ##
+    # Use the uniquely generated bnodes, rather than a sequence
+    # @param [String] old ("")
+    # @return [String]
+    def get_sym(old = "")
+      old = old.to_s.sub(/_:/, '')
+      if old && self.has_key?(old)
+        self[old]
+      elsif !old.empty?
+        self[old] = RDF::Node.new.to_unique_base[2..-1]
+      else
+        RDF::Node.new.to_unique_base[2..-1]
+      end
+    end
+  end
+
   class BlankNodeNamer < BlankNodeMapper
     # @param [String] prefix
     def initialize(prefix)

data/lib/json/ld/writer.rb

@@ -85,6 +85,8 @@ module JSON::LD
     #   Add standard prefixes to @prefixes, if necessary.
     # @option options [IO, Array, Hash, String, Context]     :context     ({})
     #   context to use when serializing. Constructed context for native serialization.
+    # @option options [Boolean]  :unique_bnodes   (false)
+    #   Use unique bnode identifiers, defaults to using the identifier which the node was originall initialized with (if any).
     # @yield  [writer] `self`
     # @yieldparam  [RDF::Writer] writer
     # @yieldreturn [void]
@@ -160,7 +162,12 @@ module JSON::LD
         end if @options[:prefixes]
         ctx
       end
-      
+
+      # Rename BNodes to uniquify them, if necessary
+      if options[:unique_bnodes]
+        result = API.flatten(result, context, @options)
+      end
+
       # Perform compaction, if we have a context
       if context
         debug("writer") { "compact result"}

data/spec/to_rdf_spec.rb

@@ -25,6 +25,13 @@ describe JSON::LD::API do
           }),
           %q([ <http://example.com/foo> "bar"^^xsd:string] .)
         ],
+        "@id with _:a and reference" => [
+          %q({
+            "@id": "_:a",
+            "http://example.com/foo": {"@id": "_:a"}
+          }),
+          %q(_:a <http://example.com/foo> _:a .)
+        ],
       }.each do |title, (js, ttl)|
         it title do
           ttl = "@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . #{ttl}"
@@ -56,21 +63,21 @@ describe JSON::LD::API do
               "@id": "",
               "@type": "#{RDF::RDFS.Resource}"
             }),
-            %(<http://example.org/> a <#{RDF::RDFS.Resource}>)
+            %(<http://example.org/> a <#{RDF::RDFS.Resource}> .)
           ],
           "relative" => [
             %({
               "@id": "a/b",
               "@type": "#{RDF::RDFS.Resource}"
             }),
-            %(<http://example.org/a/b> a <#{RDF::RDFS.Resource}>)
+            %(<http://example.org/a/b> a <#{RDF::RDFS.Resource}> .)
           ],
           "hash" => [
             %({
               "@id": "#a",
               "@type": "#{RDF::RDFS.Resource}"
             }),
-            %(<http://example.org/#a> a <#{RDF::RDFS.Resource}>)
+            %(<http://example.org/#a> a <#{RDF::RDFS.Resource}> .)
           ],
         }.each do |title, (js, ttl)|
           it title do
@@ -660,7 +667,7 @@ describe JSON::LD::API do
   def parse(input, options = {})
     @debug = []
     graph = options[:graph] || RDF::Graph.new
-    options = {:debug => @debug, :validate => true, :canonicalize => false}.merge(options)
+    options = {debug: @debug, validate: true, canonicalize: false}.merge(options)
     JSON::LD::API.toRdf(StringIO.new(input), options) {|st| graph << st}
     graph
   end

data/spec/writer_spec.rb

@@ -20,7 +20,7 @@ describe JSON::LD::Writer do
       {:content_type   => 'application/x-ld+json'},
     ].each do |arg|
       it "discovers with #{arg.inspect}" do
-        RDF::Reader.for(arg).should == JSON::LD::Reader
+        expect(RDF::Reader.for(arg)).to eql JSON::LD::Reader
       end
     end
   end
@@ -28,7 +28,7 @@ describe JSON::LD::Writer do
   context "simple tests" do
     it "should use full URIs without base" do
       input = %(<http://a/b> <http://a/c> <http://a/d> .)
-      serialize(input).should produce([{
+      expect(serialize(input)).to produce([{
         '@id'         => "http://a/b",
         "http://a/c"  => [{"@id" => "http://a/d"}]
       }], @debug)
@@ -36,8 +36,7 @@ describe JSON::LD::Writer do
 
     it "should use qname URIs with standard prefix" do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
-      serialize(input, :standard_prefixes => true).
-      should produce({
+      expect(serialize(input, :standard_prefixes => true)).to produce({
         '@context' => {
           "foaf"  => "http://xmlns.com/foaf/0.1/",
         },
@@ -53,12 +52,11 @@ describe JSON::LD::Writer do
         <https://senet.org/gm> <https://senet.org/ns#unofficialTitle> "Rhythm Tengoku"@en .
         <https://senet.org/gm> <https://senet.org/ns#urlkey> "rhythm-tengoku" .
       )
-      serialize(input, :prefixes => {
+      expect(serialize(input, :prefixes => {
         :dc    => "http://purl.org/dc/terms/",
         :frbr  => "http://vocab.org/frbr/core#",
         :senet => "https://senet.org/ns#",
-      }).
-      should produce({
+      })).to produce({
         '@context' => {
           "dc" => "http://purl.org/dc/terms/",
           "frbr" => "http://vocab.org/frbr/core#",
@@ -75,8 +73,8 @@ describe JSON::LD::Writer do
     it "should use CURIEs with empty prefix" do
       input = %(<http://xmlns.com/foaf/0.1/b> <http://xmlns.com/foaf/0.1/c> <http://xmlns.com/foaf/0.1/d> .)
       begin
-        serialize(input, :prefixes => { "" => RDF::FOAF}).
-        should produce({
+        expect(serialize(input, :prefixes => { "" => RDF::FOAF})).
+        to produce({
           "@context" => {
             "" => "http://xmlns.com/foaf/0.1/"
           },
@@ -92,8 +90,8 @@ describe JSON::LD::Writer do
     
     it "should not use terms if no suffix" do
       input = %(<http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> <http://xmlns.com/foaf/0.1/> .)
-      serialize(input, :standard_prefixes => true).
-      should_not produce({
+      expect(serialize(input, :standard_prefixes => true)).
+      not_to produce({
         "@context" => {"foaf" => "http://xmlns.com/foaf/0.1/"},
         '@id'   => "foaf",
         "foaf"   => {"@id" => "foaf"}
@@ -107,10 +105,10 @@ describe JSON::LD::Writer do
         db:Michael_Jackson dbo:artistOf <http://dbpedia.org/resource/%28I_Can%27t_Make_It%29_Another_Day> .
       )
 
-      serialize(input, :prefixes => {
+      expect(serialize(input, :prefixes => {
           "db" => RDF::URI("http://dbpedia.org/resource/"),
-          "dbo" => RDF::URI("http://dbpedia.org/ontology/")}).
-      should produce({
+          "dbo" => RDF::URI("http://dbpedia.org/ontology/")})).
+      to produce({
         "@context" => {
           "db"    => "http://dbpedia.org/resource/",
           "dbo"   => "http://dbpedia.org/ontology/"
@@ -120,6 +118,12 @@ describe JSON::LD::Writer do
       }, @debug)
     end
 
+    it "should not use provided node identifiers if :unique_bnodes set" do
+      input = %(_:a <http://example.com/foo> _:b \.)
+      result = serialize(input, unique_bnodes: true, context: {})
+      expect(result.to_json).to match(%r(_:g\w+))
+    end
+
     it "serializes multiple subjects" do
       input = %q(
         @prefix : <http://www.w3.org/2006/03/test-description#> .
@@ -127,8 +131,8 @@ describe JSON::LD::Writer do
         <http://example.com/test-cases/0001> a :TestCase .
         <http://example.com/test-cases/0002> a :TestCase .
       )
-      serialize(input, :prefixes => {"" => "http://www.w3.org/2006/03/test-description#"}).
-      should produce({
+      expect(serialize(input, :prefixes => {"" => "http://www.w3.org/2006/03/test-description#"})).
+      to produce({
         '@context'     => {
           "" => "http://www.w3.org/2006/03/test-description#",
           "dc" => RDF::DC.to_s 
@@ -154,12 +158,12 @@ describe JSON::LD::Writer do
            owl:onClass <http://data.wikia.com/terms#Element>;
            owl:onProperty <http://data.wikia.com/terms#characterIn> .
       )
-      serialize(input, :rename_bnodes => false, :prefixes => {
+      expect(serialize(input, :rename_bnodes => false, :prefixes => {
         :owl  => "http://www.w3.org/2002/07/owl#",
         :rdfs => "http://www.w3.org/2000/01/rdf-schema#",
         :xsd  => "http://www.w3.org/2001/XMLSchema#"
-      }).
-      should produce({
+      })).
+      to produce({
         '@context'     => {
           "owl"  => "http://www.w3.org/2002/07/owl#",
           "rdf"  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement