rcsvreader 0.1.2 → 0.1.3

data/lib/csv_reader.rb

@@ -16,10 +16,10 @@ module CSVReader
   
   class Reader
   
-    def initialize(file, expected_header)
+    def initialize(file, mandatory_field)
       @file = file
-      check_header(expected_header)
-      @expected_header = expected_header
+      check_header(mandatory_field)
+      @mandatory_field = mandatory_field
     end
   
     # Iterates through the CSV file
@@ -42,14 +42,14 @@ module CSVReader
       return @header
     end
   
-    def check_header(expected_header)
+    def check_header(mandatory_field)
       curr_header = header
-      if (expected_header.empty?)
+      if (mandatory_field.empty?)
         raise InvalidHeaderException, "Expected header cannot be empty."
       end
-      if (curr_header.size < expected_header.size ||
-          (curr_header & expected_header).empty?)
-          raise InvalidHeaderException, "Expected header #{expected_header} does not match or is not contained in the current header #{curr_header}."
+      if (curr_header.size < mandatory_field.size ||
+          (curr_header & mandatory_field).empty?)
+          raise InvalidHeaderException, "Expected header #{mandatory_field} does not match or is not contained in the current header #{curr_header}."
       end
     end
   
@@ -66,14 +66,14 @@ module CSVReader
     def parse_row(r)
       row = {}
       i = 0
-      @expected_header.each do |column|
+      @mandatory_field.each do |column|
         row[column] = r[header.index(column)]
         i += 1
       end
       return row
     end
   
-    private :parse_row, :header, :check_header
+    private :parse_row, :check_header
       
   end
 

data/test/data/foo.csv

@@ -2,4 +2,4 @@ name,email
 Daniel Quirino Oliveira,danielqo@gmail.com
 John Doe,doe@email.com
 ,anon@noemail.com
-Sem Email, 
+Sem Email,

data/test/data/foo2.csv

@@ -0,0 +1,5 @@
+"name","email"
+Daniel Quirino Oliveira,danielqo@gmail.com
+John Doe,doe@email.com
+,anon@noemail.com
+Sem Email,

data/test/test.rb

@@ -28,6 +28,12 @@ class TestCSVReader < Test::Unit::TestCase
     assert_equal expected_lines, lines
   end
   
+  def test_header
+    expected_header = ["name","email"]
+    reader = CSVReader::Reader.new("#{@data_dir}/foo.csv", expected_header)
+    assert_equal reader.header, expected_header
+  end
+  
   def test_fetch_all_rows_and_all_columns_unsorted
     reader = CSVReader::Reader.new("#{@data_dir}/foo.csv", ["email","name"])
     expected_lines = 4

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rcsvreader
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Quirino Oliveira
@@ -9,19 +14,22 @@ autorequire: name
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -03:00
+date: 2010-04-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ccsv
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
         version: "0.1"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: daniel@nullability.org
 executables: []
@@ -45,21 +53,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Yet another CSV parser with CSV header validation, based on CCSV (http://github.com/fauna/ccsv/).
 test_files: 
 - test/data/foo.csv
+- test/data/foo2.csv
 - test/test.rb