alacrity-rails 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b063f660214c374b47a2cfbad8e91c85b6cca2d
-  data.tar.gz: 56b178a5f5e29f4d88f421465a927ece164a2e39
+  metadata.gz: 15e0a853985dc0e53009d9456ee640112a1cba67
+  data.tar.gz: a82aa5c5d092b4dc9b38cff22c8d7d91fbb813a9
 SHA512:
-  metadata.gz: a9fa5e1f9351d8f9e95f1dccb7563d7bfba39538e2f610f3454eb411e23b80b707c7fa58613fe09764437c9cf14a8399d8acc874fd86d7a22b36bef9b0ae950a
-  data.tar.gz: 8a47e73f3c8eb1ba0a529ea421f83fc127dcc3892e5a65e4bc4ffa58e76d6ad353c1a5410b07d46fb0abae5b1dd39a13d0d19bd10f97ace60e7dc8565c0ee613
+  metadata.gz: c200798ec7d65f132b51814e92ab48fef065ecc032f63610b8843ce0a54f6af643c3c019a18635c7d71c3fb89f83df37ad5874b8d2aa0522b1f198d15c422072
+  data.tar.gz: 6885ef7ef6ab63c2093416be9977c3f9f9cae58edab0d1e8e624c4742a5ba8a11ab32d35de280763c96c7bcefa54c8339b2c4d89be62a2b224c343da84ae9639

data/lib/alacrity-rails/transaction/web_transaction.rb

@@ -1,10 +1,9 @@
 module AlacrityRails::Transaction
   class WebTransaction < Base
-    attr_accessor :url, :middleware_started_at, :middleware_finished_at,
-      :controller, :action, :format, :method, :status
+    attr_accessor :url, :controller, :action, :format, :method, :status
 
     def initialize(env={})
-      self.middleware_started_at = absolute_time(DateTime.now)
+      @middleware_started_at = DateTime.now
       self.url = env['REQUEST_URI']
       self.method = env['REQUEST_METHOD']
     end
@@ -16,41 +15,35 @@ module AlacrityRails::Transaction
     end
 
     def store_timeline_event(data)
-      started_at = absolute_time(data[:started_at].to_datetime)
-      finished_at = absolute_time(data[:finished_at].to_datetime)
-
       timeline_events << {
         name: data[:name],
         event_type: data[:event_type],
         engine: data[:engine],
-        started_at: started_at,
-        finished_at: finished_at,
+        started_at: data[:started_at],
+        finished_at: data[:finished_at],
         detail: data[:detail]
-      } unless timeline_events.detect do |event|
-        event[:engine] == data[:engine] &&
-          event[:started_at] == started_at &&
-          event[:finished_at] == finished_at &&
-          event[:detail] == data[:detail]
-      end
+      }
     end
 
     def finalize!
-      self.middleware_finished_at = absolute_time(DateTime.now)
+      @middleware_finished_at = DateTime.now
     end
 
     def as_json(*args)
+      middleware_started_at = absolute_time(@middleware_started_at)
+      middleware_finished_at = absolute_time(@middleware_finished_at) || absolute_time(DateTime.now)
       {
         environment: AlacrityRails::ServerConfig.environment,
         url: url,
         controller: controller,
         action: action,
-        middleware_elapsed: (middleware_finished_at || absolute_time(DateTime.now)) - middleware_started_at,
+        middleware_elapsed: middleware_finished_at - middleware_started_at,
         middleware_started_at: middleware_started_at,
         middleware_finished_at: middleware_finished_at,
         format: format,
         method: method,
         status: status,
-        timeline_events: timeline_events,
+        timeline_events: prepared_timeline_events,
         timestamp: Time.now.utc
       }
     end
@@ -63,6 +56,16 @@ module AlacrityRails::Transaction
       @timeline_events ||= []
     end
 
+    def prepared_timeline_events
+      timeline_events.uniq do |timeline_event|
+        timeline_event.values_at(:engine, :started_at, :finished_at, :detail).join('~')
+      end.map do |timeline_event|
+        timeline_event[:started_at] = absolute_time(timeline_event[:started_at].to_datetime)
+        timeline_event[:finished_at] = absolute_time(timeline_event[:finished_at].to_datetime)
+        timeline_event
+      end
+    end
+
     def absolute_time(datetime)
       datetime.strftime('%Q').to_i
     end

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails