appmap 0.34.4 → 0.36.0

data/test/cli_test.rb

@@ -56,12 +56,10 @@ class CLITest < Minitest::Test
     Class frequency:
     ----------------
     1	Main
-    1	IO
 
     Method frequency:
     ----------------
     1	Main.say_hello
-    1	IO#write
     OUTPUT
   end
 
@@ -82,20 +80,12 @@ class CLITest < Minitest::Test
         {
           "name": "Main",
           "count": 1
-        },
-        {
-          "name": "IO",
-          "count": 1
         }
       ],
       "method_frequency": [
         {
           "name": "Main.say_hello",
           "count": 1
-        },
-        {
-          "name": "IO#write",
-          "count": 1
         }
       ]
     }

data/test/fixtures/gem_test/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'appmap', git: 'applandinc/appmap-ruby', branch: `git rev-parse --abbrev-ref HEAD`.strip
+gem 'activesupport'
+gem 'byebug'
+gem 'minitest'

data/test/fixtures/gem_test/appmap.yml

@@ -0,0 +1,3 @@
+name: gem_test
+packages:
+  - gem: activesupport

data/test/fixtures/gem_test/test/to_param_test.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'appmap/minitest'
+require 'minitest/autorun'
+require 'active_support'
+require 'active_support/core_ext'
+
+class ToParamTest < ::Minitest::Test
+  def test_to_param
+    # record use of a core extension
+    assert_equal 'my+id', 'my+id'.to_param
+  end
+end

data/test/gem_test.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'English'
+
+class MinitestTest < Minitest::Test
+  def perform_gem_test(test_name)
+    Bundler.with_clean_env do
+      Dir.chdir 'test/fixtures/gem_test' do
+        FileUtils.rm_rf 'tmp'
+        system 'bundle config --local local.appmap ../../..'
+        system 'bundle'
+        system({ 'APPMAP' => 'true' }, %(bundle exec ruby -Ilib -Itest test/#{test_name}_test.rb))
+
+        yield
+      end
+    end
+  end
+
+  def test_record_gem
+    perform_gem_test 'to_param' do
+      appmap_file = 'tmp/appmap/minitest/To_param_to_param.appmap.json'
+      appmap = JSON.parse(File.read(appmap_file))
+      events = appmap['events']
+      assert_equal 2, events.size
+      assert_equal 'call', events.first['event']
+      assert_equal 'to_param', events.first['method_id']
+      assert_equal "#{Gem.loaded_specs['activesupport'].gem_dir}/lib/active_support/core_ext/object/to_query.rb", events.first['path']
+      assert_equal 'return', events.second['event']
+      assert_equal 1, events.second['parent_id']
+    end
+  end
+end

data/test/minitest_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 require 'English'
 
 class MinitestTest < Minitest::Test
-  def perform_test(test_name)
+  def perform_minitest_test(test_name)
     Bundler.with_clean_env do
       Dir.chdir 'test/fixtures/minitest_recorder' do
         FileUtils.rm_rf 'tmp'
@@ -19,7 +19,7 @@ class MinitestTest < Minitest::Test
   end
 
   def test_hello
-    perform_test 'hello' do
+    perform_minitest_test 'hello' do
       appmap_file = 'tmp/appmap/minitest/Hello_hello.appmap.json'
 
       assert File.file?(appmap_file), 'appmap output file does not exist'

data/test/openssl_test.rb

@@ -11,7 +11,7 @@ class OpenSSLTest < Minitest::Test
         FileUtils.rm_rf 'tmp'
         system 'bundle config --local local.appmap ../../..'
         system 'bundle'
-        system({ 'APPMAP' => 'true', 'DEBUG' => 'true' }, %(bundle exec ruby lib/openssl_#{test_name}.rb))
+        system({ 'APPMAP' => 'true' }, %(bundle exec ruby lib/openssl_#{test_name}.rb))
 
         yield
       end
@@ -79,27 +79,6 @@ class OpenSSLTest < Minitest::Test
               ]
             }
           ]
-        },
-        {
-          "name": "io",
-          "type": "package",
-          "children": [
-            {
-              "name": "IO",
-              "type": "class",
-              "children": [
-                {
-                  "name": "write",
-                  "type": "function",
-                  "location": "IO#write",
-                  "static": false,
-                  "labels": [
-                    "io"
-                  ]
-                }
-              ]
-            }
-          ]
         }
       ]
       JSON
@@ -167,33 +146,6 @@ class OpenSSLTest < Minitest::Test
           "return_value": {
             "class": "String"
           }
-        },
-        {
-          "id": 5,
-          "event": "call",
-          "defined_class": "IO",
-          "method_id": "write",
-          "path": "IO#write",
-          "static": false,
-          "parameters": [
-            {
-              "name": "arg",
-              "class": "String",
-              "value": "Computed signature",
-              "kind": "rest"
-            }
-          ],
-          "receiver": {
-            "class": "IO"
-          }
-        },
-        {
-          "id": 6,
-          "event": "return",
-          "parent_id": 5,
-          "return_value": {
-            "class": "Integer"
-          }
         }
       ]
       JSON

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.34.4
+  version: 0.36.0
 platform: ruby
 authors:
 - Kevin Gilpin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,14 +84,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -290,7 +290,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - kgilpin@gmail.com
 executables:
@@ -303,7 +303,6 @@ files:
 - ".gitignore"
 - ".rbenv-gemsets"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile.appmap
@@ -338,7 +337,7 @@ files:
 - lib/appmap/middleware/remote_recording.rb
 - lib/appmap/minitest.rb
 - lib/appmap/open.rb
-- lib/appmap/rails/action_handler.rb
+- lib/appmap/rails/request_handler.rb
 - lib/appmap/rails/sql_handler.rb
 - lib/appmap/railtie.rb
 - lib/appmap/record.rb
@@ -545,6 +544,9 @@ files:
 - test/fixtures/cucumber_recorder/features/support/hooks.rb
 - test/fixtures/cucumber_recorder/features/support/steps.rb
 - test/fixtures/cucumber_recorder/lib/hello.rb
+- test/fixtures/gem_test/Gemfile
+- test/fixtures/gem_test/appmap.yml
+- test/fixtures/gem_test/test/to_param_test.rb
 - test/fixtures/minitest_recorder/Gemfile
 - test/fixtures/minitest_recorder/appmap.yml
 - test/fixtures/minitest_recorder/lib/hello.rb
@@ -562,6 +564,7 @@ files:
 - test/fixtures/rspec_recorder/spec/decorated_hello_spec.rb
 - test/fixtures/rspec_recorder/spec/labeled_hello_spec.rb
 - test/fixtures/rspec_recorder/spec/plain_hello_spec.rb
+- test/gem_test.rb
 - test/minitest_test.rb
 - test/openssl_test.rb
 - test/record_process_test.rb
@@ -571,7 +574,7 @@ homepage: https://github.com/applandinc/appmap-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -587,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Record the operation of a Ruby program, using the AppLand 'AppMap' format.
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.6.2

data/lib/appmap/rails/action_handler.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require 'appmap/event'
-
-module AppMap
-  module Rails
-    module ActionHandler
-      Context = Struct.new(:id, :start_time)
-
-      module ContextKey
-        def context_key
-          "#{HTTPServerRequest.name}#call"
-        end
-      end
-
-      class HTTPServerRequest
-        include ContextKey
-
-        class Call < AppMap::Event::MethodCall
-          attr_accessor :payload
-
-          def initialize(payload)
-            super AppMap::Event.next_id_counter, :call, Thread.current.object_id
-
-            self.payload = payload
-          end
-
-          def to_h
-            super.tap do |h|
-              h[:http_server_request] = {
-                request_method: payload[:method],
-                path_info: payload[:path]
-              }
-
-              params = payload[:params]
-              h[:message] = params.keys.map do |key|
-                val = params[key]
-                {
-                  name: key,
-                  class: val.class.name,
-                  value: self.class.display_string(val),
-                  object_id: val.__id__
-                }
-              end
-            end
-          end
-        end
-
-        def call(_, started, finished, _, payload) # (name, started, finished, unique_id, payload)
-          event = Call.new(payload)
-          Thread.current[context_key] = Context.new(event.id, Time.now)
-          AppMap.tracing.record_event(event)
-        end
-      end
-
-      class HTTPServerResponse
-        include ContextKey
-
-        class Call < AppMap::Event::MethodReturnIgnoreValue
-          attr_accessor :payload
-
-          def initialize(payload, parent_id, elapsed)
-            super AppMap::Event.next_id_counter, :return, Thread.current.object_id
-
-            self.payload = payload
-            self.parent_id = parent_id
-            self.elapsed = elapsed
-          end
-
-          def to_h
-            super.tap do |h|
-              h[:http_server_response] = {
-                status: payload[:status]
-              }
-            end
-          end
-        end
-
-        def call(_, started, finished, _, payload) # (name, started, finished, unique_id, payload)
-          return unless Thread.current[context_key]
-
-          context = Thread.current[context_key]
-          Thread.current[context_key] = nil
-
-          event = Call.new(payload, context.id, Time.now - context.start_time)
-          AppMap.tracing.record_event(event)
-        end
-      end
-    end
-  end
-end