newshound 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2c9eae65ac8681fc1c72890cbd421ca9dd73130c37fa86c04643cb74c03856
-  data.tar.gz: 7ccb875f08607e1478245384376a621243fdd44e40443fb191064210cff94ba6
+  metadata.gz: 3128baf64381d76f8ba53efd4887d333b875ba981d08f9ca6d6ebde9f5d23921
+  data.tar.gz: 35110f37798b54c435be13f5ebe0a1d1dfeb0e2629a676fa51c15b2ebafee9ef
 SHA512:
-  metadata.gz: a78bd31f883c89116c83b7c77b680faba172b41e0bc3f375e4a81a075503d33860ebd4778e71f11d868a794fe04effd815e240ebd3d5c6135b0ed80599c87469
-  data.tar.gz: 4985d3d128688284f4734391b12e7f6e34d1c69857d713d3995d2078cc4df210b64ca5f84d889841e52b1b3a9086bcf0f19e7d35bef646b60e08020379527ad6
+  metadata.gz: 9d99bc945f8fd1a1bb0550c94a215006833b962e815a4450fc84281e3ca6d0f37fa98fd6ecfedd5aee9e1f4dc4ad93da9e4cf30710906a0651d1e1959a554c47
+  data.tar.gz: b01b19aa141e0fe32db7dd188487fd6b8e7840b68194bf1b06b1f666c463240a353d3d8f0c1c408a2d60d0c58a13df517c83b78303d78ebd16caa504a0552180

data/lib/newshound/exception_reporter.rb

@@ -24,6 +24,14 @@ module Newshound
         *format_exceptions
       ]
     end
+    alias_method :report, :generate_report
+
+    # Returns data formatted for the banner UI
+    def banner_data
+      {
+        exceptions: recent_exceptions.map { |exception| format_exception_for_banner(exception) }
+      }
+    end
 
     private
 
@@ -53,29 +61,100 @@ module Newshound
     end
 
     def format_exception_text(exception, number)
+      details = parse_exception_details(exception)
+
       <<~TEXT
-        *#{number}. #{exception.title || exception.exception_class}*
+        *#{number}. #{exception_title(exception)}*
         • *Time:* #{exception.created_at.strftime('%I:%M %p')}
-        • *Controller:* #{exception.controller_name}##{exception.action_name}
-        • *Count:* #{exception_count(exception)}
-        #{format_message(exception)}
+        #{format_controller(details)}
+        #{format_message(exception, details)}
       TEXT
     end
 
-    def format_message(exception)
-      return "" unless exception.message.present?
-      
-      message = exception.message.truncate(100)
+    def exception_title(exception)
+      if exception.respond_to?(:title) && exception.title.present?
+        exception.title
+      elsif exception.respond_to?(:exception_class) && exception.exception_class.present?
+        exception.exception_class
+      else
+        "Unknown Exception"
+      end
+    end
+
+    def parse_exception_details(exception)
+      return {} unless exception.respond_to?(:body) && exception.body.present?
+
+      JSON.parse(exception.body)
+    rescue JSON::ParserError
+      {}
+    end
+
+    def format_controller(details)
+      return String.new unless details["controller_name"] && details["action_name"]
+
+      "• *Controller:* #{details['controller_name']}##{details['action_name']}\n"
+    end
+
+    def format_message(exception, details = nil)
+      details ||= parse_exception_details(exception)
+
+      # Try to get message from different sources
+      message = if details["message"].present?
+        details["message"]
+      elsif exception.respond_to?(:message) && exception.message.present?
+        exception.message
+      end
+
+      return String.new unless message.present?
+
+      message = message.to_s.truncate(100)
       "• *Message:* `#{message}`"
     end
 
     def exception_count(exception)
       return 0 unless exception_source
 
-      exception_source
-        .where(exception_class: exception.exception_class)
-        .where("created_at >= ?", time_range.ago)
-        .count
+      # Use title for exception-track, exception_class for other systems
+      if exception.respond_to?(:title) && exception.title.present?
+        exception_source
+          .where(title: exception.title)
+          .where("created_at >= ?", time_range.ago)
+          .count
+      elsif exception.respond_to?(:exception_class)
+        exception_source
+          .where(exception_class: exception.exception_class)
+          .where("created_at >= ?", time_range.ago)
+          .count
+      else
+        0
+      end
+    end
+
+    def format_exception_for_banner(exception)
+      details = parse_exception_details(exception)
+
+      # Extract message
+      message = if details["message"].present?
+        details["message"].to_s
+      elsif exception.respond_to?(:message) && exception.message.present?
+        exception.message.to_s
+      else
+        String.new
+      end
+
+      # Extract location
+      location = if details["controller_name"] && details["action_name"]
+        "#{details['controller_name']}##{details['action_name']}"
+      else
+        String.new
+      end
+
+      {
+        title: exception_title(exception),
+        message: message.truncate(100),
+        location: location,
+        time: exception.created_at.strftime('%I:%M %p')
+      }
     end
 
     def no_exceptions_block

data/lib/newshound/middleware/banner_injector.rb

@@ -48,7 +48,7 @@ module Newshound
       end
 
       def response_body(response)
-        body = ""
+        body = String.new
         response.each { |part| body << part }
         body
       end
@@ -57,8 +57,8 @@ module Newshound
         exception_reporter = Newshound::ExceptionReporter.new
         que_reporter = Newshound::QueReporter.new
 
-        exception_data = exception_reporter.report
-        job_data = que_reporter.report
+        exception_data = exception_reporter.banner_data
+        job_data = que_reporter.banner_data
 
         # Generate HTML from template
         render_banner(exception_data, job_data)
@@ -275,7 +275,7 @@ module Newshound
       end
 
       def escape_html(text)
-        return "" unless text
+        return String.new unless text.present?
         text.to_s
           .gsub('&', '&amp;')
           .gsub('<', '&lt;')

data/lib/newshound/que_reporter.rb

@@ -22,6 +22,21 @@ module Newshound
         queue_health_section
       ].compact
     end
+    alias_method :report, :generate_report
+
+    # Returns data formatted for the banner UI
+    def banner_data
+      stats = queue_statistics
+
+      {
+        queue_stats: {
+          ready_to_run: stats[:ready],
+          scheduled: stats[:scheduled],
+          failed: stats[:failed],
+          completed_today: stats[:finished_today]
+        }
+      }
+    end
 
     private
 
@@ -42,21 +57,33 @@ module Newshound
     def job_counts_by_type
       return {} unless job_source
 
-      job_source
-        .group(:job_class)
-        .group(:error_count)
-        .count
-        .each_with_object({}) do |((job_class, error_count), count), hash|
-          hash[job_class] ||= { success: 0, failed: 0, total: 0 }
-          
-          if error_count.zero?
-            hash[job_class][:success] += count
-          else
-            hash[job_class][:failed] += count
-          end
-          
-          hash[job_class][:total] += count
+      # Use raw SQL since Que::Job may not support ActiveRecord's .group method
+      results = ActiveRecord::Base.connection.execute(<<~SQL)
+        SELECT job_class, error_count, COUNT(*) as count
+        FROM que_jobs
+        WHERE finished_at IS NULL
+        GROUP BY job_class, error_count
+        ORDER BY job_class
+      SQL
+
+      results.each_with_object({}) do |row, hash|
+        job_class = row["job_class"]
+        error_count = row["error_count"].to_i
+        count = row["count"].to_i
+
+        hash[job_class] ||= {success: 0, failed: 0, total: 0}
+
+        if error_count.zero?
+          hash[job_class][:success] += count
+        else
+          hash[job_class][:failed] += count
         end
+
+        hash[job_class][:total] += count
+      end
+    rescue StandardError => e
+      logger.error "Failed to fetch job counts: #{e.message}"
+      {}
     end
 
     def format_job_counts(counts)
@@ -85,20 +112,27 @@ module Newshound
     def queue_statistics
       return default_stats unless job_source
 
-      current_time = Time.now
-      beginning_of_day = Date.today.to_time
+      conn = ActiveRecord::Base.connection
+      current_time = conn.quote(Time.now)
+      beginning_of_day = conn.quote(Date.today.to_time)
 
       {
-        ready: job_source.where(finished_at: nil, expired_at: nil).where("run_at <= ?", current_time).count,
-        scheduled: job_source.where(finished_at: nil, expired_at: nil).where("run_at > ?", current_time).count,
-        failed: job_source.where.not(error_count: 0).where(finished_at: nil).count,
-        finished_today: job_source.where("finished_at >= ?", beginning_of_day).count
+        ready: count_jobs("finished_at IS NULL AND expired_at IS NULL AND run_at <= #{current_time}"),
+        scheduled: count_jobs("finished_at IS NULL AND expired_at IS NULL AND run_at > #{current_time}"),
+        failed: count_jobs("error_count > 0 AND finished_at IS NULL"),
+        finished_today: count_jobs("finished_at >= #{beginning_of_day}")
       }
     rescue StandardError => e
       logger.error "Failed to fetch Que statistics: #{e.message}"
       default_stats
     end
 
+    def count_jobs(where_clause)
+      ActiveRecord::Base.connection.select_value(
+        "SELECT COUNT(*) FROM que_jobs WHERE #{where_clause}"
+      ).to_i
+    end
+
     def default_stats
       { ready: 0, scheduled: 0, failed: 0, finished_today: 0 }
     end

data/lib/newshound/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Newshound
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newshound
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - salbanez