Set validate flag if either json-ld-1.0 or json-ld-1.1, and don't override that passed in through options.

Author: gkellogg

lib/json/ld/api.rb

@@ -73,7 +73,7 @@ class API
     # @option options [String] :processingMode ("json-ld-1.1")
     #   Processing mode, json-ld-1.0 or json-ld-1.1. Also can have other values:
     #
-    #   * expand-frame – special frame expansion mode.
+    #   * json-ld-1.1-expand-frame – special frame expansion mode.
     # @option options [Boolean] :rename_bnodes (true)
     #   Rename bnodes as part of expansion, or keep them the same.
     # @option options [Boolean]  :unique_bnodes   (false)
@@ -89,10 +89,11 @@ def initialize(input, context, options = {}, &block)
       @options = {
         compactArrays: true,
         rename_bnodes: true,
-        processingMode: "json-ld-1.1"
-      }.merge(options)
-      @options[:validate] = @options[:processingMode] == "json-ld-1.0"
-      @options[:documentLoader] ||= self.class.method(:documentLoader)
+        processingMode: "json-ld-1.1",
+        documentLoader: self.class.method(:documentLoader)
+      }
+      @options[:validate] = %w(json-ld-1.0 json-ld-1.1).include?(@options[:processingMode])
+      @options = @options.merge(options)
       @namer = options[:unique_bnodes] ? BlankNodeUniqer.new : (@options[:rename_bnodes] ? BlankNodeNamer.new("b") : BlankNodeMapper.new)
 
       # For context via Link header

lib/json/ld/format.rb

@@ -62,12 +62,12 @@ def self.cli_commands
                 # If files are empty, either use options[:execute]
                 input = options[:evaluate] ? StringIO.new(options[:evaluate]) : STDIN
                 input.set_encoding(options.fetch(:encoding, Encoding::UTF_8))
-                JSON::LD::API.expand(input, options) do |expanded|
+                JSON::LD::API.expand(input, options.merge(validate: false)) do |expanded|
                   out.puts expanded.to_json(JSON::LD::JSON_STATE)
                 end
               else
                 files.each do |file|
-                  JSON::LD::API.expand(file, options) do |expanded|
+                  JSON::LD::API.expand(file, options.merge(validate: false)) do |expanded|
                     out.puts expanded.to_json(JSON::LD::JSON_STATE)
                   end
                 end

spec/format_spec.rb

@@ -78,25 +78,25 @@
         expect {RDF::CLI.exec(["expand", ttl], format: :ttl)}.to write.to(:output)
       end
       it "expands JSON" do
-        expect {RDF::CLI.exec(["expand", json], format: :jsonld)}.to write.to(:output)
+        expect {RDF::CLI.exec(["expand", json], format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
     describe "#compact" do
       it "compacts RDF" do
-        expect {RDF::CLI.exec(["compact", ttl], context: context, format: :ttl)}.to write.to(:output)
+        expect {RDF::CLI.exec(["compact", ttl], context: context, format: :ttl, validate: false)}.to write.to(:output)
       end
       it "compacts JSON" do
-        expect {RDF::CLI.exec(["compact", json], context: context, format: :jsonld)}.to write.to(:output)
+        expect {RDF::CLI.exec(["compact", json], context: context, format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
     describe "#flatten" do
       it "flattens RDF" do
-        expect {RDF::CLI.exec(["flatten", ttl], context: context, format: :ttl)}.to write.to(:output)
+        expect {RDF::CLI.exec(["flatten", ttl], context: context, format: :ttl, validate: false)}.to write.to(:output)
       end
       it "flattens JSON" do
-        expect {RDF::CLI.exec(["flatten", json], context: context, format: :jsonld)}.to write.to(:output)
+        expect {RDF::CLI.exec(["flatten", json], context: context, format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
 
@@ -105,7 +105,7 @@
         expect {RDF::CLI.exec(["frame", ttl], frame: context, format: :ttl)}.to write.to(:output)
       end
       it "frames JSON" do
-        expect {RDF::CLI.exec(["frame", json], frame: context, format: :jsonld)}.to write.to(:output)
+        expect {RDF::CLI.exec(["frame", json], frame: context, format: :jsonld, validate: false)}.to write.to(:output)
       end
     end
   end