appmap 0.75.0 → 0.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 322b607426359e9dcebd46ea4a565550c75413e785275b736530149e19f493c4
-  data.tar.gz: 34b81b8f50e4312b0d1b3e54ad58bb86666812eafaba19338aca73ed12f12c37
+  metadata.gz: 15371b6980bcc95640c4d579c323da11db85509c0f50110c318da0d9cc04f189
+  data.tar.gz: 03a4e889edcfaf15629a7e9662f230df18b3b1123c86ce463edf4ba03c9e7280
 SHA512:
-  metadata.gz: ac8aa369f84bd56aa5b2fddba6211eb528beb9c79d710738e9b7feb20198922a35a98e7b57bb615979ad186d7920b358f3ef06f9ced9d4b9289c5627cc660512
-  data.tar.gz: 9e1c7ab9a501fd4043b31843291f62f71257d3d946a46d8b4c08e3330546a6680cdb53ac512b23ce81ac525e1d35178cc491b5a72113e23a93649c8f87948dab
+  metadata.gz: a1bc1b230b3e946400acbc3d1bc8ee87508973ce594ca488c17f2d39d1280346959e2c5acb5c9d3f6cd62627b61764f5cd0d96ef60639c645337df2ac850409b
+  data.tar.gz: e0bb0223a99795cedc38470d49dae428a720f0638674dc4e04b26d15aa085286d51c42aacc1ee490ff713122711728af9df1064adcb66a6dff7ccb89292b72a5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.76.0](https://github.com/applandinc/appmap-ruby/compare/v0.75.0...v0.76.0) (2022-03-19)
+
+
+### Features
+
+* Autoload hook handlers ([4cc0e70](https://github.com/applandinc/appmap-ruby/commit/4cc0e7003a8c37d3b6c8c8bbc68cffac0335b878))
+
 # [0.75.0](https://github.com/applandinc/appmap-ruby/compare/v0.74.0...v0.75.0) (2022-03-17)
 
 

data/lib/appmap/config.rb

@@ -4,8 +4,7 @@ require 'pathname'
 require 'set'
 require 'yaml'
 require 'appmap/util'
-require 'appmap/handler/net_http'
-require 'appmap/handler/rails/template'
+require 'appmap/handler'
 require 'appmap/service/guesser'
 require 'appmap/swagger/configuration'
 require 'appmap/depends/configuration'
@@ -206,8 +205,8 @@ module AppMap
         }.compact
 
         handler_class = hook_decl['handler_class']
-        options[:handler_class] = Util.class_from_string(handler_class) if handler_class
-        
+        options[:handler_class] = Handler.find(handler_class) if handler_class
+
         package_hooks(methods, **options)
       end
 

data/lib/appmap/handler.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector/methods'
+
+module AppMap
+  # Specific hook handler classes and general related utilities.
+  module Handler
+    # Try to find handler module with a given name.
+    #
+    # If the module is not loaded, tries to require the appropriate file
+    # using the usual conventions, eg. `Acme::Handler::AppMap` will try
+    # to require `acme/handler/app_map`, then `acme/handler` and
+    # finally `acme`. Raises NameError if the module could not be loaded
+    # this way.
+    def self.find(name)
+      begin
+        return Object.const_get name
+      rescue NameError
+        try_load ActiveSupport::Inflector.underscore name
+      end
+      Object.const_get name
+    end
+
+    def self.try_load(fname)
+      fname = fname.sub %r{^app_map/}, 'appmap/'
+      fname = fname.split '/'
+      until fname.empty?
+        begin
+          require fname.join '/'
+          return
+        rescue LoadError
+          # pass
+        end
+        fname.pop
+      end
+    end
+  end
+end

data/lib/appmap/hook.rb

@@ -108,8 +108,11 @@ module AppMap
 
               warn "AppMap: Initiating hook for builtin #{class_name} #{method_name}" if LOG
 
-              base_cls = Util.class_from_string(class_name, must: false)
-              next unless base_cls
+              begin
+                base_cls = Object.const_get class_name
+              rescue NameError
+                next
+              end
 
               hook_method = lambda do |entry|
                 cls, method = entry

data/lib/appmap/util.rb

@@ -21,14 +21,6 @@ module AppMap
     WHITE   = "\e[37m"
 
     class << self
-      def class_from_string(fq_class, must: true)
-        fq_class.split('::').inject(Object) do |mod, class_name|
-          mod.const_get(class_name)
-        end
-      rescue NameError
-        raise if must
-      end
-
       def parse_function_name(name)
         package_tokens = name.split('/')
 

data/lib/appmap/version.rb

@@ -3,7 +3,7 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.75.0'
+  VERSION = '0.76.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.75.0
+  version: 0.76.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -374,6 +374,7 @@ files:
 - lib/appmap/gem_hooks/resque.yml
 - lib/appmap/gem_hooks/sidekiq.yml
 - lib/appmap/gem_hooks/sprockets.yml
+- lib/appmap/handler.rb
 - lib/appmap/handler/function.rb
 - lib/appmap/handler/net_http.rb
 - lib/appmap/handler/rails/request_handler.rb