restful_resource_bugsnag 0.3.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5364387d5bed8d3251bb4ef6d3b3a46b3db5cf6c
-  data.tar.gz: 7a37346c075d9a9b3a87f2ba722dbdf7891ff875
+SHA256:
+  metadata.gz: 8aca2c4f060de91456555ba272cf82b9dfb3561686a5db1271458dcbcc2cc9b8
+  data.tar.gz: 2d061e4ef4c73a8f6974a99da117b6b9c1bbd5873b85a80885e303ed01f9486e
 SHA512:
-  metadata.gz: 91747d01b252ebab8c3184e8e6a9bc289c0ebe3cea89ed1eb32edeccd391ea2747bb4d3a73e2a4b1bce1c143b1ca96656c0ff6ece3e73a3aa8ef1badce25f672
-  data.tar.gz: 38963a9d1dfc52e97be0833c924d615bbf83bb68cce3fff04302a25d6209a7ac060e9b84198a60032a977f9290a1f995a55e8b27b1b58d7ab450ae07ea449690
+  metadata.gz: '091765fce9f89eda509a533a85ca55d6ac687664b7d446f198463c567fe982fe1f97077b61c231b6151a8d47c96034f05af06f41bcdee9bacf399c3a86fede38'
+  data.tar.gz: 391717c5b6ccc1f8bcabc498598641694fd45d6b63fd7d8970c335b12a9666e76d9a695db919610de837904ab271c37acfda243f2734738f4544e5464168a7e8

data/.circleci/config.yml

@@ -0,0 +1,42 @@
+references:
+  ruby: &ruby
+    image: carwow/ruby-ci:2.6
+
+  defaults: &defaults
+    working_directory: ~/restful_resource_bugsnag
+    docker:
+      - *ruby
+
+version: 2
+jobs:
+  bundle:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - bundle-v2-{{ checksum "Gemfile.lock" }}
+            - bundle-v2-
+      - run: |
+          bundle config --local path vendor/bundle &&
+          bundle check || bundle install --jobs=4 --retry=3
+          bundle clean --force
+      - save_cache:
+          key: bundle-v2-{{ checksum "Gemfile.lock" }}
+          paths: [vendor/bundle]
+
+  tests:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache: { keys: ['bundle-v2-{{ checksum "Gemfile.lock" }}'] }
+      - run: |
+          bundle exec rspec --pattern "**/*_spec.rb" --format "progress"
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - bundle
+      - tests:
+          requires: [bundle]

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: .
+  specs:
+    restful_resource_bugsnag (0.5.2)
+      bugsnag (~> 6)
+      restful_resource (~> 2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    bugsnag (6.18.0)
+      concurrent-ruby (~> 1.0)
+    concurrent-ruby (1.1.7)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-cdn-metrics (0.2.0)
+      faraday (~> 1)
+    faraday-encoding (0.0.5)
+      faraday
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    ffi (1.13.1)
+    hashdiff (0.3.9)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    link_header (0.0.8)
+    minitest (5.14.2)
+    multipart-post (2.1.1)
+    public_suffix (3.0.3)
+    rack (2.2.3)
+    rake (13.0.1)
+    restful_resource (2.10.3)
+      activesupport (~> 6.0)
+      faraday (~> 1.0)
+      faraday-cdn-metrics (~> 0.2)
+      faraday-encoding
+      faraday-http-cache (~> 2.2)
+      faraday_middleware (~> 1.0)
+      link_header
+      rack (~> 2.2)
+      typhoeus (~> 1.4)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    ruby2_keywords (0.0.2)
+    safe_yaml (1.0.5)
+    thread_safe (0.3.6)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
+    webmock (3.5.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    zeitwerk (2.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  restful_resource_bugsnag!
+  rspec
+  webmock
+
+BUNDLED WITH
+   2.1.4

data/lib/restful_resource_bugsnag/middleware.rb

@@ -7,19 +7,18 @@ module RestfulResourceBugsnag
     end
 
     def call(notification)
-      exception = notification.exceptions.first
+      exception = notification.raw_exceptions.first
 
       if exception.is_a?(RestfulResource::HttpClient::HttpError)
         notification.add_tab(:restful_resource_response, {
           status: exception.response.status,
-          body: exception.response.body,
+          body: attempt_json_parse(exception.response.body),
           headers: exception.response.headers
         })
         notification.add_tab(:restful_resource_request, {
           method: exception.request.method,
           url: exception.request.url,
-          accept: exception.request.accept,
-          body: exception.request.body
+          body: attempt_json_parse(exception.request.body)
         })
       end
 
@@ -34,7 +33,7 @@ module RestfulResourceBugsnag
         notification.context = "Client error: Service unavailable #{request_host_from_exception exception}"
         notification.grouping_hash = notification.context
       end
-      
+
       if exception.is_a?(RestfulResource::HttpClient::Timeout)
         notification.context = "Client error: Timeout #{request_host_from_exception exception}"
         notification.grouping_hash = notification.context
@@ -48,5 +47,17 @@ module RestfulResourceBugsnag
     def request_host_from_exception(exception)
       URI.parse(exception.request.url).host
     end
+
+    def attempt_json_parse(string)
+      redacted_string = redact_user_emails_from_errors(string)
+      JSON.parse(redacted_string)
+    rescue JSON::ParserError, TypeError
+      redacted_string
+    end
+
+    def redact_user_emails_from_errors(string)
+      # Based on Devise.email_regexp
+      string&.gsub(/[^@"\s]+@[^@"\s]+/, '<email-address-redacted>')
+    end
   end
 end

data/lib/restful_resource_bugsnag/version.rb

@@ -1,3 +1,3 @@
 module RestfulResourceBugsnag
-  VERSION = "0.3.1"
+  VERSION = "0.5.2"
 end

data/restful_resource_bugsnag.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bugsnag", "~> 5"
-  spec.add_dependency "restful_resource", "~> 1"
+  spec.add_dependency "bugsnag", "~> 6"
+  spec.add_dependency "restful_resource", "~> 2"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 2.0", ">= 2.0.3"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource_bugsnag
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.2
 platform: ruby
 authors:
 - mwagg
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bugsnag
@@ -16,90 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: restful_resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
 description: A Bugsnag middleware which adds extra details to notifications for RestfulResource
   errors.
 email:
@@ -108,16 +102,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - lib/restful_resource_bugsnag.rb
 - lib/restful_resource_bugsnag/middleware.rb
 - lib/restful_resource_bugsnag/version.rb
@@ -126,7 +121,7 @@ homepage: https://github.com/carwow/restful_resource_bugsnag
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Bugsnag middleware which adds extra details to notifications for RestfulResource
   errors.

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  ruby:
-    version: 2.3.1