rollbar 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 245d598a698d57310a524065495b585450e183d8
-  data.tar.gz: ae4841097d594e0b58528806f3b151163e9b432a
+  metadata.gz: a8387b8dd9b53558f27d84908e1f3ac8beb26204
+  data.tar.gz: d8eec2f09315894700991fbaf1765d30cd0c697d
 SHA512:
-  metadata.gz: 43011a9710f91e3640dc5542d099b112ea4b2424842d2db8045a5f14444027ec225b15380539d7f38ecde2258744db6e74df31855b1a293c36d106c7ee2ac0dd
-  data.tar.gz: 47bfe86f356e5efa27fea9ef15c5150541d4c065c9d8c72f0def6c1ad2813d8ff0be5bc1381b0b9bea38f7df49f3fc3dfb03a3b23a362510da196a1391596668
+  metadata.gz: 15191d6677c822f80dadeb608d41e1cd35e778e15a4f2e49254bd954e2db4179127406c841f05910cee36a8d2be6adabbb70704f18e53f6b9da0c773bb231585
+  data.tar.gz: 59e4273d242a88151f509845334448c067eb63b97241785eb4b46db6fbe1afcb4a916760fa2351283df1b10357394c59026aaeb808784f5119295394123b1289

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.2.1
+
+Improvement:
+
+- Speed-up payload encoding. See [#285](https://github.com/rollbar/rollbar-gem/pull/285)
+
 ## 2.2.0
 
 New features:

data/README.md

@@ -1,4 +1,4 @@
-# Rollbar notifier for Ruby [![Build Status](https://api.travis-ci.org/rollbar/rollbar-gem.svg?branch=v2.2.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.2.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,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.2.0'
+gem 'rollbar', '~> 2.2.1'
 ```
 
 And then execute:

data/lib/rollbar/encoding.rb

@@ -1,21 +1,27 @@
 module Rollbar
   module Encoding
-    def self.encode(object)
-      can_be_encoded = object.is_a?(Symbol) || object.is_a?(String)
-
-      return object unless can_be_encoded
-
-      encoding_class.new(object).encode
+    class << self
+      attr_accessor :encoding_class
     end
 
-    def self.encoding_class
+    def self.setup
       if String.instance_methods.include?(:encode)
         require 'rollbar/encoding/encoder'
-        Encoder
+        self.encoding_class = Rollbar::Encoding::Encoder
       else
         require 'rollbar/encoding/legacy_encoder'
-        LegacyEncoder
+        self.encoding_class = Rollbar::Encoding::LegacyEncoder
       end
     end
+
+    def self.encode(object)
+      can_be_encoded = object.is_a?(String) || object.is_a?(Symbol)
+
+      return object unless can_be_encoded
+
+      encoding_class.new(object).encode
+    end
   end
 end
+
+Rollbar::Encoding.setup

data/lib/rollbar/encoding/encoder.rb

@@ -4,6 +4,8 @@ module Rollbar
       ALL_ENCODINGS = [::Encoding::UTF_8, ::Encoding::ISO_8859_1, ::Encoding::ASCII_8BIT, ::Encoding::US_ASCII]
       ASCII_ENCODINGS = [::Encoding::US_ASCII, ::Encoding::ASCII_8BIT, ::Encoding::ISO_8859_1]
       ENCODING_OPTIONS = { :invalid => :replace, :undef => :replace, :replace => '' }
+      UTF8 = 'UTF-8'.freeze
+      BINARY = 'binary'.freeze
 
       attr_accessor :object
 
@@ -13,8 +15,14 @@ module Rollbar
 
       def encode
         value = object.to_s
+        encoding = value.encoding
 
-        encoded_value = force_encoding(value).encode(*encoding_args(value))
+        # This will be most of cases so avoid force anything for them
+        if encoding == ::Encoding::UTF_8 && value.valid_encoding?
+          encoded_value = value
+        else
+          encoded_value = force_encoding(value).encode(*encoding_args(value))
+        end
 
         object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
       end
@@ -34,6 +42,7 @@ module Rollbar
 
         ALL_ENCODINGS.detect do |encoding|
           begin
+            # Seems #codepoints is faster than #valid_encoding?
             value.force_encoding(encoding).encode(::Encoding::UTF_8).codepoints
             true
           rescue
@@ -43,8 +52,8 @@ module Rollbar
       end
 
       def encoding_args(value)
-        args = ['UTF-8']
-        args << 'binary' if ASCII_ENCODINGS.include?(value.encoding)
+        args = [UTF8]
+        args << BINARY if ASCII_ENCODINGS.include?(value.encoding)
         args << ENCODING_OPTIONS
 
         args

data/lib/rollbar/encoding/legacy_encoder.rb

@@ -1,18 +1,20 @@
 require 'iconv'
 
 module Rollbar
-  class LegacyEncoder
-    attr_accessor :object
+  module Encoding
+    class LegacyEncoder
+      attr_accessor :object
 
-    def initialize(object)
-      @object = object
-    end
+      def initialize(object)
+        @object = object
+      end
 
-    def encode
-      value = object.to_s
-      encoded_value = ::Iconv.conv('UTF-8//IGNORE', 'UTF-8', value)
+      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
+        object.is_a?(Symbol) ? encoded_value.to_sym : encoded_value
+      end
     end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar