pliny 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ee2327594f7a24b91de1931315b9d56857a6db
-  data.tar.gz: 19764f159ec7799e68d4d704ff679b2101eddf43
+  metadata.gz: d42dcfb555d6af54e5e87035c53d5fbb9de11cfe
+  data.tar.gz: 9b498dbf53638dbc04770f93df95614fffa59591
 SHA512:
-  metadata.gz: 9c20a3261666622c51f92614f2c4c49bd3d169b34fed20f8359ba6647a45ed4fc5bdbde260127ea9f4d6dae66a909a80bf2cc756d28845900afed16449bc5838
-  data.tar.gz: d29a0d1bf16fd8cc623b7ee302113cf61b131bab0d171fc41e96cef1703d6bc4c3b097b352b3b4c4b6ddb6f0a3ea88ba2fcb8fb5c4946da23f0d4e4fd4db3a4c
+  metadata.gz: 9d85fa248efc6f4e4de6d93107a312c9a67200033f633133985246e43603a1e749eefc1175185ea4d4ea1df8ec516d14ce554ea952513192e61190b29615d1fb
+  data.tar.gz: 0f96306f19f94bff354d95b0e4adf8f512aff8577a29fadb786fee3fc31e9462fe6c4f46b0285d27c952e9df78f7a7256d0a24eb83bfdb1422e98ab85ea26982

data/lib/pliny.rb

@@ -16,7 +16,8 @@ require_relative "pliny/utils"
 require_relative "pliny/middleware/cors"
 require_relative "pliny/middleware/instruments"
 require_relative "pliny/middleware/request_id"
-require_relative "pliny/middleware/request_store"
+require_relative "pliny/middleware/request_store/clear"
+require_relative "pliny/middleware/request_store/seed"
 require_relative "pliny/middleware/rescue_errors"
 require_relative "pliny/middleware/versioning"
 

data/lib/pliny/middleware/instruments.rb

@@ -7,10 +7,7 @@ module Pliny::Middleware
     def call(env)
       start = Time.now
 
-      request_ids = env["REQUEST_IDS"] ? env["REQUEST_IDS"].join(",") : nil
-
       data = {
-        request_id:      request_ids,
         instrumentation: true,
         method:          env["REQUEST_METHOD"],
         path:            env["PATH_INFO"]

data/lib/pliny/middleware/request_store/clear.rb

@@ -0,0 +1,13 @@
+module Pliny::Middleware::RequestStore
+  class Clear
+    def initialize(app, options={})
+      @app = app
+      @store = options[:store] || Pliny::RequestStore
+    end
+
+    def call(env)
+      @store.clear!
+      @app.call(env)
+    end
+  end
+end

data/lib/pliny/middleware/{request_store.rb → request_store/seed.rb}

@@ -1,12 +1,11 @@
-module Pliny::Middleware
-  class RequestStore
+module Pliny::Middleware::RequestStore
+  class Seed
     def initialize(app, options={})
       @app = app
       @store = options[:store] || Pliny::RequestStore
     end
 
     def call(env)
-      @store.clear!
       @store.seed(env)
       @app.call(env)
     end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.3.1"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.18"
+gem "pliny", "~> 0.19"
 gem "pry"
 gem "puma", "~> 2.16"
 gem "rack-ssl"

data/lib/template/lib/routes.rb

@@ -1,9 +1,10 @@
 Routes = Rack::Builder.new do
+  use Pliny::Middleware::RequestStore::Clear, store: Pliny::RequestStore
   use Pliny::Middleware::CORS
   use Pliny::Middleware::RequestID
+  use Pliny::Middleware::RequestStore::Seed, store: Pliny::RequestStore
   use Pliny::Middleware::Instruments
   use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
-  use Pliny::Middleware::RequestStore, store: Pliny::RequestStore
   use Rack::Timeout,
       service_timeout: Config.timeout if Config.timeout > 0
   use Pliny::Middleware::Versioning,

data/spec/error_reporters_spec.rb

@@ -20,6 +20,10 @@ describe Pliny::ErrorReporters do
       allow(reporter_double).to receive(:notify)
     end
 
+    after do
+      Pliny::ErrorReporters.error_reporters = []
+    end
+
     it "notifies rollbar" do
       notify_reporter
 

data/spec/metrics_spec.rb

@@ -6,12 +6,17 @@ describe Pliny::Metrics do
   subject(:metrics) { Pliny::Metrics }
 
   before do
+    @stdout = Pliny.stdout
     Pliny.stdout = io
 
     allow(io).to receive(:print)
     allow(Config).to receive(:app_name).and_return('pliny')
   end
 
+  after do
+    Pliny.stdout = @stdout
+  end
+
   context "#count" do
     it "counts a single key with a default value" do
       metrics.count(:foo)

data/spec/middleware/{request_store_spec.rb → request_store/clear_spec.rb}

@@ -1,10 +1,10 @@
 require "spec_helper"
 
-describe Pliny::Middleware::RequestStore do
+describe Pliny::Middleware::RequestStore::Clear do
   def app
     Rack::Builder.new do
       use Rack::Lint
-      use Pliny::Middleware::RequestStore, store: Pliny::RequestStore
+      use Pliny::Middleware::RequestStore::Clear, store: Pliny::RequestStore
       run Sinatra.new {
         get "/" do
           "hi"
@@ -17,9 +17,4 @@ describe Pliny::Middleware::RequestStore do
     expect(Pliny::RequestStore).to receive(:clear!)
     get "/"
   end
-
-  it "seeds the store" do
-    expect(Pliny::RequestStore).to receive(:seed)
-    get "/"
-  end
 end

data/spec/middleware/request_store/seed_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Pliny::Middleware::RequestStore::Seed do
+  def app
+    Rack::Builder.new do
+      use Rack::Lint
+      use Pliny::Middleware::RequestStore::Seed, store: Pliny::RequestStore
+      run Sinatra.new {
+        get "/" do
+          "hi"
+        end
+      }
+    end
+  end
+
+  it "seeds the store" do
+    expect(Pliny::RequestStore).to receive(:seed)
+    get "/"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -365,7 +365,8 @@ files:
 - lib/pliny/middleware/cors.rb
 - lib/pliny/middleware/instruments.rb
 - lib/pliny/middleware/request_id.rb
-- lib/pliny/middleware/request_store.rb
+- lib/pliny/middleware/request_store/clear.rb
+- lib/pliny/middleware/request_store/seed.rb
 - lib/pliny/middleware/rescue_errors.rb
 - lib/pliny/middleware/versioning.rb
 - lib/pliny/request_store.rb
@@ -451,7 +452,8 @@ files:
 - spec/middleware/cors_spec.rb
 - spec/middleware/instruments_spec.rb
 - spec/middleware/request_id_spec.rb
-- spec/middleware/request_store_spec.rb
+- spec/middleware/request_store/clear_spec.rb
+- spec/middleware/request_store/seed_spec.rb
 - spec/middleware/rescue_errors_spec.rb
 - spec/middleware/versioning_spec.rb
 - spec/request_store_spec.rb