meta_request 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d50e7981aca25dd87449d817b7a6e223491be3cb2155ad3ee82e081afce02f
-  data.tar.gz: 8fa75570b5c5b41b546f71aa883bd9df3bdf9b76e4a6a38f5498aa3af641e0fd
+  metadata.gz: 9e49088dd0f59edb460bd290208da99950c27d80b53a89ec118eff7e92456081
+  data.tar.gz: 176cf5c3b6acc39a80c962e3e1bc6d2d2a7bbce8c492bd5055bcb18d592fc1a5
 SHA512:
-  metadata.gz: 22764f1ec9e723a596e56993c802e541263ce1c7902b88c30902d69701a4b47705c404ce85fd3d2240f5fda7f5d1e85f0512f192647d181e10f30a5f13c6e6a0
-  data.tar.gz: 4c62d0983519f5ae3779759aeba06354e6cb9d4c920feb42f9966be91d0615ca8439c7749109435c3d916f1a40d3718b7c9c5dc99d88b50a04ee44b243b74374
+  metadata.gz: 8c91cd99b7cbf908d8aa04fd2781296be408921eb4ea1b4504fa10a586fa216f55f68798bd2f6304ab0e5be3a1300c00347adcc3add55ffb15285298b2db3e5f
+  data.tar.gz: 6ef328ed871cc4705fece9ffc7ab0642a8763b40d24848ecedc9e7754a5636164484be069d6655596a1be7be2a8b94fab28fab5916645a577bdb148ca736df0a

data/lib/meta_request/app_notifications.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 module MetaRequest
   class AppNotifications
-
     # these are the specific keys in the cache payload that we display in the
     # panel view
-    CACHE_KEY_COLUMNS = [:key, :hit, :options, :type]
+    CACHE_KEY_COLUMNS = %i[key hit options type].freeze
 
     # define this here so we can pass it in to all of our cache subscribe calls
-    CACHE_BLOCK = Proc.new {|*args|
+    CACHE_BLOCK = proc { |*args|
       name, start, ending, transaction_id, payload = args
 
       # from http://edgeguides.rubyonrails.org/active_support_instrumentation.html#cache-fetch-hit-active-support
       #
-      # :super_operation	:fetch is added when a read is used with #fetch
+      # :super_operation  :fetch is added when a read is used with #fetch
       #
       # so if :super_operation is present, we'll use it for the type. otherwise
       # strip (say) 'cache_delete.active_support' down to 'delete'
@@ -36,17 +37,17 @@ module MetaRequest
     # 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_EVENT_NAME = 'sql.active_record'
 
-    SQL_BLOCK = Proc.new {|*args|
-      name, start, ending, transaction_id, payload = args
+    SQL_BLOCK = proc { |*args|
+      _name, start, ending, transaction_id, payload = args
       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|
+    VIEW_BLOCK = proc { |*args|
       name, start, ending, transaction_id, payload = args
       payload[:identifier] = MetaRequest::Utils.sub_source_path(payload[:identifier])
 
@@ -56,34 +57,32 @@ module MetaRequest
     # Subscribe to all events relevant to RailsPanel
     #
     def self.subscribe
-      new.
-        subscribe("meta_request.log").
-        subscribe("sql.active_record", &SQL_BLOCK).
-        subscribe("sql.sequel", &SQL_BLOCK).
-        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|
+      new
+        .subscribe('meta_request.log')
+        .subscribe('sql.active_record', &SQL_BLOCK)
+        .subscribe('sql.sequel', &SQL_BLOCK)
+        .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
           payload[:status] = '500' if payload[:exception]
           Event.new(name, start, ending, transaction_id, payload)
-        end.
-        subscribe("cache_read.active_support", &CACHE_BLOCK).
-        subscribe("cache_generate.active_support", &CACHE_BLOCK).
-        subscribe("cache_fetch_hit.active_support", &CACHE_BLOCK).
-        subscribe("cache_write.active_support", &CACHE_BLOCK).
-        subscribe("cache_delete.active_support", &CACHE_BLOCK).
-        subscribe("cache_exist?.active_support", &CACHE_BLOCK)
+        end
+        .subscribe('cache_read.active_support', &CACHE_BLOCK)
+        .subscribe('cache_generate.active_support', &CACHE_BLOCK)
+        .subscribe('cache_fetch_hit.active_support', &CACHE_BLOCK)
+        .subscribe('cache_write.active_support', &CACHE_BLOCK)
+        .subscribe('cache_delete.active_support', &CACHE_BLOCK)
+        .subscribe('cache_exist?.active_support', &CACHE_BLOCK)
     end
 
     def subscribe(event_name)
       ActiveSupport::Notifications.subscribe(event_name) do |*args|
-        event = block_given?? yield(*args) : Event.new(*args)
+        event = block_given? ? yield(*args) : Event.new(*args)
         AppRequest.current.events << event if AppRequest.current
       end
       self
     end
-
   end
-
 end

data/lib/meta_request/app_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaRequest
   class AppRequest
     attr_reader :id, :events
@@ -14,6 +16,5 @@ module MetaRequest
     def current!
       Thread.current[:meta_request_id] = self
     end
-
   end
 end

data/lib/meta_request/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaRequest
   class Config
     attr_writer :logger, :storage_pool_size, :source_path

data/lib/meta_request/event.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/json'
 require 'active_support/core_ext'
 
 module MetaRequest
-
   # Subclass of ActiveSupport Event that is JSON encodable
   #
   class Event < ActiveSupport::Notifications::Event
-    NOT_JSON_ENCODABLE = 'Not JSON Encodable'.freeze
+    NOT_JSON_ENCODABLE = 'Not JSON Encodable'
 
     attr_reader :duration
 
@@ -27,7 +28,7 @@ module MetaRequest
       end
       trace.unshift "#{exception.class} (#{exception.message})"
       trace.map do |call|
-        Event.new('process_action.action_controller.exception', 0, 0, nil, {:call => call})
+        Event.new('process_action.action_controller.exception', 0, 0, nil, call: call)
       end
     end
 
@@ -35,38 +36,43 @@ module MetaRequest
 
     def json_encodable(payload)
       return {} unless payload.is_a?(Hash)
-      transform_hash(payload, :deep => true) { |hash, key, value|
+
+      transform_hash(payload, deep: true) do |hash, key, value|
         if value.class.to_s == 'ActionDispatch::Http::Headers'
           value = value.to_h.select { |k, _| k.upcase == k }
-        elsif defined?(ActiveRecord) && value.is_a?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
+        elsif not_encodable?(value)
           value = NOT_JSON_ENCODABLE
         end
 
         begin
-          value.to_json(:methods => [:duration])
+          value.to_json(methods: [:duration])
           new_value = value
-        rescue
+        rescue StandardError
           new_value = NOT_JSON_ENCODABLE
         end
         hash[key] = new_value
-      }.with_indifferent_access
+      end.with_indifferent_access
+    end
+
+    def not_encodable?(value)
+      (defined?(ActiveRecord) && value.is_a?(ActiveRecord::ConnectionAdapters::AbstractAdapter)) ||
+        (defined?(ActionDispatch) &&
+          (value.is_a?(ActionDispatch::Request) || value.is_a?(ActionDispatch::Response)))
     end
 
     # https://gist.github.com/dbenhur/1070399
-    def transform_hash(original, options={}, &block)
+    def transform_hash(original, options = {}, &block)
       options[:safe_descent] ||= {}
       new_hash = {}
       options[:safe_descent][original.object_id] = new_hash
-      original.inject(new_hash) { |result, (key,value)|
-        if (options[:deep] && Hash === value)
-          value = options[:safe_descent].fetch( value.object_id ) {
+      original.each_with_object(new_hash) do |(key, value), result|
+        if options[:deep] && Hash === value
+          value = options[:safe_descent].fetch(value.object_id) do
             transform_hash(value, options, &block)
-          }
+          end
         end
-        block.call(result,key,value)
-        result
-      }
+        block.call(result, key, value)
+      end
     end
-
   end
 end

data/lib/meta_request/log_interceptor.rb

@@ -1,44 +1,46 @@
+# frozen_string_literal: true
+
 module MetaRequest
   module LogInterceptor
-
-    def debug(message=nil, *args)
+    def debug(message = nil, *args)
       push_event(:debug, message)
       super
     end
 
-    def info(message=nil, *args)
+    def info(message = nil, *args)
       push_event(:info, message)
       super
     end
 
-    def warn(message=nil, *args)
+    def warn(message = nil, *args)
       push_event(:warn, message)
       super
     end
 
-    def error(message=nil, *args)
+    def error(message = nil, *args)
       push_event(:error, message)
       super
     end
 
-    def fatal(message=nil, *args)
+    def fatal(message = nil, *args)
       push_event(:fatal, message)
       super
     end
 
-    def unknown(message=nil, *args)
+    def unknown(message = nil, *args)
       push_event(:unknown, message)
       super
     end
 
     private
+
     def push_event(level, message)
       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
+    rescue StandardError => e
       MetaRequest.config.logger.fatal(e.message + "\n " + e.backtrace.join("\n "))
     end
   end

data/lib/meta_request/middlewares/app_request_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module MetaRequest
@@ -8,19 +10,19 @@ module MetaRequest
       end
 
       def call(env)
-        app_request = AppRequest.new env["action_dispatch.request_id"]
+        app_request = AppRequest.new env['action_dispatch.request_id']
         app_request.current!
         @app.call(env)
-      rescue Exception => exception
+      rescue StandardError => e
         if defined?(ActionDispatch::ExceptionWrapper)
           wrapper = if ActionDispatch::ExceptionWrapper.method_defined? :env
-                      ActionDispatch::ExceptionWrapper.new(env, exception)
+                      ActionDispatch::ExceptionWrapper.new(env, e)
                     else
-                      ActionDispatch::ExceptionWrapper.new(env['action_dispatch.backtrace_cleaner'], exception)
+                      ActionDispatch::ExceptionWrapper.new(env['action_dispatch.backtrace_cleaner'], e)
                     end
           app_request.events.push(*Event.events_for_exception(wrapper))
         else
-          app_request.events.push(*Event.events_for_exception(exception))
+          app_request.events.push(*Event.events_for_exception(e))
         end
         raise
       ensure
@@ -29,4 +31,3 @@ module MetaRequest
     end
   end
 end
-

data/lib/meta_request/middlewares/headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/contrib/response_headers'
 
 module MetaRequest
@@ -29,9 +31,8 @@ module MetaRequest
       end
 
       def assets_prefix
-        "/#{@app_config.assets.prefix[/\A\/?(.*?)\/?\z/, 1]}/"
+        "/#{@app_config.assets.prefix[%r{\A/?(.*?)/?\z}, 1]}/"
       end
-
     end
   end
 end

data/lib/meta_request/middlewares/meta_request_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaRequest
   module Middlewares
     class MetaRequestHandler
@@ -6,7 +8,7 @@ module MetaRequest
       end
 
       def call(env)
-        request_id = env["PATH_INFO"][%r{/__meta_request/(.+)\.json$}, 1]
+        request_id = env['PATH_INFO'][%r{/__meta_request/(.+)\.json$}, 1]
         if request_id
           events_json(request_id)
         else
@@ -18,7 +20,7 @@ module MetaRequest
 
       def events_json(request_id)
         events_json = Storage.new(request_id).read
-        [200, { "Content-Type" => "text/plain; charset=utf-8" }, [events_json]]
+        [200, { 'Content-Type' => 'text/plain; charset=utf-8' }, [events_json]]
       end
     end
   end

data/lib/meta_request/middlewares.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module MetaRequest
   module Middlewares
-    autoload :Headers,            "meta_request/middlewares/headers"
-    autoload :AppRequestHandler,  "meta_request/middlewares/app_request_handler"
-    autoload :MetaRequestHandler, "meta_request/middlewares/meta_request_handler"
+    autoload :Headers,            'meta_request/middlewares/headers'
+    autoload :AppRequestHandler,  'meta_request/middlewares/app_request_handler'
+    autoload :MetaRequestHandler, 'meta_request/middlewares/meta_request_handler'
   end
 end

data/lib/meta_request/railtie.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 
 module MetaRequest
   class Railtie < ::Rails::Railtie
-
     initializer 'meta_request.inject_middlewares' do |app|
       app.middleware.use Middlewares::MetaRequestHandler
 
@@ -16,14 +17,11 @@ module MetaRequest
     end
 
     initializer 'meta_request.log_interceptor' do
-      Rails.logger.extend(LogInterceptor) if Rails.logger
+      Rails.logger&.extend(LogInterceptor)
     end
 
     initializer 'meta_request.subscribe_to_notifications' do
       AppNotifications.subscribe
     end
-
   end
 end
-
-

data/lib/meta_request/storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaRequest
   class Storage
     attr_reader :key

data/lib/meta_request/utils.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module MetaRequest
   module Utils
-    extend self
+    module_function
 
     def dev_callsite(caller)
       app_line = caller.detect { |c| c.start_with? MetaRequest.rails_root }
@@ -19,6 +21,7 @@ module MetaRequest
       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

data/lib/meta_request/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaRequest
-  VERSION = Gem.loaded_specs["meta_request"].version.to_s
+  VERSION = Gem.loaded_specs['meta_request'].version.to_s
 end

data/lib/meta_request.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module MetaRequest
-  autoload :VERSION,          "meta_request/version"
-  autoload :Config,           "meta_request/config"
-  autoload :Event,            "meta_request/event"
-  autoload :AppRequest,       "meta_request/app_request"
-  autoload :Storage,          "meta_request/storage"
-  autoload :Middlewares,      "meta_request/middlewares"
-  autoload :LogInterceptor,   "meta_request/log_interceptor"
-  autoload :AppNotifications, "meta_request/app_notifications"
-  autoload :Utils,            "meta_request/utils"
+  autoload :VERSION,          'meta_request/version'
+  autoload :Config,           'meta_request/config'
+  autoload :Event,            'meta_request/event'
+  autoload :AppRequest,       'meta_request/app_request'
+  autoload :Storage,          'meta_request/storage'
+  autoload :Middlewares,      'meta_request/middlewares'
+  autoload :LogInterceptor,   'meta_request/log_interceptor'
+  autoload :AppNotifications, 'meta_request/app_notifications'
+  autoload :Utils,            'meta_request/utils'
 
   def self.config
     @config ||= Config.new
@@ -24,4 +26,4 @@ module MetaRequest
   end
 end
 
-require "meta_request/railtie"
+require 'meta_request/railtie'

metadata

@@ -1,55 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: meta_request
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rack-contrib
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.74.0
 description: Supporting gem for Rails Panel (Google Chrome extension for Rails development)
 email: desimic@gmail.com
 executables: []
@@ -90,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Request your Rails request