hippie_csv 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09ec409677ca747265cd3542b2ca799d7d6cb78
-  data.tar.gz: 3f6a81c389556408e7cae8dd73f5e6da70bc5593
+  metadata.gz: 178191d199c6e5318a8377be2852354d1371537e
+  data.tar.gz: cd17b3aa8028743e6b531c67ba36822d2a31a4a8
 SHA512:
-  metadata.gz: 46c7ceaf2d3125fe02b3ba8feb8aedb4078db0eb685f109a8cb4e6f0006b008c14a4d4d74828269662023fc34a75d4e8d3a1732cac76539c848c906955a7b073
-  data.tar.gz: 22ac0bfd0871c7c7b6c010667da643307e7bc5d4d5a12da0d9ead4134b0ec79fb8126883023a8c4b69d6dd476ffc144ff9cd65c88c06aab4caa1482e0b7360cd
+  metadata.gz: 86f07865e61f68ad07c4811d1fdfc7db210f476f9042d7cdac2cea2aa0da6de44c4fdb589d8fa0e35245ed90aec4c7f5df2c5dfeb98dcf7e8d458c47b9398b42
+  data.tar.gz: ec95093f3a6e3c060b8706b76538d050040f91a4307888e3ff2a05544fa29f0897375c6c0cdde88f8b4c91dfdf68ba83378a2aeccf7b8cbf79101c11ebc4f363

data/lib/hippie_csv/constants.rb

@@ -13,5 +13,4 @@ module HippieCSV
   FIELD_SAMPLE_COUNT = 10.freeze
   ENCODING_SAMPLE_CHARACTER_COUNT = 10000.freeze
   ENCODING_WITH_BOM = "bom|#{ENCODING}".freeze
-  BLANK_LINE_REGEX = /^,+\r+$/.freeze
 end

data/lib/hippie_csv/support.rb

@@ -21,7 +21,11 @@ module HippieCSV
             magical_encode(string)
           end
         end
-        string.gsub!(BLANK_LINE_REGEX, "")
+
+        DELIMETERS.each do |delimiter|
+          string.gsub!(blank_line_regex(delimiter), "")
+        end
+
         string.encode(string.encoding, universal_newline: true)
       end
 
@@ -29,7 +33,7 @@ module HippieCSV
         QUOTE_CHARACTERS.find do |quote_character|
           [string, tolerate_escaping(string, quote_character)].find do |string_to_parse|
             rescuing_malformed do
-              return parse_csv(string_to_parse.strip, quote_character)
+              return parse_csv(string_to_parse.squeeze("\n").strip, quote_character)
             end
           end
         end
@@ -63,6 +67,10 @@ module HippieCSV
 
       private
 
+      def blank_line_regex(delimiter)
+        /^#{delimiter}+(\r\n|\r)$/
+      end
+
       def detect_encoding(string)
         CharDet.detect(string[0..ENCODING_SAMPLE_CHARACTER_COUNT])["encoding"]
       end

data/lib/hippie_csv/version.rb

@@ -1,3 +1,3 @@
 module HippieCSV
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/fixtures/blank_lines_crlf.csv

@@ -0,0 +1,9 @@
+Email,First Name,Last Name
+admin@example.com,The,Admin
+,,
+msonstot@example.com,Matt, Clemens
+,,
+nathan@example.com,NATHAN,O'BRIEN
+,,
+,,
+garry@example.com,Garry,Redmond

data/spec/hippie_csv/version_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe HippieCSV do
 
   it "defines a version" do
-    expect(HippieCSV::VERSION).to eq("0.0.8")
+    expect(HippieCSV::VERSION).to eq("0.0.9")
   end
 
 end

data/spec/hippie_csv_spec.rb

@@ -141,10 +141,12 @@ describe HippieCSV do
     end
 
     it "maintains coherent column count when stripping blank lines" do
-      path = fixture_path(:trailing_leading_blank_lines)
+      [:blank_lines_crlf, :trailing_leading_blank_lines].each do |fixture_name|
+        path = fixture_path(fixture_name)
 
-      import = subject.read(path)
-      expect(import.map(&:length).uniq.size).to eq(1)
+        import = subject.read(path)
+        expect(import.map(&:length).uniq.size).to eq(1)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hippie_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Stephen O'Brien
@@ -101,6 +101,7 @@ files:
 - lib/hippie_csv/version.rb
 - spec/fixtures/accents_semicolon_windows_1252.csv
 - spec/fixtures/bad_quoting.csv
+- spec/fixtures/blank_lines_crlf.csv
 - spec/fixtures/dos_line_ending.csv
 - spec/fixtures/encoding.csv
 - spec/fixtures/escaped_quotes.csv
@@ -143,6 +144,7 @@ summary: Tolerant, liberal CSV parsing
 test_files:
 - spec/fixtures/accents_semicolon_windows_1252.csv
 - spec/fixtures/bad_quoting.csv
+- spec/fixtures/blank_lines_crlf.csv
 - spec/fixtures/dos_line_ending.csv
 - spec/fixtures/encoding.csv
 - spec/fixtures/escaped_quotes.csv