pliny 0.20.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11d6e6303689db3c75d06599309d8044f8e24058
-  data.tar.gz: ad4702309f3488e7bf99654a732c1e03f4685989
+  metadata.gz: a17e76a1800d179c9271ab0bf1b67dad549e7fed
+  data.tar.gz: badd208c4a7ad6e3b58735cd3d8edde7b485bab2
 SHA512:
-  metadata.gz: f5f26f1cdb8f55a373917e750fcae6866e4dbaf091fcd98f3876cfb6f7249359bde685aa523ca1df156ec0b57b78686d7ce6de053b8116e7209d889ddddf4cb6
-  data.tar.gz: d6e5c047b08ff89ed6c1f6e3fe1246877886ddd2ea491a3effc24e157ee23ca011d83f9eaea67d53e94711c8a7e21ab331bc182f032f1650ae5997e79dcd431d
+  metadata.gz: cc9b96fad0c7fca0f0ced728dc148cda49ac22b330cb45614b0068ee166ed528ada6d8f331bafbf6be5ac340ac6cd6d569e97b6c83270684b82da814e59cd4a6
+  data.tar.gz: 6b7f260a8c291e1435920ba61d6ac5aa63246b1efc3dffbbc01b2adb1c2cec8f61954096b71780ed3b0ed1d9fe5b1422dd6d94bb22067c696b38ac9248d5e41b

data/lib/pliny/config_helpers.rb

@@ -96,6 +96,11 @@ module Pliny
     end
   end
 
+  # DEPRECATED: ConfigHelpers was a slightly more primitive version
+  # of CastingConfigHelpers above that didn't contain any of the
+  # latter's features around typing. It's been left here for
+  # backwards compatibility in apps based on old templates that may
+  # be using it.
   module ConfigHelpers
     def optional(*attrs)
       attrs.each do |attr|

data/lib/pliny/error_reporters/rollbar.rb

@@ -18,9 +18,11 @@ module Pliny
       private
 
       def fetch_scope(context:, rack_env:)
-        {
-          request: proc { extract_request_data_from_rack(rack_env) }
-        }
+        scope = {}
+        if rack_env.respond_to?(:body)
+          scope[:request] = proc { extract_request_data_from_rack(rack_env) }
+        end
+        scope
       rescue Exception => e
         report_exception_to_rollbar(rack_env, e)
         raise

data/lib/pliny/middleware/rescue_errors.rb

@@ -3,6 +3,7 @@ module Pliny::Middleware
     def initialize(app, options = {})
       @app = app
       @raise = options[:raise]
+      @message = options[:message]
     end
 
     def call(env)
@@ -13,7 +14,7 @@ module Pliny::Middleware
       raise if @raise
 
       Pliny::ErrorReporters.notify(e, rack_env: env)
-      Pliny::Errors::Error.render(Pliny::Errors::InternalServerError.new)
+      Pliny::Errors::Error.render(Pliny::Errors::InternalServerError.new(@message))
     end
   end
 end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.20.2"
+  VERSION = "0.21.0"
 end

data/lib/template/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.3

data/lib/template/Gemfile

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
-ruby "2.3.1"
+ruby "2.3.3"
 
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.20"
+gem "pliny", "~> 0.21"
 gem "pry"
 gem "puma", "~> 2.16"
 gem "rack-ssl"

data/spec/error_reporters/rollbar_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+require "rollbar"
+require "pliny/error_reporters/rollbar"
+
+describe Pliny::ErrorReporters::Rollbar do
+  subject(:reporter) { described_class.new }
+
+  describe "#notify" do
+    let(:exception) { StandardError.new("Something went wrong") }
+    let(:context)   { {} }
+    let(:rack_env)  { double(:rack_env, body: StringIO.new) }
+
+    subject(:notify) do
+      reporter.notify(exception, context: context, rack_env: rack_env)
+    end
+
+    before do
+      allow(::Rollbar).to receive(:reset_notifier!)
+      allow(::Rollbar).to receive(:scoped).and_yield
+      allow(reporter).to receive(:report_exception_to_rollbar)
+    end
+
+    it "resets the rollbar notifier" do
+      notify
+      expect(::Rollbar).to have_received(:reset_notifier!).once
+    end
+
+    it "scopes the rollbar notification" do
+      notify
+      expect(::Rollbar).to have_received(:scoped).once.with(hash_including(
+        request: instance_of(Proc)
+      ))
+    end
+
+    it "delegates to #report_exception_to_rollbar" do
+      notify
+      expect(reporter).to have_received(:report_exception_to_rollbar)
+        .once.with(rack_env, exception)
+    end
+
+    context "given an empty rack_env" do
+      let(:rack_env) { {} }
+
+      it "reports to Rollbar with an empty scope" do
+        notify
+        expect(Rollbar).to have_received(:scoped).once.with({})
+      end
+
+      it "delegates to #report_exception_to_rollbar" do
+        notify
+        expect(reporter).to have_received(:report_exception_to_rollbar)
+          .once.with(rack_env, exception)
+      end
+    end
+  end
+end

data/spec/middleware/rescue_errors_spec.rb

@@ -43,12 +43,22 @@ describe Pliny::Middleware::RescueErrors do
     end
   end
 
+  it "uses a custom error message with the message option" do
+    @app = new_rack_app(message: "Please stand by")
+    allow(Pliny::ErrorReporters).to receive(:notify)
+    get "/"
+    assert_equal 500, last_response.status
+    error_json = MultiJson.decode(last_response.body)
+    assert_equal "internal_server_error", error_json["id"]
+    assert_equal "Please stand by", error_json["message"]
+  end
+
   private
 
   def new_rack_app(options = {})
     Rack::Builder.new do
       use Rack::Lint
-      use Pliny::Middleware::RescueErrors, raise: options[:raise]
+      use Pliny::Middleware::RescueErrors, raise: options[:raise], message: options[:message]
       run BadMiddleware.new
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -265,6 +265,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: pg
   requirement: !ruby/object:Gem::Requirement
@@ -445,6 +459,7 @@ files:
 - spec/commands/updater_spec.rb
 - spec/config_helpers_spec.rb
 - spec/db_support_spec.rb
+- spec/error_reporters/rollbar_spec.rb
 - spec/error_reporters_spec.rb
 - spec/errors_spec.rb
 - spec/helpers/encode_spec.rb