rollbar 0.10.2 → 0.10.3

data/.travis.yml

@@ -18,8 +18,6 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-18mode
     - rvm: rbx-19mode
-    - gemfile: gemfiles/rails30.gemfile
-    - gemfile: gemfiles/rails40.gemfile
   exclude:
     - rvm: 1.8.7
       gemfile: gemfiles/rails40.gemfile

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 
-**0.10.2*
+**0.10.3**
+- Rework how request params are extracted so that json params are properly extracted in rails 4.0
+- Fix rollbar:test rake task
+
+**0.10.2**
 - Require hooks at configuration time instead of gem load time
 
 **0.10.1**

data/lib/rollbar.rb

@@ -12,6 +12,8 @@ require 'rollbar/configuration'
 require 'rollbar/request_data_extractor'
 require 'rollbar/exception_reporter'
 
+require 'rollbar/railtie' if defined?(Rails)
+
 module Rollbar
   class << self
     attr_writer :configuration
@@ -146,7 +148,6 @@ module Rollbar
       require 'rollbar/goalie' if defined?(Goalie)
       require 'rollbar/rack' if defined?(Rack)
       require 'rollbar/rake' if defined?(Rake)
-      require 'rollbar/railtie' if defined?(Rails)
       require 'rollbar/better_errors' if defined?(BetterErrors)
     end
 

data/lib/rollbar/request_data_extractor.rb

@@ -14,19 +14,13 @@ module Rollbar
       rack_req = Rack::Request.new(env)
       
       sensitive_params = sensitive_params_list(env)
-      request_params = rollbar_request_params(env)
+      request_params = rollbar_filtered_params(sensitive_params, rollbar_request_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 = request_params.merge(get_params).merge(post_params)
       
       {
         :params => params,
@@ -66,16 +60,7 @@ module Rollbar
     def rollbar_user_ip(env)
       (env['action_dispatch.remote_ip'] || env['HTTP_X_REAL_IP'] || env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR']).to_s
     end
-
-    def rollbar_request_params(env)
-      route = ::Rails.application.routes.recognize_path(env['PATH_INFO']) rescue {}
-      {
-        :controller => route[:controller],
-        :action => route[:action],
-        :format => route[:format],
-      }
-    end
-
+    
     def rollbar_get_params(rack_req)
       rack_req.GET
     rescue
@@ -87,6 +72,15 @@ module Rollbar
     rescue
       {}
     end
+
+    def rollbar_request_params(env)
+      route = ::Rails.application.routes.recognize_path(env['PATH_INFO']) rescue {}
+      {
+        :controller => route[:controller],
+        :action => route[:action],
+        :format => route[:format],
+      }.merge(env['action_dispatch.request.parameters'] || {})
+    end
     
     def rollbar_request_cookies(rack_req)
       rack_req.cookies

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/spec/controllers/home_controller_spec.rb

@@ -196,6 +196,7 @@ describe HomeController do
     
     it "should raise a NameError and have JSON POST params" do
       logger_mock.should_receive(:info).with('[Rollbar] Success')
+      @request.env["HTTP_ACCEPT"] = "application/json"
       
       params = {:jsonparam => 'jsonval'}.to_json
       post 'report_exception', params, {'CONTENT_TYPE' => 'application/json'}
@@ -214,11 +215,23 @@ describe HomeController do
     
     context 'show_exceptions' do
       before(:each) do
-        Dummy::Application.env_config['action_dispatch.show_exceptions'] = true
+        if Dummy::Application.respond_to? :env_config
+          config = Dummy::Application.env_config
+        else
+          config = Dummy::Application.env_defaults
+        end
+        
+        config['action_dispatch.show_exceptions'] = true
       end
       
       after(:each) do
-        Dummy::Application.env_config['action_dispatch.show_exceptions'] = false
+        if Dummy::Application.respond_to? :env_config
+          config = Dummy::Application.env_config
+        else
+          config = Dummy::Application.env_defaults
+        end
+        
+        config['action_dispatch.show_exceptions'] = false
       end
       
       it "middleware should catch the exception and only report to rollbar once" do

data/spec/dummyapp/config/routes.rb

@@ -5,6 +5,6 @@ Dummy::Application.routes.draw do
   end
 
   get "/cause_exception" => "home#cause_exception"
-  match "/report_exception" => "home#report_exception", :via=> [:get, :put, :post]
+  match "/report_exception" => "home#report_exception", :via => [:get, :post, :put]
   get "/current_user" => "home#current_user"
 end

data/spec/requests/home_spec.rb

@@ -16,13 +16,16 @@ describe HomeController do
 
   context "with broken request" do
     it "should report uncaught exceptions" do
-      expect{ get 'current_user', nil, :cookie => '8%B' }.to raise_exception
-
-      Rollbar.last_report.should_not be_nil
-
-      exception_info = Rollbar.last_report[:body][:trace][:exception]
-      exception_info[:class].should == 'ArgumentError'
-      exception_info[:message].should == 'invalid %-encoding (8%B)'
+      # only seems to be relevant in 3.1 and 3.2
+      if ::Rails::VERSION::STRING.starts_with? "3.1" or ::Rails::VERSION::STRING.starts_with? "3.2"
+        expect{ get 'current_user', nil, :cookie => '8%B' }.to raise_exception
+
+        Rollbar.last_report.should_not be_nil
+  
+        exception_info = Rollbar.last_report[:body][:trace][:exception]
+        exception_info[:class].should == 'ArgumentError'
+        exception_info[:message].should == 'invalid %-encoding (8%B)'
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json