appmap 0.80.1 → 0.80.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1e5a636c3d6e807f11c54a29563e338804f3d101dc4779229596455cd60682
-  data.tar.gz: cf2aba805fdb427da2a642826f490b0002eb1892dd57a07693b119582a8cd7e1
+  metadata.gz: 52ebea9f89c7f412123ff2473f0ed62f46f2be4e69e98574d59c3eb91f8ef29b
+  data.tar.gz: 823073540b9979ede52b30c0e70398894b284bf51d10fcce786f082258d363c8
 SHA512:
-  metadata.gz: 6056dda497e69c32a6e7550c76b4b4e40a5cd5405d7244748af4f5f34ed7d6790eafa206470ac8c9a98019fec802944b4cec0cc274451028cf2c5d6f405bd626
-  data.tar.gz: '039ef96a6ae64cf641e58fb364a2777a65dc507ded48027752ca766c65204659b844cb6408d17a077947968d1fbf006f7c9b29e2fdfe03fc392d90c4495361ff'
+  metadata.gz: f837ad0b0ac7520c36c4ba2aa1c2d897235d316068461019a77a826dac5e8bf1401f44815d9cfb4fb47194c7b9090c70f3936073e1e99f0c7124fa9fe1d6baac
+  data.tar.gz: abb39a31ffd07bdccb0f5835cdd69bf5bacd5eb0844ea8836995017fe41716560243d1629bed2ed9fce046636586d35a17dc6abaaa5286d8532e41a3ad94f5ec

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.80.2](https://github.com/applandinc/appmap-ruby/compare/v0.80.1...v0.80.2) (2022-04-26)
+
+
+### Bug Fixes
+
+* Ensure that request env key is a string ([721baef](https://github.com/applandinc/appmap-ruby/commit/721baefbb3ba083bf6c5a1b46e6ddffa51feebec))
+* Fix method_display_name ([b05c7fe](https://github.com/applandinc/appmap-ruby/commit/b05c7fe027a981214b224852dc54c5e467e1f116))
+
 ## [0.80.1](https://github.com/applandinc/appmap-ruby/compare/v0.80.0...v0.80.1) (2022-04-08)
 
 

data/lib/appmap/class_map.rb

@@ -78,7 +78,7 @@ module AppMap
         end
 
         collapse_package = lambda do |package|
-          return unless package.type == 'package'
+          next unless package.type == 'package'
 
           while package.children.length == 1 && package.children.all? { |child| child.type == 'package' }
             child = package.children[0]

data/lib/appmap/handler/rails/template.rb

@@ -147,7 +147,7 @@ module AppMap
               else
                 path_obj.inspect
               end
-            path = path[Dir.pwd.length + 1..] if path.index(Dir.pwd) == 0
+            path = path[Dir.pwd.length + 1..-1] if path.index(Dir.pwd) == 0
             path
           end
         end

data/lib/appmap/hook/method.rb

@@ -18,6 +18,8 @@ module AppMap
       method
     end
 
+    RUBY_MAJOR_VERSION, RUBY_MINOR_VERSION, _ = RUBY_VERSION.split('.').map(&:to_i)
+
     # Single hooked method.
     # Call #activate to override the original.
     class Method
@@ -51,18 +53,31 @@ module AppMap
         if hook_class == Kernel
           hook_class.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
         else
-          hook_class.ancestors.find { |cls| cls.method_defined?(hook_method.name, false) }.tap do |cls|
-            if cls
-              cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
-            else
-              warn "#{hook_method.name} not found on #{hook_class}"
-            end
+          cls = defining_class(hook_class)
+          if cls
+            cls.define_method_with_arity(hook_method.name, hook_method.arity, hook_method_def)
           end
         end
       end
 
       protected
 
+      def defining_class(hook_class)
+        cls = \
+          if RUBY_MAJOR_VERSION == 2 && RUBY_MINOR_VERSION <= 5
+            hook_class
+              .ancestors
+              .select { |cls| cls.method_defined?(hook_method.name) }
+              .find { |cls| cls.instance_method(hook_method.name).owner == cls }
+          else
+            hook_class.ancestors.find { |cls| cls.method_defined?(hook_method.name, false) }
+          end
+
+        return cls if cls
+
+        warn "#{hook_method.name} not found on #{hook_class}"
+      end
+
       def gettime
         Process.clock_gettime Process::CLOCK_MONOTONIC
       end
@@ -78,7 +93,7 @@ module AppMap
       def method_display_name
         return @method_display_name if @method_display_name
 
-        return @method_display_name = [defined_class, method_symbol, hook_method.name].join if defined_class
+        return @method_display_name = [defined_class, '#', hook_method.name].join if defined_class
 
         "#{hook_method.name} (class resolution deferred)"
       end

data/lib/appmap/rspec.rb

@@ -78,7 +78,7 @@ module AppMap
         super
 
         webdriver_port = lambda do
-          return unless defined?(page) && page&.driver
+          next unless defined?(page) && page&.driver
 
           # This is the ugliest thing ever but I don't want to lose it.
           # All the WebDriver calls are getting app-mapped and it's really unclear

data/lib/appmap/swagger/markdown_descriptions.rb

@@ -15,8 +15,8 @@ module AppMap
 
       def perform
         to_markdown = lambda do |obj|
-          return obj.each(&to_markdown) if obj.is_a?(Array)
-          return unless obj.is_a?(Hash)
+          next obj.each(&to_markdown) if obj.is_a?(Array)
+          next unless obj.is_a?(Hash)
 
           description = obj['description']
           obj['description'] = converter.(description) if description

data/lib/appmap/swagger/stable.rb

@@ -10,8 +10,8 @@ module AppMap
       def perform
         clean_only = nil
         clean = lambda do |obj, properties = %w[description example]|
-          return obj.each(&clean_only.(properties)) if obj.is_a?(Array)
-          return unless obj.is_a?(Hash)
+          next obj.each(&clean_only.(properties)) if obj.is_a?(Array)
+          next unless obj.is_a?(Hash)
 
           properties.each { |property| obj.delete property }
 

data/lib/appmap/util.rb

@@ -122,7 +122,7 @@ module AppMap
         # Apparently, it's following the CGI spec in doing so.
         # https://datatracker.ietf.org/doc/html/rfc3875#section-4.1.18
         matching_headers = env
-          .select { |k,v| k.start_with? 'HTTP_' }
+          .select { |k,v| k.to_s.start_with? 'HTTP_' }
           .merge(
             'CONTENT_TYPE' => env['CONTENT_TYPE'],
             'CONTENT_LENGTH' => env['CONTENT_LENGTH'],

data/lib/appmap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.80.1
+  version: 0.80.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport