Don't pass ordered option, get it from @options.

gkellogg · gkellogg · commit cfb418daee99 · 2020-04-21T14:55:08.000-07:00
diff --git a/lib/json/ld/api.rb b/lib/json/ld/api.rb
@@ -167,7 +167,6 @@ def self.expand(input, framing: false, **options, &block)
       API.new(input, options[:expandContext], **options) do
         result = self.expand(self.value, nil, self.context,
           base: (RDF::URI(@options[:base]) if @options[:base]),
-          ordered: @options[:ordered],
           framing: framing)
         doc_base = @options[:base]
       end
@@ -226,8 +225,7 @@ def self.compact(input, context, expanded: false, **options)
       API.new(expanded_input, context, no_default_base: true, **options) do
         log_debug(".compact") {"expanded input: #{expanded_input.to_json(JSON_STATE) rescue 'malformed json'}"}
         result = compact(value,
-                         base: (RDF::URI(@options[:base]) if @options[:base]),
-                         ordered: options[:ordered])
+                         base: (RDF::URI(@options[:base]) if @options[:base]))
 
         # xxx) Add the given context to the output
         ctx = self.context.serialize(provided_context: context)
@@ -299,8 +297,7 @@ def self.flatten(input, context, expanded: false, **options)
           # Otherwise, return the result of compacting flattened according the Compaction algorithm passing context ensuring that the compaction result uses the @graph keyword (or its alias) at the top-level, even if the context is empty or if there is only one element to put in the @graph array. This ensures that the returned document has a deterministic structure.
           compacted = as_array(
             compact(flattened,
-                    base: (RDF::URI(options[:base]) if options[:base]),
-                    ordered: options[:ordered]))
+                    base: (RDF::URI(options[:base]) if options[:base])))
           kwgraph = self.context.compact_iri('@graph')
           flattened = self.context.
             serialize(provided_context: context).
@@ -435,8 +432,7 @@ def self.frame(input, frame, expanded: false, **options)
 
         # Compact result
         compacted = compact(result,
-          base: (RDF::URI(options[:base]) if options[:base]),
-          ordered: options[:ordered])
+          base: (RDF::URI(options[:base]) if options[:base]))
 
         # @replace `@null` with nil, compacting arrays
         compacted = cleanup_null(compacted)
diff --git a/lib/json/ld/compact.rb b/lib/json/ld/compact.rb
@@ -14,13 +14,11 @@ module Compact
     # @param [Array, Hash] element
     # @param [String, RDF::URI] base (nil)
     #   Ensure output objects have keys ordered properly
-    # @param [Boolean] ordered (true)
     # @param [String] property (nil)
     #   Extra validatation
     # @return [Array, Hash]
     def compact(element,
                 base: nil,
-                ordered: false,
                 property: nil)
       #if property.nil?
       #  log_debug("compact") {"element: #{element.inspect}, ec: #{context.inspect}"}
@@ -35,7 +33,7 @@ def compact(element,
       when Array
         #log_debug("") {"Array #{element.inspect}"}
         result = element.map do |item|
-          compact(item, base: base, ordered: ordered, property: property)
+          compact(item, base: base, property: property)
         end.compact
 
         # If element has a single member and the active property has no
@@ -78,7 +76,7 @@ def compact(element,
         # If expanded property is @list and we're contained within a list container, recursively compact this item to an array
         if list?(element) && context.container(property).include?('@list')
           return compact(element['@list'], base: base,
-                         ordered: ordered, property: property)
+                         property: property)
         end
 
         inside_reverse = property == '@reverse'
@@ -94,7 +92,7 @@ def compact(element,
           self.context = context.parse(term_context, propagate: false) unless term_context.nil?
         end
 
-        element.keys.opt_sort(ordered: ordered).each do |expanded_property|
+        element.keys.opt_sort(ordered: @options[:ordered]).each do |expanded_property|
           expanded_value = element[expanded_property]
           #log_debug("") {"#{expanded_property}: #{expanded_value.inspect}"}
 
@@ -126,7 +124,7 @@ def compact(element,
 
           if expanded_property == '@reverse'
             compacted_value = compact(expanded_value, base: base,
-                                      ordered: ordered, property: '@reverse')
+                                      property: '@reverse')
             #log_debug("@reverse") {"compacted_value: #{compacted_value.inspect}"}
             # handle double-reversed properties
             compacted_value.each do |prop, value|
@@ -148,7 +146,7 @@ def compact(element,
           if expanded_property == '@preserve'
             # Compact using `property`
             compacted_value = compact(expanded_value, base: base,
-                                      ordered: ordered, property: property)
+                                      property: property)
             #log_debug("@preserve") {"compacted_value: #{compacted_value.inspect}"}
 
             unless compacted_value.is_a?(Array) && compacted_value.empty?
@@ -213,7 +211,7 @@ def compact(element,
             end
 
             compacted_item = compact(value, base: base,
-                                     ordered: ordered, property: item_active_property)
+                                     property: item_active_property)
             #log_debug("") {" => compacted key: #{item_active_property.inspect} for #{compacted_item.inspect}"}
 
             # handle @list
@@ -317,7 +315,6 @@ def compact(element,
                 if compacted_item.keys.length == 1 && expanded_item.keys.include?('@id')
                   compacted_item = compact({'@id' => expanded_item['@id']},
                                            base: base,
-                                           ordered: ordered,
                                            property: item_active_property)
                 end
                 compacted_item
diff --git a/lib/json/ld/expand.rb b/lib/json/ld/expand.rb
@@ -27,13 +27,11 @@ module Expand
     #   Special rules for expanding a frame
     # @param [Boolean] from_map
     #   Expanding from a map, which could be an `@type` map, so don't clear out context term definitions
-    # @param [Boolean] ordered (true)
-    #   Ensure output objects have keys ordered properly
     #
     # @return [Array<Hash{String => Object}>]
     def expand(input, active_property, context,
                base: nil, framing: false,
-               from_map: false, ordered: true, log_depth: nil)
+               from_map: false, log_depth: nil)
       log_debug("expand", depth: log_depth.to_i) {"input: #{input.inspect}, active_property: #{active_property.inspect}, context: #{context.inspect}"}
       framing = false if active_property == '@default'
       expanded_active_property = context.expand_iri(active_property, vocab: true, as_string: true, base: base) if active_property
@@ -50,7 +48,6 @@ def expand(input, active_property, context,
           # Initialize expanded item to the result of using this algorithm recursively, passing active context, active property, and item as element.
           v = expand(v, active_property, context,
             base: base,
-            ordered: ordered,
             framing: framing,
             from_map: from_map,
             log_depth: log_depth.to_i + 1)
@@ -119,7 +116,6 @@ def expand(input, active_property, context,
                       base: base,
                       expanded_active_property: expanded_active_property,
                       framing: framing,
-                      ordered: ordered,
                       type_key: type_key,
                       type_scoped_context: type_scoped_context,
                       log_depth: log_depth.to_i + 1)
@@ -188,7 +184,7 @@ def expand(input, active_property, context,
         end
 
         # Re-order result keys if ordering
-        if ordered
+        if @options[:ordered]
           output_object.keys.sort.each_with_object({}) {|kk, memo| memo[kk] = output_object[kk]}
         else
           output_object
@@ -221,15 +217,14 @@ def expand_object(input, active_property, context, output_object,
                       framing:,
                       type_key:,
                       type_scoped_context:,
-                      ordered:,
                       log_depth: nil)
       nests = []
 
       input_type = Array(input[type_key]).last
       input_type = context.expand_iri(input_type, vocab: true, as_string: true, base: base) if input_type
 
       # Then, proceed and process each property and value in element as follows:
-      keys = ordered ? input.keys.sort : input.keys
+      keys = @options[:ordered] ? input.keys.sort : input.keys
       keys.each do |key|
         # For each key and value in element, ordered lexicographically by key:
         value = input[key]
@@ -300,7 +295,6 @@ def expand_object(input, active_property, context, output_object,
             included_result = as_array(expand(value, active_property, context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1))
 
             # Expanded values must be node objects
@@ -362,7 +356,6 @@ def expand_object(input, active_property, context, output_object,
             value = expand(value, '@graph', context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
             as_array(value)
           when '@value'
@@ -458,7 +451,6 @@ def expand_object(input, active_property, context, output_object,
             value = expand(value, active_property, context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
 
             # Spec FIXME: need to be sure that result is an array
@@ -470,7 +462,6 @@ def expand_object(input, active_property, context, output_object,
             expand(value, active_property, context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
           when '@reverse'
             # If expanded property is @reverse and value is not a JSON object, an invalid @reverse value error has been detected and processing is aborted.
@@ -482,7 +473,6 @@ def expand_object(input, active_property, context, output_object,
             value = expand(value, '@reverse', context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
 
             # If expanded value contains an @reverse member, i.e., properties that are reversed twice, execute for each of its property and item the following steps:
@@ -519,7 +509,6 @@ def expand_object(input, active_property, context, output_object,
             [expand(value, expanded_property, context,
               base: base,
               framing: framing,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
             ].flatten
           when '@nest'
@@ -549,7 +538,7 @@ def expand_object(input, active_property, context, output_object,
           ary = []
 
           # For each key-value pair language-language value in value, ordered lexicographically by language
-          keys = ordered ? value.keys.sort : value.keys
+          keys = @options[:ordered] ? value.keys.sort : value.keys
           keys.each do |k|
             expanded_k = context.expand_iri(k, vocab: true, as_string: true, base: base)
 
@@ -594,7 +583,7 @@ def expand_object(input, active_property, context, output_object,
           end
 
           # For each key-value in the object:
-          keys = ordered ? value.keys.sort : value.keys
+          keys = @options[:ordered] ? value.keys.sort : value.keys
           keys.each do |k|
             # If container mapping in the active context includes @type, and k is a term in the active context having a local context, use that context when expanding values
             map_context = container_context.term_definitions[k].context if container.include?('@type') && container_context.term_definitions[k]
@@ -612,7 +601,6 @@ def expand_object(input, active_property, context, output_object,
               base: base,
               framing: framing,
               from_map: true,
-              ordered: ordered,
               log_depth: log_depth.to_i + 1)
             index_value.each do |item|
               case
@@ -653,7 +641,6 @@ def expand_object(input, active_property, context, output_object,
           expand(value, key, context,
             base: base,
             framing: framing,
-            ordered: ordered,
             log_depth: log_depth.to_i + 1)
         end
 
@@ -725,7 +712,6 @@ def expand_object(input, active_property, context, output_object,
                         base: base,
                         framing: framing,
                         expanded_active_property: expanded_active_property,
-                        ordered: ordered,
                         type_key: type_key,
                         type_scoped_context: type_scoped_context,
                         log_depth: log_depth.to_i + 1)
diff --git a/script/tc b/script/tc
@@ -158,8 +158,8 @@ def run_tc(man, tc, options)
     exit 1
   rescue StandardError => e
     result = if tc.positiveTest?
-      STDERR.puts "#{"exception:" unless options[:quiet]}: #{e}"
-      if options[:quiet]
+      STDERR.puts "#{" exception" unless options[:quiet]}: #{e}"
+      if options[:quiet] || !options[:verbose]
         options[:results]['failed'] ||= 0
         options[:results]['failed'] += 1
       else
@@ -216,7 +216,6 @@ opts = GetoptLong.new(
   ["--quiet", "-q", GetoptLong::NO_ARGUMENT],
   ["--output", "-o", GetoptLong::REQUIRED_ARGUMENT],
   ["--stream",   GetoptLong::NO_ARGUMENT],
-  ["--validate", GetoptLong::NO_ARGUMENT],
   ["--verbose", "-v", GetoptLong::NO_ARGUMENT]
 )
 
@@ -228,7 +227,6 @@ def help(options)
   puts "      --quiet:              Minimal output"
   puts "      --output:             Output to specified file"
   puts "      --stream:             Use streaming RDF reader/writer"
-  puts "      --validate:           Validate input"
   puts "      --verbose:            Verbose processing"
   puts "      --help,-?:            This message"
   exit(0)
@@ -246,7 +244,6 @@ opts.each do |opt, arg|
     options[:quiet] = true
     logger.level = Logger::FATAL
   when '--stream'           then options[:stream] = true
-  when '--validate'         then options[:validate] = true
   when '--verbose'          then options[:verbose] = true
   end
 end
