pliny 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405803fe2e1fc9197737c8dc017c122dbfa55c6f
-  data.tar.gz: 592d0ea8437b24db20277fc45cd3109c48e635b2
+  metadata.gz: fc435bb8dd0c08d30696e53650d96a8ed0c38cb9
+  data.tar.gz: 01707d0efaf29bc8e2133887d936d58a10a4a388
 SHA512:
-  metadata.gz: cd6828d0b03e015ee3eb695989538fa88630d43926ee6b9bc8f9d328c9029e38e28acff1e0780e20c8d5456d7238ed5520d1e5e7ee9fb1e5a4e12b33f4ff6de4
-  data.tar.gz: f31990df1e2486b1dcccf4ce0514ccc8f3d1be3a559707007b5b38d9667ec9cf49dd86ead2eba8cb4874b20955e1626054128e8149d33627c424af92350770f2
+  metadata.gz: 593f3a3e15d3f1094a78ad0fad317e86500f596dd8d7577bfe406b4a3cc1b0a813efab88630dd4ebb30e6168a30d4cf202a06df77663b24c8114c960e8884218
+  data.tar.gz: 6300a8c749f94601fc7bec51baeffc83aa1687b51c458984c39484a0ab910a2fece3d61fc2518f6a08943efbe141b083047cca050bdde8d0080bf136b741c49d

data/lib/pliny/helpers/serialize.rb

@@ -5,14 +5,21 @@ module Pliny::Helpers
     end
 
     def serialize(data, structure = :default)
-      if self.class.serializer_class.nil?
+      serializer_class = self.class.serializer_class
+
+      if serializer_class.nil?
         raise <<-eos.strip
 No serializer has been specified for this endpoint. Please specify one with
 `serializer Serializers::ModelName` in the endpoint.
         eos
       end
 
-      self.class.serializer_class.new(structure).serialize(data)
+      env['pliny.serializer_arity'] = data.respond_to?(:size) ? data.size : 1
+
+      start = Time.now
+      serializer_class.new(structure).serialize(data).tap do
+        env['pliny.serializer_timing'] = (Time.now - start).to_f
+      end
     end
 
     module ClassMethods

data/lib/pliny/middleware/canonical_log_line.rb

@@ -48,12 +48,14 @@ module Pliny::Middleware
 
       log_field :response_length, Integer
       log_field :response_status, Integer
+      log_field :serializer_arity, Integer
 
       #
       # timing
       #
 
       log_field :timing_total_elapsed, Float
+      log_field :timing_serializer, Float
     end
 
     def initialize(app, emitter:)
@@ -103,12 +105,14 @@ module Pliny::Middleware
             line.response_length = length.to_i
           end
           line.response_status = status
+          line.serializer_arity = env["pliny.serializer_arity"]
 
           #
           # timing
           #
 
           line.timing_total_elapsed = (Time.now - start).to_f
+          line.timing_serializer = env["pliny.serializer_timing"]
 
           @emitter.call(line.to_h)
         rescue => e

data/lib/pliny/version.rb

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

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.4.0"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.25"
+gem "pliny", "~> 0.26"
 gem "pry"
 gem "puma", "~> 3"
 gem "rack-ssl"
@@ -14,7 +14,7 @@ gem "rollbar"
 gem "sequel", "~> 4.34"
 gem "sequel-paranoid"
 gem "sequel_pg", "~> 1.6", require: "sequel"
-gem "sinatra", "~> 1.4", require: "sinatra/base"
+gem "sinatra", [">= 1.4", "< 3.0"], require: "sinatra/base"
 gem "sinatra-contrib", require: ["sinatra/namespace", "sinatra/reloader"]
 gem "sinatra-router"
 gem "sucker_punch"

data/lib/template/lib/routes.rb

@@ -4,6 +4,7 @@ Routes = Rack::Builder.new do
   use Pliny::Middleware::RequestID
   use Pliny::Middleware::RequestStore::Seed, store: Pliny::RequestStore
   use Pliny::Middleware::Metrics
+  use Pliny::Middleware::Instruments
   use Pliny::Middleware::CanonicalLogLine,
       emitter: -> (data) {
         Pliny.log_with_default_context({ canonical_log_line: true }.merge(data))

data/spec/helpers/serialize_spec.rb

@@ -36,6 +36,10 @@ describe Pliny::Helpers::Serialize do
         get "/" do
           MultiJson.encode(serialize([]))
         end
+
+        get "/env" do
+          MultiJson.encode(serialize(env))
+        end
       end
     end
 
@@ -44,5 +48,13 @@ describe Pliny::Helpers::Serialize do
       assert_equal 200, last_response.status
       assert_equal MultiJson.encode([]), last_response.body
     end
+
+    it "emits information for canonical log lines" do
+      get "/env"
+      assert_equal 200, last_response.status
+      body = MultiJson.decode(last_response.body)
+      assert body["pliny.serializer_arity"] > 1
+      assert body["pliny.serializer_timing"] > 0
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,22 +75,22 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: http_accept
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -215,22 +215,22 @@ dependencies:
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.7
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -528,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra