Strip any query strings from files

Nathan Broadbent
1 parent cab56064
Showing 2 changed files with 22 additions and 8 deletions Show diff stats
app/models/backtrace_line_normalizer.rb
spec/models/backtrace_line_normalizer_spec.rb
@@ -12,7 +12,12 @@ class BacktraceLineNormalizer
     if @raw_line['file'].blank?
       "[unknown source]"
     else
-      @raw_line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+      file = @raw_line['file'].to_s
+      # Detect lines from gem
+      file.gsub!(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+      # Strip any query strings
+      file.gsub!(/\?[^\?]*$/, '')
+      @raw_line['file'] = file
     end
   end
  
@@ -3,16 +3,25 @@ require &#39;spec_helper&#39;
 describe BacktraceLineNormalizer do
   subject { described_class.new(raw_line).call }
  
-  describe "sanitize file and method" do
-    let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
+  describe "sanitize" do
+    context "unknown file and method" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
  
-    it "should replace nil file with [unknown source]" do
-      subject['file'].should == "[unknown source]"
-    end
+      it "should replace nil file with [unknown source]" do
+        subject['file'].should == "[unknown source]"
+      end
  
-    it "should replace nil method with [unknown method]" do
-      subject['method'].should == "[unknown method]"
+      it "should replace nil method with [unknown method]" do
+        subject['method'].should == "[unknown method]"
+      end
     end
  
+    context "in app file" do
+      let(:raw_line) { { 'number' => rand(999), 'file' => "[PROJECT_ROOT]/assets/file.js?body=1", 'method' => nil } }
+
+      it "should strip query strings from files" do
+        subject['file'].should == "[PROJECT_ROOT]/assets/file.js"
+      end
+    end
   end
 end
...	...	@@ -12,7 +12,12 @@ class BacktraceLineNormalizer
12	12	if @raw_line['file'].blank?
13	13	"[unknown source]"
14	14	else
15		- @raw_line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
	15	+ file = @raw_line['file'].to_s
	16	+ # Detect lines from gem
	17	+ file.gsub!(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
	18	+ # Strip any query strings
	19	+ file.gsub!(/\?[^\?]*$/, '')
	20	+ @raw_line['file'] = file
16	21	end
17	22	end
18	23
...	...
...	...	@@ -3,16 +3,25 @@ require 'spec_helper'
3	3	describe BacktraceLineNormalizer do
4	4	subject { described_class.new(raw_line).call }
5	5
6		- describe "sanitize file and method" do
7		- let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
	6	+ describe "sanitize" do
	7	+ context "unknown file and method" do
	8	+ let(:raw_line) { { 'number' => rand(999), 'file' => nil, 'method' => nil } }
8	9
9		- it "should replace nil file with [unknown source]" do
10		- subject['file'].should == "[unknown source]"
11		- end
	10	+ it "should replace nil file with [unknown source]" do
	11	+ subject['file'].should == "[unknown source]"
	12	+ end
12	13
13		- it "should replace nil method with [unknown method]" do
14		- subject['method'].should == "[unknown method]"
	14	+ it "should replace nil method with [unknown method]" do
	15	+ subject['method'].should == "[unknown method]"
	16	+ end
15	17	end
16	18
	19	+ context "in app file" do
	20	+ let(:raw_line) { { 'number' => rand(999), 'file' => "[PROJECT_ROOT]/assets/file.js?body=1", 'method' => nil } }
	21	+
	22	+ it "should strip query strings from files" do
	23	+ subject['file'].should == "[PROJECT_ROOT]/assets/file.js"
	24	+ end
	25	+ end
17	26	end
18	27	end
...	...