bugsnag 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df43adc7e6a279be8b5d1e7e454745573c6ce6b
-  data.tar.gz: 285955b0b0f441e442c2d888400d3049e2819371
+  metadata.gz: 3e431cd9b8e24c77a857706e4226447ca12b73f7
+  data.tar.gz: 9844d688bc0311ccad83c6997d8bf0274c8ccd7a
 SHA512:
-  metadata.gz: 6e75646fd35a624c3b03d6be994fee9e44b019a90f791a4ec090479e11382c6b3fb580961ecae3a3cc8cd50ec2232b4779a98460da032b0930d229ab869b8292
-  data.tar.gz: 1662f2351b795995731a4298d24831ba42eecc503de8101522e75c9681bdfddd3e3aa8976120253a17ad1e19e6a88380f59051912005c2c1525311651fd05101
+  metadata.gz: f12b1aec2e9a72a9557f5a9df16e0c519603ad51624ef2754280f30f6ce93ba17439bb2ad8ff4577cc5488eeb5483ac3cb4fbf0682a312721527b9ca1e3c7cbe
+  data.tar.gz: f9c0201a1a2c079ddcdc626c6a94e5a20b64259128998d7dda16d7162a77c76ebfb2c54dee8be7b7527f9702cc8630899862f4e09d60f351dae9604fd25cd769

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+2.0.2
+-----
+-   Fix encoding issue when ensuring utf8 string is valid
+
 2.0.1
 -----
 -   Fix capistrano v3 after 2.0.0

data/README.md

@@ -127,7 +127,7 @@ Bugsnag.before_notify_callbacks.clear
 ### Exceptions with Meta Data
 
 If you include the `Bugsnag::MetaData` module into your own exceptions, you can
-associate meta data with a paticular exception.
+associate meta data with a particular exception.
 
 ```ruby
 class MyCustomException < Exception

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/bugsnag/helpers.rb

@@ -26,7 +26,7 @@ module Bugsnag
       case obj
       when Hash
         clean_hash = {}
-        obj.each do |k,v| 
+        obj.each do |k,v|
           if filters && filters.any? {|f| k.to_s.include?(f.to_s)}
             clean_hash[k] = "[FILTERED]"
           else
@@ -41,7 +41,11 @@ module Bugsnag
         obj
       when String
         if defined?(obj.encoding) && defined?(Encoding::UTF_8)
-          obj.encode('utf-8', obj.encoding == Encoding::UTF_8 ? 'binary' : obj.encoding, :invalid => :replace, :undef => :replace)
+          if obj.encoding == Encoding::UTF_8
+            obj.valid_encoding? ? obj : obj.encode('utf-16', {:invalid => :replace, :undef => :replace}).encode('utf-8')
+          else
+            obj.encode('utf-8', {:invalid => :replace, :undef => :replace})
+          end
         elsif defined?(Iconv)
           Iconv.conv('UTF-8//IGNORE', 'UTF-8', obj) || obj
         else
@@ -62,10 +66,10 @@ module Bugsnag
       return url unless filters
 
       filter_regex = Regexp.new("([?&](?:[^&=]*#{filters.to_a.join('|[^&=]*')}[^&=]*)=)[^&]*")
-      
+
       url.gsub(filter_regex, '\1[FILTERED]')
     end
-    
+
     def self.reduce_hash_size(hash)
       return {} unless hash.is_a?(Hash)
       hash.inject({}) do |h, (k,v)|
@@ -82,13 +86,13 @@ module Bugsnag
         h
       end
     end
-    
+
     def self.flatten_meta_data(overrides)
       return nil unless overrides
 
       meta_data = overrides.delete(:meta_data)
       if meta_data.is_a?(Hash)
-        overrides.merge(meta_data) 
+        overrides.merge(meta_data)
       else
         overrides
       end

data/spec/helper_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Bugsnag::Helpers do
@@ -27,6 +29,21 @@ describe Bugsnag::Helpers do
     expect(Bugsnag::Helpers.cleanup_obj(a)).to eq([["hello"], ["hello"]])
   end
 
+  it "cleans up UTF8 strings properly" do
+    obj = "André"
+    expect(Bugsnag::Helpers.cleanup_obj(obj)).to eq("André")
+  end
+
+  it "cleans up binary strings properly" do
+    if RUBY_VERSION > "1.9"
+      obj = "Andr\xc7\xff"
+      if obj.respond_to? :force_encoding
+        obj = obj.force_encoding('BINARY')
+      end
+      expect(Bugsnag::Helpers.cleanup_obj(obj)).to eq("Andr��")
+    end
+  end
+
   it "reduces hash size correctly" do
     meta_data = {
       :key_one => "this should not be truncated",

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby notifier for bugsnag.com
@@ -108,10 +108,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -166,17 +166,17 @@ 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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for bugsnag.com