appmap 0.80.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb003b96b494282db035877377124bc3736d78320a64e479b7caa0b8df49063a
-  data.tar.gz: 3aab36a97c90485e1c7f77bed373c4c572b46a5c8c93ac4aa012db3becf201f4
+  metadata.gz: 86f2c44b83fd3ecc97b23cbffb41f1c735eb41b9ed6e134518ecfc3093e5585a
+  data.tar.gz: 3e5d84855cbcfdc93d3dee64719f63650f7f46932e60e81b93f24050c43b9965
 SHA512:
-  metadata.gz: 8637610caacf145c5badb4de3eb399858a231d3de9a794f86e8fcb3d14801d3b5309453da7e9b799d47ddb9c4eed55bbd97bf2f77eabe7e605e95089b560c5bf
-  data.tar.gz: bba8d4f2f8ffa5b0e5d8b113657324561dfa71e7b7128273631d62d426c8e12339e305d9fb0fe0d05244685a1ddc1b4be4bfbe5a4b44607a2df96e5d60749557
+  metadata.gz: 63aa95863c061a8c8185efb02cb10a410b0399a9bde445be8911bed7a0d4a7b10c36c9143d3f77647004610bedc072dca1b14f953c82bfd86ee863883a5dbae6
+  data.tar.gz: 1ca89bb45ed6bb7c6f917d297d2b15d341a9349e1694b38be94251bad090170b84a5c5390fcc9760bdd160fa6c9f660942cf7203d8064dc90f83e10a0dcfa3f9

data/.travis.yml

@@ -4,9 +4,8 @@ cache:
 - bundle
 - yarn
 
-# NB: if you update the ruby versions here, you also need to update
-# them in the Rakefile.
 rbenv:
+- 2.5
 - 2.6
 - 2.7
 - 3.0

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [0.81.0](https://github.com/applandinc/appmap-ruby/compare/v0.80.2...v0.81.0) (2022-04-26)
+
+
+### Features
+
+* Add Ruby 2.5 to the version whitelist ([945f7da](https://github.com/applandinc/appmap-ruby/commit/945f7daaee9685a55f14e8714677661fa5cb4e82))
+
+## [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)
+
+
+### Bug Fixes
+
+* Don't call #size on complex objects ([3f19d1e](https://github.com/applandinc/appmap-ruby/commit/3f19d1e67288379570dfa14d8758a0624d2c6c34))
+
 # [0.80.0](https://github.com/applandinc/appmap-ruby/compare/v0.79.0...v0.80.0) (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/event.rb

@@ -60,6 +60,13 @@ module AppMap
           final ? value_string : encode_display_string(value_string)
         end
 
+        def add_size(param, value)
+          # Don't risk calling #size on things like data-access objects, which can and will issue queries for this information.
+          if value.is_a?(Array) || value.is_a?(Hash)
+            param[:size] = value.size
+          end
+        end
+
         def add_schema(param, value)
           begin
             if value.respond_to?(:keys)
@@ -224,7 +231,7 @@ module AppMap
                 value: display_string(value),
                 kind: param_type
               }.tap do |param|
-                param[:size] = value.size if value.respond_to?(:size) && value.is_a?(Enumerable)
+                add_size param, value
               end
             end
             event.receiver = {
@@ -289,7 +296,7 @@ module AppMap
                 value: display_string(return_value),
                 object_id: return_value.__id__
               }.tap do |param|
-                param[:size] = return_value.size if return_value.respond_to?(:size) && return_value.is_a?(Enumerable)
+                add_size param, return_value
                 add_schema param, return_value if parameter_schema && !exception
               end
             end

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,11 +3,11 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.80.0'
+  VERSION = '0.81.0'
 
   APPMAP_FORMAT_VERSION = '1.5.1'
 
-  SUPPORTED_RUBY_VERSIONS = %w[2.6 2.7 3.0 3.1].freeze
+  SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 
   DEFAULT_APPMAP_DIR = 'tmp/appmap'.freeze
   DEFAULT_CONFIG_FILE_PATH = 'appmap.yml'.freeze

data/spec/handler/eval_spec.rb

@@ -38,7 +38,7 @@ describe 'AppMap::Handler::Eval' do
   # a la Ruby 2.6.3 ruby-token.rb
   # token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
   it 'can define a new class' do
-    num = (Random.random_number * 10_000).to_i
+    num = (Random.new.random_number * 10_000).to_i
     class_name = "Cls_#{num}"
     m = ClassMaker
     cls = nil

data/spec/rails_spec_helper.rb

@@ -18,7 +18,7 @@ class TestRailsApp
   attr_reader :fixture_dir
 
   def run_cmd(cmd, env = {})
-    run_process method(:system), cmd, env, exception: true
+    run_process method(:system), cmd, env
   end
 
   def spawn_cmd(cmd, env = {})
@@ -33,7 +33,7 @@ class TestRailsApp
 
   def database_name
     # This is used locally too, so make the name nice and unique.
-    @database_name ||= "appland-rails-test-#{Random.bytes(8).unpack1('h*')}"
+    @database_name ||= "appland-rails-test-#{Random.new.bytes(8).unpack1('h*')}"
   end
 
   def bundle

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.81.0
 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