w3c_validators 0.9.2 → 0.9.3

data/README

@@ -18,7 +18,7 @@ W3CValidators::CSSValidator.
 Each validator has offers three different validation methods.
 
 * +validate_text+ methods take a string
-* +validate_file+ methods take a path to a file
+* +validate_file+ methods take a path to a file or an IO object
 * +validate_uri+ methods take a published URL
 
 In addition, the W3CValidators::MarkupValidator has a validate_uri_quickly method, which 
@@ -114,5 +114,7 @@ Documentation and the source code are available at http://code.dunae.ca/w3c_vali
 
 Written by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007.
 
-Thanks to Ryan King (http://theryanking.com/) for creating the 0.9.1 update.
+Thanks to Ryan King (http://theryanking.com/) for creating the 0.9.2 update.
+
+Thanks to Ryan King (http://theryanking.com/) and Jonathan Julian for creating the 0.9.3 update.
   

data/lib/w3c_validators/css_validator.rb

@@ -64,11 +64,16 @@ module W3CValidators
     
     # Validate the CSS of a local file.
     #
-    # +file_path+ must be the fully-expanded path to the file.
+    # +file_path+ may be either the fully-expanded path to the file or
+    # an IO object (like File).
     #
     # Returns W3CValidators::Results.
     def validate_file(file_path)
-      src = read_local_file(file_path)
+      if file_path.respond_to? :read
+        src = file_path.read
+      else
+        src = read_local_file(file_path)
+      end 
       return validate_text(src)
     end
 
@@ -76,10 +81,8 @@ module W3CValidators
 protected
     def validate(options) # :nodoc:
       options = get_request_options(options)
-      #puts options.inspect
       response = send_request(options, :get)
       @results = parse_soap_response(response.body)
-      #puts response.body
       @results
     end
 

data/lib/w3c_validators/feed_validator.rb

@@ -33,11 +33,16 @@ module W3CValidators
 
     # Validate a local feed file.
     #
-    # +file_path+ must be the fully-expanded path to the file.
+    # +file_path+ may be either the fully-expanded path to the file or
+    # an IO object (like File).
     #
     # Returns W3CValidators::Results.
     def validate_file(file_path)
-      src = read_local_file(file_path)
+      if file_path.respond_to? :read
+        src = file_path.read
+      else
+        src = read_local_file(file_path)
+      end
       return validate_text(src)
     end
 

data/lib/w3c_validators/markup_validator.rb

@@ -101,12 +101,18 @@ module W3CValidators
     
     # Validate the markup of a local file.
     #
-    # +file_path+ must be the fully-expanded path to the file.
+    # +file_path+ may be either the fully-expanded path to the file or
+    # an IO object (like File).
     #
     # Returns W3CValidators::Results.
     def validate_file(file_path)
-      src = read_local_file(file_path)
-      return validate({:uploaded_file => src}, false)
+      if file_path.respond_to? :read
+        src = file_path.read
+      else
+        src = read_local_file(file_path)
+      end 
+
+      return validate({:uploaded_file => src, :file_path => file_path}, false)
     end
 
 protected

data/test/test_css_validator.rb

@@ -38,5 +38,14 @@ class CSSValidatorTests < Test::Unit::TestCase
     assert_equal 1, r.errors.length
   end
 
+  def test_validating_text_via_file
+    file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_css.css')
+    fh = File.new(file_path, 'r+')    
+    r = @v.validate_file(fh)
+    fh.close
+    assert_equal 1, r.errors.length
+  end
+
+
  
 end

data/test/test_feed_validator.rb

@@ -47,5 +47,15 @@ class FeedValidatorTests < Test::Unit::TestCase
     assert_equal 1, r.errors.length
   end
 
+
+  def test_validating_text_via_file
+    file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/invalid_feed.xml')
+    fh = File.new(file_path, 'r+')    
+    r = @v.validate_file(fh)
+    fh.close
+    assert_equal 1, r.errors.length
+  end
+
+
  
 end

data/test/test_markup_validator.rb

@@ -54,6 +54,8 @@ class MarkupValidatorTests < Test::Unit::TestCase
     file = File.dirname(__FILE__) + '/fixtures/invalid_markup.html'
     r = @v.validate_file(file)
     assert_equal 1, r.errors.length
+    
+    assert r.uri =~ /fixtures\/invalid_markup\.html$/
   end
 
   def test_validating_text
@@ -70,6 +72,14 @@ class MarkupValidatorTests < Test::Unit::TestCase
     assert_equal 0, r.warnings.length
   end
 
+  def test_validating_text_via_file
+    fh = File.new(File.dirname(__FILE__) + '/fixtures/invalid_markup.html', 'r+')    
+    r = @v.validate_file(fh)
+    fh.close
+    assert_equal 1, r.errors.length
+  end
+
+
   def test_validator_abort
     @v.set_debug!
     assert_nothing_raised do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: w3c_validators
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2008-02-08 00:00:00 -08:00
+  version: 0.9.3
+date: 2008-03-11 00:00:00 -07:00
 summary: Wrapper for the World Wide Web Consortium's online validation services.
 require_paths: 
 - lib