yardie 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29620a34791153b5052f60b03cf99bb7735df11
-  data.tar.gz: e150111058d351cf979e25c856ba155d9efdbd03
+  metadata.gz: 429da70fb6d471ac829492fa89c5ac47be7d9b4d
+  data.tar.gz: 37d6cab27a8b845ec305ba3d111e3dc11d99e2a9
 SHA512:
-  metadata.gz: f192476eda9ec91efcd1544392764e2fd65d6702e7b8bd4a830ccf5b79c1333f18fc1f8434737567dbfd64efae38a2097708f31ed2ab153491ad5d0ff001b4e0
-  data.tar.gz: 81c835d9b6d997ef0860512553dd02930a3ca8a21d76c3cedce5f0051f634443913844a537e9545c9e602178e4c369202783dcce81f15342cf5d9b80fa86d9e4
+  metadata.gz: 4c727007f22c2a56003d9293499559a36c84ac757bbd0f5bd3db36c8262bf9151bfd96a571b6bfdd6b9b82f2960b00e6415fe313367d68ab589af5a35104e96d
+  data.tar.gz: f289c1d93b648fde0b24c8a2ef393d2e5a81d27654bd88ce597c27efc3910baf2065d783ed44b6638020d2ec42ab7e2b7992d234887df3d7e8e7ec4f934f4d77

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 .idea/
+*.gem

data/lib/yardie/middleware/middleware.rb

@@ -16,6 +16,7 @@ module Yardie
       return @app.call(env) unless env['CONTENT_TYPE'].eql?('application/json')
       return @app.call(env) if ENV['YARDIE_AUTH_KEY'].blank?
 
+      local_mode = ENV['YARDIE_LOCAL'] && ENV['YARDIE_LOCAL'].casecmp('TRUE').zero?
       ct = Thread.current.object_id
 
       error = false
@@ -25,7 +26,8 @@ module Yardie
               id: env['action_dispatch.request_id'],
               path: env['REQUEST_PATH'],
               method: env['REQUEST_METHOD'],
-              body: nil
+              body: nil,
+              trace: [ ]
           },
           controller: {
               name: nil,
@@ -52,13 +54,21 @@ module Yardie
       trace = TracePoint.new(:call) do |tp|
         klass = tp.defined_class.to_s
 
-        if klass.end_with?('Controller') && !klass.start_with?('Devise')
+        if tp.path.to_s.start_with?(Rails.root.to_s) && Thread.current.object_id == ct
           # tracepoint emits events for ALL threads, so check that the thread that caused the event to be
           # emitted is the one we are interested in
-          if Thread.current.object_id == ct
+
+          p "#{tp.defined_class} - #{tp.method_id} - #{tp.path}" if local_mode
+
+          if klass.end_with?('Controller') && !klass.start_with?('Devise')
             payload[:controller][:name] = tp.defined_class.to_s
             payload[:controller][:method] = tp.method_id.to_s
           end
+
+          payload[:request][:trace] << {
+            class: tp.defined_class.to_s,
+            method: tp.method_id.to_s
+          }
         end
       end
 
@@ -85,7 +95,6 @@ module Yardie
         if payload[:controller][:name].present? && payload[:controller][:method].present?
           # post the payload to Construction Yard servers
           Thread.new {
-            local_mode = ENV['YARDIE_LOCAL'] && ENV['YARDIE_LOCAL'].casecmp('TRUE').zero?
             uri = local_mode ? DEV_DELIVERY_URI : PROD_DELIVERY_PATH
             http = Net::HTTP.new(uri.host, uri.port)
             req = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')

data/lib/yardie/version.rb

@@ -1,3 +1,3 @@
 module Yardie
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yardie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Deany
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler