csv-importer 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e17c85aa62e6f2774f1cb86dcea9d7743622b73690fb896228d1bf7ce54951e
-  data.tar.gz: acfd22bf68c1c228a0afecba046cf3cb7231311192ee1ee5c88828a56a51f429
+  metadata.gz: 803f33e5d2db4d5331bb2f6ef1c5fd6cc9ea19d1d8350e1c16a2041f2ac2176c
+  data.tar.gz: 822e5caa1ae8d3e73909fcf42a9e57e6cff00dc6f2f2bb900b25e010bed72f19
 SHA512:
-  metadata.gz: c5c8894e68eaa33418761a9cad3ab8f0ddfea0eeaa3e62101ab1105a40978b7c206dc7448a4b536f9efc06c06b952935146efe9b4ae010c9a3f98428f649b641
-  data.tar.gz: 66f498dc9d2e62bf413ba35ac362b03fa557640c724cafb8cc38686bfe825334455d936c1c8a4e79b97fc4ec0355887cb0f6dee178b0f3893d0b37c6dc043b09
+  metadata.gz: 0edf3c998a6b506a4778d0e36fddc828339cf8900653de0b41494489e4de57358df23a34ed30ad03f8583837ec0ca9c29d4166982ab80e17018481c00baad84d
+  data.tar.gz: c11177ab4e4fb02751a8e1be12ded7c41360bd62f2f72156c75b8a90819d47f861fbff94b1ed1c8fa29940c5db4484ccb15341c8baaf2bfae256234fb2183c35

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,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.8.0] - 2020-09-02
+
+### Fixed
+
+* Ruby 2.7 compatibility. [#93][] by [@perezperret][]
+
 ## [0.7.0] - 2019-11-29
 
 ### Added
@@ -195,6 +201,7 @@ 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
 [@brain-geek]: https://github.com/brain-geek
 [@danielweinmann]: https://github.com/danielweinmann
 [@egg-chicken]: https://github.com/egg-chicken
@@ -203,6 +210,7 @@ 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

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/version.rb

@@ -1,3 +1,3 @@
 module CSVImporter
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 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.0
 platform: ruby
 authors:
 - Philippe Creux
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-09-03 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
@@ -105,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: CSV Import for humans
 test_files: []