crashlog 1.0.7 → 1.1.0.pre1

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rspec-rails"
+gem "rspec"
+gem "guard-rspec"
+gem "uuid"
+gem "json_spec"
+gem "rake", "0.9.2"
+gem "delorean"
+gem "rack-test"
+gem "simplecov", :platforms=>:mri_19
+gem "appraisal"
+gem "rails", "3.1.8"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_1.gemfile.lock

@@ -0,0 +1,169 @@
+PATH
+  remote: /Users/ivan/Dropbox/dev/ruby/crashlog-gem
+  specs:
+    crashlog (1.0.7)
+      crashlog-auth-hmac (>= 1.1.7)
+      faraday (~> 0.8.4)
+      hashr
+      json
+      multi_json (>= 1.1.0)
+      rabl (>= 0.6.13)
+      uuid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
+      mail (~> 2.3.3)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    chronic (0.8.0)
+    coderay (1.0.8)
+    crashlog-auth-hmac (1.1.7)
+    delorean (2.1.0)
+      chronic
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    guard (1.5.4)
+      listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (2.3.1)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    hashr (0.0.22)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    json_spec (1.1.0)
+      multi_json (~> 1.0)
+      rspec (~> 2.0)
+    listen (0.6.0)
+    lumberjack (1.0.2)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.1)
+    mime-types (1.19)
+    multi_json (1.2.0)
+    multipart-post (1.1.5)
+    polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rabl (0.7.9)
+      activesupport (>= 2.3.14)
+      multi_json (~> 1.0)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
+      bundler (~> 1.0)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.3.3)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    systemu (2.5.2)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uuid (2.3.6)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  crashlog!
+  delorean
+  guard-rspec
+  json_spec
+  rack-test
+  rails (= 3.1.8)
+  rake (= 0.9.2)
+  rspec
+  rspec-rails
+  simplecov
+  uuid

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rspec-rails"
+gem "rspec"
+gem "guard-rspec"
+gem "uuid"
+gem "json_spec"
+gem "rake", "0.9.2"
+gem "delorean"
+gem "rack-test"
+gem "simplecov", :platforms=>:mri_19
+gem "appraisal"
+gem "rails", "3.2.9"
+
+gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile.lock

@@ -0,0 +1,168 @@
+PATH
+  remote: /Users/ivan/Dropbox/dev/ruby/crashlog-gem
+  specs:
+    crashlog (1.0.7)
+      crashlog-auth-hmac (>= 1.1.7)
+      faraday (~> 0.8.4)
+      hashr
+      json
+      multi_json (>= 1.1.0)
+      rabl (>= 0.6.13)
+      uuid
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
+      mail (~> 2.4.4)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    chronic (0.8.0)
+    coderay (1.0.8)
+    crashlog-auth-hmac (1.1.7)
+    delorean (2.1.0)
+      chronic
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    guard (1.5.4)
+      listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (2.3.1)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    hashr (0.0.22)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    json_spec (1.1.0)
+      multi_json (~> 1.0)
+      rspec (~> 2.0)
+    listen (0.6.0)
+    lumberjack (1.0.2)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.1)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    multipart-post (1.1.5)
+    polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rabl (0.7.9)
+      activesupport (>= 2.3.14)
+      multi_json (~> 1.0)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
+      bundler (~> 1.0)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.3.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    systemu (2.5.2)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uuid (2.3.6)
+      macaddr (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  crashlog!
+  delorean
+  guard-rspec
+  json_spec
+  rack-test
+  rails (= 3.2.9)
+  rake (= 0.9.2)
+  rspec
+  rspec-rails
+  simplecov
+  uuid

data/lib/crash_log.rb

@@ -15,6 +15,8 @@ require_relative 'crash_log/reporter'
 require_relative 'crash_log/system_information'
 require_relative 'crash_log/rack'
 
+require_relative "crash_log/sidekiq" if defined?(Sidekiq)
+
 module CrashLog
   extend Logging::ClassMethods
 

data/lib/crash_log/payload.rb

@@ -28,6 +28,7 @@ module CrashLog
       @context = {}
       @environment = {}
       @data = {}
+      @session = {}
       @backtrace_filters = config[:backtrace_filters] || []
 
       # Actually serialize the exception/event hash for transport
@@ -64,7 +65,7 @@ module CrashLog
     end
 
     def add_session_data(data)
-      (@data[:session] ||= {}).merge!(data) if data.is_a?(Hash)
+      (@session ||= {}).merge!(data) if data.is_a?(Hash)
     end
 
     def add_environment_data(data)

data/lib/crash_log/rails/controller_methods.rb

@@ -2,18 +2,31 @@ module CrashLog
   module Rails
     module ControllerMethods
 
-      def crash_log_context
-        {
-          :context => {
-            :controller       => params[:controller],
-            :action           => params[:action],
-            :current_user     => crash_log_current_user
-          },
-          :parameters       => crash_log_filter_if_filtering(params.to_hash),
-          :session_data     => crash_log_filter_if_filtering(crash_log_session_data),
-          :url              => crash_log_request_url,
-          :cgi_data         => crash_log_filter_if_filtering(request.env),
-        }
+      # def crash_log_context_old(env = nil)
+      #   {
+      #     :context => {
+      #       :controller       => params[:controller],
+      #       :action           => params[:action],
+      #       :current_user     => crash_log_current_user
+      #     },
+      #     :request          => process_headers(request.env),
+      #     :response         => process_response,
+      #     :parameters       => crash_log_filter_if_filtering(params.to_hash),
+      #     :session_data     => crash_log_filter_if_filtering(crash_log_session_data),
+      #     :url              => crash_log_request_url,
+      #     :cgi_data         => crash_log_filter_if_filtering(request.env),
+      #   }
+      # end
+
+      def crash_log_context(env)
+        payload = {}
+
+        payload[:request]   = process_request(request.env)
+        payload[:response]  = process_response
+        payload[:user]      = crash_log_current_user
+        payload[:context]   = process_context
+
+        payload
       end
 
     private
@@ -32,6 +45,69 @@ module CrashLog
         end
       end
 
+      def process_response
+        response = {}
+
+        if self.respond_to?(:response) && self.response.respond_to?(:headers)
+          response.merge!({:headers => self.response.headers})
+        end
+
+        response
+      end
+
+      def process_request(env)
+        headers, environment = {}, {}
+        data = nil
+        env.each_pair do |key, value|
+          next unless key.upcase == key # Non-upper case stuff isn't a header
+          if key.start_with?('HTTP_')
+            # Header
+            http_key = key[5..key.length-1].split('_').map{|s| s.capitalize}.join('-')
+            headers[http_key] = value.to_s
+          else
+            # Environment
+            environment[key] = value.to_s
+          end
+        end
+
+        require 'rack'
+        req = ::Rack::Request.new(env)
+        query_string = req.query_string
+        method = req.request_method
+        url = req.url.split('?').first
+        cookies = req.cookies
+
+        data = if req.form_data?
+          req.POST
+        elsif req.body
+          data = req.body.read
+          req.body.rewind
+          data
+        end
+
+        {
+          :url => url,
+          :query_string => query_string,
+          :method => method,
+          :headers => headers,
+          :cookies => cookies,
+          :parameters => crash_log_filter_if_filtering(params.to_hash),
+          :environment => environment,
+          :session => crash_log_filter_if_filtering(crash_log_session_data),
+          :data => data
+        }
+      end
+
+      def process_context
+        {
+          :controller => params[:controller],
+          :action     => params[:action]
+        }
+
+      rescue NoMethodError
+        {}
+      end
+
       def crash_log_request_url
         url = "#{request.protocol}#{request.host}"
 
@@ -56,13 +132,17 @@ module CrashLog
       end
 
       def crash_log_current_user
-        # Credit to Airbrake gem for this one.
+        user_hash = {}
+        user_attributes = CrashLog.configuration.user_attributes
         user = begin current_user rescue current_member end
-        user.attributes.select do |k, v|
-          CrashLog.configuration.
-            user_attributes.map(&:to_sym).
-            include?(k.to_sym) unless v.blank?
-        end.symbolize_keys
+
+        user_attributes.map(&:to_sym).each do |attribute|
+          if user.respond_to?(attribute)
+            user_hash[attribute] = user.__send__(attribute)
+          end
+        end
+
+        user_hash
       rescue NoMethodError, NameError
         {}
       end