rollbar 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9654ef4b39ccff0c61d5829b0ed24cf4fe8358ff
-  data.tar.gz: b966e415ba2c051cef36b0b7fad7c5ce5f3e2b9c
+  metadata.gz: 553381499b916556da8272eadf551847254ffcaa
+  data.tar.gz: c80b393ccaa1cb9e2c2d46646703510852965ecf
 SHA512:
-  metadata.gz: 63715716194409340fd44702f874148a7a22f490eb86cf947a62f3bb5429f55f6891d055f056f4e17cdd3356412c7071d0d4bd4ca17900328ff7c4f2d7198ce7
-  data.tar.gz: 8834975d7fed4de30c536664589d600d1647fe79e106f3c05e7674a7414009eecf0eccf97c768e387622950c27a256626e3ad575b8680876ac3fdc0b6ca6f4ae
+  metadata.gz: d31b2d8d6d71c30c5888c3dacd631cda2f584d2de6a8b4cb238ca8c484a7037745904cfa5925ea5eca5e2100a93afa8c56681deab6292ffeefd97d4a764b078d
+  data.tar.gz: eedb32f0cc342297fbb7c48f989b8568bb6856ee385bc8f5d65c7d95334f58ed0a3121511d5824c870ddb1545e94fe8f2c265435a1afeb458730f2a2d927d581

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.1.2
+
+Bug fix:
+
+- Allow having multiple uploads for the same parameter. Thanks @mdominiak.
+
 ## 2.1.1
 
 Bug fix:

data/Gemfile

@@ -1,20 +1,16 @@
-source 'https://rubygems.org'
+# This file was generated by Appraisal
 
-gemspec
-
-gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
-gem 'jruby-openssl',                    :platform => :jruby
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'appraisal'
+source "https://rubygems.org"
 
-gem 'rubysl', '~> 2.0',                 :platform => :rbx
-gem 'racc',                             :platform => :rbx
-gem 'minitest',                         :platform => :rbx
-gem 'rubysl-test-unit',                 :platform => :rbx
-gem 'rubinius-developer_tools',         :platform => :rbx
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jruby-openssl", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+gem "appraisal"
+gem "rubysl", "~> 2.0", :platform => :rbx
+gem "racc", :platform => :rbx
+gem "minitest", :platform => :rbx
+gem "rubinius-developer_tools", :platform => :rbx
+gem "rails", "4.2.3"
 
-if RUBY_VERSION.chars.first.to_i > 1
-  gem 'byebug'
-else
-  gem 'debugger'
-end
+gemspec
+gem 'byebug'

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.1.1)](https://travis-ci.org/rollbar/rollbar-gem/branches)
+# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.1.2)](https://travis-ci.org/rollbar/rollbar-gem/branches)
 
 <!-- RemoveNext -->
 [Rollbar](https://rollbar.com) is an error tracking service for Ruby and other languages. The Rollbar service will alert you of problems with your code and help you understand them in a ways never possible before. We love it and we hope you will too.
@@ -12,7 +12,7 @@ This is the Ruby library for Rollbar. It will instrument many kinds of Ruby appl
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rollbar', '~> 2.1.1
+gem 'rollbar', '~> 2.1.2'
 ```
 
 And then execute:

data/lib/rollbar/request_data_extractor.rb

@@ -1,7 +1,10 @@
 require 'rack'
+require 'tempfile'
 
 module Rollbar
   module RequestDataExtractor
+    SKIPPED_CLASSES = [Tempfile]
+
     def extract_person_data_from_controller(env)
       if env.has_key? 'rollbar.person_data'
         person_data = env['rollbar.person_data'] || {}
@@ -165,22 +168,34 @@ module Rollbar
           result[key] = rollbar_filtered_params(sensitive_params, value)
         elsif value.is_a?(Array)
           result[key] = value.map do |v|
-            v.is_a?(Hash) ? rollbar_filtered_params(sensitive_params, v) : v
+            v.is_a?(Hash) ? rollbar_filtered_params(sensitive_params, v) : rollbar_filtered_param_value(v)
           end
-        elsif ATTACHMENT_CLASSES.include?(value.class.name)
-          result[key] = {
-            :content_type => value.content_type,
-            :original_filename => value.original_filename,
-            :size => value.tempfile.size
-          } rescue 'Uploaded file'
+        elsif skip_value?(value)
+          result[key] = "Skipped value of class '#{value.class.name}'"
         else
-          result[key] = value
+          result[key] = rollbar_filtered_param_value(value)
         end
 
         result
       end
     end
 
+    def rollbar_filtered_param_value(value)
+      if ATTACHMENT_CLASSES.include?(value.class.name)
+        begin
+          {
+            :content_type => value.content_type,
+            :original_filename => value.original_filename,
+            :size => value.tempfile.size
+          }
+        rescue
+          'Uploaded file'
+        end
+      else
+        value
+      end
+    end
+
     def sensitive_params_list(env)
       Array(Rollbar.configuration.scrub_fields) | Array(env['action_dispatch.parameter_filter'])
     end
@@ -193,5 +208,8 @@ module Rollbar
       '*' * (value.length rescue 8)
     end
 
+    def skip_value?(value)
+      SKIPPED_CLASSES.any? { |klass| value.is_a?(klass) }
+    end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/controllers/home_controller_spec.rb

@@ -349,6 +349,36 @@ describe HomeController do
     end
   end
 
+  context 'with file uploads',:type => "request" do
+    let(:file1) { fixture_file_upload('spec/fixtures/file1') }
+    let(:file2) { fixture_file_upload('spec/fixtures/file2') }
+
+    context 'with a single upload' do
+      it "saves attachment data" do
+        expect { post '/file_upload', :upload => file1 }.to raise_exception
+
+        upload_param = Rollbar.last_report[:request][:params]['upload']
+
+        expect(upload_param).to have_key(:filename)
+        expect(upload_param).to have_key(:type)
+        expect(upload_param).to have_key(:name)
+        expect(upload_param).to have_key(:head)
+
+        expect(upload_param[:tempfile]).to be_eql("Skipped value of class 'Tempfile'")
+      end
+    end
+
+    context 'with multiple uploads' do
+      it "saves attachment data for all uploads" do
+        expect { post '/file_upload', :upload => [file1, file2] }.to raise_exception
+        sent_params = Rollbar.last_report[:request][:params]['upload']
+
+        expect(sent_params).to be_kind_of(Array)
+        expect(sent_params).to have(2).items
+      end
+    end
+  end
+
   after(:each) do
     Rollbar.configure do |config|
       config.logger = ::Rails.logger

data/spec/dummyapp/app/controllers/home_controller.rb

@@ -24,11 +24,14 @@ class HomeController < ApplicationController
     render :json => {}
   end
 
-
   def cause_exception
     foo = bar
   end
 
+  def file_upload
+    this = will_crash
+  end
+
   def current_user
     @current_user ||= User.find_by_id(cookies[:session_id])
   end

data/spec/dummyapp/config/routes.rb

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

data/spec/fixtures/file1

@@ -0,0 +1 @@
+This is a file

data/spec/fixtures/file2

@@ -0,0 +1 @@
+This is a file

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Rollbar, Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: girl_friday
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: girl_friday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.1
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: sucker_punch
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.11.1
+- !ruby/object:Gem::Dependency
+  name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: sidekiq
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: genspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: genspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.8
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: sinatra
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
+- !ruby/object:Gem::Dependency
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: resque
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: delayed_job
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: redis
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails plugin to catch and send exceptions to Rollbar
 email:
 - support@rollbar.com
@@ -186,8 +186,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -306,6 +306,8 @@ files:
 - spec/dummyapp/public/500.html
 - spec/dummyapp/public/favicon.ico
 - spec/dummyapp/script/rails
+- spec/fixtures/file1
+- spec/fixtures/file2
 - spec/fixtures/payloads/message.json
 - spec/fixtures/payloads/sample.trace.json
 - spec/fixtures/payloads/sample.trace_chain.json
@@ -342,24 +344,24 @@ homepage: https://rollbar.com
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.1
+signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar
 test_files:
@@ -416,6 +418,8 @@ test_files:
 - spec/dummyapp/public/500.html
 - spec/dummyapp/public/favicon.ico
 - spec/dummyapp/script/rails
+- spec/fixtures/file1
+- spec/fixtures/file2
 - spec/fixtures/payloads/message.json
 - spec/fixtures/payloads/sample.trace.json
 - spec/fixtures/payloads/sample.trace_chain.json