rollbar 1.5.3 → 2.0.0

data/lib/rollbar/encoding/legacy_encoder.rb

@@ -0,0 +1,18 @@
+require 'iconv'
+
+module Rollbar
+  class LegacyEncoder
+    attr_accessor :object
+
+    def initialize(object)
+      @object = object
+    end
+
+    def encode
+      value = object.to_s
+      encoded_value = ::Iconv.conv('UTF-8//IGNORE', 'UTF-8', value)
+
+      object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
+    end
+  end
+end

data/lib/rollbar/json.rb

@@ -0,0 +1,41 @@
+module Rollbar
+  module JSON
+    extend self
+
+    attr_accessor :backend_name
+    attr_accessor :dump_method
+    attr_accessor :load_method
+
+    def load_native_json
+      require 'json' unless defined?(::JSON)
+
+      if ::JSON.respond_to?(:dump_default_options)
+        options = ::JSON.dump_default_options
+      else
+        # Default options from json 1.1.9 up to 1.6.1
+        options = { :allow_nan => true, :max_nesting => false }
+      end
+
+      self.dump_method = proc { |obj| ::JSON.generate(obj, options)  }
+      self.load_method    = proc { |obj| ::JSON.load(obj) }
+      self.backend_name   = :json
+
+      true
+    rescue StandardError, ScriptError => err
+      Rollbar.log_debug('%p while loading JSON library: %s' % [err, err.message])
+    end
+
+    def dump(object)
+      dump_method.call(object)
+    end
+
+    def load(string)
+      load_method.call(string)
+    end
+
+    def setup
+      load_native_json
+    end
+  end
+end
+

data/lib/rollbar/request_data_extractor.rb

@@ -121,7 +121,7 @@ module Rollbar
       return {} unless correct_method
       return {} unless rack_req.env['CONTENT_TYPE'] =~ %r{application/json}i
 
-      MultiJson.decode(rack_req.body.read)
+      Rollbar::JSON.load(rack_req.body.read)
     rescue
       {}
     ensure

data/lib/rollbar/tasks/rollbar.cap

@@ -7,6 +7,8 @@ namespace :rollbar do
   desc 'Send the deployment notification to Rollbar.'
   task :deploy do
     on roles fetch(:rollbar_role) do
+      warn("You need to upgrade capistrano to '>= 3.1' version in order to correctly report deploys to Rollbar. (On 3.0, the reported revision will be incorrect.)") if Capistrano::VERSION =~ /^3\.0/
+
       uri    = URI.parse 'https://api.rollbar.com/api/1/deploy/'
       params = {
         :local_username => fetch(:rollbar_user),

data/lib/rollbar/truncation/mixin.rb

@@ -4,7 +4,7 @@ module Rollbar
   module Truncation
     module Mixin
       def dump(payload)
-        MultiJson.dump(payload)
+        Rollbar::JSON.dump(payload)
       end
 
       def truncate?(result)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.5.3"
+  VERSION = "2.0.0"
 end

data/rollbar.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rollbar::VERSION
 
-  gem.add_runtime_dependency 'multi_json', '~> 1.3'
-
   gem.add_development_dependency 'rails', '>= 3.0.0'
   gem.add_development_dependency 'rspec-rails', '>= 2.14.0'
   gem.add_development_dependency 'database_cleaner', '~> 1.0.0'
@@ -29,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'resque'
   gem.add_development_dependency 'delayed_job'
   gem.add_development_dependency 'rake', '>= 0.9.0'
+  gem.add_development_dependency 'redis'
 end

data/spec/requests/home_spec.rb

@@ -43,7 +43,7 @@ describe HomeController do
       trace = body[:trace] && body[:trace] || body[:trace_chain][0]
 
       trace[:exception][:class].should == 'NoMethodError'
-      trace[:exception][:message].should == 'undefined method `-\' for "1":String'
+      trace[:exception][:message].should =~ /^undefined method `-'/
     end
   end
 end

data/spec/rollbar/delay/resque_spec.rb

@@ -12,7 +12,7 @@ describe Rollbar::Delay::Resque do
     end
 
     it 'process the payload' do
-      loaded_hash = MultiJson.load(MultiJson.dump(payload))
+      loaded_hash = Rollbar::JSON.load(Rollbar::JSON.dump(payload))
 
       expect(Rollbar).to receive(:process_payload_safely).with(loaded_hash)
       described_class.call(payload)

data/spec/rollbar/encoding/encoder_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require 'spec_helper'
+
+unless RUBY_VERSION.start_with?('1.8')
+  require 'rollbar/encoding/encoder'
+
+  describe Rollbar::Encoding::Encoder do
+    subject { described_class.new(object) }
+
+    shared_examples 'encoding' do
+      it 'encodes ir properly' do
+        value = subject.encode
+
+        expect(value).to be_eql(expected)
+      end
+    end
+
+    describe '#encode' do
+      context 'with ascii chars at end of string' do
+        it_behaves_like 'encoding' do
+          let(:object) { force_to_ascii("bad value 1\255") }
+          let(:expected) { 'bad value 1' }
+        end
+      end
+
+      context 'with ascii chars at middle of string' do
+        it_behaves_like 'encoding' do
+          let(:object) { force_to_ascii("bad\255 value 2") }
+          let(:expected) { 'bad value 2' }
+        end
+      end
+
+      context 'with ascii chars at end of string' do
+        it_behaves_like 'encoding' do
+          let(:object) { force_to_ascii("bad value 3\255") }
+          let(:expected) { 'bad value 3' }
+        end
+      end
+
+      context '0xa0 char in exception object' do
+        it_behaves_like 'encoding' do
+          let(:object) { "foo \xa0".force_encoding(::Encoding::ISO_8859_1) }
+          let(:expected) { "foo " }
+        end
+      end
+
+      context 'with bad symbol' do
+        it_behaves_like 'encoding' do
+          let(:bad_string) { force_to_ascii("inner \x92bad key") }
+          let(:object) { bad_string.to_sym }
+          let(:expected) { :"inner bad key" }
+        end
+      end
+
+      context 'with russian chars in string' do
+        it_behaves_like 'encoding' do
+          let(:object) { 'Изменение' }
+          let(:expected) { 'Изменение' }
+        end
+      end
+    end
+  end
+end

data/spec/rollbar/json_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'rollbar/json'
+require 'rollbar/configuration'
+
+describe Rollbar::JSON do
+  before do
+    Rollbar::JSON.setup
+  end
+
+  describe '.dump' do
+    it 'has JSON as backend' do
+      expect(Rollbar::JSON.backend_name).to be_eql(:json)
+    end
+
+    it 'calls JSON.generate' do
+      expect(::JSON).to receive(:generate).once
+
+      Rollbar::JSON.dump(:foo => :bar)
+    end
+  end
+
+  describe '.load' do
+    it 'calls MultiJson.load' do
+      expect(::JSON).to receive(:load).once
+
+      Rollbar::JSON.load(:foo => :bar)
+    end
+  end
+end

data/spec/rollbar/truncation/frames_strategy_spec.rb

@@ -16,7 +16,7 @@ describe Rollbar::Truncation::FramesStrategy do
       end
 
       it 'returns a new payload with 300 frames' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         new_frames = result['data']['body']['trace']['frames']
 
@@ -38,7 +38,7 @@ describe Rollbar::Truncation::FramesStrategy do
       end
 
       it 'returns a new payload with 300 frames for each chain item' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         new_frames1 = result['data']['body']['trace_chain'][0]['frames']
         new_frames2 = result['data']['body']['trace_chain'][1]['frames']
@@ -61,7 +61,7 @@ describe Rollbar::Truncation::FramesStrategy do
       end
 
       it 'returns the original payload' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         expect(result).to be_eql(payload)
       end

data/spec/rollbar/truncation/min_body_strategy_spec.rb

@@ -14,7 +14,7 @@ describe Rollbar::Truncation::MinBodyStrategy do
       end
 
       it 'truncates the exception message and frames array' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         trace = result['data']['body']['trace']
         expect(trace['frames']).to have(2).items
@@ -33,7 +33,7 @@ describe Rollbar::Truncation::MinBodyStrategy do
       end
 
       it 'truncates the exception message and frames array' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         traces = result['data']['body']['trace_chain']
         expect(traces[0]['frames']).to have(2).items
@@ -48,7 +48,7 @@ describe Rollbar::Truncation::MinBodyStrategy do
       let(:payload_fixture) { 'payloads/sample.trace_chain.json' }
 
       it "doesn't truncate anything and returns same payload" do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         expect(result).to be_eql(payload)
       end

data/spec/rollbar/truncation/strings_strategy_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 require 'spec_helper'
 require 'rollbar/truncation/frames_strategy'
@@ -19,7 +19,7 @@ describe Rollbar::Truncation::StringsStrategy do
     end
 
     it 'should truncate all nested strings in the payload' do
-      result = MultiJson.load(described_class.call(payload))
+      result = Rollbar::JSON.load(described_class.call(payload))
 
       expect(result['truncated'].size).to be_eql(1024)
       expect(result['hash']['inner_truncated'].size).to be_eql(1024)
@@ -36,7 +36,7 @@ describe Rollbar::Truncation::StringsStrategy do
       end
 
       it 'should truncate utf8 strings properly' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
         expect(result['truncated']).to match(/^Ŝǻмρļẻ śţяịņģa*\.{3}/)
       end
     end
@@ -50,7 +50,7 @@ describe Rollbar::Truncation::StringsStrategy do
       end
 
       it 'truncates to 512 size strings' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         expect(result['0'].size).to be_eql(512)
       end
@@ -65,7 +65,7 @@ describe Rollbar::Truncation::StringsStrategy do
       end
 
       it 'truncates to 256 size strings, the third threshold' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         expect(result['0'].size).to be_eql(256)
       end
@@ -80,7 +80,7 @@ describe Rollbar::Truncation::StringsStrategy do
       end
 
       it 'just return the value for third threshold' do
-        result = MultiJson.load(described_class.call(payload))
+        result = Rollbar::JSON.load(described_class.call(payload))
 
         expect(result['0'].size).to be_eql(256)
       end

data/spec/rollbar_bc_spec.rb

@@ -202,27 +202,30 @@ describe Rollbar do
       Rollbar.report_exception(@exception, request_data, person_data)
     end
 
-    it 'should work with an IO object as rack.errors' do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
-
-      request_data = {
-        :params => { :foo => 'bar' },
-        :url => 'http://localhost/',
-        :user_ip => '127.0.0.1',
-        :headers => {},
-        :GET => { 'baz' => 'boz' },
-        :session => { :user_id => 123 },
-        :method => 'GET',
-        :env => { :'rack.errors' => IO.new(2, File::WRONLY) },
-      }
-
-      person_data = {
-        :id => 1,
-        :username => 'test',
-        :email => 'test@example.com'
-      }
-
-      Rollbar.report_exception(@exception, request_data, person_data)
+    # Skip jruby 1.9+ (https://github.com/jruby/jruby/issues/2373)
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && (not RUBY_VERSION =~ /^1\.9/)
+      it 'should work with an IO object as rack.errors' do
+        logger_mock.should_receive(:info).with('[Rollbar] Success')
+ 
+        request_data = {
+          :params => { :foo => 'bar' },
+          :url => 'http://localhost/',
+          :user_ip => '127.0.0.1',
+          :headers => {},
+          :GET => { 'baz' => 'boz' },
+          :session => { :user_id => 123 },
+          :method => 'GET',
+          :env => { :'rack.errors' => IO.new(2, File::WRONLY) },
+        }
+ 
+        person_data = {
+          :id => 1,
+          :username => 'test',
+          :email => 'test@example.com'
+        }
+ 
+        Rollbar.report_exception(@exception, request_data, person_data)
+      end  
     end
 
     it 'should ignore ignored exception classes' do

data/spec/rollbar_spec.rb

@@ -4,6 +4,9 @@ require 'logger'
 require 'socket'
 require 'spec_helper'
 require 'girl_friday'
+require 'redis'
+require 'active_support/core_ext/object'
+require 'active_support/json/encoding'
 
 begin
   require 'sucker_punch'
@@ -472,6 +475,23 @@ describe Rollbar do
         payload['data'][:server][:root].should == '/path/to/root'
         payload['data'][:server][:branch].should == 'master'
       end
+
+      context "with Redis instance in payload and ActiveSupport is enabled" do
+        let(:redis) { ::Redis.new }
+        let(:payload) do
+          {
+            :key => {
+              :value => redis
+            }
+          }
+        end
+        it 'dumps to JSON correctly' do
+          redis.set('foo', 'bar')
+          json = notifier.send(:dump_payload, payload)
+
+          expect(json).to be_kind_of(String)
+        end
+      end
     end
 
     context 'build_payload_body' do
@@ -800,10 +820,13 @@ describe Rollbar do
       end
     end
 
-    it "should work with an IO object as rack.errors" do
-      logger_mock.should_receive(:info).with('[Rollbar] Success')
+    # Skip jruby 1.9+ (https://github.com/jruby/jruby/issues/2373)
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && (not RUBY_VERSION =~ /^1\.9/)
+      it "should work with an IO object as rack.errors" do
+        logger_mock.should_receive(:info).with('[Rollbar] Success')
 
-      Rollbar.error(exception, :env => { :"rack.errors" => IO.new(2, File::WRONLY) })
+        Rollbar.error(exception, :env => { :"rack.errors" => IO.new(2, File::WRONLY) })
+      end
     end
 
     it 'should ignore ignored persons' do
@@ -1199,7 +1222,7 @@ describe Rollbar do
       let(:async_handler) do
         proc do |payload|
           # simulate previous gem version
-          string_payload = MultiJson.dump(payload)
+          string_payload = Rollbar::JSON.dump(payload)
 
           Rollbar.process_payload(string_payload)
         end
@@ -1361,6 +1384,11 @@ describe Rollbar do
   end
 
   context 'enforce_valid_utf8' do
+    # TODO(jon): all these tests should be removed since they are in
+    # in spec/rollbar/encoding/encoder.rb.
+    #
+    # This should just check that in payload with simple values and
+    # nested values are each one passed through Rollbar::Encoding.encode
     context 'with utf8 string and ruby > 1.8' do
       next unless String.instance_methods.include?(:force_encoding)