lookout-rack-utils 3.3.0.22 → 3.3.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjFjZjM4ZTdlZTM0OTM4ZGI4ZGE0NTRlNTFiODlmYTQ4NzgxNjk0Nw==
+    YjBmOTI2MTc3YmEzMDlkN2U5ZDMxNjQyMjBiNWM3M2Y1ZTMxOGU5Yw==
   data.tar.gz: !binary |-
-    MmU1MTc1YWYzOTljY2Y0ZTRhNjgyNTRhMTlhMmEyMmEyZDRlZmJmOQ==
+    MjQ1Mjc2YWQzMWUyZGRiNDFjMDdmZTQ4NDg0MWJlMjRkZTBjNGZhZA==
 SHA512:
   metadata.gz: !binary |-
-    MjQ1ZmJiYTI5ZDljYTczZDgwMTA3YjQ1NGNiNGY3YjA5OGIzNDhmMWExOTVj
-    OWM3NDRiN2NjM2QxYmRlYTNhNGE3NzdjYmU5MjEzZTk5YmJkMzNlMjIwZTU3
-    MWMwZDNiNjU3MjQ2OGNjNDBiMjUwYjAzZWY5MGUyNTAwNTYzNTM=
+    NzhhZmJhNDAwYzk1MzVmOTY2MjUyNjZmNWY4ZDNiODM0MmQxN2M4Mjk2Y2Uz
+    YzhmM2M2YTcwN2NjNGYzMDI4OGQyOTZlNzI2MzU3Y2FhYjUzMTk2N2RiNjRm
+    NjczMDY5YjllNzhiZDlmMDI0ZWM1OWFjM2E3M2U1MjBjM2EwOWY=
   data.tar.gz: !binary |-
-    Y2UwOTVkMTM4YjMwODdhYzVmY2I2M2FlNDlmMTA4Yjc4NjBkYzgxOWI2M2Iw
-    MGFjOGYwOWJhZTA1MTBmNGRjYTc4MzRiY2RmZDU3YjJhNmNlMjg1NTc1MTY5
-    NWQxM2YwMjZjZDc2NDEzYTFjZTBkZTA1NmUyMGI2YWRkZjc0ODM=
+    NTk2MzVlNGE3MDZlZmUyOGNjMjAyNGRiMmI2Yjk4ZmM3OWY3NzIyZmVlMTFm
+    Y2I4ZjczYzY4MTg3MjQ4YTRjMTIwYWYzMGJiNWNkMmUxOGM1OTg1N2M3ZDlh
+    NjQxMTFiM2NkZGMxMTI5MmU1MWU1MGFmMGUzYjIyYWZiNDg4NGE=

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+.ruby-gemset
+.ruby-version
 .bundle
 .config
 .yardoc

data/lib/lookout/rack/utils/log.rb

@@ -33,11 +33,36 @@ module Lookout::Rack::Utils
         @basedir ||= File.expand_path(File.join(File.dirname(__FILE__), ".."))
       end
 
+      # Return the common base directory between this project and the
+      # given trace. If no common base directory is found, return
+      # basedir.
+      #
+      # This memoizes the result, which can be bad if the first log
+      # comes from an unusual place. However, in all current uses this
+      # is running from an unpacked jar/war and its vastly faster to
+      # memoize the result.
+      #
+      # @param [String] tracer A line from the LogEvent#tracer Array
+      # @return [String] Common base directory with the trace
+      def common_basedir(tracer)
+        return @common_basedir if @common_basedir
+
+        basedir_pieces = basedir.split(File::SEPARATOR)
+        trace_pieces = tracer.split(File::SEPARATOR)
+        i = 0
+        while basedir_pieces[i] == trace_pieces[i]
+          i += 1
+        end
+        # If there were no common directories (besides /), return our basedir
+        @common_basedir = (i <= 1) ? basedir : basedir_pieces[0...i].join(File::SEPARATOR)
+      end
+
       # Return a trimmed version of the filename from where a LogEvent occurred
       # @param [String] tracer A line from the LogEvent#tracer Array
       # @return [String] Trimmed and parsed version of the file ane line number
       def event_filename(tracer)
-        parts = tracer.match(/#{basedir}\/(.*:[0-9]+).*:/)
+        base = common_basedir(tracer)
+        parts = tracer.match(/#{base}\/(.*:[0-9]+).*:/)
 
         # If we get no matches back, we're probably in a jar file in which case
         # the format of the tracer is going to be abbreviated

data/spec/log_spec.rb

@@ -158,4 +158,31 @@ describe Lookout::Rack::Utils::Log::LookoutFormatter do
     end
 
   end
+
+  describe "#common_basedir" do
+    subject(:common_basedir) { formatter.common_basedir(path) }
+
+    context "with no common path" do
+      let(:path) { "/impossible/path" }
+
+      it "should return basedir" do
+        expect(subject).to eq basedir
+      end
+    end
+
+    context "with a partially shared path" do
+      let(:path) { File.expand_path(File.join(basedir, "..", "tmp", "foo.rb")) }
+
+      it "should return shared path" do
+        expect(subject).to eq File.expand_path(File.join(basedir, ".."))
+      end
+    end
+
+    context "with a fully shared path" do
+      let(:path) { File.expand_path(File.join(basedir, "tmp.rb")) }
+      it "should return full path" do
+        expect(subject).to eq basedir
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-rack-utils
 version: !ruby/object:Gem::Version
-  version: 3.3.0.22
+  version: 3.3.0.24
 platform: ruby
 authors:
 - Ian Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler