Create more fine-grained errors and warnings for content type issues

Data-Liberation-Front · Jan 13, 2014 · 02ce93d · 02ce93d
1 parent 1deedcf
commit 02ce93d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 39 deletions.
diff --git a/features/fixtures/spreadsheet.xls b/features/fixtures/spreadsheet.xls
diff --git a/features/validation_errors.feature b/features/validation_errors.feature
@@ -64,4 +64,35 @@ Feature: Get validation errors
     And I set an encoding header of "ISO-8859-1"    
     And it is stored at the url "http://example.com/example1.csv"
     When I ask if there are errors
-    Then there should be 0 error  
+    Then there should be 0 error  
+    
+   Scenario: Report invalid file
+    Given I have a CSV file called "spreadsheet.xls"
+    And it is stored at the url "http://example.com/example1.csv"
+    When I ask if there are errors
+    Then there should be 1 error    
+    And that error should have the type "invalid_encoding"
+    
+  Scenario: Incorrect content type
+    Given I have a CSV with the following content:
+    """
+"abc","2","3"
+    """
+    And the content type is set to "application/excel"
+    And it is stored at the url "http://example.com/example1.xls"
+    And I ask if there are errors
+    Then there should be 1 error
+    And that error should have the type "wrong_content_type"
+
+  Scenario: Incorrect extension
+    Given I have a CSV with the following content:
+    """
+"abc","2","3"
+    """
+    And the content type is set to "application/excel"
+    And it is stored at the url "http://example.com/example1.csv"
+    And I ask if there are errors
+    Then there should be 1 error
+    And that error should have the type "wrong_content_type"
+    
+    
diff --git a/features/validation_warnings.feature b/features/validation_warnings.feature
@@ -29,39 +29,6 @@ Feature: Validation warnings
     And it is stored at the url "http://example.com/example1.csv"
     And I ask if there are warnings
     Then there should be 0 warnings
-
-  Scenario: Incorrect content type
-    Given I have a CSV with the following content:
-    """
-"abc","2","3"
-    """
-    And the content type is set to "application/excel"
-    And it is stored at the url "http://example.com/example1.xls"
-    And I ask if there are warnings
-    Then there should be 1 warnings
-    And that warning should have the type "content_type"
-
-  Scenario: Incorrect extension
-    Given I have a CSV with the following content:
-    """
-"abc","2","3"
-    """
-    And the content type is set to "text/csv"
-    And it is stored at the url "http://example.com/example1.xls"
-    And I ask if there are warnings
-    Then there should be 1 warnings
-    And that warning should have the type "extension"
-
-  Scenario: Incorrect extension
-    Given I have a CSV with the following content:
-    """
-"abc","2","3"
-    """
-    And the content type is set to "application/excel"
-    And it is stored at the url "http://example.com/example1.csv"
-    And I ask if there are warnings
-    Then there should be 2 warnings
-    And that warning should have the type "extension"
 
   Scenario: No extension
     Given I have a CSV with the following content:

diff --git a/lib/csvlint/validate.rb b/lib/csvlint/validate.rb
@@ -34,16 +34,14 @@ def validate
         @encoding = s.charset rescue nil
         @content_type = s.content_type rescue nil
         @headers = s.meta        
-        mime_types = MIME::Types.type_for(@url)
-        if mime_types.count > 0 && mime_types.select { |m| @content_type == m.content_type }.count == 0
-          build_warnings(:extension, nil)
-        end
         if @headers["content-type"] !~ /charset=/
           build_warnings(:no_encoding, nil) 
         else
           build_warnings(:encoding, nil) if @encoding != "utf-8"
         end
-        build_warnings(:content_type, nil) unless @content_type =~ /text\/csv/
+        build_warnings(:no_content_type, nil) if @content_type == nil
+        build_warnings(:excel, nil) if @content_type == nil && @extension =~ /.xls(x)?/
+        build_errors(:wrong_content_type, nil) unless (@content_type && @content_type =~ /text\/csv/)
         s.each_line(@line_terminator) do |line|
           begin
             current_line = current_line + 1