csv-hash 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/csv-hash.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csv-hash}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tal Atlas"]

data/lib/csv-hash.rb

@@ -11,15 +11,15 @@ module CSVHash
     FasterCSV.foreach(file) do |row|
       num += 1
       if num == 1
-        columns = row.collect {|c| c.strip}
+        columns = row.collect {|c| c.strip if c}
         next
       end
 
       hash = {}
       columns.each_with_index do |col, i|
         next unless col
-        col = col.strip
-        val = row[i].strip
+        col = col ? col.strip : nil
+        val = row[i] ? row[i].strip : nil
 
         setter = hash
         sp = col.split('__')
@@ -38,7 +38,7 @@ module CSVHash
       data << hash
     end
     
-    return data, columns
+    return data, columns.compact
   end
   
   def to_string hashes, columns

data/spec/assets/clean_test.csv

@@ -1,3 +1,3 @@
-one,two,foo__bar__three,foo__bar__four,foo__five,bar__six,bar__seven
-1,2,3,4,5,6,7
-14,13,12,11,10,9,8
+one,two,foo__bar__three,foo__bar__four,foo__five,bar__six,nil,bar__seven
+1,2,3,4,5,6,,7
+14,13,12,11,10,9,,8

data/spec/assets/test.csv

@@ -1,3 +1,3 @@
-one,two,foo__bar__three,foo__bar__four, foo__five,bar__six,bar__seven
-1,2,3,4,5, 6,7
-14,13,12,11,10,9,8
+one,two,foo__bar__three,foo__bar__four, foo__five,bar__six,nil,,bar__seven
+1,2,3,4,5, 6,,,7
+14,13,12,11,10,9,,,8

data/spec/csv-hash_spec.rb

@@ -12,7 +12,7 @@ describe CSVHash do
     end
     
     it "should get correct column names (no spaces)" do
-      @columns.should == "one,two,foo__bar__three,foo__bar__four,foo__five,bar__six,bar__seven".split(',')
+      @columns.should == ["one", "two", "foo__bar__three", "foo__bar__four", "foo__five", "bar__six", "nil", "bar__seven"]
     end
     
     it "should only include data rows" do
@@ -27,7 +27,8 @@ describe CSVHash do
           "bar" => {"three" => "3", "four" => "4"},
           "five" => "5"
         },
-        "bar" => {"six" => "6", "seven" => "7"}
+        "bar" => {"six" => "6", "seven" => "7"},
+        "nil" => nil
       }
       @array.first.should == first
       
@@ -38,14 +39,20 @@ describe CSVHash do
           "bar" => {"three" => "12", "four" => "11"},
           "five" => "10"
         },
-        "bar" => {"six" => "9", "seven" => "8"}
+        "bar" => {"six" => "9", "seven" => "8"},
+        "nil" => nil
       }
       @array.last.should == second
     end
   end
   
   
-  it "should do a round trip" do
+  it "should generate an expected file" do
     CSVHash.to_string(*CSVHash.from_file(@csv_path)).chomp.should == File.open(@clean_csv_path).read.chomp
   end
+  
+  it "should do a round trip" do
+    pending "Desire to add nil columns"
+    CSVHash.to_string(*CSVHash.from_file(@csv_path)).chomp.should == File.open(@csv_path).read.chomp
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tal Atlas