pliny 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc58fa1c7528a90b019d6f7d01dcb733909c918d
-  data.tar.gz: ed596145f95be0ff622f9cdcf2e6a5448a96a56e
+  metadata.gz: 405803fe2e1fc9197737c8dc017c122dbfa55c6f
+  data.tar.gz: 592d0ea8437b24db20277fc45cd3109c48e635b2
 SHA512:
-  metadata.gz: 300c529e268a5e168dd015a42d3a1a68b3fceaf6359c47ca8288aa6e08cfcf222f029a0cb0f6541c160ad000951ebb607144c4191eecaa981b75fbbe75cd2679
-  data.tar.gz: ad0e7f83fdd78ccd9c97c2fcdf296b17c842874cf9e372e592a666072b0361cf9a1e4a1aebdda921130115b5420e03623ea472ebcb24946ffafd4ed17a9c33d8
+  metadata.gz: cd6828d0b03e015ee3eb695989538fa88630d43926ee6b9bc8f9d328c9029e38e28acff1e0780e20c8d5456d7238ed5520d1e5e7ee9fb1e5a4e12b33f4ff6de4
+  data.tar.gz: f31990df1e2486b1dcccf4ce0514ccc8f3d1be3a559707007b5b38d9667ec9cf49dd86ead2eba8cb4874b20955e1626054128e8149d33627c424af92350770f2

data/lib/pliny/log.rb

@@ -72,6 +72,17 @@ module Pliny
       @stderr
     end
 
+    def log_scrubber=(scrubber)
+      if scrubber && !scrubber.respond_to?(:call)
+        raise(ArgumentError, "Must respond to 'call'")
+      end
+      @scrubber = scrubber
+    end
+
+    def log_scrubber
+      @scrubber
+    end
+
     private
 
     def merge_log_contexts(data)
@@ -92,6 +103,7 @@ module Pliny
 
     def log_to_stream(stream, data, &block)
       unless block
+        data = log_scrubber.call(data) if log_scrubber
         str = unparse(data)
         stream.print(str + "\n")
       else

data/lib/pliny/version.rb

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

data/spec/log_spec.rb

@@ -94,4 +94,40 @@ describe Pliny::Log do
     expect(@io).to receive(:print).with("app=pliny exception class=RuntimeError message=RuntimeError exception_id=#{e.object_id}\n")
     Pliny.log_exception(e)
   end
+
+  describe "scrubbing" do
+
+    it "allows a Proc to be assigned as a log scrubber" do
+      Pliny.log_scrubber = -> (hash) { hash }
+
+      begin
+        Pliny.log_scrubber = Object.new
+        fail
+      rescue ArgumentError; end
+    end
+
+    describe "when a scrubber is present" do
+      before do
+        Pliny.log_scrubber = -> (hash) {
+          Hash.new.tap do |h|
+            hash.keys.each do |k|
+              h[k] = "*SCRUBBED*"
+            end
+          end
+        }
+      end
+
+      after do
+        Pliny.log_scrubber = nil
+      end
+
+      it "scrubs the log when a scrubber is present" do
+        Pliny::RequestStore.store[:log_context] = { app: "pliny" }
+
+        expect(@io).to receive(:print).with("app=*SCRUBBED* foo=*SCRUBBED*\n")
+
+        Pliny.log(foo: "bar")
+      end
+    end
+  end
 end

metadata

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