Fix trailing whitespace issue in filename parsing

dbeard · dbeard · commit d679ad1dc6e9 · 2018-07-20T13:51:39.000-07:00
diff --git a/lib/git_diff_parser/patches.rb b/lib/git_diff_parser/patches.rb
@@ -28,7 +28,7 @@ def self.parse(contents)
           body = false
         when /^\-\-\-/
         when %r{^\+\+\+ b/(?<file_name>.*)}
-          file_name = Regexp.last_match[:file_name]
+          file_name = Regexp.last_match[:file_name].rstrip
           body = true
         when /^(?<body>[\ @\+\-\\].*)/
           patch << Regexp.last_match[:body] if body
diff --git a/spec/git_diff_parser/patches_spec.rb b/spec/git_diff_parser/patches_spec.rb
@@ -15,6 +15,10 @@ module GitDiffParser
       let(:sjis_file) { 'spec/support/fixtures/sjis.csv' }
       let(:sjis_diff) { sjis_file.gsub(/\.csv\z/, '.diff') }
       let(:sjis_body) { File.read(sjis_diff) }
+      
+      let(:whitespace_file) { 'b/spec/support/fixtures/sjis.csv' }
+      let(:whitespace_filename_diff) { 'spec/support/fixtures/whitespacefilename.diff' }
+      let(:whitespace_filename_body) { File.read(whitespace_filename_diff) }
 
       it 'returns parsed patches' do
         diff_body = File.read('spec/support/fixtures/d1bd180-c27866c.diff')
@@ -36,6 +40,11 @@ module GitDiffParser
         expect { patches = Patches.parse(sjis_body) }.not_to raise_error
         expect(patches[0].file).to eq sjis_file
       end
+      
+      it 'correctly strips trailing whitespace from filenames' do
+        patches = Patches.parse(whitespace_filename_body)
+        expect(patches[0].file == whitespace_file)
+      end
     end
   end
 end
diff --git a/spec/support/fixtures/whitespacefilename.diff b/spec/support/fixtures/whitespacefilename.diff
@@ -0,0 +1,8 @@
+diff --git a/spec/support/fixtures/sjis.csv b/spec/support/fixtures/sjis.csv
+new file mode 100644
+index 0000000..4c19aee
+--- /dev/null
++++ b/spec/support/fixtures/sjis.csv  
+@@ -0,0 +1 @@
++�M	abcdefg
+\ No newline at end of file
