fluyenta-ruby 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ca1f2c2598c130631334f3dec5b1a282c429e3d826303b4ea7ec19650a4027
-  data.tar.gz: a12753631b95878565d3718d8ba5afe6e72a01a5df225b8d08ac7c0f6edf5471
+  metadata.gz: 5fab76eeb7fe5e7336aafff67123c751df4fc149649b886a1606bbdb75135832
+  data.tar.gz: 05a8e5ec3449ffb2f22720fcae790a2b503213d5990ebd6fcb5d348f51f7d6df
 SHA512:
-  metadata.gz: 8d39569edb9136b4f3ea2553f6f222339c0d602de213c4803ebb66c39b1f9bf4744ab253c8bd9863ce8374ab35cdf095c45d4e7882a5ce10eccdbe82de40266d
-  data.tar.gz: f9f180f1ae570fe10e6705b52266e477866b829eec1061755f9380c856e9cc2450c3cbfd5bfa5ccc4be8ede83818fdb146886a8790a93edd7ac45d986f175da0
+  metadata.gz: 70c448c6019272169c8eef9c4b469381cb7dfcc401aa85c5a3b6e9b85986a8f00470418bf40f92d040b05cdc9730b97f8fde5bce46970e5e58fecaae0ebc916a
+  data.tar.gz: dda6842f5584f20309c6a8ab86ba0ee7462609a2884570fdc43c11bd16e79e44b2a086111d9d8584d9e96eca21ffde370260bbeecda548f74180506f9b889ca6

data/lib/brainzlab/devtools/middleware/asset_server.rb

@@ -18,6 +18,7 @@ module BrainzLab
 
         def call(env)
           return @app.call(env) unless DevTools.enabled?
+          return @app.call(env) if env['REQUEST_METHOD'] == 'OPTIONS'
 
           path = env['PATH_INFO']
           asset_prefix = DevTools.asset_path

data/lib/brainzlab/devtools/middleware/debug_panel.rb

@@ -38,6 +38,7 @@ module BrainzLab
           return false unless DevTools.debug_panel_enabled?
           return false unless DevTools.allowed_environment?
           return false unless DevTools.allowed_ip?(extract_ip(env))
+          return false if env['REQUEST_METHOD'] == 'OPTIONS'
           return false if asset_request?(env['PATH_INFO'])
           return false if devtools_asset_request?(env['PATH_INFO'])
           return false if turbo_stream_request?(env)

data/lib/brainzlab/devtools/middleware/error_page.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module BrainzLab
   module DevTools
     module Middleware
@@ -10,29 +12,33 @@ module BrainzLab
         end
 
         def call(env)
+          return @app.call(env) if env['REQUEST_METHOD'] == 'OPTIONS'
           return @app.call(env) unless should_handle?(env)
 
           begin
             status, headers, body = @app.call(env)
 
             # Check if this is an error response that we should intercept
-            if status >= 400 && html_response?(headers) && !json_request?(env)
+            if status >= 400 && html_response?(headers) && !json_request?(env) && !api_path?(env)
               # Check if this looks like Rails' default error page
               body_content = collect_body(body)
               if body_content.include?('Action Controller: Exception caught') || body_content.include?('background: #C00')
                 # Extract exception info from the page
                 exception_info = extract_exception_from_html(body_content)
                 if exception_info
-                  data = collect_debug_data_from_info(env, exception_info)
-                  return render_error_page_from_info(exception_info, data)
+                  data = collect_debug_data_from_info(env, exception_info, status)
+                  return render_error_page_from_info(exception_info, data, status)
                 end
               end
             end
 
             [status, headers, body]
           rescue Exception => e
-            # Don't intercept if request wants JSON
-            return raise_exception(e) if json_request?(env)
+            # For JSON/API requests, return a proper JSON error response
+            if json_request?(env) || api_path?(env)
+              capture_to_reflex(e)
+              return json_error_response(e)
+            end
 
             # Still capture to Reflex if available
             capture_to_reflex(e)
@@ -87,7 +93,7 @@ module BrainzLab
              .gsub(' ', ' ')
         end
 
-        def collect_debug_data_from_info(env, info)
+        def collect_debug_data_from_info(env, info, status = 500)
           context = defined?(BrainzLab::Context) ? BrainzLab::Context.current : nil
           collector_data = Data::Collector.get_request_data
 
@@ -113,7 +119,7 @@ module BrainzLab
           }
         end
 
-        def render_error_page_from_info(info, data)
+        def render_error_page_from_info(info, data, status = 500)
           # Create a simple exception-like object
           exception = StandardError.new(info[:message])
           exception.define_singleton_method(:class) do
@@ -126,7 +132,7 @@ module BrainzLab
           html = @renderer.render(exception, data)
 
           [
-            500,
+            status,
             {
               'Content-Type' => 'text/html; charset=utf-8',
               'Content-Length' => html.bytesize.to_s,
@@ -169,6 +175,48 @@ module BrainzLab
             env['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
         end
 
+        def api_path?(env)
+          path = env['PATH_INFO'] || ''
+          path.start_with?('/api/')
+        end
+
+        def exception_to_status(exception)
+          case exception.class.name
+          when 'ActionController::RoutingError', 'AbstractController::ActionNotFound'
+            404
+          when 'ActionController::MethodNotAllowed'
+            405
+          when 'ActionController::BadRequest', 'ActionDispatch::Http::Parameters::ParseError'
+            400
+          when 'ActionController::UnknownFormat'
+            406
+          else
+            500
+          end
+        end
+
+        def json_error_response(exception)
+          status_code = exception_to_status(exception)
+          message = case status_code
+                    when 400 then 'Bad request'
+                    when 404 then 'Not found'
+                    when 405 then 'Method not allowed'
+                    when 406 then 'Not acceptable'
+                    else 'Internal server error'
+                    end
+
+          body = JSON.generate({ error: message })
+          [
+            status_code,
+            {
+              'Content-Type' => 'application/json; charset=utf-8',
+              'Content-Length' => body.bytesize.to_s,
+              'X-Content-Type-Options' => 'nosniff'
+            },
+            [body]
+          ]
+        end
+
         def capture_to_reflex(exception)
           return unless defined?(BrainzLab::Reflex)
 

data/lib/brainzlab/rails/railtie.rb

@@ -223,7 +223,11 @@ module BrainzLab
         context.request_method = request.request_method
         context.request_path = request.path
         context.request_url = request.url
-        context.request_params = filter_params(request.params.to_h)
+        context.request_params = begin
+          filter_params(request.params.to_h)
+        rescue ActionDispatch::Http::Parameters::ParseError
+          {}
+        end
         context.request_headers = extract_headers(env)
 
         # Add breadcrumb for request start

data/lib/brainzlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrainzLab
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluyenta-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Fluyenta