json-ld 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/json/ld.rb

@@ -42,38 +42,16 @@ module JSON
     # Default context
     # @see http://json-ld.org/spec/ED/20110507/#the-default-context
     DEFAULT_CONTEXT = {
-      'rdf'           => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-      'rdfs'          => 'http://www.w3.org/2000/01/rdf-schema#',
-      'owl'           => 'http://www.w3.org/2002/07/owl#',
-      'xsd'           => 'http://www.w3.org/2001/XMLSchema#',
-      'dcterms'       => 'http://purl.org/dc/terms/',
-      'foaf'          => 'http://xmlns.com/foaf/0.1/',
-      'cal'           => 'http://www.w3.org/2002/12/cal/ical#',
-      'vcard'         => 'http://www.w3.org/2006/vcard/ns# ',
-      'geo'           => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-      'cc'            => 'http://creativecommons.org/ns#',
-      'sioc'          => 'http://rdfs.org/sioc/ns#',
-      'doap'          => 'http://usefulinc.com/ns/doap#',
-      'com'           => 'http://purl.org/commerce#',
-      'ps'            => 'http://purl.org/payswarm#',
-      'gr'            => 'http://purl.org/goodrelations/v1#',
-      'sig'           => 'http://purl.org/signature#',
-      'ccard'         => 'http://purl.org/commerce/creditcard#',
       '@coerce'       => {
-        # Note: rdf:type is not in the document, but necessary for this implementation
-        'xsd:anyURI'  => ['rdf:type', 'rdf:rest', 'foaf:homepage', 'foaf:member'],
-        'xsd:integer' => 'foaf:age',
+        IRI  => [TYPE]
       }
     }.freeze
 
     # Default type coercion, in property => datatype order
     DEFAULT_COERCE = {
-      RDF.type           => RDF::XSD.anyURI,
-      RDF.first          => false,            # Make sure @coerce isn't generated for this
-      RDF.rest           => RDF::XSD.anyURI,
-      RDF::FOAF.homepage => RDF::XSD.anyURI,
-      RDF::FOAF.member   => RDF::XSD.anyURI,
-      RDF::FOAF.age      => RDF::XSD.integer,
+      TYPE            => IRI,
+      RDF.first.to_s  => false,            # Make sure @coerce isn't generated for this
+      RDF.rest.to_s   => IRI,
     }.freeze
 
     def self.debug?; @debug; end

data/lib/json/ld/extensions.rb

@@ -31,6 +31,12 @@ module RDF
       query(:subject => subject, :predicate => RDF.type).map {|st| st.object}
     end
   end
+  
+  class URI
+    def to_s
+      @uri.to_s
+    end
+  end
 end
 
 if RUBY_VERSION < "1.9"

data/lib/json/ld/format.rb

@@ -21,8 +21,9 @@ module JSON::LD
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'application/json',    :extension => :json
-    content_type     'application/json',    :extension => :ld
+    content_type     'application/ld+json',    :extension => :json
+    content_type     'application/ld+json',    :extension => :ld
+    content_type     'application/x-ld+json'
     content_encoding 'utf-8'
 
     reader { JSON::LD::Reader }
@@ -38,7 +39,7 @@ module JSON::LD
   #     RDF::Format.for(:jsonld).reader  #=> JSON::LD::Reader
   #     RDF::Format.for(:jsonld).writer  #=> JSON::LD::Writer
   class JSONLD < RDF::Format
-    content_type     'application/json',    :extension => :jsonld
+    content_type     'application/ld+json',    :extension => :jsonld
     content_encoding 'utf-8'
 
     reader { JSON::LD::Reader }

data/lib/json/ld/reader.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module JSON::LD
   ##
   # A JSON-LD parser in Ruby.
@@ -52,7 +54,7 @@ module JSON::LD
       #
       # The @coerce keyword is used to specify type coersion rules for the data. For each key in the map, the
       # key is the type to be coerced to and the value is the vocabulary term to be coerced. Type coersion for
-      # the key `xsd:anyURI` asserts that all vocabulary terms listed should undergo coercion to an IRI,
+      # the key `@iri` asserts that all vocabulary terms listed should undergo coercion to an IRI,
       # including `@base` processing for relative IRIs and CURIE processing for compact URI Expressions like
       # `foaf:homepage`.
       #
@@ -76,8 +78,8 @@ module JSON::LD
 
       def inspect
         v = %w([EvaluationContext) + %w(base vocab).map {|a| "#{a}='#{self.send(a).inspect}'"}
-        v << "mappings[#{mappings.keys.length}]"
-        v << "coerce[#{coerce.keys.length}]"
+        v << "mappings[#{mappings.keys.length}]=#{mappings}"
+        v << "coerce[#{coerce.keys.length}]=#{coerce}"
         v.join(", ") + "]"
       end
     end
@@ -91,10 +93,15 @@ module JSON::LD
     # @yield  [reader] `self`
     # @yieldparam  [RDF::Reader] reader
     # @yieldreturn [void] ignored
+    # @raise [RDF::ReaderError] if the JSON document cannot be loaded
     def initialize(input = $stdin, options = {}, &block)
       super do
         @base_uri = uri(options[:base_uri]) if options[:base_uri]
-        @doc = ::JSON.load(input)
+        begin
+          @doc = JSON.load(input)
+        rescue JSON::ParserError => e
+          raise RDF::ReaderError, "Failed to parse input document: #{e.message}"
+        end
 
         if block_given?
           case block.arity
@@ -160,6 +167,17 @@ module JSON::LD
           prefixes.merge!(ec.mappings)  # Update parsed prefixes
         end
         
+        # 2.2) Create a new associative array by mapping the keys from the current associative array ...
+        new_element = {}
+        element.each do |k, v|
+          k = ec.mappings[k.to_sym] while ec.mappings.has_key?(k.to_sym)
+          new_element[k] = v
+        end
+        unless element == new_element
+          add_debug(path, "traverse: keys after map: #{new_element.keys.inspect}")
+          element = new_element
+        end
+
         # Other shortcuts to allow use of this method for terminal associative arrays
         if element[IRI].is_a?(String)
           # Return the IRI found from the value
@@ -175,39 +193,36 @@ module JSON::LD
           return
         end
         
-        # 2.2) ... Otherwise, if the local context is known perform the following steps:
-        #   2.2.1) If a @ key is found, the processor sets the active subject to the
+        # 2.3) ... Otherwise, if the local context is known perform the following steps:
+        #   2.3.1) If a @ key is found, the processor sets the active subject to the
         #         value after Object Processing has been performed.
         if element[SUBJECT].is_a?(String)
           active_subject = expand_term(element[SUBJECT], ec.base, ec)
         elsif element[SUBJECT]
           # Recursively process hash or Array values
-          traverse("#{path}[@]", element[SUBJECT], subject, property, ec)
+          traverse("#{path}[#{SUBJECT}]", element[SUBJECT], subject, property, ec)
         else
-          # 2.2.7) If the end of the associative array is detected, and a active subject
+          # 2.3.7) If the end of the associative array is detected, and a active subject
           # was not discovered, then:
-          #   2.2.7.1) Generate a blank node identifier and set it as the active subject.
+          #   2.3.7.1) Generate a blank node identifier and set it as the active subject.
           active_subject = RDF::Node.new
         end
           
-        # 2.2.1.1) If the inherited subject and inherited property values are
+        # 2.3.1.1) If the inherited subject and inherited property values are
         # specified, generate a triple using the inherited subject for the
         # subject, the inherited property for the property, and the active
         # subject for the object.
-        # 2.2.7.2) Complete any previously incomplete triples by running all substeps of Step 2.2.1.
+        # 2.3.7.2) Complete any previously incomplete triples by running all substeps of Step 2.2.1.
         add_triple(path, subject, property, active_subject) if subject && property
         subject = active_subject
         
         element.each do |key, value|
-          # 2.2.3) If a key that is not @context, @, or a, set the active property by
+          # 2.3.3) If a key that is not @context, @subject, or @type, set the active property by
           # performing Property Processing on the key.
           property = case key
-          when /^@/
-            nil
-          when 'a'
-            RDF.type
-          else
-            expand_term(key, ec.vocab, ec)
+          when TYPE then TYPE
+          when /^@/ then nil
+          else      expand_term(key, ec.vocab, ec)
           end
 
           traverse("#{path}[#{key}]", value, subject, property, ec) if property
@@ -238,14 +253,15 @@ module JSON::LD
         end
       when String
         # Perform coersion of the value, or generate a literal
-        add_debug(path, "traverse(#{element}): coerce?(#{property.inspect}) == #{ec.coerce[property].inspect}, ec=#{ec.coerce.inspect}")
-        object = if ec.coerce[property] == RDF::XSD.anyURI
+        add_debug(path, "traverse(#{element}): coerce?(#{property.inspect}) == #{ec.coerce[property.to_s].inspect}, ec=#{ec.coerce.inspect}")
+        object = if ec.coerce[property.to_s] == IRI
           expand_term(element, ec.base, ec)
-        elsif ec.coerce[property]
-          RDF::Literal.new(element, :datatype => ec.coerce[property])
+        elsif ec.coerce[property.to_s]
+          RDF::Literal.new(element, :datatype => ec.coerce[property.to_s])
         else
           RDF::Literal.new(element)
         end
+        property = RDF.type if property == TYPE
         add_triple(path, subject, property, object) if subject && property
       when Float
         object = RDF::Literal::Double.new(element)
@@ -291,11 +307,21 @@ module JSON::LD
 
     ##
     # Parse a JSON context, into a new EvaluationContext
-    # @param [Hash{String => String,Hash}] context
+    # @param [Hash{String => String,Hash}, String] context
     #   JSON representation of @context
     # @return [EvaluationContext]
-    # @raise [RDF::ReaderError] on a syntax error, or a reference to a term which is not defined.
+    # @raise [RDF::ReaderError]
+    #   on a remote context load error, syntax error, or a reference to a term which is not defined.
     def parse_context(ec, context)
+      # Load context document, if it is a string
+      if context.is_a?(String)
+        begin
+          context = open(context.to_s) {|f| JSON.load(f)}
+        rescue JSON::ParserError => e
+          raise RDF::ReaderError, "Failed to parse remote context at #{context}: #{e.message}"
+        end
+      end
+      
       context.each do |key, value|
         add_debug("parse_context(#{key})", value.inspect)
         case key
@@ -315,13 +341,13 @@ module JSON::LD
       if context[COERCE]
         # Spec confusion: doc says to merge each key-value mapping to the local context's @coerce mapping,
         # overwriting duplicate values. In the case where a mapping is indicated to a list of properties
-        # (e.g., { "xsd:anyURI": ["foaf:homepage", "foaf:member"] }, does this overwrite a previous mapping
-        # of { "xsd:anyURI": "foaf:knows" }, or add to it.
+        # (e.g., { "@iri": ["foaf:homepage", "foaf:member"] }, does this overwrite a previous mapping
+        # of { "@iri": "foaf:knows" }, or add to it.
         add_error RDF::ReaderError, "Expected @coerce to reference an associative array" unless context[COERCE].is_a?(Hash)
         context[COERCE].each do |type, property|
-          type_uri = expand_term(type, ec.vocab, ec)
+          type_uri = expand_term(type, ec.vocab, ec).to_s
           [property].flatten.compact.each do |prop|
-            p = expand_term(prop, ec.vocab, ec)
+            p = expand_term(prop, ec.vocab, ec).to_s
             ec.coerce[p] = type_uri
           end
         end

data/lib/json/ld/writer.rb

@@ -66,7 +66,7 @@ module JSON::LD
     #
     # Maintained as a reverse mapping of `property` => `type`.
     #
-    # @attr [Hash{RDF::URI => RDF::URI}]
+    # @attr [Hash{String => String}]
     attr :coerce, true
 
     def self.new_hash
@@ -345,13 +345,11 @@ module JSON::LD
       unless coerce == DEFAULT_COERCE
         c_h = new_hash
         coerce.keys.sort.each do |k|
-          next if coerce[k] == DEFAULT_COERCE[k]  ||
-                  coerce[k] == false ||
-                  coerce[k] == RDF::XSD.integer ||
-                  coerce[k] == RDF::XSD.boolean
-          k_iri = format_uri(k, :position => :predicate)
+          next if [TYPE, RDF.type.to_s].include?(k.to_s)
+          next if [DEFAULT_COERCE[k], false, RDF::XSD.integer.to_s, RDF::XSD.boolean.to_s].include?(coerce[k])
+          k_iri = k == IRI ? IRI : format_uri(k, :position => :predicate)
           d_iri = format_uri(coerce[k], :position => :subject)
-          add_debug "coerce[#{k_iri}] => #{d_iri}"
+          add_debug "coerce[#{k_iri}] => #{d_iri}, k=#{k.inspect}"
           case c_h[d_iri]
           when nil
             c_h[d_iri] = k_iri
@@ -496,6 +494,10 @@ module JSON::LD
       case resource
       when RDF::Node
         return resource.to_s
+      when String
+        iri = resource
+        resource = RDF::URI(resource)
+        return nil unless resource.absolute?
       when RDF::URI
         iri = resource.to_s
         return iri if options[:canonicalize]
@@ -583,14 +585,14 @@ module JSON::LD
     def iri_range?(predicate)
       return false if predicate.nil? || @options[:canonicalize]
 
-      unless coerce.has_key?(predicate)
+      unless coerce.has_key?(predicate.to_s)
         # objects of all statements with the predicate may not be literal
-       coerce[predicate] = @graph.query(:predicate => predicate).to_a.any? {|st| st.object.literal?} ?
-          false : RDF::XSD.anyURI
+       coerce[predicate.to_s] = @graph.query(:predicate => predicate).to_a.any? {|st| st.object.literal?} ?
+          false : IRI
       end
       
-      add_debug "iri_range(#{predicate}) = #{coerce[predicate].inspect}"
-      coerce[predicate] == RDF::XSD.anyURI
+      add_debug "iri_range(#{predicate}) = #{coerce[predicate.to_s].inspect}"
+      coerce[predicate.to_s] == IRI
     end
     
     ##
@@ -598,23 +600,23 @@ module JSON::LD
     # @param [RDF::URI] predicate
     # @return [Boolean]
     def datatype_range?(predicate)
-      unless coerce.has_key?(predicate)
+      unless coerce.has_key?(predicate.to_s)
         # objects of all statements with the predicate must be literal
         # and have the same non-nil datatype
         dt = nil
         @graph.query(:predicate => predicate) do |st|
           if st.object.literal? && st.object.has_datatype?
-            dt = st.object.datatype if dt.nil?
-            dt = false unless dt == st.object.datatype
+            dt = st.object.datatype.to_s if dt.nil?
+            dt = false unless dt == st.object.datatype.to_s
           else
             dt = false
           end
         end
         add_debug "range(#{predicate}) = #{dt.inspect}"
-        coerce[predicate] = dt
+        coerce[predicate.to_s] = dt
       end
 
-      coerce[predicate]
+      coerce[predicate.to_s]
     end
     
     # Reset internal helper instance variables

metadata

@@ -1,186 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json-ld
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 -07:00
+date: 2011-08-05 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdf
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2168459600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168459600
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2168459140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168459140
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2168458680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168458680
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2168458220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168458220
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
+  requirement: &2168457760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdf-n3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168457760
+- !ruby/object:Gem::Dependency
+  name: rdf-n3
+  requirement: &2168487740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.3
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdf-isomorphic
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2168487740
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
+  requirement: &2168487280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.4
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sxp
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2168487280
+- !ruby/object:Gem::Dependency
+  name: sxp
+  requirement: &2168486820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sparql-algebra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2168486820
+- !ruby/object:Gem::Dependency
+  name: sparql-algebra
+  requirement: &2168486360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sparql-grammar
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2168486360
+- !ruby/object:Gem::Dependency
+  name: sparql-grammar
+  requirement: &2168485900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *2168485900
 description: JSON-LD reader/writer for Ruby.
 email: public-rdf-ruby@w3.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - README
 - UNLICENSE
@@ -193,39 +140,28 @@ files:
 - lib/json/ld.rb
 has_rdoc: false
 homepage: http://github.com/gkellogg/json-ld
-licenses: 
+licenses:
 - Public Domain
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 8
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: json-ld
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: JSON-LD reader/writer for Ruby.
 test_files: []
-