rollbar 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9b6e18ebb383811eeb94a71ebb3c257c6f8eb3
-  data.tar.gz: 53fff3d9e6c7e382ddad631f09fbbfb790761875
+  metadata.gz: 307192963be4a3aefcd14f135c284089329768e8
+  data.tar.gz: 827eab30ef25e8da4c2ad4befcd48f6e9d142794
 SHA512:
-  metadata.gz: 6a71c85969223088bba62f91c54e68fc05bf803f7e7de5fdba8df2912ccb20d14b8eccb896ba6d5e1710f3b0695bcd0faca91a655e2edc93f229a287ebb79a52
-  data.tar.gz: 41ae2da0a51043db97987f019ef0628ae9b52f9385ae6772df2691c1b95171543d3883d6e2fad6e0c467f1545e48e3360bae41fde06d8f0296b9f0d848bede45
+  metadata.gz: fa47e8350d65964e7077556ec9c5930ae429850ce83a8ca945dd57415429c8c800f7617d99b440e2596e01e7d0613b72f31b0d40f9a1341ffc75dec625ae9327
+  data.tar.gz: 313592eef5826b4f7bb9674848b28d30b2e366fd4ad580b5a1478fb18d118ff9f49a6ad5d54bb349adc80794460ae8ae239b2e856d4680f9cd17921625c47a06

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.7.1
+
+- Suggest using ROLLBAR_ENV for staging apps. See [#353](https://github.com/rollbar/rollbar-gem/pull/353).
+- Fix Rollbar::Util.deep_merge so it has default values for arguments. See [#362](https://github.com/rollbar/rollbar-gem/pull/362).
+- Ignore exception cause when it's not another exception. See [#357](https://github.com/rollbar/rollbar-gem/pull/357).
+
+
 ## 2.7.0
 
 - Delayed job integration fix. See [#355](https://github.com/rollbar/rollbar-gem/pull/355).

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.7.0)](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.7.1)](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,13 +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.7.0'
-```
-
-If you are not using JRuby we suggest using [Oj](https://github.com/ohler55/oj) for JSON serialization. In order to install Oj you can add this line to your Gemfile:
-
-```ruby
-gem 'oj', '~> 2.12.14'
+gem 'rollbar', '~> 2.7.1'
 ```
 
 And then execute:
@@ -29,6 +23,14 @@ $ bundle install
 $ gem install rollbar
 ```
 
+Unless you are using JRuby, we suggest also installing [Oj](https://github.com/ohler55/oj) for JSON serialization. Add this line to your Gemfile:
+
+```ruby
+gem 'oj', '~> 2.12.14'
+```
+
+and then `bundle install` again.
+
 ### If using Rails
 
 Run the following command from your Rails root:

data/lib/generators/rollbar/templates/initializer.rb

@@ -56,4 +56,11 @@ Rollbar.configure do |config|
   # config.use_sidekiq
   # You can supply custom Sidekiq options:
   # config.use_sidekiq 'queue' => 'default'
+
+  # If you run your staging application instance in production environment then
+  # you'll want to override the environment reported by `Rails.env` with an
+  # environment variable like this: `ROLLBAR_ENV=staging`. This is a recommended
+  # setup for Heroku. See:
+  # https://devcenter.heroku.com/articles/deploying-to-a-custom-rails-environment
+  config.environment = ENV['ROLLBAR_ENV'] || Rails.env
 end

data/lib/rollbar.rb

@@ -442,7 +442,7 @@ module Rollbar
       traces = [trace_data(exception)]
       visited = [exception]
 
-      while exception.respond_to?(:cause) && (cause = exception.cause) && !visited.include?(cause)
+      while exception.respond_to?(:cause) && (cause = exception.cause) && cause.is_a?(Exception) && !visited.include?(cause)
         traces << trace_data(cause)
         visited << cause
         exception = cause

data/lib/rollbar/util.rb

@@ -66,10 +66,13 @@ module Rollbar
     end
 
     def self.deep_merge(hash1, hash2)
+      hash1 ||= {}
+      hash2 ||= {}
+
       hash2.each_key do |k|
-        if hash1[k].is_a? ::Hash and hash2[k].is_a? ::Hash
+        if hash1[k].is_a?(::Hash) && hash2[k].is_a?(::Hash)
           hash1[k] = deep_merge(hash1[k], hash2[k])
-        elsif hash1[k].is_a? Array and hash2[k].is_a? Array
+        elsif hash1[k].is_a?(Array) && hash2[k].is_a?(Array)
           hash1[k] += deep_copy(hash2[k])
         elsif hash2[k]
           hash1[k] = deep_copy(hash2[k])

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/spec/rollbar/util_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+require 'rollbar/util'
+
+describe Rollbar::Util do
+  describe '.deep_merge' do
+    context 'with nil arguments' do
+      let(:data) do
+        { :foo => :bar }
+      end
+
+      it 'doesnt fail and returns same hash' do
+        result = Rollbar::Util.deep_merge(nil, data)
+
+        expect(result).to be_eql(data)
+      end
+    end
+  end
+end

data/spec/rollbar_spec.rb

@@ -2,7 +2,6 @@
 
 require 'logger'
 require 'socket'
-require 'spec_helper'
 require 'girl_friday'
 require 'redis'
 require 'active_support/core_ext/object'
@@ -14,6 +13,8 @@ begin
 rescue LoadError
 end
 
+require 'spec_helper'
+
 describe Rollbar do
   let(:notifier) { Rollbar.notifier }
   before do
@@ -646,6 +647,13 @@ describe Rollbar do
             chain[1][:exception][:message].should match(/the cause/)
           end
 
+          it 'ignores the cause when it is not an Exception' do
+            exception_with_custom_cause = Exception.new('custom cause')
+            allow(exception_with_custom_cause).to receive(:cause) { "Foo" }
+            body = notifier.send(:build_payload_body_exception, message, exception_with_custom_cause, extra)
+            body[:trace].should_not be_nil
+          end
+
           context 'with cyclic nested exceptions' do
             let(:exception1) { Exception.new('exception1') }
             let(:exception2) { Exception.new('exception2') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -371,6 +371,7 @@ files:
 - spec/rollbar/truncation/strings_strategy_spec.rb
 - spec/rollbar/truncation_spec.rb
 - spec/rollbar/util/hash_spec.rb
+- spec/rollbar/util_spec.rb
 - spec/rollbar_bc_spec.rb
 - spec/rollbar_spec.rb
 - spec/spec_helper.rb
@@ -491,6 +492,7 @@ test_files:
 - spec/rollbar/truncation/strings_strategy_spec.rb
 - spec/rollbar/truncation_spec.rb
 - spec/rollbar/util/hash_spec.rb
+- spec/rollbar/util_spec.rb
 - spec/rollbar_bc_spec.rb
 - spec/rollbar_spec.rb
 - spec/spec_helper.rb