smarter_csv 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0efcd4dbad2546469ba99c1a133bc7548382e147fca66207d11065607fdb5ee
-  data.tar.gz: 98024633925ed73251dd00606f23f73ca6cbda5517c24882b95935138ab4d7e3
+  metadata.gz: b12b00d4615d3c9c6bb3f233b5179b8a3990204af46c88b6ee2203de307608e0
+  data.tar.gz: 215dc43d5280083f7452c0be169daab991057239601fa37c23cd474649a8cd4d
 SHA512:
-  metadata.gz: ac64f3a688f9b5b4bce09e26d8ee140994bf585578ea6eed1d998cec434535f3afb4aa8c2ea222b873cb5ee113fba748412a96e1b3b23a8b5425d13aa7a6436c
-  data.tar.gz: f8c3132f1f2cf60f8f67d2278d0b3660d7aab456581256e1c2508d1397c1cc31d455035c68656777c34e90ad6238c239699b1c59cdd918cdcd63c9f5a264aaba
+  metadata.gz: 05bc8348e29d095788ee6d2a9cf299232fc1e7f8abc5048544e80a0f0c6b5d7517b935daddc3eb697a5f01616eb5a3dd2a9b4d0ee489f358e0b95718caba243f
+  data.tar.gz: bd2b070f965ba554b2b2551a5959690308a1a68fdbe452b6d7900e7c665202e73e1b1bfba0b4d4da72324490c55e8fd869497df64e959b80706af63509a4b1fd

data/.travis.yml

@@ -9,7 +9,7 @@ matrix:
     - rvm: 2.2.8
     - rvm: 2.3.5
     - rvm: 2.4.2
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.1.15.0
       env:
         - JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
     - rvm: ruby-head
@@ -17,3 +17,5 @@ matrix:
 branches:
   only:
     - master
+    - 1.2-stable
+    - 2.0-develop

data/README.md

@@ -324,11 +324,12 @@ Planned in the next releases:
 
 ## Changes
 
+#### 1.2.4 (2018-08-06)
+ * using Rails blank? if it's available
+
 #### 1.2.3 (2018-01-27)
  * fixed regression / test
  * fuxed quote_char interpolation for headers, but not data (thanks to Colin Petruno)
-
-#### 1.2.1 (2018-01-25)    ### YANKED!
  * bugfix (thanks to Joshua Smith for reporting)
 
 #### 1.2.0 (2018-01-20)
@@ -385,9 +386,6 @@ Planned in the next releases:
 #### 1.0.14 (2013-11-01)
  * added GPL-2 and MIT license to GEM spec file; if you need another license contact me
 
-#### 1.0.13 (2013-11-01)    ### YANKED!
- * added GPL-2 license to GEM spec file; if you need another license contact me
-
 #### 1.0.12 (2013-10-15)
  * added RSpec tests
 

data/lib/smarter_csv/smarter_csv.rb

@@ -22,6 +22,7 @@ module SmarterCSV
     old_row_sep = $/
     file_line_count = 0
     csv_line_count = 0
+    has_rails = !! defined?(Rails)
     begin
       f = input.respond_to?(:readline) ? input : File.open(input, "r:#{options[:file_encoding]}")
 
@@ -167,7 +168,13 @@ module SmarterCSV
 
         # remove empty values using the same regexp as used by the rails blank? method
         # which caters for double \n and \r\n characters such as "1\r\n\r\n2" whereas the original check (v =~ /^\s*$/) does not
-        hash.delete_if{|k,v| v.nil? || v !~ /[^[:space:]]/}  if options[:remove_empty_values]
+        if options[:remove_empty_values]
+          if has_rails
+            hash.delete_if{|k,v| v.blank?}
+          else
+            hash.delete_if{|k,v| v.nil? || v !~ /[^[:space:]]/}
+          end
+        end
 
         hash.delete_if{|k,v| ! v.nil? && v =~ /^(\d+|\d+\.\d+)$/ && v.to_f == 0} if options[:remove_zero_values]   # values are typically Strings!
         hash.delete_if{|k,v| v =~ options[:remove_values_matching]} if options[:remove_values_matching]

data/lib/smarter_csv/version.rb

@@ -1,3 +1,3 @@
 module SmarterCSV
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/fixtures/problematic.csv

@@ -0,0 +1,8 @@
+Compte;Date de comptabilisation;Date op�ration;Libell�;R�f�rence;Date valeur;Montant
+22215449203;02/06/2018;01/06/2018;ECHEANCE PRET DONT CAP    410,33 ASS.    8,00E INT.    21,87 COM.    0,00E;8711552;01/06/2018;-440,20;
+22215449203;04/06/2018;04/06/2018;EVI Gaultier Laperche remboursement compte courant;1038326;04/06/2018;-144,07;
+22215449203;04/06/2018;04/06/2018;EVI Guillemain Nicolas remboursement CC pret d'honneur;1038328;04/06/2018;-144,07;
+22215449203;01/06/2018;01/06/2018;310518 SC****5448 INTERMARCHE    95ERMONT;701JQ1K;01/06/2018;-16,00;
+22215449203;01/06/2018;01/06/2018;EVI Stripe Payments UK L STRIPE E7U0R1;706AO1Q;01/06/2018;45,89;
+22215449203;01/06/2018;01/06/2018;EVI Compte N26 Heroku;1100653;01/06/2018;-700,00;
+22215449203;31/05/2018;31/05/2018;EVI Stripe Payments UK L STRIPE L2J1N7;6YISBWF;31/05/2018;465,89;

data/spec/smarter_csv/problematic.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+fixture_path = 'spec/fixtures'
+
+describe 'loading file with UTF-8 characters in the header' do
+
+  # file which caused issues because of UTF-8 characters in the header
+  it 'loads the file with force_utf8 flag set' do
+    options = {col_sep:  ";", force_utf8: true}
+    data = SmarterCSV.process("#{fixture_path}/problematic.csv", options)
+
+    data.length.should eq 7
+  end
+
+  it 'loads the file with strings as keys' do
+    options = {
+      file_encoding: 'iso-8859-1:UTF-8', # important!
+      col_sep:  ";", strings_as_keys: true,
+    }
+    data = SmarterCSV.process("#{fixture_path}/problematic.csv", options)
+
+    data.length.should eq 7
+    data.first.keys.sort.should eq [
+      "compte",
+      "date_de_comptabilisation",
+      "date_opération",
+      "date_valeur",
+      "libellé",
+      "montant",
+      "référence"
+    ]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smarter_csv
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - 'Tilo Sloboda
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -68,6 +68,7 @@ files:
 - spec/fixtures/no_header.csv
 - spec/fixtures/numeric.csv
 - spec/fixtures/pets.csv
+- spec/fixtures/problematic.csv
 - spec/fixtures/quote_char.csv
 - spec/fixtures/quoted.csv
 - spec/fixtures/quoted2.csv
@@ -95,6 +96,7 @@ files:
 - spec/smarter_csv/malformed_spec.rb
 - spec/smarter_csv/no_header_spec.rb
 - spec/smarter_csv/not_downcase_header_spec.rb
+- spec/smarter_csv/problematic.rb
 - spec/smarter_csv/quoted_spec.rb
 - spec/smarter_csv/remove_empty_values_spec.rb
 - spec/smarter_csv/remove_keys_from_hashes_spec.rb
@@ -157,6 +159,7 @@ test_files:
 - spec/fixtures/no_header.csv
 - spec/fixtures/numeric.csv
 - spec/fixtures/pets.csv
+- spec/fixtures/problematic.csv
 - spec/fixtures/quote_char.csv
 - spec/fixtures/quoted.csv
 - spec/fixtures/quoted2.csv
@@ -184,6 +187,7 @@ test_files:
 - spec/smarter_csv/malformed_spec.rb
 - spec/smarter_csv/no_header_spec.rb
 - spec/smarter_csv/not_downcase_header_spec.rb
+- spec/smarter_csv/problematic.rb
 - spec/smarter_csv/quoted_spec.rb
 - spec/smarter_csv/remove_empty_values_spec.rb
 - spec/smarter_csv/remove_keys_from_hashes_spec.rb