json-ld 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJhN2RiZDA5MjA5ZTUxZGJhZTZhMTI5NGNkOTM3YjA0ZjkxYzlkYQ==
+    ODMzNjFiMDVhYTdjNTk1OGQ3NTFiMzQwZjE0ZDViM2I1Mjk1YWI2Mw==
   data.tar.gz: !binary |-
-    ZTRlZDUwNDA0Nzc5MWIyMDg5YmQ2MTQzY2JlYzU2YWYxMzAyNDBjMQ==
+    MGYyMDRhMjNiMWJkNDY1ODAyODk4Y2RkZTY2N2U2OGY3NWQ4YzM2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmY4M2Q3NjEyYmNkOTBlYjdiYzAzOWI1ZThhMDQ2ZjA3MWQ0ZTFiZDFkOGMx
-    NzAyYzRhYjgwNGMyMjMxNTNjZjQ2N2I2NzQyZTRlMGQzMThjZmY1Mjc3ZTk4
-    OTYyNDYzMmY1Yzc5ODFlNGY3MDY1OGQxOTY5NGRhZTdmY2FiOGQ=
+    NTM0NTI4MzRmMzA1OTI2MDM1MzQ2ZTFkYWQ4MWM0OTM4MjkwMGE0NGU3ZGQ4
+    ZmFlNjM5MzBlNGZkZjkyMjgyYmIzM2U3MWU5OTUxOTNmZGUwMjc3ODExYWRi
+    M2Q5ZjdkMjU1M2NkY2MwZTgwNWYzNTE2N2UyMWVjNmY1NmYzYjU=
   data.tar.gz: !binary |-
-    ZjBlNTM5YTJkY2YxY2UyOGMxMmRlMjRiODk5Yjk0M2EyM2NiNzlkODBjNWY2
-    ODg1MzAwOTUxODc0OTI3NDI3NzA0ZDk0ZGEzNTE3YjVmZWNhMzk2ZWY1MDAw
-    M2M5NmFjM2M0OGUzMjA1Zjk2Zjg4ZDhiOTY0YWM2OTJlNWNiZjg=
+    MjEyNzQ4MzM5MzNlNzc2ZGMwYTgxZjNiNjBjZDlhMWEzNWZmNzliN2E2Nzlm
+    N2Y2OWJjZTIwNDFmODQ0ZmFkMGM1NDQwNDRjOTQ4MjNjMjJlNTgzZGY3NWE5
+    NjQ3MDI4YTk4Y2RhYmQ0MmEyMDkxNDVjZmViMTM2MmNhMzM0NTQ=

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/json/ld/api.rb

@@ -66,8 +66,10 @@ module JSON::LD
     #   If set to "json-ld-1.0", the JSON-LD processor must produce exactly the same results as the algorithms defined in this specification. If set to another value, the JSON-LD processor is allowed to extend or modify the algorithms defined in this specification to enable application-specific optimizations. The definition of such optimizations is beyond the scope of this specification and thus not defined. Consequently, different implementations may implement different optimizations. Developers must not define modes beginning with json-ld as they are reserved for future versions of this specification.
     # @option options [String] :produceGeneralizedRdf (false)
     #   Unless the produce generalized RDF flag is set to true, RDF triples containing a blank node predicate are excluded from output.
-    # @option options [Boolean] :useNativeTypes (true)
+    # @option options [Boolean] :useNativeTypes (false)
     #   If set to `true`, the JSON-LD processor will use native datatypes for expression xsd:integer, xsd:boolean, and xsd:double values, otherwise, it will use the expanded form.
+    # @option options [Boolean] :useRdfType (false)
+    #   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.
     # @yield [api]
@@ -497,7 +499,7 @@ module JSON::LD
                   end
                 end
 
-                yield remote_document if block_given?
+                return block_given? ? yield(remote_document) : remote_document
               when Net::HTTPRedirection
                 # Follow redirection
                 parsed_url = ::URI.parse(response["Location"])
@@ -519,10 +521,9 @@ module JSON::LD
               sub !~ /^(.*\+)?json$/
           end
 
-          yield remote_document if block_given?
+          return block_given? ? yield(remote_document) : remote_document
         end
       end
-      remote_document
     end
 
     ##

data/lib/json/ld/context.rb

@@ -877,7 +877,7 @@ module JSON::LD
     # @param [Hash, String] value
     #   Value (literal or IRI) to be expanded
     # @param  [Hash{Symbol => Object}] options
-    # @option options [Boolean] :useNativeTypes (true) use native representations
+    # @option options [Boolean] :useNativeTypes (false) use native representations
     #
     # @return [Hash] Object representation of value
     # @raise [RDF::ReaderError] if the iri cannot be expanded

data/lib/json/ld/from_rdf.rb

@@ -37,7 +37,7 @@ module JSON::LD
           statement.object.literal?
 
         # If predicate equals rdf:type, and object is an IRI or blank node identifier, append object to the value of the @type member of node. If no such member exists, create one and initialize it to an array whose only item is object. Finally, continue to the next RDF triple.
-        if statement.predicate == RDF.type && statement.object.resource?
+        if statement.predicate == RDF.type && statement.object.resource? && !@options[:useRdfType]
           merge_value(node, '@type', statement.object.to_s)
           next
         end

data/spec/suite_helper.rb

@@ -10,8 +10,8 @@ module Fixtures
     class Manifest < JSON::LD::Resource
       def self.open(file)
         #puts "open: #{file}"
-        RDF::Util::File.open_file(file) do |f|
-          json = JSON.parse(f.read)
+        Fixtures::SuiteTest.documentLoader(file) do |remote|
+          json = JSON.parse(remote.document)
           if block_given?
             yield self.from_jsonld(json)
           else
@@ -44,7 +44,7 @@ module Fixtures
 
       def options
         @options ||= begin
-          opts = {:documentLoader => self.class.method(:documentLoader)}
+          opts = {:documentLoader => Fixtures::SuiteTest.method(:documentLoader)}
           {'processingMode' => "json-ld-1.0"}.merge(property('option') || {}).each do |k, v|
             opts[k.to_sym] = v
           end
@@ -57,7 +57,7 @@ module Fixtures
         define_method(m.to_sym) do
           return nil unless property(m)
           res = nil
-          self.class.documentLoader("#{SUITE}tests/#{property(m)}", :safe => true) do |remote_doc|
+          Fixtures::SuiteTest.documentLoader("#{SUITE}tests/#{property(m)}", :safe => true) do |remote_doc|
             res = remote_doc.document
           end
           res
@@ -88,7 +88,7 @@ module Fixtures
         debug << "frame: #{frame}" if frame_loc
 
         options = if self.options[:useDocumentLoader]
-          self.options.merge(:documentLoader => method(:documentLoader))
+          self.options.merge(:documentLoader => Fixtures::SuiteTest.method(:documentLoader))
         else
           self.options.dup
         end
@@ -210,104 +210,103 @@ module Fixtures
         string.to_s.gsub('\\', '\\\\').gsub("\t", '\\t').
           gsub("\n", '\\n').gsub("\r", '\\r').gsub('"', '\\"')
       end
+    end
 
-      REMOTE_PATH = "http://json-ld.org/test-suite/"
-      LOCAL_PATH = ::File.expand_path("../json-ld.org/test-suite", __FILE__) + '/'
-      ##
-      # Document loader to use for tests having `useDocumentLoader` option
-      #
-      # @param [RDF::URI, String] url
-      # @param [Hash<Symbol => Object>] options
-      # @option options [Boolean] :validate
-      #   Allow only appropriate content types
-      # @return [RemoteDocument] retrieved remote document and context information unless block given
-      # @yield remote_document
-      # @yieldparam [RemoteDocument] remote_document
-      # @raise [JsonLdError]
-      def self.documentLoader(url, options = {})
-        require 'net/http' unless defined?(Net::HTTP)
-        remote_document = nil
-        options[:headers] ||= JSON::LD::API::OPEN_OPTS[:headers]
+    REMOTE_PATH = "http://json-ld.org/test-suite/"
+    LOCAL_PATH = ::File.expand_path("../json-ld.org/test-suite", __FILE__) + '/'
+    ##
+    # Document loader to use for tests having `useDocumentLoader` option
+    #
+    # @param [RDF::URI, String] url
+    # @param [Hash<Symbol => Object>] options
+    # @option options [Boolean] :validate
+    #   Allow only appropriate content types
+    # @return [RemoteDocument] retrieved remote document and context information unless block given
+    # @yield remote_document
+    # @yieldparam [RemoteDocument] remote_document
+    # @raise [JsonLdError]
+    def documentLoader(url, options = {})
+      require 'net/http' unless defined?(Net::HTTP)
+      remote_document = nil
+      options[:headers] ||= JSON::LD::API::OPEN_OPTS[:headers]
 
-        url = url.to_s[5..-1] if url.to_s.start_with?("file:")
+      url = url.to_s[5..-1] if url.to_s.start_with?("file:")
 
-        if url.to_s.start_with?(REMOTE_PATH) && ::File.exist?(LOCAL_PATH) && url.to_s !~ /remote-doc/
-          #puts "attempt to open #{filename_or_url} locally"
-          local_filename = url.to_s.sub(REMOTE_PATH, LOCAL_PATH)
-          if ::File.exist?(local_filename)
-            remote_document = JSON::LD::API::RemoteDocument.new(url.to_s, ::File.read(local_filename))
-            yield remote_document if block_given?
-          else
-            raise JSON::LD::JsonLdError::LoadingDocumentFailed, "no such file #{local_filename}"
-          end
-          return remote_document
+      if url.to_s.start_with?(REMOTE_PATH) && ::File.exist?(LOCAL_PATH) && url.to_s !~ /remote-doc/
+        #puts "attempt to open #{filename_or_url} locally"
+        local_filename = url.to_s.sub(REMOTE_PATH, LOCAL_PATH)
+        if ::File.exist?(local_filename)
+          remote_document = JSON::LD::API::RemoteDocument.new(url.to_s, ::File.read(local_filename))
+          return block_given? ? yield(remote_document) : remote_document
+        else
+          raise JSON::LD::JsonLdError::LoadingDocumentFailed, "no such file #{local_filename}"
         end
+      end
 
-        case url.to_s
-        when /^http/
-          parsed_url = ::URI.parse(url.to_s)
-          until remote_document do
-            Net::HTTP::start(parsed_url.host, parsed_url.port) do |http|
-              request = Net::HTTP::Get.new(parsed_url.request_uri, options[:headers])
-              http.request(request) do |response|
-                case response
-                when Net::HTTPSuccess
-                  # found object
-                  content_type, ct_param = response.content_type.to_s.downcase.split(";")
-                  if content_type && options[:validate]
-                    main, sub = content_type.split("/")
-                    raise JSON::LD::JsonLdError::LoadingDocumentFailed, "content_type: #{content_type}" if
-                      main != 'application' ||
-                      sub !~ /^(.*\+)?json$/
-                  end
+      case url.to_s
+      when /^http/
+        parsed_url = ::URI.parse(url.to_s)
+        until remote_document do
+          Net::HTTP::start(parsed_url.host, parsed_url.port) do |http|
+            request = Net::HTTP::Get.new(parsed_url.request_uri, options[:headers])
+            http.request(request) do |response|
+              case response
+              when Net::HTTPSuccess
+                # found object
+                content_type, ct_param = response.content_type.to_s.downcase.split(";")
+                if content_type && options[:validate]
+                  main, sub = content_type.split("/")
+                  raise JSON::LD::JsonLdError::LoadingDocumentFailed, "content_type: #{content_type}" if
+                    main != 'application' ||
+                    sub !~ /^(.*\+)?json$/
+                end
 
-                  remote_document = JSON::LD::API::RemoteDocument.new(parsed_url.to_s, response.body)
+                remote_document = JSON::LD::API::RemoteDocument.new(parsed_url.to_s, response.body)
 
-                  unless content_type.start_with?("application/ld+json")
-                    links = response["link"].to_s.
-                      split(",").
-                      map(&:strip).
-                      select {|h| h =~ %r{rel=\"http://www.w3.org/ns/json-ld#context\"}}
-                    case links.length
-                    when 0  then #nothing to do
-                    when 1
-                      remote_document.contextUrl = links.first.match(/<([^>]*)>/) && $1
-                    else
-                      raise JSON::LD::JsonLdError::MultipleContextLinkHeaders,
-                        "expected at most 1 Link header with rel=jsonld:context, got #{links.length}"
-                    end
+                unless content_type.start_with?("application/ld+json")
+                  links = response["link"].to_s.
+                    split(",").
+                    map(&:strip).
+                    select {|h| h =~ %r{rel=\"http://www.w3.org/ns/json-ld#context\"}}
+                  case links.length
+                  when 0  then #nothing to do
+                  when 1
+                    remote_document.contextUrl = links.first.match(/<([^>]*)>/) && $1
+                  else
+                    raise JSON::LD::JsonLdError::MultipleContextLinkHeaders,
+                      "expected at most 1 Link header with rel=jsonld:context, got #{links.length}"
                   end
-                  yield remote_document if block_given?
-                when Net::HTTPRedirection
-                  # Follow redirection
-                  parsed_url = ::URI.parse(response["Location"])
-                else
-                  raise JSON::LD::JsonLdError::LoadingDocumentFailed,
-                    "<#{parsed_url}>: #{response.msg}(#{response.code})"
                 end
+                return block_given? ? yield(remote_document) : remote_document
+              when Net::HTTPRedirection
+                # Follow redirection
+                parsed_url = ::URI.parse(response["Location"])
+              else
+                raise JSON::LD::JsonLdError::LoadingDocumentFailed,
+                  "<#{parsed_url}>: #{response.msg}(#{response.code})"
               end
             end
           end
-        else
-          # Use regular open
-          RDF::Util::File.open_file(url, options) do |f|
-            remote_document = JSON::LD::API::RemoteDocument.new(url, f.read)
-            content_type, ct_param = f.content_type.to_s.downcase.split(";") if f.respond_to?(:content_type)
-            if content_type && options[:validate]
-              main, sub = content_type.split("/")
-              raise JSON::LD::JsonLdError::LoadingDocumentFailed, "content_type: #{content_type}" if
-                main != 'application' ||
-                sub !~ /^(.*\+)?json$/
-            end
-
-            yield remote_document if block_given?
+        end
+      else
+        # Use regular open
+        RDF::Util::File.open_file(url, options) do |f|
+          remote_document = JSON::LD::API::RemoteDocument.new(url, f.read)
+          content_type, ct_param = f.content_type.to_s.downcase.split(";") if f.respond_to?(:content_type)
+          if content_type && options[:validate]
+            main, sub = content_type.split("/")
+            raise JSON::LD::JsonLdError::LoadingDocumentFailed, "content_type: #{content_type}" if
+              main != 'application' ||
+              sub !~ /^(.*\+)?json$/
           end
+
+          return block_given? ? yield(remote_document) : remote_document
         end
-        remote_document
-      rescue JSON::LD::JsonLdError::LoadingDocumentFailed, JSON::LD::JsonLdError::MultipleContextLinkHeaders
-        raise unless options[:safe]
-        "don't raise error"
       end
+    rescue JSON::LD::JsonLdError::LoadingDocumentFailed, JSON::LD::JsonLdError::MultipleContextLinkHeaders
+      raise unless options[:safe]
+      "don't raise error"
     end
+    module_function :documentLoader
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf