meta_request 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49547952caa2d8244dc0342d0068ef44f2d8f2d5d98c6a6aa8ecac22df3e9122
-  data.tar.gz: d12d541968366874869350e81c716cb818966c6d3e897cb4081f8478b58bfb4a
+  metadata.gz: 40d50e7981aca25dd87449d817b7a6e223491be3cb2155ad3ee82e081afce02f
+  data.tar.gz: 8fa75570b5c5b41b546f71aa883bd9df3bdf9b76e4a6a38f5498aa3af641e0fd
 SHA512:
-  metadata.gz: 37d7b6d8f7475c6e4774e8c98484e19076a462122cd1f9861bd32772e3a8effa758bb08a57d09816f3b56af49ebe26deae2cdd6ae6e3dc605fb2d57fe404cc56
-  data.tar.gz: 82ee0cd01dfcf01d4e5c8b276f2c9d899bdd2f0aa59e97fe1dcb5a0b4619aacb04d55ca3e28516d9ed364d4e9ef2c1babe2454a5e6aaa679d1e5435c931a12e9
+  metadata.gz: 22764f1ec9e723a596e56993c802e541263ce1c7902b88c30902d69701a4b47705c404ce85fd3d2240f5fda7f5d1e85f0512f192647d181e10f30a5f13c6e6a0
+  data.tar.gz: 4c62d0983519f5ae3779759aeba06354e6cb9d4c920feb42f9966be91d0615ca8439c7749109435c3d916f1a40d3718b7c9c5dc99d88b50a04ee44b243b74374

data/README.md

@@ -35,6 +35,18 @@ end
 
 List of available attributes and defaults can be found in [lib/meta_request/config.rb](lib/meta_request/config.rb).
 
+## Docker
+
+Apps runing in Docker container will have filepaths of the container so links to editor would not work. To fix this, you need to propagate working directory through enviroment variable `SOURCE_PATH`. With docker-compose it can be done like this:
+
+```yaml
+services:
+  app:
+    environment:
+      - SOURCE_PATH=$PWD
+    # ...
+```
+
 ## Development
 
 Run all tests:

data/lib/meta_request/app_notifications.rb

@@ -24,11 +24,8 @@ module MetaRequest
         payload[:options][k] = payload.delete(k) unless k.in? CACHE_KEY_COLUMNS
       end
 
-      dev_callsite = Utils.dev_callsite(caller)
-
-      if dev_callsite
-        payload.merge!(:line => dev_callsite.line, :filename => dev_callsite.filename, :method => dev_callsite.method)
-      end
+      callsite = Utils.dev_callsite(caller)
+      payload.merge!(callsite) if callsite
 
       Event.new(name, start, ending, transaction_id, payload)
     }
@@ -43,14 +40,19 @@ module MetaRequest
 
     SQL_BLOCK = Proc.new {|*args|
       name, start, ending, transaction_id, payload = args
-      dev_callsite = Utils.dev_callsite(caller)
-
-      if dev_callsite
-        payload.merge!(:line => dev_callsite.line, :filename => dev_callsite.filename, :method => dev_callsite.method)
-      end
+      callsite = Utils.dev_callsite(caller)
+      payload.merge!(callsite) if callsite
 
       Event.new(SQL_EVENT_NAME, start, ending, transaction_id, payload)
     }
+
+    VIEW_BLOCK = Proc.new {|*args|
+      name, start, ending, transaction_id, payload = args
+      payload[:identifier] = MetaRequest::Utils.sub_source_path(payload[:identifier])
+
+      Event.new(name, start, ending, transaction_id, payload)
+    }
+
     # Subscribe to all events relevant to RailsPanel
     #
     def self.subscribe
@@ -58,8 +60,8 @@ module MetaRequest
         subscribe("meta_request.log").
         subscribe("sql.active_record", &SQL_BLOCK).
         subscribe("sql.sequel", &SQL_BLOCK).
-        subscribe("render_partial.action_view").
-        subscribe("render_template.action_view").
+        subscribe("render_partial.action_view", &VIEW_BLOCK).
+        subscribe("render_template.action_view", &VIEW_BLOCK).
         subscribe("process_action.action_controller.exception").
         subscribe("process_action.action_controller") do |*args|
           name, start, ending, transaction_id, payload = args

data/lib/meta_request/config.rb

@@ -1,6 +1,6 @@
 module MetaRequest
   class Config
-    attr_writer :logger, :storage_pool_size
+    attr_writer :logger, :storage_pool_size, :source_path
 
     # logger used for reporting gem's fatal errors
     def logger
@@ -12,5 +12,9 @@ module MetaRequest
     def storage_pool_size
       @storage_pool_size ||= 20
     end
+
+    def source_path
+      @source_path ||= ENV['SOURCE_PATH'] || Rails.root.to_s
+    end
   end
 end

data/lib/meta_request/log_interceptor.rb

@@ -31,12 +31,11 @@ module MetaRequest
       super
     end
 
-
     private
     def push_event(level, message)
-      dev_callsite = AppRequest.current && Utils.dev_callsite(caller[1])
-      if dev_callsite
-        payload = {:message => message, :level => level, :line => dev_callsite.line, :filename => dev_callsite.filename, :method => dev_callsite.method}
+      callsite = AppRequest.current && Utils.dev_callsite(caller.drop(1))
+      if callsite
+        payload = callsite.merge(message: message, level: level)
         AppRequest.current.events << Event.new('meta_request.log', 0, 0, 0, payload)
       end
     rescue Exception => e

data/lib/meta_request/utils.rb

@@ -1,13 +1,25 @@
-require 'callsite'
-
 module MetaRequest
   module Utils
     extend self
 
-    # @return [Callsite::Line, nil]
     def dev_callsite(caller)
-      app_line = Array(caller).detect { |c| c.start_with? MetaRequest.rails_root }
-      Callsite.parse(app_line) if app_line
+      app_line = caller.detect { |c| c.start_with? MetaRequest.rails_root }
+      return nil unless app_line
+
+      _, filename, _, line, _, method = app_line.split(/^(.*?)(:(\d+))(:in `(.*)')?$/)
+
+      {
+        filename: sub_source_path(filename),
+        line: line.to_i,
+        method: method
+      }
+    end
+
+    def sub_source_path(path)
+      rails_root = MetaRequest.rails_root
+      source_path = MetaRequest.config.source_path
+      return path if rails_root == source_path
+      path.sub(rails_root, source_path)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta_request
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -50,26 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: callsite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.11
 description: Supporting gem for Rails Panel (Google Chrome extension for Rails development)
 email: desimic@gmail.com
 executables: []