rollbar 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850b8631306eb9e7c4e7379f869f573d74202b18
-  data.tar.gz: 10bbd67bc34a4635d5455b66c468bc3a4c65ce24
+  metadata.gz: 3cfe303ae73dcfd7cfaff61a78a3d189205b7bcc
+  data.tar.gz: 327509998ddc5c03907fd30190ac7f087de12187
 SHA512:
-  metadata.gz: 49809c4c002ff8a03d78b3c2b785bbf124ea754f4f54d668bf17bce21ab3bd9298fe9a15a09da2d50ba75b4ff7a6a03b03b601c1400aba6f2073c58128f49c4f
-  data.tar.gz: 204ec3d976719a22aa6333347d623ba17723d8574c2ab1c3b815f88631ebc996d3c4426619bbd8c8ddd88d34bab8a5a026cb9de0ed7f64d5c1202fca2d3d9408
+  metadata.gz: 95207004e19203386da2851e762a0301694e7e7d6385608cd2acdcc04076fb9c6ee0ba4be4ac8d37fcd1697936f5797d2559c92ba0a87b546db6c0cb4b4d7e0e
+  data.tar.gz: 70541207c0df4a50eac2ee39622ffb806f7561684ce1bdfcd9c8731fb0197411674adf058e2cb2deac4f02991336228f41162a963e9a7d29e0de0acb88682ea0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**1.2.1**
+- Revert change made as part of 1.2.0 where all procs in the payload would be evaluated. See [#143](https://github.com/rollbar/rollbar-gem/pull/143).
+
 **1.2.0**
 - Added new, much nicer interface for sending exceptions and messages to Rollbar. This is a backwards-compatible release: the old interface (`report_message`, `report_exception`, `report_message_with_request`) is deprecated but will continue to work at least until 2.0.
   

data/lib/rollbar.rb

@@ -207,11 +207,13 @@ module Rollbar
 
       payload = build_payload(level, message, exception, extra)
       data = payload['data']
-      evaluate_payload(data)
 
       if data[:person]
         person_id = data[:person][configuration.person_id_method.to_sym]
         return 'ignored' if configuration.ignored_person_ids.include?(person_id)
+
+        is_proc = data[:person].respond_to?(:call)
+        data[:person] = data[:person].call if is_proc
       end
 
       schedule_payload(payload)
@@ -364,27 +366,6 @@ module Rollbar
       data
     end
 
-    # Walks the entire payload and replaces callable values with
-    # their results
-    def evaluate_payload(payload)
-      evaluator = proc do |key, value|
-        result = value
-
-        if value.respond_to? :call
-          begin
-            result = value.call
-          rescue
-            log_error "[Rollbar] Error while evaluating callable in payload for key #{key}"
-            result = nil
-          end
-        end
-
-        result
-      end
-
-      Rollbar::Util.iterate_and_update_hash(payload, evaluator)
-    end
-
     def enforce_valid_utf8(payload)
       normalizer = lambda do |object|
         is_symbol = object.is_a?(Symbol)

data/lib/rollbar/middleware/rails/rollbar.rb

@@ -44,9 +44,7 @@ module Rollbar
           block = proc { extract_person_data_from_controller(env) }
           return block unless defined?(ActiveRecord::Base)
 
-          proc do
-            ActiveRecord::Base.connection_pool.with_connection(&block)
-          end
+          proc { ActiveRecord::Base.connection_pool.with_connection(&block) }
         end
 
         def context(request_data)

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/rollbar_spec.rb

@@ -250,16 +250,6 @@ describe Rollbar do
         result = notifier.send(:report, 'info', 'message', nil, nil)
         result.should == 'ignored'
       end
-
-      it 'should evaluate callables in the payload' do
-        notifier.should receive(:schedule_payload) do |payload|
-          data = payload['data']
-          data[:body][:message][:extra][:callable].should == 2
-        end
-
-        callable = proc { 1 + 1 }
-        notifier.send(:report, 'warning', 'message', nil, { :callable => callable })
-      end
     end
 
     context 'build_payload' do
@@ -616,65 +606,6 @@ describe Rollbar do
       end
     end
 
-    context 'evaluate_payload' do
-      let(:notifier) do
-        notifier = Rollbar.notifier
-
-        notifier.configure do |config|
-          config.logger = logger_mock
-        end
-
-        notifier
-      end
-
-      let(:logger_mock) { double("Rails.logger").as_null_object }
-
-      before(:each) do
-        configure
-        notifier.configure do |config|
-          config.logger = logger_mock
-        end
-      end
-
-      it 'should evaluate callables and store the result' do
-        a = 'some string'
-
-        payload = {
-          :evaluate1 => lambda { 1 + 1 },
-          :evaluate2 => Proc.new { 2 + 2 },
-          :hash => {
-            :inner_evaluate1 => a.method(:to_s),
-            :inner_evaluate2 => lambda { {:key => 'value'} }
-          }
-        }
-
-        payload_copy = payload.clone
-        notifier.send(:evaluate_payload, payload_copy)
-
-        payload_copy[:evaluate1].should == 2
-        payload_copy[:evaluate2].should == 4
-        payload_copy[:hash][:inner_evaluate1].should == 'some string'
-        payload_copy[:hash][:inner_evaluate2][:key].should == 'value'
-      end
-
-      it 'should not crash when the callable raises an exception' do
-        logger_mock.should_receive(:error).with("[Rollbar] Error while evaluating callable in payload for key evaluate1")
-
-        payload = {
-          :evaluate1 => lambda { a = b },
-          :evaluate2 => Proc.new { 2 + 2 },
-          :key => 'value'
-        }
-
-        payload_copy = payload.clone
-        notifier.send(:evaluate_payload, payload_copy)
-
-        payload_copy[:evaluate1].should be_nil
-        payload_copy[:evaluate2].should == 4
-        payload_copy[:key].should == 'value'
-      end
-    end
-
     context 'enforce_valid_utf8' do
       it 'should replace invalid utf8 values' do
         payload = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json