meta_request 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa726d98ee329e0d8f5c191fb58015b1869f407a
-  data.tar.gz: 6683df50b00f40428ea3161420f1874ab610ffca
+SHA256:
+  metadata.gz: a4b9c5b68ec96706c97b7694930d494d51a71d4cdfe8d0e4a31a1c5a3bd6162b
+  data.tar.gz: 12175a52caa80018ac03d1c47cce506da4f41094e72bbb36a3f950812436b2e5
 SHA512:
-  metadata.gz: 3c17a83779def3d7466d57b2076faa5f88ece7493998c7a2f7b7e3602634f6c238c2ddef5abb97424ef23f6e19e57de65496a689dd81463d1d369dcf8793c58c
-  data.tar.gz: 0fbf94aa9cb729400ee9900d01913a45a76373c5c8fb2fb7853c50309703a8cbd82f0e323b0c4da0b4685dc1eadab0f358046b16577df71d0d2afbae1b63c9d2
+  metadata.gz: f4344ff68b5379c110ed0a6f1d4b9e852b8dc72b3f6c3e323bcf36fc6e62b4aef196d9f61b81f38922c1c577c48f763b0fe574a7db6183d28ef931e8746d02d5
+  data.tar.gz: 5e3f37af2fb91197b442cb41f57f71c3c8aff600cfa6ce9ccf516419aa48f2e954ae7553b038c67b2bf7efbe647f34a794fd4afe2fb5554b7d53f4976b6a1bcb

data/lib/meta_request/app_notifications.rb

@@ -32,20 +32,31 @@ module MetaRequest
 
       Event.new(name, start, ending, transaction_id, payload)
     }
+
+    # sql processing block - used for sql.active_record and sql.sequel
+
+    # HACK: we hardcode the event name to 'sql.active_record' so that the ui will
+    # display sequel events without modification. otherwise the ui would need to
+    # be modified to support a sequel tab (or to change the display name on the
+    # active_record tab when necessary - which maybe makes more sense?)
+    SQL_EVENT_NAME = "sql.active_record"
+
+    SQL_BLOCK = Proc.new {|*args|
+      name, start, ending, transaction_id, payload = args
+      dev_caller = caller.detect { |c| c.include? MetaRequest.rails_root }
+      if dev_caller
+        c = Callsite.parse(dev_caller)
+        payload.merge!(:line => c.line, :filename => c.filename, :method => c.method)
+      end
+      Event.new(SQL_EVENT_NAME, start, ending, transaction_id, payload)
+    }
     # Subscribe to all events relevant to RailsPanel
     #
     def self.subscribe
       new.
         subscribe("meta_request.log").
-        subscribe("sql.active_record") do |*args|
-          name, start, ending, transaction_id, payload = args
-          dev_caller = caller.detect { |c| c.include? MetaRequest.rails_root }
-          if dev_caller
-            c = Callsite.parse(dev_caller)
-            payload.merge!(:line => c.line, :filename => c.filename, :method => c.method)
-          end
-          Event.new(name, start, ending, transaction_id, payload)
-        end.
+        subscribe("sql.active_record", &SQL_BLOCK).
+        subscribe("sql.sequel", &SQL_BLOCK).
         subscribe("render_partial.action_view").
         subscribe("render_template.action_view").
         subscribe("process_action.action_controller.exception").

data/lib/meta_request/event.rb

@@ -7,6 +7,8 @@ module MetaRequest
   # Subclass of ActiveSupport Event that is JSON encodable
   #
   class Event < ActiveSupport::Notifications::Event
+    NOT_JSON_ENCODABLE = 'Not JSON Encodable'.freeze
+
     attr_reader :duration
 
     def initialize(name, start, ending, transaction_id, payload)
@@ -36,13 +38,15 @@ module MetaRequest
       transform_hash(payload, :deep => true) { |hash, key, value|
         if value.class.to_s == 'ActionDispatch::Http::Headers'
           value = value.to_h.select { |k, _| k.upcase == k }
+        elsif value.is_a?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
+          value = NOT_JSON_ENCODABLE
         end
 
         begin
           value.to_json(:methods => [:duration])
           new_value = value
         rescue
-          new_value = 'Not JSON Encodable'
+          new_value = NOT_JSON_ENCODABLE
         end
         hash[key] = new_value
       }.with_indifferent_access

data/lib/meta_request/version.rb

@@ -1,3 +1,3 @@
 module MetaRequest
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta_request
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Request your Rails request