Update some ruby conventions.

gkellogg · gkellogg · commit 7f66e4eac2d6 · 2021-01-27T17:16:39.000-08:00
diff --git a/bin/jsonld b/bin/jsonld
@@ -24,7 +24,7 @@ def run(input, options, parser_options)
 
   start = Time.new
   if options[:expand]
-    parser_options = parser_options.merge(expandContext: parser_options.delete(:context)) if parser_options.has_key?(:context)
+    parser_options = parser_options.merge(expandContext: parser_options.delete(:context)) if parser_options.key?(:context)
     input = JSON::LD::API.fromRdf(reader) if reader
     output = JSON::LD::API.expand(input, parser_options)
     secs = Time.new - start
@@ -49,7 +49,7 @@ def run(input, options, parser_options)
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Framed in #{secs} seconds." unless options[:quiet]
   else
-    parser_options = parser_options.merge(expandContext: parser_options.delete(:context)) if parser_options.has_key?(:context)
+    parser_options = parser_options.merge(expandContext: parser_options.delete(:context)) if parser_options.key?(:context)
     parser_options[:standard_prefixes] = true
     reader ||= JSON::LD::Reader.new(input, parser_options)
     num = 0
@@ -181,7 +181,7 @@ opts.each do |opt, arg|
 end
 
 # Hack
-if !(options.keys & [:expand, :compact, :flatten, :frame]).empty? &&
+if !(options.keys & %i{expand compact flatten frame}).empty? &&
    (parser_options[:stream] || options[:output_format] != :jsonld)
    STDERR.puts "Incompatible options"
    exit(1)
diff --git a/etc/template.haml b/etc/template.haml
@@ -102,7 +102,7 @@
                 %dd{rel: "doap:developer"}
                   - subject['developer'].each do |dev|
                     %div{resource: dev['@id'], typeof: Array(dev['@type']).join(" ")}
-                      - if dev.has_key?('@id')
+                      - if dev.key?('@id')
                         %a{href: dev['@id']}
                           %span{property: "foaf:name"}<
                             ~ CGI.escapeHTML dev['foaf:name'].to_s
diff --git a/lib/json/ld/api.rb b/lib/json/ld/api.rb
@@ -396,7 +396,7 @@ def self.frame(input, frame, expanded: false, **options)
         end
 
         # Set omitGraph option, if not present, based on processingMode
-        unless options.has_key?(:omitGraph)
+        unless options.key?(:omitGraph)
           options[:omitGraph] = context.processingMode('json-ld-1.1')
         end
 
@@ -423,7 +423,7 @@ def self.frame(input, frame, expanded: false, **options)
         frame(framing_state, framing_state[:subjects].keys.opt_sort(ordered: @options[:ordered]), (expanded_frame.first || {}), parent: result, **options)
 
         # Default to based on processinMode
-        if !options.has_key?(:pruneBlankNodeIdentifiers)
+        if !options.key?(:pruneBlankNodeIdentifiers)
           options[:pruneBlankNodeIdentifiers] = context.processingMode('json-ld-1.1')
         end
 
diff --git a/lib/json/ld/compact.rb b/lib/json/ld/compact.rb
@@ -231,7 +231,7 @@ def compact(element,
               unless container.include?('@list')
                 al = context.compact_iri('@list', vocab: true)
                 compacted_item = {al => compacted_item}
-                if expanded_item.has_key?('@index')
+                if expanded_item.key?('@index')
                   key = context.compact_iri('@index', vocab: true)
                   compacted_item[key] = expanded_item['@index']
                 end
@@ -276,7 +276,7 @@ def compact(element,
                   al = context.compact_iri('@id', vocab: true)
                   compacted_item[al] = context.compact_iri(expanded_item['@id'], vocab: false)
                 end
-                if expanded_item.has_key?('@index')
+                if expanded_item.key?('@index')
                   key = context.compact_iri('@index', vocab: true)
                   compacted_item[key] = expanded_item['@index']
                 end
diff --git a/lib/json/ld/context.rb b/lib/json/ld/context.rb
diff --git a/lib/json/ld/expand.rb b/lib/json/ld/expand.rb
@@ -81,7 +81,7 @@ def expand(input, active_property, context,
         log_debug("expand", depth: log_depth.to_i) {"after property_scoped_context: #{context.inspect}"} unless property_scoped_context.nil?
 
         # If element contains the key @context, set active context to the result of the Context Processing algorithm, passing active context and the value of the @context key as local context.
-        if input.has_key?('@context')
+        if input.key?('@context')
           context = context.parse(input.delete('@context'), base: @options[:base])
           log_debug("expand", depth: log_depth.to_i) {"context: #{context.inspect}"}
         end
@@ -142,7 +142,7 @@ def expand(input, active_property, context,
 
           if output_object['@type'] == '@json' && context.processingMode('json-ld-1.1')
             # Any value of @value is okay if @type: @json
-          elsif !ary.all? {|v| v.is_a?(String) || v.is_a?(Hash) && v.empty?} && output_object.has_key?('@language')
+          elsif !ary.all? {|v| v.is_a?(String) || v.is_a?(Hash) && v.empty?} && output_object.key?('@language')
             # Otherwise, if the value of result's @value member is not a string and result contains the key @language, an invalid language-tagged value error has been detected (only strings can be language-tagged) and processing is aborted.
             raise JsonLdError::InvalidLanguageTaggedValue,
                   "when @language is used, @value must be a string: #{output_object.inspect}"
@@ -266,7 +266,7 @@ def expand_object(input, active_property, context, output_object,
 
           # If result has already an expanded property member (other than @type), an colliding keywords error has been detected and processing is aborted.
           raise JsonLdError::CollidingKeywords,
-                "#{expanded_property} already exists in result" if output_object.has_key?(expanded_property) && !KEYS_INCLUDED_TYPE_REVERSE.include?(expanded_property)
+                "#{expanded_property} already exists in result" if output_object.key?(expanded_property) && !KEYS_INCLUDED_TYPE_REVERSE.include?(expanded_property)
 
           expanded_value = case expanded_property
           when '@id'
@@ -504,7 +504,7 @@ def expand_object(input, active_property, context, output_object,
               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:
-            if value.has_key?('@reverse')
+            if value.key?('@reverse')
               #log_debug("@reverse", depth: log_depth.to_i) {"double reverse: #{value.inspect}"}
               value['@reverse'].each do |property, item|
                 # If result does not have a property member, create one and set its value to an empty array.
diff --git a/lib/json/ld/extensions.rb b/lib/json/ld/extensions.rb
@@ -11,10 +11,10 @@ def +(value)
   class Statement
     # Validate extended RDF
     def valid_extended?
-      has_subject?    && subject.resource? && subject.valid_extended? &&
-      has_predicate?  && predicate.resource? && predicate.valid_extended? &&
-      has_object?     && object.term? && object.valid_extended? &&
-      (has_graph?      ? (graph_name.resource? && graph_name.valid_extended?) : true)
+      subject?    && subject.resource? && subject.valid_extended? &&
+      predicate?  && predicate.resource? && predicate.valid_extended? &&
+      object?     && object.term? && object.valid_extended? &&
+      (graph?      ? (graph_name.resource? && graph_name.valid_extended?) : true)
     end
   end
 
diff --git a/lib/json/ld/flatten.rb b/lib/json/ld/flatten.rb
@@ -49,7 +49,7 @@ def create_node_map(element, graph_map,
         subject_node = !reverse && graph[active_subject.is_a?(Hash) ? active_subject.to_json_c14n : active_subject]
 
         # Transform BNode types
-        if element.has_key?('@type')
+        if element.key?('@type')
           element['@type'] = Array(element['@type']).map {|t| blank_node?(t) ? namer.get_name(t) : t}
         end
 
@@ -143,7 +143,7 @@ def create_node_map(element, graph_map,
                             active_subject: star_subject)
           end
 
-          if element.has_key?('@type')
+          if element.key?('@type')
             add_value(node, '@type', element.delete('@type'), property_is_array: true, allow_duplicate: false)
           end
 
diff --git a/lib/json/ld/format.rb b/lib/json/ld/format.rb
@@ -57,7 +57,7 @@ def self.cli_commands
           lambda: ->(files, **options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
-            options = options.merge(expandContext: options.delete(:context)) if options.has_key?(:context)
+            options = options.merge(expandContext: options.delete(:context)) if options.key?(:context)
             options[:base] ||= options[:base_uri]
             if options[:format] == :jsonld
               if files.empty?
diff --git a/lib/json/ld/frame.rb b/lib/json/ld/frame.rb
@@ -52,7 +52,7 @@ def frame(state, subjects, frame, parent: nil, property: nil, ordered: false, **
           state[:uniqueEmbeds][state[:graph]] ||= {}
         end
 
-        if flags[:embed] == '@link' && link.has_key?(id)
+        if flags[:embed] == '@link' && link.key?(id)
           # add existing linked subject
           add_frame_output(parent, property, link[id])
           next
@@ -66,7 +66,7 @@ def frame(state, subjects, frame, parent: nil, property: nil, ordered: false, **
           warn "[DEPRECATION] #{flags[:embed]}  is not a valid value of @embed in 1.1 mode.\n"
         end
 
-        if !state[:embedded] && state[:uniqueEmbeds][state[:graph]].has_key?(id)
+        if !state[:embedded] && state[:uniqueEmbeds][state[:graph]].key?(id)
           # Skip adding this node object to the top-level, as it was included in another node object
           next
         elsif state[:embedded] &&
@@ -76,7 +76,7 @@ def frame(state, subjects, frame, parent: nil, property: nil, ordered: false, **
           next
         elsif state[:embedded] &&
           %w(@first @once).include?(flags[:embed]) &&
-          state[:uniqueEmbeds][state[:graph]].has_key?(id)
+          state[:uniqueEmbeds][state[:graph]].key?(id)
 
           # if only the first match should be embedded
           # Embed unless already embedded
@@ -97,15 +97,15 @@ def frame(state, subjects, frame, parent: nil, property: nil, ordered: false, **
         state[:subjectStack] << {subject: subject, graph: state[:graph]}
 
         # Subject is also the name of a graph
-        if state[:graphMap].has_key?(id)
+        if state[:graphMap].key?(id)
           # check frame's "@graph" to see what to do next
           # 1. if it doesn't exist and state.graph === "@merged", don't recurse
           # 2. if it doesn't exist and state.graph !== "@merged", recurse
           # 3. if "@merged" then don't recurse
           # 4. if "@default" then don't recurse
           # 5. recurse
           recurse, subframe = false, nil
-          if !frame.has_key?('@graph')
+          if !frame.key?('@graph')
             recurse, subframe = (state[:graph] != '@merged'), {}
           else
             subframe = frame['@graph'].first
@@ -134,7 +134,7 @@ def frame(state, subjects, frame, parent: nil, property: nil, ordered: false, **
           end
 
           # explicit is on and property isn't in frame, skip processing
-          next if flags[:explicit] && !frame.has_key?(prop)
+          next if flags[:explicit] && !frame.key?(prop)
 
           # add objects
           objects.each do |o|
@@ -267,7 +267,7 @@ def cleanup_preserve(input)
         # If, after replacement, an array contains only the value null remove the value, leaving an empty array.
         input.map {|o| cleanup_preserve(o)}
       when Hash
-        if input.has_key?('@preserve')
+        if input.key?('@preserve')
           # Replace with the content of `@preserve`
           cleanup_preserve(input['@preserve'].first)
         else
@@ -388,7 +388,7 @@ def filter_subject(subject, frame, state, flags)
           is_empty = v.empty?
           if v = v.first
             validate_frame(v)
-            has_default = v.has_key?('@default')
+            has_default = v.key?('@default')
           end
 
           # No longer a wildcard pattern if frame has any non-keyword properties
diff --git a/lib/json/ld/from_rdf.rb b/lib/json/ld/from_rdf.rb
@@ -75,7 +75,7 @@ def from_statements(dataset, useRdfType: false, useNativeTypes: false)
             property: statement.predicate.to_s,
             value:    value
           })
-        elsif referenced_once.has_key?(statement.object.to_s)
+        elsif referenced_once.key?(statement.object.to_s)
           referenced_once[statement.object.to_s] = false
         elsif statement.object.node?
           referenced_once[statement.object.to_s] = {
@@ -146,7 +146,7 @@ def from_statements(dataset, useRdfType: false, useNativeTypes: false)
       result = []
       default_graph.keys.opt_sort(ordered: @options[:ordered]).each do |subject|
         node = default_graph[subject]
-        if graph_map.has_key?(subject)
+        if graph_map.key?(subject)
           node['@graph'] = []
           graph_map[subject].keys.opt_sort(ordered: @options[:ordered]).each do |s|
             n = graph_map[subject][s]
diff --git a/lib/json/ld/streaming_reader.rb b/lib/json/ld/streaming_reader.rb
@@ -136,7 +136,7 @@ def parse_object(input, active_property, context,
         when '@type'
           # Set the type-scoped context to the context on input, for use later
           raise JsonLdError::InvalidStreamingKeyOrder,
-                "found #{key} in state #{state}" unless [:await_context, :await_type].include?(state)
+                "found #{key} in state #{state}" unless %i(await_context await_type).include?(state)
 
           type_scoped_context = context
           as_array(value).sort.each do |term|
@@ -159,7 +159,7 @@ def parse_object(input, active_property, context,
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if is_list_or_set
           raise JsonLdError::CollidingKeywords,
-                "found #{key} in state #{state}" unless [:await_context, :await_type, :await_id].include?(state)
+                "found #{key} in state #{state}" unless %i(await_context await_type await_id).include?(state)
 
           # Set our actual id, and use for replacing any provisional statements using our existing node_id, which is provisional
           raise JsonLdError::InvalidIdValue,
@@ -209,7 +209,7 @@ def parse_object(input, active_property, context,
           # Expanded values must be node objects
           have_statements = false
           parse_object(value, active_property, context) do |st|
-            have_statements ||= st.has_subject?
+            have_statements ||= st.subject?
             block.call(st)
           end
           raise JsonLdError::InvalidIncludedValue, "values of @included must expand to node objects" unless have_statements
@@ -232,7 +232,7 @@ def parse_object(input, active_property, context,
         when '@list'
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if
-            ![:await_context, :await_type, :await_id].include?(state)
+            !%i(await_context await_type await_id).include?(state)
           is_list_or_set = true
           if subject
             node_id = parse_list(value, active_property, context, &block)
@@ -277,7 +277,7 @@ def parse_object(input, active_property, context,
         when '@set'
           raise JsonLdError::InvalidSetOrListObject,
                 "found #{key} in state #{state}" if
-                ![:await_context, :await_type, :await_id].include?(state)
+                !%i(await_context await_type await_id).include?(state)
           is_list_or_set = true
           value = as_array(value).compact
           parse_object(value, active_property, context, subject: subject, predicate: predicate, &block)
diff --git a/lib/json/ld/streaming_writer.rb b/lib/json/ld/streaming_writer.rb
@@ -64,8 +64,8 @@ def stream_statement(statement)
           {"@value" => MultiJson.load(statement.object.to_s), "@type" => "@json"}
         else
           lit = {"@value" => statement.object.to_s}
-          lit["@type"] = statement.object.datatype.to_s if statement.object.has_datatype?
-          lit["@language"] = statement.object.language.to_s if statement.object.has_language?
+          lit["@type"] = statement.object.datatype.to_s if statement.object.datatype?
+          lit["@language"] = statement.object.language.to_s if statement.object.language?
           lit
         end
       end
@@ -91,7 +91,7 @@ def stream_epilogue
     def start_graph(resource)
       #log_debug("start_graph") {"state: #{@state.inspect}, resource: #{resource}"}
       if resource
-        @output.puts(",") if [:wrote_node, :wrote_graph].include?(@state)
+        @output.puts(",") if %i(wrote_node wrote_graph).include?(@state)
         @output.puts %({"@id": "#{resource}", "@graph": [)
         @state = :in_graph
       end
@@ -109,7 +109,7 @@ def end_graph
 
     def end_node
       #log_debug("end_node") {"state: #{@state.inspect}, node: #{@current_node_def.to_json}"}
-      @output.puts(",") if [:wrote_node, :wrote_graph].include?(@state)
+      @output.puts(",") if %i(wrote_node wrote_graph).include?(@state)
       if @current_node_def
         node_def = if context
           compacted = JSON::LD::API.compact(@current_node_def, context, rename_bnodes: false, **@options)
diff --git a/lib/json/ld/to_rdf.rb b/lib/json/ld/to_rdf.rb
@@ -48,7 +48,7 @@ def item_to_rdf(item, graph_name: nil, &block)
           # Only valid for rdf:JSON
           value = value.to_json_c14n
         else
-          if item.has_key?('@direction') && @options[:rdfDirection]
+          if item.key?('@direction') && @options[:rdfDirection]
             # Either serialize using a datatype, or a compound-literal
             case @options[:rdfDirection]
             when 'i18n-datatype'
@@ -63,7 +63,7 @@ def item_to_rdf(item, graph_name: nil, &block)
           end
 
           # Otherwise, if datatype is null, set it to xsd:string or xsd:langString, depending on if item has a @language key.
-          datatype ||= item.has_key?('@language') ? RDF.langString : RDF::XSD.string
+          datatype ||= item.key?('@language') ? RDF.langString : RDF::XSD.string
           if datatype == RDF::URI(RDF.to_uri + "JSON")
             value = value.to_json_c14n
           end
diff --git a/lib/json/ld/utils.rb b/lib/json/ld/utils.rb
diff --git a/lib/json/ld/writer.rb b/lib/json/ld/writer.rb
diff --git a/profiler/test-loaders.rb b/profiler/test-loaders.rb
diff --git a/script/parse b/script/parse
diff --git a/spec/compact_spec.rb b/spec/compact_spec.rb
