csvhuman 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34cc6d7eb412bf02188cde5b26201cc1e5c8a46c
-  data.tar.gz: 4c04e8bc8678b19923a42f05d11114389ff78ab5
+  metadata.gz: d8038f1824b8772b53f57f7dc00c67ca902fd872
+  data.tar.gz: a95430def44f77428a32b4ceb80f12c96d078199
 SHA512:
-  metadata.gz: 404dc263217830a3dfc68e15114bd3e45a406774638574106708fed616a1fa9245becd6cab9a54889ef8335bffc0be5ca9324bb15779510fd4a5eea365156ecd
-  data.tar.gz: 8689b1d38c6edade697583786e595332c5a496285c778967ad8a35557290d0b08a62056b75fc194d995f571220e4836eadcbf6d5f9083ec92cc5d97b3877d9cd
+  metadata.gz: a2ee778e98288478930b92cb066b8d8ee65da61dca3d911e3f3de12c5ee3a0d0f3451db5ea1426c1c59a5a8cd6fc9ecb2bb509d8982e79b1ff0ce8d8c353765e
+  data.tar.gz: e02189132d596e2b5abc654f55c9dcf925ed96d0d5008b8b2eba956cdfc0044827c374409e2e22e45c95791ed5db256c441210a36d81172c53f3178007f8cc40

data/Manifest.txt

@@ -9,8 +9,13 @@ lib/csvhuman/converter.rb
 lib/csvhuman/reader.rb
 lib/csvhuman/tag.rb
 lib/csvhuman/version.rb
+test/data/sample1.csv
+test/data/sample2.csv
+test/data/sample3.csv
+test/data/sample4.csv
 test/data/test.csv
 test/helper.rb
 test/test_header_converter.rb
 test/test_reader.rb
+test/test_samples.rb
 test/test_tags.rb

data/lib/csvhuman/tag.rb

@@ -61,16 +61,22 @@ class Tag
 
     if name == 'date'
        Date
-    elsif ['affected', 'inneed', 'targeted', 'reached'].include?( name )
+    ## todo/fix: add more well-known names with num required!!!
+    elsif ['affected', 'inneed', 'targeted', 'reached', 'population'].include?( name )
        Integer
     else
       ## check attributes
       if attributes.nil? || attributes.empty?
         String  ## assume (default to) string
-      elsif attributes.include?( 'num' )
+      elsif attributes.include?( 'num' ) ||
+            attributes.include?( 'id')   ## assume id is (always) a rowid - why? why not?
         Integer
       elsif attributes.include?( 'date' )   ### todo/check: exists +date?
         Date
+      elsif name == 'geo' && (attributes.include?('lat') ||
+                              attributes.include?('lon') ||
+                              attributes.include?('elevation'))
+        Float
       elsif attributes.include?( 'killed' ) ||
             attributes.include?( 'injured' ) ||
             attributes.include?( 'infected' ) ||
@@ -151,12 +157,17 @@ class Tag
   def typecast( value )   ## use convert or call - why? why not?
     if @type == Integer
       conv_to_i( value )
+    elsif @type == Float
+      conv_to_f( value )
+    elsif @type == Date
+      conv_to_date( value )
     else   ## assume String
       # pass through as is
       value
     end
   end
 
+
 private
   def conv_to_i( value )
     if value.nil? || value.empty?
@@ -166,7 +177,25 @@ private
     end
   end
 
+  def conv_to_f( value )
+    if value.nil? || value.empty?
+      nil   ## return nil - why? why not?
+    else
+      ## todo/fix: add support for NaN, Inf, -Inf etc.
+      ##    how to deal with conversion errors (throw exception? ignore? NaN? why? why not?)
+      Float( value )
+    end
+  end
 
+  def conv_to_date( value )
+    if value.nil? || value.empty?
+      nil   ## return nil - why? why not?
+    else
+      ## todo/fix: add support for more formats
+      ##    how to deal with conversion errors (throw exception? ignore? why? why not?)
+      Date.strptime( value, "%Y-%m-%d" )
+    end
+  end
 end # class Tag
 
 

data/lib/csvhuman/version.rb

@@ -5,7 +5,7 @@ class CsvHuman
 
   MAJOR = 1
   MINOR = 0
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
 

data/test/data/sample1.csv

@@ -0,0 +1,10 @@
+%%%%%%%%%%%%%%%%%%%%%
+% sample from HXL tagging conventions (version 1.1)
+%  see http://hxlstandard.org/standard/1_1final/tagging/
+
+CAMP INFORMATION,       ,        NEEDS
+LOCATION NAME,    LOCATION CODE, NUMBER AFFECTED
+#loc +name,       #loc +code,    #affected
+Camp A,           01000001,      2000
+Camp B,           01000002,      750
+Camp C,           01000003,      1920

data/test/data/sample2.csv

@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%%
+% sample from HXL tagging conventions (version 1.1)
+%  see http://hxlstandard.org/standard/1_1final/tagging/
+
+#event+id, #affected+killed, #region,                      #meta+source+reliability, #date+reported, #geo+lat,  #geo+lon
+1,         1,                Mediterranean,                Verified,                 2015-11-05,     36.891500,  27.287700
+3,         1,                Central America incl. Mexico, Partially Verified,       2015-11-03,     15.956400, -93.663099

data/test/data/sample3.csv

@@ -0,0 +1,11 @@
+%%%%%%%%%%%%%%%%%%%%%
+% sample from HXL tagging conventions (version 1.1)
+%  see http://hxlstandard.org/standard/1_1final/tagging/
+
+P-CODE 1,  P-CODE 2,  P-CODE 3
+#loc+code, #loc+code, #loc+code
+020503
+060107,    060108
+173219
+530012
+530013,    530015,    279333

data/test/data/sample4.csv

@@ -0,0 +1,8 @@
+%%%%%%%%%%%%%%%%%%%%%
+% sample from HXL tagging conventions (version 1.1)
+%  see http://hxlstandard.org/standard/1_1final/tagging/
+
+REGION,            2008,            2009,            2010,            2011
+#adm1 +name,       #affected+label, #affected+label, #affected+label, #affected+label
+Coast District,    0,               30,              100,             250
+Mountain District, 15,              75,              30,              45

data/test/test_samples.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_samples.rb
+
+
+require 'helper'
+
+class TestSamples < MiniTest::Test
+
+
+def test_sample1
+  recs = CsvHuman.read( "#{CsvHuman.test_data_dir}/sample1.csv" )
+  ## pp recs
+  assert_equal [{"loc+name"=>"Camp A", "loc+code"=>"01000001", "affected"=>2000},
+                {"loc+name"=>"Camp B", "loc+code"=>"01000002", "affected"=>750},
+                {"loc+name"=>"Camp C", "loc+code"=>"01000003", "affected"=>1920}], recs
+end
+
+def test_sample2
+  recs = CsvHuman.read( "#{CsvHuman.test_data_dir}/sample2.csv" )
+  ## pp recs
+  assert_equal [{"event+id"=>1,
+                 "affected+killed"=>1,
+                 "region"=>"Mediterranean",
+                 "meta+reliability+source"=>"Verified",
+                 "date+reported"=>Date.new( 2015, 11, 5 ),
+                 "geo+lat"=>36.8915,
+                 "geo+lon"=>27.2877},
+                {"event+id"=>3,
+                 "affected+killed"=>1,
+                 "region"=>"Central America incl. Mexico",
+                 "meta+reliability+source"=>"Partially Verified",
+                 "date+reported"=>Date.new( 2015, 11, 3 ),
+                 "geo+lat"=>15.9564,
+                 "geo+lon"=>-93.663099}], recs
+end
+
+def test_sample3
+  recs = CsvHuman.read( "#{CsvHuman.test_data_dir}/sample3.csv" )
+  ## pp recs
+  assert_equal [{"loc+code"=>["020503", nil, nil]},
+                {"loc+code"=>["060107", "060108", nil]},
+                {"loc+code"=>["173219", nil, nil]},
+                {"loc+code"=>["530012", nil, nil]},
+                {"loc+code"=>["530013", "530015", "279333"]}], recs
+end
+
+def test_sample4
+  recs = CsvHuman.read( "#{CsvHuman.test_data_dir}/sample4.csv" )
+  ## pp recs
+  assert_equal [{"adm1+name"=>"Coast District",    "affected+label"=>[0, 30, 100, 250]},
+                {"adm1+name"=>"Mountain District", "affected+label"=>[15, 75, 30, 45]}], recs
+end
+
+
+end # class TestSamples

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvhuman
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csvreader
@@ -74,10 +74,15 @@ files:
 - lib/csvhuman/reader.rb
 - lib/csvhuman/tag.rb
 - lib/csvhuman/version.rb
+- test/data/sample1.csv
+- test/data/sample2.csv
+- test/data/sample3.csv
+- test/data/sample4.csv
 - test/data/test.csv
 - test/helper.rb
 - test/test_header_converter.rb
 - test/test_reader.rb
+- test/test_samples.rb
 - test/test_tags.rb
 homepage: https://github.com/csvreader/csvhuman
 licenses: