json-ld 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ4OTc2MWQ0M2FlYTFiNmEyMDM3ZmEzNWMxYTE2NDk2MjczYWZmMg==
+    YTQ0NzdhNmE4YWFlYzBjYzVkOWVlOGJjNGJjNDdiY2ZmN2RhYzdhMg==
   data.tar.gz: !binary |-
-    MTYzNzQ3ZGE1ZTlhY2MyYTBlMDBiODVlMDE3NTBhZmZkNGE1OTk2Yw==
+    NWNkMTAxNWU0NGQxOGQ5NjlmMTFkZmFiZDY3MWRiZDFkMWE2YWMwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTEyZDU1ZWY0OWU1ZWJiNzY4YzQ4M2M3MmUyM2I4ODMyOGRkMjAxNDkwZjg0
-    YmZmNWIzZTQ0ZmRiZWFjMzAwZDg4NWQzNDU1MmM4YWUzYmM1M2IyYWUxY2Ux
-    NzVlOWFjNGM0N2NhZDJkNTI2MjVkNDdkNWQxYTE4Y2NlNzEzNDY=
+    ZGExMzc0OThkODZlNDJiOWI2ZDRmOGU3Y2RkNTY5YWVjNzcyZmM1N2M3NzY0
+    OGM5YzcyYzM5NzUxMTNiZDE1NDVhYmZhMzNhN2ZkYzkwZWY5YTJkMDA2NjRm
+    ZjA0M2ViODM0YTk0MTQzMDk2MmE2MTg2NzQ1Y2MyNzc2N2Q3NjA=
   data.tar.gz: !binary |-
-    YzI5MzE5ZDBlOGEyNjIwMDA3YzhhZTNiNWJmOTkwZTRkZjU2OWM4Y2MwYTVl
-    MTZhNDQzYzg1ZDU1NmRjMGFjN2E1ZDdjZDU1ZjE0ZGM0Y2RjZDFhNTg2Njhi
-    M2VjMWQ5ZmE3M2E5MGI0NGRiY2U4N2JkOTgwNzNlZjYxOWE3ZTQ=
+    MzljNjBiZDdlYWZjZjM4YmI5MmZhZDQ0ZTI3N2EyYjU2MWIzNjBlZTk5ZjI1
+    YjM2YzkyMmEyNDU2NmEyNTMwNzE3NGE4YTczMTMzYWE2MDA3MzI5ZDhkNWEw
+    Y2MwMjllM2FjNTRiYTRhMzRlMGVjYWIwYzg4Zjc0NzJiNGMxZmU=

data/README.md

@@ -18,7 +18,7 @@ Install with `gem install json-ld`
 
 ### Expand a Document
 
-    input = {
+    input = JSON.parse %({
       "@context": {
         "name": "http://xmlns.com/foaf/0.1/name",
         "homepage": "http://xmlns.com/foaf/0.1/homepage",
@@ -27,7 +27,7 @@ Install with `gem install json-ld`
       "name": "Manu Sporny",
       "homepage": "http://manu.sporny.org/",
       "avatar": "http://twitter.com/account/profile_image/manusporny"
-    }
+    })
     JSON::LD::API.expand(input) =>
     
     [{
@@ -38,26 +38,26 @@ Install with `gem install json-ld`
 
 ### Compact a Document
 
-    input = [{
+    input = JSON.parse %([{
         "http://xmlns.com/foaf/0.1/name": ["Manu Sporny"],
-        "http://xmlns.com/foaf/0.1/homepage": ["http://manu.sporny.org/"],
-        "http://xmlns.com/foaf/0.1/avatar": ["http://twitter.com/account/profile_image/manusporny"]
-    }]
+        "http://xmlns.com/foaf/0.1/homepage": [{"@id": "http://manu.sporny.org/"}],
+        "http://xmlns.com/foaf/0.1/avatar": [{"@id": "http://twitter.com/account/profile_image/manusporny"}]
+    }])
     
-    context = {
+    context = JSON.parse(%({
       "@context": {
         "name": "http://xmlns.com/foaf/0.1/name",
-        "homepage": "http://xmlns.com/foaf/0.1/homepage",
-        "avatar": "http://xmlns.com/foaf/0.1/avatar"
+        "homepage": {"@id": "http://xmlns.com/foaf/0.1/homepage", "@type": "@id"},
+        "avatar": {"@id": "http://xmlns.com/foaf/0.1/avatar", "@type": "@id"}
       }
-    }
+    }))['@context']
     
     JSON::LD::API.compact(input, context) =>
     {
         "@context": {
-            "avatar": "http://xmlns.com/foaf/0.1/avatar",
-            "homepage": "http://xmlns.com/foaf/0.1/homepage",
-            "name": "http://xmlns.com/foaf/0.1/name"
+          "name": "http://xmlns.com/foaf/0.1/name",
+          "homepage": {"@id": "http://xmlns.com/foaf/0.1/homepage", "@type": "@id"},
+          "avatar": {"@id": "http://xmlns.com/foaf/0.1/avatar", "@type": "@id"}
         },
         "avatar": "http://twitter.com/account/profile_image/manusporny",
         "homepage": "http://manu.sporny.org/",
@@ -66,7 +66,7 @@ Install with `gem install json-ld`
 
 ### Frame a Document
 
-    input = {
+    input = JSON.parse %({
       "@context": {
         "Book":         "http://example.org/vocab#Book",
         "Chapter":      "http://example.org/vocab#Chapter",
@@ -95,9 +95,9 @@ Install with `gem install json-ld`
         "description": "An introductory chapter on The Republic.",
         "title": "The Introduction"
       }]
-    }
+    })
     
-    frame = {
+    frame = JSON.parse %({
       "@context": {
         "Book":         "http://example.org/vocab#Book",
         "Chapter":      "http://example.org/vocab#Chapter",
@@ -114,8 +114,9 @@ Install with `gem install json-ld`
           "@type": "Chapter"
         }
       }
-    }
-    JSON::LD.frame(input, frame) =>
+    })
+
+    JSON::LD::API.frame(input, frame) =>
     {
       "@context": {
         "Book": "http://example.org/vocab#Book",
@@ -148,7 +149,7 @@ Install with `gem install json-ld`
 
 ### Turn JSON-LD into RDF (Turtle)
 
-    input = {
+    input = JSON.parse %({
       "@context": {
         "":       "http://manu.sporny.org/",
         "foaf":   "http://xmlns.com/foaf/0.1/"
@@ -157,9 +158,12 @@ Install with `gem install json-ld`
       "@type":          "foaf:Person",
       "foaf:name":      "Joe Bob",
       "foaf:nick":      { "@list": [ "joe", "bob", "jaybe" ] }
-    }
+    })
     
-    JSON::LD::API.toRDF(input) =>
+    graph = RDF::Graph.new << JSON::LD::API.toRDF(input)
+
+    require 'rdf/turtle'
+    graph.dump(:ttl, :prefixes => {:foaf => "http://xmlns.com/foaf/0.1/"})
     @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 
     <http://example.org/people#joebob> a foaf:Person;
@@ -168,36 +172,41 @@ Install with `gem install json-ld`
 
 ### Turn RDF into JSON-LD
 
-    input =
-    @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+    require 'rdf/turtle'
+    input = RDF::Graph.new << RDF::Turtle::Reader.new(%(
+      @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 
-    <http://manu.sporny.org/#me> a foaf:Person;
-       foaf:knows [ a foaf:Person;
-         foaf:name "Gregg Kellogg"];
-       foaf:name "Manu Sporny" .
+      <http://manu.sporny.org/#me> a foaf:Person;
+         foaf:knows [ a foaf:Person;
+           foaf:name "Gregg Kellogg"];
+         foaf:name "Manu Sporny" .
+    ))
     
-    context =
-    {
-      "@context": {
-        "":       "http://manu.sporny.org/",
-        "foaf":   "http://xmlns.com/foaf/0.1/"
-      }
-    }
-
-    JSON::LD::API::fromRDF(input, context) =>
-    {
+    context = JSON.parse %({
       "@context": {
         "":       "http://manu.sporny.org/",
         "foaf":   "http://xmlns.com/foaf/0.1/"
-      },
-      "@id":       ":#me",
-      "@type":          "foaf:Person",
-      "foaf:name":      "Manu Sporny",
-      "foaf:knows": {
-        "@type":          "foaf:Person",
-        "foaf:name":      "Gregg Kellogg"
       }
-    }
+    })
+
+    compacted = nil
+    JSON::LD::API::fromRDF(input) do |expanded|
+      compacted = JSON::LD::API.compact(expanded, context['@context'])
+    end
+    compacted =>
+      [
+        {
+          "@id": "_:g70265766605380",
+          "@type": ["http://xmlns.com/foaf/0.1/Person"],
+          "http://xmlns.com/foaf/0.1/name": [{"@value": "Gregg Kellogg"}]
+        },
+        {
+          "@id": "http://manu.sporny.org/#me",
+          "@type": ["http://xmlns.com/foaf/0.1/Person"],
+          "http://xmlns.com/foaf/0.1/knows": [{"@id": "_:g70265766605380"}],
+          "http://xmlns.com/foaf/0.1/name": [{"@value": "Manu Sporny"}]
+        }
+      ]
 
 ## RDF Reader and Writer
 {JSON::LD} also acts as a normal RDF reader and writer, using the standard RDF.rb reader/writer interfaces:
@@ -205,6 +214,8 @@ Install with `gem install json-ld`
     graph = RDF::Graph.load("etc/doap.jsonld", :format => :jsonld)
     graph.dump(:jsonld, :standard_prefixes => true)
 
+`RDF::GRAPH#dump` can also take a `:context` option to use a separately defined context
+
 ## Documentation
 Full documentation available on [RubyDoc](http://rubydoc.info/gems/json-ld/file/README.md)
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/json/ld/to_rdf.rb

@@ -20,8 +20,8 @@ module JSON::LD
         # For each id-node in active_graph
         active_graph.each do |id, node|
           # Initialize subject as the IRI or BNode representation of id
-          subject = as_resource(id, context.doc_base)
-          debug("graph_to_rdf")  {"subject: #{subject.to_ntriples}"}
+          subject = as_resource(id)
+          debug("graph_to_rdf")  {"subject: #{subject.to_ntriples} (id: #{id})"}
 
           # For each property-values in node
           node.each do |property, values|
@@ -29,7 +29,7 @@ module JSON::LD
             when '@type'
               # If property is @type, construct triple as an RDF Triple composed of id, rdf:type, and object from values where id and object are represented either as IRIs or Blank Nodes
               results += values.map do |value|
-                object = as_resource(value, context.doc_base)
+                object = as_resource(value)
                 debug("graph_to_rdf")  {"type: #{object.to_ntriples}"}
                 RDF::Statement.new(subject, RDF.type, object)
               end
@@ -38,7 +38,7 @@ module JSON::LD
             else
               # Otherwise, property is an IRI or Blank Node identifier
               # Initialize predicate from  property as an IRI or Blank node
-              predicate = as_resource(property, context.doc_base)
+              predicate = as_resource(property)
               debug("graph_to_rdf")  {"predicate: #{predicate.to_ntriples}"}
 
               # For each item in values
@@ -104,7 +104,7 @@ module JSON::LD
         # Otherwise, value must be a node definition containing only @id whos value is an IRI or Blank Node identifier
         raise "Expected node reference, got #{item.inspect}" unless item.keys == %w(@id)
         # Return value associated with @id as an IRI or Blank node
-        as_resource(item['@id'], context.doc_base)
+        as_resource(item['@id'])
       end
     end
 

data/spec/suite_helper.rb

@@ -60,6 +60,8 @@ end
 module Fixtures
   module SuiteTest
     SUITE = RDF::URI("http://json-ld.org/test-suite/")
+    TEST_IRI_BASE = RDF::URI("http://example/").freeze
+
     class Manifest < JSON::LD::Resource
       def self.open(file)
         #puts "open: #{file}"
@@ -109,6 +111,45 @@ module Fixtures
       end
       
       def trace; @debug.join("\n"); end
+
+      # Don't use NQuads writer so that we don't escape Unicode
+      def to_quad(thing)
+        case thing
+        when RDF::URI
+          TEST_IRI_BASE.join(thing).canonicalize.to_ntriples
+        when RDF::Node
+          escaped(thing)
+        when RDF::Literal::Double
+          thing.canonicalize.to_ntriples
+        when RDF::Literal
+          v = quoted(escaped(thing.value))
+          case thing.datatype
+          when nil, "http://www.w3.org/2001/XMLSchema#string", "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+            # Ignore these
+          else
+            v += "^^#{to_quad(thing.datatype)}"
+          end
+          v += "@#{thing.language}" if thing.language
+          v
+        when RDF::Statement
+          thing.to_quad.map {|r| to_quad(r)}.compact.join(" ") + " .\n"
+        end
+      end
+
+      ##
+      # @param  [String] string
+      # @return [String]
+      def quoted(string)
+        "\"#{string}\""
+      end
+
+      ##
+      # @param  [String, #to_s] string
+      # @return [String]
+      def escaped(string)
+        string.to_s.gsub('\\', '\\\\').gsub("\t", '\\t').
+          gsub("\n", '\\n').gsub("\r", '\\r').gsub('"', '\\"')
+      end
     end
   end
 end

data/spec/suite_to_rdf_spec.rb

@@ -15,7 +15,7 @@ describe JSON::LD do
                                         :base => t.base,
                                         :debug => t.debug
             ).map do |statement|
-              to_quad(statement)
+              t.to_quad(statement)
             end
 
             sorted_expected = t.expect.readlines.uniq.sort.join("")
@@ -31,52 +31,4 @@ describe JSON::LD do
       end
     end
   end
-
-  # Don't use NQuads writer so that we don't escape Unicode
-  def to_quad(thing)
-    case thing
-    when RDF::URI
-      "<#{escaped(thing.to_s)}>"
-    when RDF::Node
-      escaped(thing.to_s)
-    when RDF::Literal::Double
-      case
-      when thing.object.nan?, thing.object.infinite?, thing.object.zero?
-        thing.canonicalize.to_ntriples
-      else
-        i, f, e = ('%.15E' % thing.object.to_f).split(/[\.E]/)
-        f.sub!(/0*$/, '')           # remove any trailing zeroes
-        f = '0' if f.empty?         # ...but there must be a digit to the right of the decimal point
-        e.sub!(/^\+?0+(\d)$/, '\1') # remove the optional leading '+' sign and any extra leading zeroes
-        %("#{i}.#{f}E#{e}"^^<http://www.w3.org/2001/XMLSchema#double>)
-      end
-    when RDF::Literal
-      v = quoted(escaped(thing.value))
-      case thing.datatype
-      when nil, "http://www.w3.org/2001/XMLSchema#string", "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-        # Ignore these
-      else
-        v += "^^<#{thing.datatype}>"
-      end
-      v += "@#{thing.language}" if thing.language
-      v
-    when RDF::Statement
-      thing.to_quad.map {|r| to_quad(r)}.compact.join(" ") + " .\n"
-    end
-  end
-
-  ##
-  # @param  [String] string
-  # @return [String]
-  def quoted(string)
-    "\"#{string}\""
-  end
-
-  ##
-  # @param  [String] string
-  # @return [String]
-  def escaped(string)
-    string.gsub('\\', '\\\\').gsub("\t", '\\t').
-      gsub("\n", '\\n').gsub("\r", '\\r').gsub('"', '\\"')
-  end
 end unless ENV['CI']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf