csv-importer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b837a8650d40afb4feb4be4b9d1679d4f7a41a
-  data.tar.gz: f74a63d0b1c65c647ca8ccd102151a2c542f1212
+  metadata.gz: 9fb2af22af454df8a5d98c1d4fb2b8045c75c39b
+  data.tar.gz: 0ea722d76a33fc31fe3cea489d95e480b63b188c
 SHA512:
-  metadata.gz: 0b3453bf9dc18bc3dcd66b04b7901c5e68d9c66afa362d4e0ae9965dc82745a9380dd53e8d5fbdcc42cc7ab4b3501f3d1debfe2894e013b9fa08a7dc90012dcb
-  data.tar.gz: 633f1f1e78cb60a1dd911349ab5651d498acfb0a1ff8983f88e144a4d429de17a43d3e2bd43e12538a1a31c15edf327ccca290c908f727f06811253dc8aaf8d5
+  metadata.gz: 7afd22eabb1c1d6e9aa04aac774f0063e8682e5a58a1c5d3fe339084f47fa8f432c82f80e4f78b5cb37bedc6d82ae4f6d9ddac8c044209510c40053182d45d37
+  data.tar.gz: d52f0d10d2b8916e2f049c69301539fc42e09ef3610955cb1eed8ebf8e398080eab4a7b654d6cf0a19dd51447ea23dc2268ec01c2b209adcc16a0f580b8d55a5

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.3.0
 addons:
   code_climate:
     repo_token: 0e005c563813539e6d0cdca9a3e95b3c0f1c79f32284f8eaa93b54c57303d427

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.1] - 2016-05-09
+
+### Added
+
+* You can customize the encoding with the `encoding` option. Default is
+  `UTF-8`. ([#38][] by [@egg-chicken][])
+
 ## [0.3.0] - 2016-02-05
 
 ### Added
@@ -97,4 +104,6 @@ report object instead of raising an exception.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#26]: https://github.com/BrewhouseTeam/csv-importer/issues/26
-[@shvetsovdm]: https://github.com/shvetsovdm
+[#38]: https://github.com/BrewhouseTeam/csv-importer/issues/38
+[@egg-chicken]: https://github.com/egg-chicken
+[@shvetsovdm]: https://github.com/shvetsovdm

data/README.md

@@ -244,7 +244,7 @@ end
 import = ImportUserCSV.new(content: "email\nbob@example.com\nINVALID_EMAIL")
 import.valid_header? # => true
 import.run!
-import.success? # => false
+import.report.success? # => false
 import.report.status # => :aborted
 import.report.message # => "Import aborted"
 ```
@@ -399,6 +399,14 @@ import.run!
   # => [ ["bob@example.com", "bob \"elvis\" wilson"] ]
 ```
 
+### Custom encoding
+
+You can handle exotic encodings with the `encoding` option.
+
+```ruby
+ImportUserCSV.new(content: "メール,氏名".encode('SJIS'), encoding: 'SJIS:UTF-8')
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/csv_importer/csv_reader.rb

@@ -8,12 +8,13 @@ module CSVImporter
     attribute :file # IO
     attribute :path, String
     attribute :quote_char, String, default: '"'
+    attribute :encoding, String, default: 'UTF-8:UTF-8'
 
     def csv_rows
       @csv_rows ||= begin
         sane_content = sanitize_content(read_content)
         separator = detect_separator(sane_content)
-        cells = CSV.parse(sane_content, col_sep: separator, quote_char: quote_char, skip_blanks: true)
+        cells = CSV.parse(sane_content, col_sep: separator, quote_char: quote_char, skip_blanks: true, encoding: encoding)
         sanitize_cells(cells)
       end
     end
@@ -43,8 +44,9 @@ module CSVImporter
     end
 
     def sanitize_content(csv_content)
+      internal_encoding = encoding.split(':').last
       csv_content
-        .encode(Encoding.find('UTF-8'), {invalid: :replace, undef: :replace, replace: ''}) # Remove invalid byte sequences
+        .encode(Encoding.find(internal_encoding), {invalid: :replace, undef: :replace, replace: ''}) # Remove invalid byte sequences
         .gsub(/\r\r?\n?/, "\n") # Replaces windows line separators with "\n"
     end
 

data/lib/csv_importer/version.rb

@@ -1,3 +1,3 @@
 module CSVImporter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Philippe Creux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus