activetracker 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa285082d179d3e5e8ee686c1012c334af277e81d8de2b897c9ad732ce45f407
-  data.tar.gz: 5c297f61f2d0731cf0bde0833b609153510ce5c7833dca5ab30a7f11715eb268
+  metadata.gz: 1e63a184eb0383b6a3b026b154906ee136da8897003079c08846159c42f8b9f3
+  data.tar.gz: 1fd517ea2dd413013e2c205144c6090a83ea95b2e0748a6fcd42723697cfb1cd
 SHA512:
-  metadata.gz: faf8ae02103b763883fdd7bf6bd796abd1a03e1208a5c7ca259910ffb6f3904f31f1710893d3eb433ab2318674d6f8075a2366d1f7b944d83701f44ce1395420
-  data.tar.gz: bf60a7177ce99e7c924943ca059a3eef83ef5d881a32a9816b876f15d4fe064e4c5af33f8962d9e2a14bf2938828fcc0a7bf0e939ca48bc09aaa55a32950207f
+  metadata.gz: e270d4d2bbc749e747083568e383999951444823055611d7ff8016877021cd0ffb543cc5fb883806b1945a8a8e91a4591e838f28fc1c68ec0c1fe7b2016310ef
+  data.tar.gz: 570a780b051840c76f1adcfc6491406dd70745bae55a1320331cbd7fe2587640a18415b79ca2c78c92f6f59c249fd0303ef3bb23d72e2700df23fca00468566d

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.9] - 2019-11-06
+### Added
+- Pretty printing of JSON responses and minor display tweaks
+
 ## [0.4.8] - 2019-11-05
 ### Fixed
 - Removed unnecessary ActionMailer class

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activetracker (0.4.8)
+    activetracker (0.4.9)
       redis (~> 4.0)
 
 GEM

data/app/controllers/active_tracker/base_controller.rb

@@ -4,6 +4,11 @@ module ActiveTracker
 
     layout "active_tracker/active_tracker"
 
+    helper ActiveTracker::ImagesHelper
+    helper ActiveTracker::ApplicationHelper
+    helper ActiveTracker::PaginationHelper
+    helper ActiveTracker::OutputHelper
+
     before_action do
       if ActiveTracker::Configuration.authentication.is_a? String
         username, password = ActiveTracker::Configuration.authentication.split(":")

data/app/views/active_tracker/requests/show.html.erb

@@ -5,15 +5,15 @@
 <div class="flex flex-grow mt-10 items-center">
   <div class="rounded-lg bg-white text-sm text-gray-600 flex-1">
     <div class="flex flex-grow items-center">
-      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4">Method</div>
+      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4 flex-shrink-0">Method</div>
       <div class="pl-4"><span class="bg-gray-200 text-gray-600 rounded-full px-2 py-1 text-sm font-bold"><%= @request.tags[:method] %></span></div>
     </div>
     <div class="flex flex-grow items-center">
-      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4">Path</div>
+      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4 flex-shrink-0">Path</div>
       <div class="pl-4"><%= @request.tags[:url] %></div>
     </div>
     <div class="flex flex-grow items-center">
-      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4">Status</div>
+      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4 flex-shrink-0">Status</div>
       <% if @request.tags[:status].start_with?("2") %>
         <div class="pl-4"><span class="bg-green-100 text-green-600 rounded-full px-2 py-1 text-sm font-bold"><%= @request.tags[:status] %></span></div>
       <% elsif @request.tags[:status].start_with?("3") %>
@@ -25,7 +25,7 @@
       <% end %>
     </div>
     <div class="flex flex-grow items-center">
-      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4">When</div>
+      <div class="bg-gray-200 text-gray-600 uppercase w-32 p-4 flex-shrink-0">When</div>
       <div class="pl-4"><%= time_ago_in_words @request.log_at %> ago</div>
     </div>
   </div>
@@ -55,7 +55,15 @@
   </div>
 
   <div class="bg-black text-white font-mono whitespace-pre-wrap text-sm rounded-lg mt-2 p-4 overflow-x-auto js-activetracker-tab-content" data-content="logs"><%= escape_ansi @request.log.strip %></div>
-  <div class="bg-black text-white font-mono whitespace-pre-wrap text-sm rounded-lg mt-2 p-4 overflow-x-auto js-activetracker-tab-content hidden" data-content="response"><%= @request.output.strip %></div>
+  <div class="bg-black text-white font-mono whitespace-pre-wrap text-sm rounded-lg mt-2 p-4 overflow-x-auto js-activetracker-tab-content hidden" data-content="response"><%=
+  output = @request.output
+
+  if (@request.content_type || "")["application/json"]
+    output = JSON.pretty_generate(JSON.parse(output))
+  end
+
+  output.strip
+   %></div>
   <div class="bg-white rounded-b-lg mt-2 overflow-x-auto js-activetracker-tab-content hidden" data-content="queries">
     <div class="bg-gray-200 text-gray-600 uppercase tracking-tight leading-none py-2 px-4 flex flex-grow">
       <div class="flex-1">SQL</div>

data/lib/active_tracker/engine.rb

@@ -4,15 +4,6 @@ module ActiveTracker
     config.eager_load_paths += Dir["#{config.root}/lib/**/"]
     config.eager_load_paths += Dir["#{config.root}/app/**/"]
 
-    initializer 'active_tracker_helper.action_controller' do
-      ActiveSupport.on_load :action_controller do
-        helper ActiveTracker::ImagesHelper
-        helper ActiveTracker::ApplicationHelper
-        helper ActiveTracker::PaginationHelper
-        helper ActiveTracker::OutputHelper
-      end
-    end
-
     config.generators do |g|
       g.test_framework :rspec, fixture: false
       g.fixture_replacement :factory_girl, dir: 'spec/factories'

data/lib/active_tracker/output_capturer.rb

@@ -9,12 +9,12 @@ module ActiveTracker
       status, headers, response = @app.call(env)
       [status, headers, response]
     ensure
-      capture(response)
+      capture(response, headers)
       duration = (Time.current.to_f - start_time.to_f) * 1000
       ActiveTracker::Plugin::Request.record_duration(duration)
     end
 
-    def capture(response)
+    def capture(response, headers)
       body = response.body rescue nil
       unless body.is_a?(String)
         body = body.to_a rescue [body.body] rescue "No body given"
@@ -30,7 +30,7 @@ module ActiveTracker
         output = body.to_s
       end
 
-      ActiveTracker::Plugin::Request.output_capture(output)
+      ActiveTracker::Plugin::Request.output_capture(output, headers["Content-type"])
     end
 
   end

data/lib/active_tracker/plugin/request.rb

@@ -108,8 +108,9 @@ module ActiveTracker
         tag_current app: app_name
       end
 
-      def self.output_capture(output)
+      def self.output_capture(output, content_type)
         @output = output
+        @content_type = content_type
       end
 
       def self.record_duration(duration)
@@ -125,7 +126,7 @@ module ActiveTracker
         log = apply_redactions(log)
         @output = apply_redactions(@output)
 
-        ActiveTracker::Model.save("Request", {log: log, output: @output},
+        ActiveTracker::Model.save("Request", {log: log, output: @output, content_type: @content_type},
           tags: ActiveTracker::Plugin::Request.current_tags,
           data_type: "full",
           expiry: 7.days,

data/lib/active_tracker/version.rb

@@ -1,3 +1,3 @@
 module ActiveTracker
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activetracker
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler