csv-importer 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e17c85aa62e6f2774f1cb86dcea9d7743622b73690fb896228d1bf7ce54951e
-  data.tar.gz: acfd22bf68c1c228a0afecba046cf3cb7231311192ee1ee5c88828a56a51f429
+  metadata.gz: 48a0833adc98a3eb391c5f8f5dfcbf17e18d2b2b67c30ac6ce61ac10c75f4e65
+  data.tar.gz: 35af734114d7edc62208492860340747696ede74b26c37af8f69abb8cb3664db
 SHA512:
-  metadata.gz: c5c8894e68eaa33418761a9cad3ab8f0ddfea0eeaa3e62101ab1105a40978b7c206dc7448a4b536f9efc06c06b952935146efe9b4ae010c9a3f98428f649b641
-  data.tar.gz: 66f498dc9d2e62bf413ba35ac362b03fa557640c724cafb8cc38686bfe825334455d936c1c8a4e79b97fc4ec0355887cb0f6dee178b0f3893d0b37c6dc043b09
+  metadata.gz: e39e5ae5ba02cd31d77972f452fded7fc7584bacac159a6e0a9bd305bb8f3e597b843af2006ce7e64e29de7b70fec7015ca485bdfe0f562ae8727150a682f4bb
+  data.tar.gz: bce7c77c6d159788228bfbc6da9920bbbf810344d1075113e57edce647288da907a0d7c8358710b1729be5463d85492a5ce63be1299eaf519e0fb8a04c691a6b

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 2.3.0
+  - 2.7
 addons:
   code_climate:
     repo_token: bcecbf1b229a2ddd666a2c3830f26a0113fd56ae1586d30d2d3fb1af837bf0e4

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.2] - 2022-08-02
+
+### Fixed
+
+* Handle Invisible Chars in headers. [#107][] by [@tracyloisel][]
+
+## [0.8.1] - 2021-02-21
+
+* Rails 6.2 compability. [#99][] by [@stevenou][]
+
+## [0.8.0] - 2020-09-02
+
+### Fixed
+
+* Ruby 2.7 compatibility. [#93][] by [@perezperret][]
+
 ## [0.7.0] - 2019-11-29
 
 ### Added
@@ -195,6 +211,9 @@ report object instead of raising an exception.
 [#83]: https://github.com/pcreux/csv-importer/issues/83
 [#85]: https://github.com/pcreux/csv-importer/issues/85
 [#88]: https://github.com/pcreux/csv-importer/issues/88
+[#93]: https://github.com/pcreux/csv-importer/issues/93
+[#99]: https://github.com/pcreux/csv-importer/issues/99
+[#107]: https://github.com/pcreux/csv-importer/issues/107
 [@brain-geek]: https://github.com/brain-geek
 [@danielweinmann]: https://github.com/danielweinmann
 [@egg-chicken]: https://github.com/egg-chicken
@@ -203,6 +222,9 @@ report object instead of raising an exception.
 [@mltsy]: https://github.com/mltsy
 [@paulodeleo]: https://github.com/paulodeleo
 [@pcreux]: https://github.com/pcreux
+[@perezperret]: https://github.com/perezperret
 [@pnomolos]: https://github.com/pnomolos
 [@shvetsovdm]: https://github.com/shvetsovdm
-[@stas]: https://github.com/stas
+[@stas]: https://github.com/stas
+[@stevenou]: https://github.com/stevenou
+[@tracyloisel]: https://github.com/tracyloisel

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in csv-importer.gemspec
 gemspec
-
-gem 'rspec', '~> 3.3.0'
-gem 'guard-rspec'
-gem 'activemodel'
-gem 'simplecov', require: nil
-gem "codeclimate-test-reporter", require: nil

data/csv-importer.gemspec

@@ -20,6 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "virtus"
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "activemodel", "~> 5"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/lib/csv_importer/csv_reader.rb

@@ -14,8 +14,12 @@ module CSVImporter
       @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, encoding: encoding)
-        sanitize_cells(cells)
+        cells = CSV.parse(
+          sane_content,
+          col_sep: separator, quote_char: quote_char, skip_blanks: true,
+          external_encoding: source_encoding
+        )
+        sanitize_cells(encode_cells(cells))
       end
     end
 
@@ -44,9 +48,8 @@ module CSVImporter
     end
 
     def sanitize_content(csv_content)
-      internal_encoding = encoding.split(':').last
       csv_content
-        .encode(Encoding.find(internal_encoding), {invalid: :replace, undef: :replace, replace: ''}) # Remove invalid byte sequences
+        .encode(Encoding.find(source_encoding), invalid: :replace, undef: :replace, replace: '') # Remove invalid byte sequences
         .gsub(/\r\r?\n?/, "\n") # Replaces windows line separators with "\n"
     end
 
@@ -75,5 +78,21 @@ module CSVImporter
         end
       end
     end
+
+    def encode_cells(rows)
+      rows.map do |cells|
+        cells.map do |cell|
+          cell ? cell.encode(target_encoding) : ""
+        end
+      end
+    end
+
+    def source_encoding
+      encoding.split(':').first || 'UTF-8'
+    end
+
+    def target_encoding
+      encoding.split(':').last || 'UTF-8'
+    end
   end
 end

data/lib/csv_importer/header.rb

@@ -9,6 +9,9 @@ module CSVImporter
 
     def columns
       column_names.map do |column_name|
+        # ensure column name escapes invisible characters
+        column_name = column_name.gsub(/[^[:print:]]/, '')
+
         Column.new(
           name: column_name,
           definition: find_column_definition(column_name)

data/lib/csv_importer/row.rb

@@ -77,11 +77,11 @@ module CSVImporter
     # Error from the model mapped back to the CSV header if we can
     def errors
       Hash[
-        model.errors.map do |attribute, errors|
+        model.errors.to_hash.map do |attribute, errors|
           if column_name = header.column_name_for_model_attribute(attribute)
-            [column_name, errors]
+            [column_name, errors.last]
           else
-            [attribute, errors]
+            [attribute, errors.last]
           end
         end
       ]

data/lib/csv_importer/version.rb

@@ -1,3 +1,3 @@
 module CSVImporter
-  VERSION = "0.7.0"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv-importer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Philippe Creux
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -25,34 +25,90 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: 
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - pcreux@gmail.com
 executables: []
@@ -89,7 +145,7 @@ homepage: https://github.com/pcreux/csv-importer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: CSV Import for humans
 test_files: []