pliny 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b59272bbe834eaf737b9ffe3e4769e54f8897cf
-  data.tar.gz: 13bfa08975ac6f65c74a686e54cf22608bbab639
+  metadata.gz: fc58fa1c7528a90b019d6f7d01dcb733909c918d
+  data.tar.gz: ed596145f95be0ff622f9cdcf2e6a5448a96a56e
 SHA512:
-  metadata.gz: 1d76b1d6abaf678044111133e3fcb4aa587b88e87c866d8e60adbc03543e77f6e1cb959609eea9b8bb75931ea6f206c49c8447852b4035ca00a6360bd4408e0c
-  data.tar.gz: 8a4e54331f8642b58176358fb3d57845cf623dc93a3d8e0bdd301ea853a84ee29db9c2d1dc5567b6db6cf3fc5f920d8348b419a09f0b3a4ae49593597110b4d6
+  metadata.gz: 300c529e268a5e168dd015a42d3a1a68b3fceaf6359c47ca8288aa6e08cfcf222f029a0cb0f6541c160ad000951ebb607144c4191eecaa981b75fbbe75cd2679
+  data.tar.gz: ad0e7f83fdd78ccd9c97c2fcdf296b17c842874cf9e372e592a666072b0361cf9a1e4a1aebdda921130115b5420e03623ea472ebcb24946ffafd4ed17a9c33d8

data/lib/pliny/error_reporters/rollbar.rb

@@ -18,7 +18,7 @@ module Pliny
       private
 
       def fetch_scope(context:, rack_env:)
-        scope = {}
+        scope = { custom: context }
         unless rack_env.empty?
           scope[:request] = proc { extract_request_data_from_rack(rack_env) }
         end

data/lib/pliny/log.rb

@@ -4,6 +4,10 @@ module Pliny
       log_to_stream(stdout || $stdout, merge_log_contexts(data), &block)
     end
 
+    def log_with_default_context(data, &block)
+      log_to_stream(stdout || $stdout, default_context.merge(data), &block)
+    end
+
     def log_without_context(data, &block)
       log_to_stream(stdout || $stdout, data, &block)
     end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

data/lib/template/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.0

data/lib/template/Gemfile

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
-ruby "2.3.3"
+ruby "2.4.0"
 
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.24"
+gem "pliny", "~> 0.25"
 gem "pry"
 gem "puma", "~> 3"
 gem "rack-ssl"

data/lib/template/lib/routes.rb

@@ -6,7 +6,7 @@ Routes = Rack::Builder.new do
   use Pliny::Middleware::Metrics
   use Pliny::Middleware::CanonicalLogLine,
       emitter: -> (data) {
-        Pliny.log_without_context({ canonical_log_line: true }.merge(data))
+        Pliny.log_with_default_context({ canonical_log_line: true }.merge(data))
       }
   use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
   if Config.timeout.positive?

data/spec/error_reporters/rollbar_spec.rb

@@ -7,7 +7,7 @@ describe Pliny::ErrorReporters::Rollbar do
 
   describe "#notify" do
     let(:exception) { StandardError.new("Something went wrong") }
-    let(:context)   { {} }
+    let(:context)   { { step: :foo } }
     let(:rack_env)  { { "rack.input" => StringIO.new } }
 
     subject(:notify) do
@@ -28,7 +28,8 @@ describe Pliny::ErrorReporters::Rollbar do
     it "scopes the rollbar notification" do
       notify
       expect(::Rollbar).to have_received(:scoped).once.with(hash_including(
-        request: instance_of(Proc)
+        request: instance_of(Proc),
+        custom: { step: :foo }
       ))
     end
 
@@ -45,9 +46,9 @@ describe Pliny::ErrorReporters::Rollbar do
         assert_kind_of(Hash, rack_env)
       end
 
-      it "reports to Rollbar with an empty scope" do
+      it "reports to Rollbar without request data in the scope" do
         notify
-        expect(Rollbar).to have_received(:scoped).once.with({})
+        expect(Rollbar).to have_received(:scoped).once.with({ custom: {step: :foo} })
       end
 
       it "delegates to #report_exception_to_rollbar" do

data/spec/log_spec.rb

@@ -38,6 +38,13 @@ describe Pliny::Log do
     Pliny.log(foo: "bar")
   end
 
+  it "logs with just default context" do
+    Pliny.default_context = { app: "pliny" }
+    Pliny::RequestStore.store[:log_context] = { request_store: true }
+    expect(@io).to receive(:print).with("app=pliny foo=bar\n")
+    Pliny.log_with_default_context(foo: "bar")
+  end
+
   it "logs without context" do
     Pliny.default_context = { app: "pliny" }
     expect(@io).to receive(:print).with("foo=bar\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport