bugsnag 1.3.6 → 1.3.7

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/bugsnag.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "bugsnag"
-  s.version = "1.3.6"
+  s.name = %q{bugsnag}
+  s.version = "1.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2013-05-02"
-  s.description = "Ruby notifier for bugsnag.com"
-  s.email = "james@bugsnag.com"
+  s.date = %q{2013-05-30}
+  s.description = %q{Ruby notifier for bugsnag.com}
+  s.email = %q{james@bugsnag.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -54,36 +54,38 @@ Gem::Specification.new do |s|
     "lib/bugsnag/version.rb",
     "lib/resque/failure/bugsnag.rb",
     "rails/init.rb",
+    "spec/helper_spec.rb",
     "spec/middleware_spec.rb",
     "spec/notification_spec.rb",
     "spec/rack_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/bugsnag/bugsnag-ruby"
+  s.homepage = %q{http://github.com/bugsnag/bugsnag-ruby}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Ruby notifier for bugsnag.com"
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby notifier for bugsnag.com}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+      s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     s.add_dependency(%q<multi_json>, ["~> 1.0"])
-    s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+    s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/lib/bugsnag/helpers.rb

@@ -32,6 +32,14 @@ module Bugsnag
         obj.to_s unless obj.to_s =~ /#<.*>/
       end
     end
+
+    def self.cleanup_url(url, filters = nil)
+      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)

data/lib/bugsnag/middleware/rack_request.rb

@@ -21,7 +21,7 @@ module Bugsnag::Middleware
         # Build the clean url (hide the port if it is obvious)
         url = "#{request.scheme}://#{request.host}"
         url << ":#{request.port}" unless [80, 443].include?(request.port)
-        url << request.fullpath
+        url << Bugsnag::Helpers.cleanup_url(request.fullpath, notification.configuration.params_filters)
 
         # Add a request tab
         notification.add_tab(:request, {

data/lib/bugsnag/middleware/rails2_request.rb

@@ -19,7 +19,7 @@ module Bugsnag::Middleware
         # Build the clean url
         url = "#{request.protocol}#{request.host}"
         url << ":#{request.port}" unless [80, 443].include?(request.port)
-        url << request.fullpath
+        url << Helpers.cleanup_url(request.fullpath, notification.configuration.params_filters)
 
         # Add a request tab
         notification.add_tab(:request, {

data/lib/bugsnag/middleware/warden_user.rb

@@ -21,8 +21,14 @@ module Bugsnag::Middleware
           # Set the user_id
           if best_scope
             scope_key = "warden.user.#{best_scope}.key"
-            user_id = session[scope_key][1][0] rescue nil
-            notification.user_id = user_id unless user_id.nil?
+            scope = session[scope_key]
+            if scope.is_a? Array
+              user_ids = scope.detect {|el| el.is_a? Array}
+              if user_ids
+                user_id = user_ids.first
+                notification.user_id = user_id unless user_id.nil?
+              end
+            end
           end
 
           # Extract useful user information

data/lib/bugsnag/notification.rb

@@ -21,6 +21,7 @@ module Bugsnag
 
     attr_accessor :context
     attr_accessor :user_id
+    attr_accessor :configuration
 
     class << self
       def deliver_exception_payload(endpoint, payload)

data/spec/helper_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Bugsnag::Helpers do
+  it "should work with no filters configured" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2"
+
+    url.should == "/dir/page?param1=value1&param2=value2"
+  end
+
+  it "should not filter with no get params" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page"
+
+    url.should == "/dir/page"
+  end
+
+  it "should leave a url alone if no filters match" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2", ["param3"]
+
+    url.should == "/dir/page?param1=value1&param2=value2"
+  end
+
+  it "should filter a single get param" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2", ["param1"]
+
+    url.should == "/dir/page?param1=[FILTERED]&param2=value2"
+  end
+
+  it "should filter a get param that contains a filtered term" do
+    url = Bugsnag::Helpers.cleanup_url '/dir/page?param1=value1&param2=value2&bla=yes', ["param"]
+
+    url.should == "/dir/page?param1=[FILTERED]&param2=[FILTERED]&bla=yes"
+  end
+
+  it "should filter multiple matches" do
+    url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2&param3=value3", ["param1", "param2"]
+
+    url.should == "/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3"
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: ruby
 authors: 
 - James Smith
@@ -15,92 +14,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 Z
+date: 2013-05-30 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :runtime
+  name: multi_json
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id001
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: multi_json
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: httparty
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
         version: "0.6"
-  version_requirements: *id002
-  prerelease: false
-  type: :runtime
-  name: httparty
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 2
         - 11
         - 0
         version: 2.11.0
-  version_requirements: *id003
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  name: rdoc
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 3
         - 12
         version: "3.12"
-  version_requirements: *id004
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: rdoc
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 1
         - 8
         - 4
         version: 1.8.4
-  version_requirements: *id005
-  prerelease: false
-  type: :development
-  name: jeweler
+  requirement: *id005
 description: Ruby notifier for bugsnag.com
 email: james@bugsnag.com
 executables: []
@@ -148,10 +137,12 @@ files:
 - lib/bugsnag/version.rb
 - lib/resque/failure/bugsnag.rb
 - rails/init.rb
+- spec/helper_spec.rb
 - spec/middleware_spec.rb
 - spec/notification_spec.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/bugsnag/bugsnag-ruby
 licenses: 
 - MIT
@@ -161,27 +152,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby notifier for bugsnag.com