wat_catcher 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f2a21cd4573317517ed282fa6820600ff69b4c
-  data.tar.gz: 4b58457abf52246715226a4c0ec86bb248f2134b
+  metadata.gz: 0a016f51cbd103e97c8c1bc24c6d7ea60137d247
+  data.tar.gz: 4c919cfb4f640de0af8dd10422420a89582d204b
 SHA512:
-  metadata.gz: c1f1ac1767ee82fd8b08171e03a5d1e7c53762279fb5a29e3720e96c5382d2a84633979748db9ff8f18c4987f53288b334992385d4c924de338ab1737fafddf5
-  data.tar.gz: c47dcbf8981c8ed9d5b7f10065eff314687b003a8c387a35013df6d1e2ecfd40b1e3d1592533ab32525ea21c05104ae44b62307eba0a39813cd9fb42dfcffff7
+  metadata.gz: ffbba1e53fa970456cc7e37bed74a3725bd7cbe8eef4749307bc482a259026dc2e8f1581fa38df51b8732fdfe7943dc70186a6dd7086f8a2cfdb6d9fe758408d
+  data.tar.gz: 28fe9d227b89359741a9cd9ff9cd809e16205093aa8003523e564309dcc814b07efd3f6227c13e13e0bd78bf55dde5e9d5536417bb3922c1a6dcc4fd66ca0243

data/lib/wat_catcher.rb

@@ -1,5 +1,6 @@
 require "wat_catcher/version"
 
+require "wat_catcher/report"
 require 'wat_catcher/sidekiq_poster'
 require "wat_catcher/middleware"
 require "wat_catcher/wattle_helper"

data/lib/wat_catcher/middleware.rb

@@ -7,10 +7,10 @@ module WatCatcher
     def call(env)
       @app.call(env)
     rescue Exception => exception
-      SidekiqPoster.report(exception, request: env["action_controller.instance"].request)
+      Report.new(exception, request: env["action_controller.instance"].request)
       raise
     end
   end
 
 
-end
+end

data/lib/wat_catcher/report.rb

@@ -0,0 +1,58 @@
+module WatCatcher
+  class Report
+    attr_accessor :exception, :request, :sidekiq
+
+    def initialize(exception, request: nil, sidekiq: nil)
+      self.exception = exception
+      self.request = request
+      self.sidekiq = sidekiq
+      send_report
+    end
+
+    def send_report
+      ::WatCatcher::SidekiqPoster.perform_async("#{WatCatcher.configuration.host}/wats", params)
+    end
+
+    def params
+      { wat: exception_description.merge(request_description).merge(worker_description) }
+    end
+
+
+    def exception_description
+      {
+        backtrace: exception.backtrace.to_a,
+        message: exception.message,
+        error_class: exception.class.to_s,
+        app_env: ::Rails.env.to_s,
+        app_name: ::Rails.application.class.parent_name
+      }
+    end
+
+    def request_description
+      return {} unless request
+      request_params = request.filtered_parameters
+      session = request.session.as_json
+      page_url = request.url
+
+      {
+        page_url: page_url,
+        request_headers: headers,
+        request_params: request_params,
+        session: session,
+      }
+    end
+
+    def headers
+      Hash[*request.headers.select { |x| x.first !~ /\./ }.sort_by(&:first).flatten]
+    end
+
+    def worker_description
+      return {} unless sidekiq
+      {
+        sidekiq_msg: sidekiq
+      }
+    end
+
+  end
+end
+

data/lib/wat_catcher/sidekiq_middleware.rb

@@ -4,11 +4,15 @@ module WatCatcher
       begin
         yield
       rescue => excpt
-        raise if msg["class"] == WatCatcher::SidekiqPoster.to_s
-        WatCatcher::SidekiqPoster.report(excpt, sidekiq: msg)
+        raise if thrown_by_watcatcher?
+        WatCatcher::Report.new(excpt, sidekiq: msg)
         raise
       end
     end
+
+    def thrown_by_watcatcher?
+      msg["class"] =~ /WatCatcher/
+    end
   end
 
-end
+end

data/lib/wat_catcher/sidekiq_poster.rb

@@ -1,42 +1,10 @@
 require 'sidekiq'
 
 module WatCatcher
-  class SidekiqPoster
+ class SidekiqPoster
     include Sidekiq::Worker
 
-    def self.report(exception, request: nil, sidekiq: nil)
-      params = {
-        wat: {
-          backtrace: exception.backtrace.to_a,
-          message: exception.message,
-          error_class: exception.class.to_s,
-          app_env: ::Rails.env.to_s,
-          app_name: ::Rails.application.class.parent_name
-        }
-      }
-
-      if request
-        request_params = request.filtered_parameters
-        session = request.session.as_json
-        page_url = request.url
-
-        params[:wat].merge!({
-          page_url: page_url,
-          request_params: request_params,
-          session: session,
-        })
-      end
-
-      if sidekiq
-        params[:wat].merge!({
-          sidekiq_msg: sidekiq
-        })
-      end
-
-      ::WatCatcher::SidekiqPoster.perform_async("#{WatCatcher.configuration.host}/wats", params)
-    end
-
-    def perform(url, params)
+     def perform(url, params)
       HTTPClient.post_content(url,
                               body: params["wat"].to_json,
                               header: {"Content-Type" => "application/json; charset=utf-8"})

data/lib/wat_catcher/version.rb

@@ -1,3 +1,3 @@
 module WatCatcher
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wat_catcher
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Chris Constantine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - lib/wat_catcher/engine.rb
 - lib/wat_catcher/middleware.rb
 - lib/wat_catcher/railtie.rb
+- lib/wat_catcher/report.rb
 - lib/wat_catcher/sidekiq_middleware.rb
 - lib/wat_catcher/sidekiq_poster.rb
 - lib/wat_catcher/version.rb