hippie_csv 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb2ee83cfaedb06e0335c4f33c8a022b88dea3e
-  data.tar.gz: edfcbcf63e127841b3e6ac9906b38330403ce20e
+  metadata.gz: 07464f9018551eea7e183ef2ffd0e855b8a46d6a
+  data.tar.gz: 98b28c4757768af0fe785127914bdc964a067cff
 SHA512:
-  metadata.gz: 40bb630118a2e7ab90ea2e0a4d1627353bcc296296665d34ce0af53286aab4cb11166ffb927ff12b941109146b9969925df8ab59c4cda87ad6fb396ec747e5b6
-  data.tar.gz: 1f748d3bd1e6900c402aba780daefbb07f02dfaef0912ac4f986058a999f8b420614b0e5d737e3e5c133d23f2bae560932fab95ad60865daa91860f4a56f4e5f
+  metadata.gz: 346448b5193bc9beeddee5ec1dfe066a795d0a8820b2dbf28910925bf461feaec1cbbcd886394bf8323d47d931cbfda6e540febe5d5a51935b6fc127c0b61573
+  data.tar.gz: ec3278642148bc8597af5d5128fe2c9ac2231fa7b87c19dc40d3a0933ba0a41c0407464bcbe938609e3ea55c72587d39c3c50d56b04c280e4300bd8f5f27e44e

data/README.md

@@ -44,8 +44,8 @@ HippieCSV.parse(csv_string)
 
 ## Features
 
-- Deduces the delimiter (supports `,`, `;`, and `|`)
-- Deduces the quote character (supports `'` and `"`)
+- Deduces the delimiter (supports `,`, `;`, and `\t`)
+- Deduces the quote character (supports `'`, `"`, and `|`)
 - Forgives backslash escaped quotes in quoted CSVs
 - Forgives invalid newlines in quoted CSVs
 - Heals many encoding issues (and aggressively forces UTF-8)

data/lib/hippie_csv/support.rb

@@ -9,18 +9,7 @@ module HippieCSV
       end
 
       def encode(string)
-        unless string.valid_encoding?
-          string = begin
-            current_encoding = detect_encoding(string)
-            if !current_encoding.nil?
-              string.encode(ENCODING, current_encoding)
-            else
-              magical_encode(string)
-            end
-          rescue Encoding::InvalidByteSequenceError
-            magical_encode(string)
-          end
-        end
+        string = ensure_valid_encoding(string)
 
         DELIMETERS.each do |delimiter|
           string.gsub!(blank_line_regex(delimiter), "")
@@ -71,6 +60,20 @@ module HippieCSV
 
       private
 
+      def ensure_valid_encoding(string)
+        return string if string.valid_encoding?
+
+        current_encoding = detect_encoding(string)
+
+        if !current_encoding.nil? && current_encoding != ENCODING
+          string.encode(ENCODING, current_encoding)
+        else
+          magical_encode(string)
+        end
+      rescue Encoding::InvalidByteSequenceError
+        magical_encode(string)
+      end
+
       def blank_line_regex(delimiter)
         /^#{delimiter}+(\r\n|\r)$/
       end

data/lib/hippie_csv/version.rb

@@ -1,3 +1,3 @@
 module HippieCSV
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/hippie_csv/support_spec.rb

@@ -38,6 +38,17 @@ describe HippieCSV::Support do
       end
     end
 
+    context "with a string detected to be UTF-8 but with an invalid byte sequence" do
+      let(:utf8_string) { ("Rubyのメ" * HippieCSV::ENCODING_SAMPLE_CHARACTER_COUNT).force_encoding("utf-8") }
+      let(:string) { utf8_string << "\xBF"}
+
+      it "ensures encoding becomes valid" do
+        expect(string).not_to be_valid_encoding
+
+        expect(subject.encode(string)).to be_valid_encoding
+      end
+    end
+
     context 'with unquoted fields and \r or \n' do
       let(:string) { "id,first_name,last_name\r123,Heinrich,Schütz\r\n" }
 

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.10")
+    expect(HippieCSV::VERSION).to eq("0.0.11")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippie_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Stephen O'Brien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tolerant, liberal CSV parsing
@@ -162,4 +162,3 @@ test_files:
 - spec/hippie_csv/version_spec.rb
 - spec/hippie_csv_spec.rb
 - spec/spec_helper.rb
-has_rdoc: