appmap 0.53.0 → 0.54.0

data/spec/fixtures/rails5_users_app/config/environments/test.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/fixtures/rails6_users_app/Dockerfile

@@ -2,7 +2,6 @@ ARG GEM_VERSION
 ARG RUBY_VERSION
 
 FROM appmap:${GEM_VERSION} as appmap
-
 FROM ruby:${RUBY_VERSION}
 
 SHELL ["/bin/bash", "-c"]

data/spec/fixtures/rails6_users_app/appmap.yml

@@ -5,4 +5,6 @@ packages:
   - path: app/controllers
     labels: [ mvc.controller ]
   - gem: sequel
-
+swagger:
+  project_version: 1.1.0
+  output_dir: tmp/swagger

data/spec/fixtures/rails6_users_app/config/environments/test.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/fixtures/rails6_users_app/lib/tasks/appmap.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :appmap do
+  def swagger_tasks
+    require 'appmap/swagger'
+
+    AppMap::Swagger::RakeTasks.define_tasks
+  end
+
+  if %w[test development].member?(Rails.env)
+    swagger_tasks
+  end
+end

data/spec/rails_recording_spec.rb

@@ -224,7 +224,7 @@ describe 'Rails' do
                 'name' => 'ActionView',
                 'children' => include(hash_including(
                   # Rails 6/5 difference
-                  'name' => /^(Template)?Renderer$/,                  
+                  'name' => /^(Template)?Renderer$/,
                   'children' => include(hash_including(
                     'name' => 'render',
                     'labels' => ['mvc.view']

data/spec/swagger/swagger_spec.rb

@@ -0,0 +1,47 @@
+require_relative '../rails_spec_helper'
+
+describe 'rake appmap:swagger' do
+  include_context 'Rails app pg database', "spec/fixtures/rails6_users_app" unless use_existing_data?
+  include_context 'rails integration test setup'
+
+  def run_spec(spec_name)
+    cmd = <<~CMD.gsub "\n", ' '
+      docker-compose run --rm -e RAILS_ENV=test -e APPMAP=true
+      -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rspec #{spec_name}
+    CMD
+    run_cmd cmd, chdir: fixture_dir
+  end
+
+  def generate_swagger
+    cmd = <<~CMD.gsub "\n", ' '
+      docker-compose run --rm -v #{File.absolute_path tmpdir}:/app/tmp app ./bin/rake appmap:swagger
+    CMD
+    run_cmd cmd, chdir: fixture_dir
+  end
+
+  unless use_existing_data?
+    before(:all) do
+      generate_swagger
+    end
+  end
+
+  # The swagger-building logic is mostly in the JS code. So what we are really testing here
+  # is the Rails integration - the rake task and integration with the appmap.yml.
+  # And of course the bundling of the JS code by the appmap gem.
+  it 'generates openapi_stable.yml' do
+    swagger = YAML.load(File.read(File.join(tmpdir, 'swagger', 'openapi_stable.yaml'))).deep_symbolize_keys
+
+    expect(swagger).to match(
+      hash_including(
+        openapi: /^\d\.\d\.\d$/,
+        info: {
+          title: 'Usersapp API',
+          version: '1.1.0'
+        },
+        paths: hash_including(
+          :'/api/users' => an_instance_of(Hash)
+        )
+      )
+    )
+  end
+end

data/test/gem_test.rb

@@ -3,6 +3,7 @@
 
 require 'test_helper'
 require 'English'
+require 'json'
 
 class GemTest < Minitest::Test
   def perform_gem_test(test_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,6 +314,7 @@ files:
 - ext/appmap/appmap.c
 - ext/appmap/extconf.rb
 - lib/appmap.rb
+- lib/appmap/agent.rb
 - lib/appmap/class_map.rb
 - lib/appmap/command/agent_setup/init.rb
 - lib/appmap/command/inspect.rb
@@ -337,6 +338,11 @@ files:
 - lib/appmap/record.rb
 - lib/appmap/rspec.rb
 - lib/appmap/service/guesser.rb
+- lib/appmap/swagger.rb
+- lib/appmap/swagger/configuration.rb
+- lib/appmap/swagger/markdown_descriptions.rb
+- lib/appmap/swagger/rake_tasks.rb
+- lib/appmap/swagger/stable.rb
 - lib/appmap/trace.rb
 - lib/appmap/util.rb
 - lib/appmap/version.rb
@@ -344,6 +350,13 @@ files:
 - release.sh
 - spec/class_map_spec.rb
 - spec/config_spec.rb
+- spec/fixtures/hook/.gitignore
+- spec/fixtures/hook/app/controllers/api/api_keys_controller.rb
+- spec/fixtures/hook/app/controllers/organizations_controller.rb
+- spec/fixtures/hook/app/models/api_key.rb
+- spec/fixtures/hook/app/models/configuration.rb
+- spec/fixtures/hook/app/models/show.rb
+- spec/fixtures/hook/app/models/user.rb
 - spec/fixtures/hook/attr_accessor.rb
 - spec/fixtures/hook/compare.rb
 - spec/fixtures/hook/constructor.rb
@@ -353,7 +366,11 @@ files:
 - spec/fixtures/hook/instance_method.rb
 - spec/fixtures/hook/labels.rb
 - spec/fixtures/hook/method_named_call.rb
+- spec/fixtures/hook/revoke_api_key.appmap.json
 - spec/fixtures/hook/singleton_method.rb
+- spec/fixtures/hook/spec/api_spec.rb
+- spec/fixtures/hook/spec/user_spec.rb
+- spec/fixtures/hook/user_page_scenario.appmap.json
 - spec/fixtures/rack_users_app/.dockerignore
 - spec/fixtures/rack_users_app/.gitignore
 - spec/fixtures/rack_users_app/Dockerfile
@@ -496,6 +513,7 @@ files:
 - spec/fixtures/rails6_users_app/features/support/hooks.rb
 - spec/fixtures/rails6_users_app/features/support/steps.rb
 - spec/fixtures/rails6_users_app/lib/tasks/.keep
+- spec/fixtures/rails6_users_app/lib/tasks/appmap.rake
 - spec/fixtures/rails6_users_app/log/.keep
 - spec/fixtures/rails6_users_app/public/robots.txt
 - spec/fixtures/rails6_users_app/spec/controllers/users_controller_api_spec.rb
@@ -513,6 +531,7 @@ files:
 - spec/record_sql_rails_pg_spec.rb
 - spec/remote_recording_spec.rb
 - spec/spec_helper.rb
+- spec/swagger/swagger_spec.rb
 - spec/util_spec.rb
 - test/agent_setup_init_test.rb
 - test/bundle_vendor_test.rb