json-ld 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9297e31b76d1e901ae278f349ed412086831f5
-  data.tar.gz: e07e7aeb8bb57349e5f819da903fb55524c46b43
+  metadata.gz: 1a24e95bd68b625c54093b4d41f19f264147cf28
+  data.tar.gz: db126bfc8830837da1cd36329451443ff610a624
 SHA512:
-  metadata.gz: 7baea9184fa7cea017a37cb7ec2aa2a4a4b18e153b6a771a8b5297bfe518ca669a66e9a84dc5e37dd04e1b135653ff9195f4b6fb56d48af1a835f1290f8862dd
-  data.tar.gz: fba430dad035dd6465e07ee94c952bf79c33be220baa642a57e07c8d21cd7aa3431e824c5487c3f3b43f4a23f7b30f55c62d059e4b6fb5c2ff1ac8828932b86e
+  metadata.gz: 0ecf9190facd71bb800cdce96eb8069da3359afe1816ab381bc21735828f0ca8c19d066850ca30339c405b0408955438d53b29e290efde9fdbe1be72430ae43a
+  data.tar.gz: 3b6bf6517ba347b8b73679c213c2c625b0957990cf9c1a2ecc220a85b4ec0340c3299d79fa8c10453a194bf9a2a5195ac8cf5e001cd96324241d899d07e99fba

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/bin/jsonld

@@ -21,7 +21,6 @@ def run(input, options)
     reader_class.new(input, options[:parser_options])
   end
 
-  prefixes = {}
   start = Time.new
   if options[:expand]
     options = options.merge(expandContext: options.delete(:context)) if options.has_key?(:context)
@@ -87,17 +86,27 @@ input = nil
 OPT_ARGS = [
   ["--dbg",           GetoptLong::NO_ARGUMENT,      "Turn on verbose debugging"],
   ["--compact",       GetoptLong::NO_ARGUMENT,      "Compact document, using --context"],
+  ["--compactArrays", GetoptLong::OPTIONAL_ARGUMENT, "Set compactArrays option"],
   ["--context",       GetoptLong::REQUIRED_ARGUMENT,"Context to apply for expand, compact and converting from RDF"],
+  ["--embed",         GetoptLong::REQUIRED_ARGUMENT,"a flag specifying that objects should be directly embedded in the output, instead of being referred to by their IRI"],
   ["--evaluate","-e", GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as a JSON-LD document"],
   ["--expand",        GetoptLong::NO_ARGUMENT,      "Expand document, using an optional --context"],
+  ["--expanded",      GetoptLong::OPTIONAL_ARGUMENT, "Input is already expanded"],
+  ["--explicit",      GetoptLong::OPTIONAL_ARGUMENT, "a flag specifying that for properties to be included in the output, they must be explicitly declared in the framing context"],
   ["--flatten",       GetoptLong::NO_ARGUMENT,      "Flatten document, using an optional --context"],
   ["--format",        GetoptLong::REQUIRED_ARGUMENT,"Specify output format when converting to RDF"],
   ["--frame",         GetoptLong::REQUIRED_ARGUMENT,"Frame document, using the file or URL as a frame specification"],
   ["--input-format",  GetoptLong::REQUIRED_ARGUMENT,"Format of the input document, when converting from RDF."],
+  ["--omitDefault",   GetoptLong::OPTIONAL_ARGUMENT,"a flag specifying that properties that are missing from the JSON-LD input should be omitted from the output"],
   ["--output", "-o",  GetoptLong::REQUIRED_ARGUMENT,"Output to the specified file path"],
   ["--parse-only",    GetoptLong::NO_ARGUMENT,      "Parse the document for well-formedness only"],
+  ["--processingMode",GetoptLong::REQUIRED_ARGUMENT,"Set processing mode, defaults to json-ld-1.1"],
   ["--quiet",         GetoptLong::NO_ARGUMENT,      "Supress most output other than progress indicators"],
+  ["--rename_bnodes", GetoptLong::OPTIONAL_ARGUMENT,"Rename bnodes as part of expansion, or keep them the same"],
+  ["--requireAll",    GetoptLong::OPTIONAL_ARGUMENT,"Rename bnodes as part of expansion, or keep them the same"],
+  ["--simple_compact_iris",GetoptLong::OPTIONAL_ARGUMENT,"When compacting IRIs, do not use terms with expanded term definitions"],
   ["--stream",        GetoptLong::NO_ARGUMENT,      "Use Streaming reader/writer"],
+  ["--unique_bnodes", GetoptLong::OPTIONAL_ARGUMENT,"Use unique bnode identifiers"],
   ["--uri",           GetoptLong::REQUIRED_ARGUMENT,"URI to be used as the document base"],
   ["--validate",      GetoptLong::NO_ARGUMENT,      "Validate while processing"],
   ["--help", "-?",    GetoptLong::NO_ARGUMENT,      "This message"]
@@ -121,22 +130,42 @@ opts = GetoptLong.new(*OPT_ARGS.map {|o| o[0..-2]})
 
 opts.each do |opt, arg|
   case opt
-  when '--dbg'          then parser_options[:debug] = ::JSON::LD::debug = true
-  when '--compact'      then options[:compact] = true
-  when '--context'      then options[:context] = arg
-  when '--evaluate'     then input = arg
-  when '--expand'       then options[:expand] = true
-  when '--format'       then options[:output_format] = arg.to_sym
-  when '--flatten'      then options[:flatten] = arg
-  when '--frame'        then options[:frame] = arg
-  when '--input-format' then options[:input_format] = arg.to_sym
-  when '--output'       then options[:output] = File.open(arg, "w")
-  when '--parse-only'   then options[:parse_only] = true
-  when '--quiet'        then options[:quiet] = true
-  when '--stream'       then parser_options[:stream] = true
-  when '--uri'          then parser_options[:base] = arg
-  when '--validate'     then parser_options[:validate] = true
-  when '--help'         then usage
+  when '--dbg'            then parser_options[:debug] = ::JSON::LD::debug = true
+  when '--compact'        then options[:compact] = true
+  when "--compactArrays"  then options[:compactArrays] = (arg || 'true') == 'true'
+  when '--context'        then options[:context] = arg
+  when '--evaluate'       then input = arg
+  when '--expand'         then options[:expand] = true
+  when "--expanded"       then options[:expanded] = (arg || 'true') == 'true'
+  when "--explicit"       then options[:compactArrays] = (arg || 'true') == 'true'
+  when '--format'         then options[:output_format] = arg.to_sym
+  when '--flatten'        then options[:flatten] = arg
+  when '--frame'          then options[:frame] = arg
+  when '--input-format'   then options[:input_format] = arg.to_sym
+  when "--omitDefault"    then options[:omitDefault] = (arg || 'true') == 'true'
+  when '--output'         then options[:output] = File.open(arg, "w")
+  when '--parse-only'     then options[:parse_only] = true
+  when '--processingMode' then options[:processingMode] = arg
+  when '--quiet'          then options[:quiet] = true
+  when "--rename_bnodes"  then options[:rename_bnodes] = (arg || 'true') == 'true'
+  when "--requireAll"     then options[:requireAll] = (arg || 'true') == 'true'
+  when '--stream'         then parser_options[:stream] = true
+  when "--unique_bnodes"  then options[:unique_bnodes] = (arg || 'true') == 'true'
+  when '--uri'            then parser_options[:base] = arg
+  when '--validate'       then parser_options[:validate] = true
+  when '--help'           then usage
+  when '--embed'
+    case arg
+    when '@always', '@never', '@link', '@last'
+      options[:embed] = arg
+    when 'true'
+      options[:embed] = true
+    when 'false'
+      options[:embed] = false
+    else
+      STDERR.puts "--embed option takes one of '@always', '@never', '@link', '@last', true, or false"
+      exit(1)
+    end
   end
 end
 

data/lib/json/ld/api.rb

@@ -60,8 +60,7 @@ module JSON::LD
     #   An external context to use additionally to the context embedded in input when expanding the input.
     # @param  [Hash{Symbol => Object}] options
     # @option options [String, #to_s] :base
-    #   The Base IRI to use when expanding the document. This overrides the value of `input` if it is a _IRI_. If not specified and `input` is not an _IRI_, the base IRI defaults to the current document IRI if in a browser context, or the empty string if there is no document context.
-    #   If not specified, and a base IRI is found from `input`, options[:base] will be modified with this value.
+    #   The Base IRI to use when expanding the document. This overrides the value of `input` if it is a _IRI_. If not specified and `input` is not an _IRI_, the base IRI defaults to the current document IRI if in a browser context, or the empty string if there is no document context. If not specified, and a base IRI is found from `input`, options[:base] will be modified with this value.
     # @option options [Boolean] :compactArrays (true)
     #   If set to `true`, the JSON-LD processor replaces arrays with just one element with that element during compaction. If set to `false`, all arrays will remain arrays even if they have just one element.
     # @option options [Proc] :documentLoader
@@ -148,8 +147,7 @@ module JSON::LD
     private :initialize
     
     ##
-    # Expands the given input according to the steps in the Expansion Algorithm. The input must be copied, expanded and returned
-    # if there are no errors. If the expansion fails, an appropriate exception must be thrown.
+    # Expands the given input according to the steps in the Expansion Algorithm. The input must be copied, expanded and returned if there are no errors. If the expansion fails, an appropriate exception must be thrown.
     #
     # The resulting `Array` either returned or yielded
     #
@@ -171,8 +169,7 @@ module JSON::LD
         result = api.expand(api.value, nil, api.context, ordered: options.fetch(:ordered, true))
       end
 
-      # If, after the algorithm outlined above is run, the resulting element is an
-      # JSON object with just a @graph property, element is set to the value of @graph's value.
+      # If, after the algorithm outlined above is run, the resulting element is an JSON object with just a @graph property, element is set to the value of @graph's value.
       result = result['@graph'] if result.is_a?(Hash) && result.keys == %w(@graph)
 
       # Finally, if element is a JSON object, it is wrapped into an array.
@@ -181,8 +178,7 @@ module JSON::LD
     end
 
     ##
-    # Compacts the given input according to the steps in the Compaction Algorithm. The input must be copied, compacted and
-    # returned if there are no errors. If the compaction fails, an appropirate exception must be thrown.
+    # Compacts the given input according to the steps in the Compaction Algorithm. The input must be copied, compacted and returned if there are no errors. If the compaction fails, an appropirate exception must be thrown.
     #
     # If no context is provided, the input document is compacted using the top-level context of the document
     #
@@ -284,9 +280,7 @@ module JSON::LD
     end
 
     ##
-    # Frames the given input using the frame according to the steps in the Framing Algorithm. The input is used to build the
-    # framed output and is returned if there are no errors. If there are no matches for the frame, null must be returned.
-    # Exceptions must be thrown if there are errors.
+    # Frames the given input using the frame according to the steps in the Framing Algorithm. The input is used to build the framed output and is returned if there are no errors. If there are no matches for the frame, null must be returned. Exceptions must be thrown if there are errors.
     #
     # The resulting `Array` is either returned, or yielded if a block is given.
     #
@@ -296,18 +290,13 @@ module JSON::LD
     #   The frame to use when re-arranging the data.
     # @option options (see #initialize)
     # @option options ['@last', '@always', '@never', '@link'] :embed ('@last')
-    #   a flag specifying that objects should be directly embedded in the output,
-    #   instead of being referred to by their IRI.
+    #   a flag specifying that objects should be directly embedded in the output, instead of being referred to by their IRI.
     # @option options [Boolean] :explicit (false)
-    #   a flag specifying that for properties to be included in the output,
-    #   they must be explicitly declared in the framing context.
+    #   a flag specifying that for properties to be included in the output, they must be explicitly declared in the framing context.
     # @option options [Boolean] :requireAll (true)
-    #   A flag specifying that all properties present in the input frame must
-    #   either have a default value or be present in the JSON-LD input for the
-    #   frame to match.
+    #   A flag specifying that all properties present in the input frame must either have a default value or be present in the JSON-LD input for the frame to match.
     # @option options [Boolean] :omitDefault (false)
-    #   a flag specifying that properties that are missing from the JSON-LD
-    #   input should be omitted from the output.
+    #   a flag specifying that properties that are missing from the JSON-LD input should be omitted from the output.
     # @option options [Boolean] :expanded Input is already expanded
     # @yield jsonld
     # @yieldparam [Hash] jsonld

data/lib/json/ld/context.rb

@@ -1283,10 +1283,10 @@ module JSON::LD
         #log_debug "uri(bnode)#{value}: #{$1}"
         bnode(namer.get_sym($1))
       else
-        value = RDF::URI.new(value)
+        value = RDF::URI(value)
         value.validate! if @options[:validate]
         value.canonicalize! if @options[:canonicalize]
-        value = RDF::URI.intern(value) if @options[:intern]
+        value = RDF::URI.intern(value, {}) if @options[:intern]
         value
       end
     end

data/lib/json/ld/resource.rb

@@ -93,7 +93,7 @@ module JSON::LD
 
     ##
     # Return a hash of this object, suitable for use by for ETag
-    # @return [Fixnum]
+    # @return [Integer]
     def hash
       self.deresolve.hash
     end

data/lib/json/ld/to_rdf.rb

@@ -23,7 +23,7 @@ module JSON::LD
           # If value is true or false, then set value its canonical lexical form as defined in the section Data Round Tripping. If datatype is null, set it to xsd:boolean.
           value = value.to_s
           datatype ||= RDF::XSD.boolean.to_s
-        when Integer, Float, Fixnum
+        when Numeric
           # Otherwise, if value is a number, then set value to its canonical lexical form as defined in the section Data Round Tripping. If datatype is null, set it to either xsd:integer or xsd:double, depending on if the value contains a fractional and/or an exponential component.
           lit = RDF::Literal.new(value, canonicalize: true)
           value = lit.to_s

data/spec/resource_spec.rb

@@ -40,7 +40,7 @@ describe JSON::LD::Resource do
   end
 
   describe "#hash" do
-    specify {expect(subject.hash).to be_a(Fixnum)}
+    specify {expect(subject.hash).to be_a(Integer)}
       
     it "returns the hash of the attributes" do
       expect(subject.hash).to eq subject.deresolve.hash

data/spec/suite_helper.rb

@@ -125,7 +125,7 @@ module Fixtures
             end
             if evaluationTest?
               if testType == "jld:ToRDFTest"
-                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect)
+                expected = RDF::Repository.new << RDF::NQuads::Reader.new(expect, logger: [])
                 rspec_example.instance_eval {
                   expect(result).to be_equivalent_graph(expected, logger)
                 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf