fix: Add missing imports and remove deprecation warnings

Author: kgilpin

appmap.gemspec

@@ -54,4 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webdrivers', '~> 4.0'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'hashie'
+  spec.add_development_dependency 'webrick'
 end

lib/appmap/handler/net_http.rb

@@ -82,7 +82,7 @@ class << self
         def request_headers(request)
           {}.tap do |headers|
             request.each_header do |k,v|
-              key = [ 'HTTP', k.underscore.upcase ].join('_')
+              key = [ 'HTTP', Util.underscore(k).upcase ].join('_')
               headers[key] = v
             end
           end

lib/appmap/handler/rails/template.rb

@@ -146,7 +146,8 @@ def handle_return(call_event_id, elapsed, return_value, exception)
         class RenderHandler
           class << self
             def handle_call(defined_class, hook_method, receiver, args)
-              context, options = args
+              # context, options
+              _, options = args
 
               warn "Renderer: #{options}" if LOG
 

lib/appmap/hook.rb

@@ -99,7 +99,6 @@ def trace_location(trace_point)
     end
 
     def trace_end(trace_point)
-      location = trace_location(trace_point)
       warn "Class or module ends at location #{trace_location(trace_point)}" if Hook::LOG || Hook::LOG_HOOK
 
       path = trace_point.path

lib/appmap/trace.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'delegate'
+
 module AppMap
   module Trace
     class RubyMethod < SimpleDelegator

lib/appmap/util.rb

@@ -124,7 +124,7 @@ def swaggerize_path(path)
         path = path.split('(.')[0]
         tokens = path.split('/')
         tokens.map do |token|
-          token.gsub /^:(.*)/, '{\1}'
+          token.gsub(/^:(.*)/, '{\1}')
         end.join('/')
       end
 
@@ -154,6 +154,18 @@ def classify(word)
         word.split(/[\-_]/).map(&:capitalize).join
       end
 
+      # https://api.rubyonrails.org/v6.1.3.2/classes/ActiveSupport/Inflector.html#method-i-underscore
+      def underscore(camel_cased_word)
+        return camel_cased_word unless /[A-Z-]|::/.match?(camel_cased_word)
+        word = camel_cased_word.to_s.gsub("::", "/")
+        # word.gsub!(inflections.acronyms_underscore_regex) { "#{$1 && '_' }#{$2.downcase}" }
+        word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
+
       def deep_dup(hash)
         # This is a simple way to avoid the need for deep_dup from activesupport.
         Marshal.load(Marshal.dump(hash))

spec/record_net_http_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'diffy'
 require 'rack'
+require 'webrick'
 require 'rack/handler/webrick'
 
 class HelloWorldApp