debugbar 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc75f60be93ef95e8b51a8dcb4a7682c801fef9ba4790828a26f8ec8c4c37f63
-  data.tar.gz: 7ef69e8c41cf2dddb68ad2d6e5ac2b2e8d4702ab9d97d89363d6f38b0fbae8ec
+  metadata.gz: 5baf46392ef6971651278629311c31ce702eff3c07cf85f1e46a0975f9535474
+  data.tar.gz: fce99f252cd68cfbd6d81b87276c6f3a0218371aa6069a6007a7def71b674769
 SHA512:
-  metadata.gz: 9d6e2fbef45e447717b91e9e92c53884e15684bd8fdfa9363b99f4ea35da766dc9b82b71340b61063832e5149ff7564c0cafd4dddfee52b74fe93805516a87e1
-  data.tar.gz: e35d17f833d1566a4c87b3a875ed496751622fd078386e10474eb09dbe739a193d67c481255813c3b3551b269935b08c0095ba0a37e8b2e709c28f90dfb2fb06
+  metadata.gz: 2f5f1f3108f0c6f5d2d5140f23c61aac35e79ba4e233d4c4c83978bd19b3e0b48acbe5d53b9dbf768d6e757e96ae8347101e128cc0a3dea513300f9967f70d82
+  data.tar.gz: ef27aa4a78e8f398ef2c8dc3bf30f5437b911f18913a0653b3b654e2e343854f052e374123fea5e478239f438c3b431c57ac7cd07d86069e223dec4d169695b1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.4.3 - 2025-02-04
+
+* Small fixes - See [#54](https://github.com/julienbourdeau/debugbar/issues/54) and [#56](https://github.com/julienbourdeau/debugbar/issues/56)
+
 ## v0.4.2 - 2025-01-11
 
 * Mount `Debugbar::Engine` automatically from the gem to simplify setup - See [#51](https://github.com/julienbourdeau/debugbar/pull/51)

data/app/controllers/debugbar/polling_controller.rb

@@ -3,6 +3,10 @@ module Debugbar
     protect_from_forgery with: :null_session
     before_action :cors_set_access_control_headers
 
+    def get
+      render json: RequestBuffer.get(params[:id])
+    end
+
     def poll
       render json: RequestBuffer.to_h
     end

data/build_extension.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm public/extension.zip
+cd client
+npm run build:extension
+cd dist-extension
+rm .DS_Store
+zip -r ../../extension.zip ./

data/config/routes.rb

@@ -3,6 +3,8 @@ Debugbar::Engine.routes.draw do
     mount ActionCable.server => '/cable'
   end
 
+  get 'get/:id' => "polling#get"
+
   get 'poll' => "polling#poll"
   options 'poll/confirm' => "polling#confirm"
   post 'poll/confirm' => "polling#confirm"

data/debugbar.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
     bin/ test/ spec/ features/ fixtures/
     client/
     .git .circleci appveyor Gemfile package.json package-lock.json .prettierrc
+    release.sh build_client.sh build_demo.sh build_fixtures.rb build_gem.sh
+    extension.zip
   ]
 
   spec.files = Dir.chdir(__dir__) do

data/lib/debugbar/buffers/cache_buffer.rb

@@ -1,5 +1,9 @@
 module Debugbar
   class CacheBuffer
+    def get(id)
+      get_collection[id].to_h
+    end
+
     def push(request)
       collection = get_collection
       collection[request.id] = request.to_h

data/lib/debugbar/buffers/memory_buffer.rb

@@ -4,6 +4,10 @@ module Debugbar
       @collection = {}
     end
 
+    def get(id)
+      @collection[id].to_h
+    end
+
     def push(request)
       @collection[request.id] = request
     end

data/lib/debugbar/buffers/null_buffer.rb

@@ -1,5 +1,9 @@
 module Debugbar
   class NullBuffer
+    def get
+      {}
+    end
+
     def push(_request)
     end
 

data/lib/debugbar/buffers/request_buffer.rb

@@ -5,6 +5,10 @@ module Debugbar
         @adapter = adapter
       end
 
+      def get(id)
+        @adapter.get(id)
+      end
+
       def push(request)
         @adapter.push(request)
         nil # Why not return self?

data/lib/debugbar/engine.rb

@@ -18,6 +18,9 @@ module Debugbar
 
     initializer 'debugbar.override_config' do |app|
       if defined? ActionCable
+        next if app.config.action_cable.allowed_request_origins.is_a?(Array) && app.config.action_cable.allowed_request_origins.any?
+        next if app.config.action_cable.allowed_request_origins.is_a?(Regexp)
+
         unless app.config.action_cable.disable_request_forgery_protection
           app.config.action_cable.disable_request_forgery_protection = true
           log "Debugbar: Action Cable request forgery protection is enabled. This can cause issues with Debugbar. Overriding setting config.action_cable.disable_request_forgery_protection = true now. Update your configuration to get rid of this message."
@@ -49,7 +52,7 @@ module Debugbar
     initializer 'debugbar.init' do |app|
       # Display error message if running in multi-process mode without proper configuration
       if ENV["WEB_CONCURRENCY"].to_i > 1
-        cache_nok = %i[null_store memory_store].include?(Rails.configuration.cache_store.first.to_sym)
+        cache_nok = %i[null_store memory_store].include?(Rails.configuration.cache_store.to_sym)
         action_cable_nok = ActionCable.server.config.cable[:adapter].to_s == "async"
         adapter_nok = app.config.debugbar.buffer_adapter != :cache
 

data/lib/debugbar/middlewares/track_current_request.rb

@@ -12,9 +12,10 @@ module Debugbar
 
       return @app.call(env) if Debugbar::Current.ignore?
 
-      Debugbar::Current.new_request!(SecureRandom.uuid)
+      req_id = SecureRandom.uuid
+      Debugbar::Current.new_request!(req_id)
 
-      res = @app.call(env)
+      status, headers, body = @app.call(env)
 
       # TODO: Remove this if statement?
       # We check meta because the frontend doesn't support request without meta yet.
@@ -29,7 +30,11 @@ module Debugbar
         end
       end
 
-      res
+      # We can't use Rails.application.url_helper here because 1. we have to set up manually the hosts, 2. the route I
+      # want is inside the engine routes and I didn't manage to access them via the helper
+      headers["X-Debugbar-Url"] = "#{ActionDispatch::Request.new(env).base_url}#{Debugbar.config.prefix}/get/#{req_id}"
+
+      [status, headers, body]
     end
   end
 

data/lib/debugbar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Debugbar
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end