Merge pull request #10 from culturecode/master

Always return nil when named column isn't found.
tatey · Mar 4, 2015 · f92825e · f92825e
2 parents 332a5bb + 9df2c1d
commit f92825e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/conformist/column.rb b/lib/conformist/column.rb
@@ -18,11 +18,15 @@ def calculate_indices!(headers)
         else
           source
         end
-      end.compact
+      end
     end
 
     def values_in enumerable
-      values = Array(enumerable).values_at(*indexes).map do |value|
+      enumerable = Array(enumerable)
+
+      values = Array(indexes).map do |index|
+        value = enumerable.at(index) if index
+
         if value.respond_to? :strip
           value.strip
         else

diff --git a/test/unit/integration_test.rb b/test/unit/integration_test.rb
@@ -100,4 +100,13 @@ def test_named_columns
     first      = enumerable.to_a.first
     assert_equal HashStruct.new(:name => 'Aaron', :age => '21', :gender => 'Male'), first
   end
+
+  def test_missing_named_column
+    schema = Conformist.new do
+      column :state, 'State'
+    end
+    enumerable = schema.conform open_csv('citizens.csv'), :skip_first => true
+    first      = enumerable.to_a.first
+    assert_equal HashStruct.new(:state => nil), first
+  end
 end