rollbar 0.9.12 → 0.9.13

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+**0.9.13**
+- Add test for PUT params
+- Parse json params when content-type is application/json
+- Remove extraneous
+- Remove redundant `GET` and `POST` keys from request payload (they're already included in `params`)
+
 **0.9.12**
 - Fix compatibility issue with Rails 4 / Ruby 2 (thanks [johnknott](https://github.com/johnknott))
 

data/lib/rollbar/request_data_extractor.rb

@@ -11,20 +11,28 @@ module Rollbar
     end
 
     def extract_request_data_from_rack(env)
+      rack_req = Rack::Request.new(env)
+      
       sensitive_params = sensitive_params_list(env)
       request_params = rollbar_request_params(env)
-      cookies = rollbar_filtered_params(sensitive_params, rollbar_request_cookies(env))
-      get_params = rollbar_filtered_params(sensitive_params, rollbar_get_params(env))
-      post_params = rollbar_filtered_params(sensitive_params, rollbar_post_params(env))
+      get_params = rollbar_filtered_params(sensitive_params, rollbar_get_params(rack_req))
+      post_params = rollbar_filtered_params(sensitive_params, rollbar_post_params(rack_req))
+      cookies = rollbar_filtered_params(sensitive_params, rollbar_request_cookies(rack_req))
       session = rollbar_filtered_params(sensitive_params, env['rack.session.options'])
-    
+      
+      params = get_params.merge(post_params).merge(request_params)
+      
+      # parse any json params
+      if env['CONTENT_TYPE'] =~ %r{application/json}i
+        json_params = JSON.parse(env['rack.input'].read) rescue {}
+        params = params.merge(json_params)
+      end
+      
       {
-        :params => get_params.merge(post_params).merge(request_params),
+        :params => params,
         :url => rollbar_url(env),
         :user_ip => rollbar_user_ip(env),
         :headers => rollbar_headers(env),
-        :GET => get_params,
-        :POST => post_params,
         :cookies => cookies,
         :session => session,
         :method => rollbar_request_method(env)
@@ -68,28 +76,24 @@ module Rollbar
       }
     end
 
-    def rollbar_get_params(env)
-      rack_request(env).GET
+    def rollbar_get_params(rack_req)
+      rack_req.GET
     rescue
       {}
     end
 
-    def rollbar_post_params(env)
-      rack_request(env).POST
+    def rollbar_post_params(rack_req)
+      rack_req.POST
     rescue
       {}
     end
-
-    def rollbar_request_cookies(env)
-      rack_request(env).cookie
+    
+    def rollbar_request_cookies(rack_req)
+      rack_req.cookies
     rescue
       {}
     end
 
-    def rack_request(env)
-      @rack_request ||= Rack::Request.new(env)
-    end
-
     def rollbar_filtered_params(sensitive_params, params)
       if params.nil?
         {}

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

data/spec/controllers/home_controller_spec.rb

@@ -36,7 +36,6 @@ describe HomeController do
       data.should have_key(:url)
       data.should have_key(:user_ip)
       data.should have_key(:headers)
-      data.should have_key(:GET)
       data.should have_key(:session)
       data.should have_key(:method)
     end
@@ -178,13 +177,32 @@ describe HomeController do
     end
   end
 
-  describe "GET 'report_exception'" do
-    it "should raise a NameError and report an exception" do
+  describe "'report_exception'", :type => "request" do
+    it "should raise a NameError and report an exception after a GET" do
       logger_mock.should_receive(:info).with('[Rollbar] Success')
 
       get 'report_exception'
       response.should be_success
     end
+    
+    it "should raise a NameError and have PUT params in the reported exception" do
+      logger_mock.should_receive(:info).with('[Rollbar] Success')
+
+      put 'report_exception', :putparam => "putval"
+      
+      Rollbar.last_report.should_not be_nil
+      Rollbar.last_report[:request][:params]["putparam"].should == "putval"
+    end
+    
+    it "should raise a NameError and have JSON POST params" do
+      logger_mock.should_receive(:info).with('[Rollbar] Success')
+      
+      params = {:jsonparam => 'jsonval'}.to_json
+      post 'report_exception', params, {'CONTENT_TYPE' => 'application/json'}
+      
+      Rollbar.last_report.should_not be_nil
+      Rollbar.last_report[:request][:params]['jsonparam'].should == 'jsonval'
+    end
   end
 
   after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json