be_valid_asset 1.1.2 → 1.2.0

data/MIT-LICENSE.txt

@@ -13,8 +13,8 @@ included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
-NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,7 +1,7 @@
 be\_valid\_asset
 ==============
 
-Provides `be_valid_xhtml`, `be_valid_css` and `be_valid_feed` matchers for rspec controller and view tests.
+Provides `be_valid_markup`, `be_valid_css` and `be_valid_feed` matchers for rspec controller and view tests.
 
 Installation
 ------------
@@ -28,7 +28,7 @@ See below for details of the configuration options available
 Usage
 -----
 
-### (X)HTML validation
+### Markup validation
 
 It can be used to test either an ActionController Response object as follows:
 
@@ -38,7 +38,7 @@ It can be used to test either an ActionController Response object as follows:
       describe "GET 'index'" do
         it "should have valid markup" do
           get 'index'
-          response.should be_valid_xhtml
+          response.should be_valid_markup
         end
       end
     end
@@ -46,24 +46,24 @@ It can be used to test either an ActionController Response object as follows:
 or
 
     describe "/index.html" do
-      it "should be valid XHTML" do
+      it "should be valid markup" do
         render 'home/index', :layout => true
-        response.should be_valid_xhtml
+        response.should be_valid_markup
       end
     end
 
 or to test a string:
 
-    it "should be valid xhtml" do
+    it "should be valid markup" do
       html = File.read(File.join(RAILS_ROOT, %w(public index.html)))
-      html.should be_valid_xhtml
+      html.should be_valid_markup
     end
 
-It is also possible to validate an xhtml fragment.  This assumes xhtml-1.0 strict.
+It is also possible to validate an html fragment.  This assumes xhtml-1.0 strict.
 
-    it "should be valid xhtml" do
+    it "should be valid html" do
       string = "<p>This is an html fragment</p>"
-      string.should be_valid_xhtml_fragment
+      string.should be_valid_markup_fragment
     end
 
 ### CSS validation
@@ -83,7 +83,7 @@ be\_valid\_css takes an optional parameter specifying the css profile to test ag
 
 ### Feed validation
 
-RSS and Atom feeds can be validated from a response, or a string, in the same way as for xhtml or CSS.  e.g.
+RSS and Atom feeds can be validated from a response, or a string, in the same way as for html or CSS.  e.g.
 
     describe FooController do
       integrate_views

data/lib/be_valid_asset.rb

@@ -28,6 +28,7 @@ module BeValidAsset
 end
 
 require 'be_valid_asset/be_valid_base'
+require 'be_valid_asset/be_valid_markup'
 require 'be_valid_asset/be_valid_xhtml'
 require 'be_valid_asset/be_valid_css'
 require 'be_valid_asset/be_valid_feed'

data/lib/be_valid_asset/be_valid_base.rb

@@ -8,7 +8,7 @@ module BeValidAsset
 
       def check_net_enabled
         if ENV["NONET"] == 'true'
-          raise Spec::Example::ExamplePendingError.new('Network tests disabled')
+          raise RSpec::Core::Pending::PendingDeclaredInExample.new('Network tests disabled')
         end
       end
 

data/lib/be_valid_asset/be_valid_xhtml.rb

@@ -1,68 +1,11 @@
-require 'net/http'
-require 'fileutils'
-require 'cgi'
-require 'digest/md5'
-require 'rexml/document'
-
 module BeValidAsset
   
-  Configuration.markup_validator_host = 'validator.w3.org'
-  Configuration.markup_validator_path = '/check'
-
-  class BeValidXhtml < BeValidBase
+  class BeValidXhtml < BeValidMarkup
   
     def initialize(options = {})
-      @fragment = options[:fragment]
-    end
-  
-    # Assert that markup (html/xhtml) is valid according the W3C validator web service.
-  
-    def matches?(fragment)
-
-      if fragment.respond_to? :body
-        fragment = fragment.body.to_s
-      end
-          
-      if fragment.empty?
-        @message = "Response was blank (maybe a missing integrate_views)"
-        return false
-      end
-
-      query_params = { :fragment => fragment }
-      if @fragment
-        query_params[:prefill] = '1'
-        query_params[:prefill_doctype] = 'xhtml10'
-      end
-
-      return validate(query_params)
-    end
-  
-    def description
-      "be valid xhtml"
+      super
+      Kernel.warn('[DEPRECATION] - `be_valid_xhtml` is deprecated, use `be_valid_markup` instead')
     end
-  
-    def failure_message
-     " expected xhtml to be valid, but validation produced these errors:\n#{@message}"
-    end
-  
-    def negative_failure_message
-      " expected to not be valid, but was (missing validation?)"
-    end
-  
-    private
-
-      def validator_host
-        Configuration.markup_validator_host
-      end
-
-      def validator_path
-        Configuration.markup_validator_path
-      end
-
-      def error_line_prefix
-        'Invalid markup'
-      end
-
   end
 
   def be_valid_xhtml

data/spec/be_valid_asset/be_valid_css_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 unless defined?(SpecFailed)
-  SpecFailed = Spec::Expectations::ExpectationNotMetError
+  SpecFailed = RSpec::Expectations::ExpectationNotMetError
 end
 
 describe 'be_valid_css' do
@@ -76,7 +76,7 @@ describe 'be_valid_css' do
       css = get_file('valid.css')
       lambda {
         css.should be_valid_css
-      }.should raise_error(Spec::Example::ExamplePendingError)
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end
@@ -187,7 +187,7 @@ describe 'be_valid_css' do
       css = get_file('valid.css')
       lambda {
         css.should be_valid_css
-      }.should raise_error(Spec::Example::ExamplePendingError)
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end

data/spec/be_valid_asset/be_valid_feed_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 unless defined?(SpecFailed)
-  SpecFailed = Spec::Expectations::ExpectationNotMetError
+  SpecFailed = RSpec::Expectations::ExpectationNotMetError
 end
 
 describe 'be_valid_feed' do
@@ -82,7 +82,7 @@ describe 'be_valid_feed' do
       feed = get_file('valid_feed.xml')
       lambda {
         feed.should be_valid_feed
-      }.should raise_error(Spec::Example::ExamplePendingError)
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end
@@ -170,7 +170,7 @@ describe 'be_valid_feed' do
       feed = get_file('valid_feed.xml')
       lambda {
         feed.should be_valid_feed
-      }.should raise_error(Spec::Example::ExamplePendingError)
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end

data/spec/be_valid_asset/{be_valid_xhtml_spec.rb → be_valid_markup_spec.rb}

@@ -1,37 +1,52 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 unless defined?(SpecFailed)
-  SpecFailed = Spec::Expectations::ExpectationNotMetError
+  SpecFailed = RSpec::Expectations::ExpectationNotMetError
 end
 
-describe 'be_valid_xhtml' do
+describe 'be_valid_markup' do
 
   describe "without caching" do
     it "should validate a valid string" do
       html = get_file('valid.html')
-      html.should be_valid_xhtml
+      html.should be_valid_markup
     end
 
-    it "should validate a valid response" do
+    it "should validate a valid xhtml response" do
       response = MockResponse.new(get_file('valid.html'))
-      response.should be_valid_xhtml
+      response.should be_valid_markup
+    end
+    
+    it "should validate a valid html5 response" do
+      response = MockResponse.new(get_file('valid.html5'))
+      response.should be_valid_markup
+    end
+
+    it "should validate a valid html5 response when only 'source' is available" do
+      response = mock(:source => get_file('valid.html5'))
+      response.should be_valid_markup
+    end
+    
+    it "should validate a valid html5 response when only 'body' is available" do
+      response = mock(:body => get_file('valid.html5'))
+      response.should be_valid_markup
     end
 
     it "should validate if body is not a string but can be converted to valid string" do
       response = MockResponse.new(stub("XHTML", :to_s => get_file('valid.html')))
-      response.should be_valid_xhtml
+      response.should be_valid_markup
     end
 
     it "should validate a valid fragment" do
-      "<p>This is a Fragment</p>".should be_valid_xhtml_fragment
+      "<p>This is a Fragment</p>".should be_valid_markup_fragment
     end
 
     it "should not validate an invalid string" do
       html = get_file('invalid.html')
       lambda {
-        html.should be_valid_xhtml
+        html.should be_valid_markup
       }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+        e.message.should match(/expected markup to be valid, but validation produced these errors/)
         e.message.should match(/Invalid markup: line 12: end tag for "b" omitted, but OMITTAG NO was specified/)
         e.message.should match(/Invalid markup: line 12: end tag for element "b" which is not open/)
       }
@@ -40,9 +55,9 @@ describe 'be_valid_xhtml' do
     it "should not validate an invalid response" do
       response = MockResponse.new(get_file('invalid.html'))
       lambda {
-        response.should be_valid_xhtml
+        response.should be_valid_markup
       }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+        e.message.should match(/expected markup to be valid, but validation produced these errors/)
         e.message.should match(/Invalid markup: line 12: end tag for "b" omitted, but OMITTAG NO was specified/)
         e.message.should match(/Invalid markup: line 12: end tag for element "b" which is not open/)
       }
@@ -52,7 +67,7 @@ describe 'be_valid_xhtml' do
       BeValidAsset::Configuration.display_invalid_content = true
       html = get_file('invalid.html')
       lambda {
-        html.should be_valid_xhtml
+        html.should be_valid_markup
       }.should raise_error(SpecFailed) { |e|
         e.message.should match(/<p><b>This is an example invalid html file<\/p><\/b>/)
       }
@@ -71,9 +86,9 @@ describe 'be_valid_xhtml' do
       it "should display invalid lines when requested" do
         html = get_file('invalid.html')
         lambda do
-          html.should be_valid_xhtml
+          html.should be_valid_markup
         end.should raise_error(SpecFailed) { |e|
-          e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+          e.message.should match(/expected markup to be valid, but validation produced these errors/)
           e.message.should_not match(/0009  :/)
           e.message.should match(/0010  :/)
           e.message.should match(/0011  :/)
@@ -88,9 +103,9 @@ describe 'be_valid_xhtml' do
         BeValidAsset::Configuration.display_invalid_lines_count = 3
         html = get_file('invalid.html')
         lambda do
-          html.should be_valid_xhtml
+          html.should be_valid_markup
         end.should raise_error(SpecFailed) { |e|
-          e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+          e.message.should match(/expected markup to be valid, but validation produced these errors/)
           e.message.should_not match(/0010  :/)
           e.message.should match(/0011  :/)
           e.message.should match(/0012>>:/)
@@ -103,9 +118,9 @@ describe 'be_valid_xhtml' do
         BeValidAsset::Configuration.display_invalid_lines_count = 7
         html = get_file('invalid2.html')
         lambda do
-          html.should be_valid_xhtml
+          html.should be_valid_markup
         end.should raise_error(SpecFailed) { |e|
-          e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+          e.message.should match(/expected markup to be valid, but validation produced these errors/)
           e.message.should_not match(/0000  :/)
           e.message.should match(/0001  :/)
           e.message.should match(/0003>>:/)
@@ -116,9 +131,9 @@ describe 'be_valid_xhtml' do
         BeValidAsset::Configuration.display_invalid_lines_count = 11
         html = get_file('invalid.html')
         lambda do
-          html.should be_valid_xhtml
+          html.should be_valid_markup
         end.should raise_error(SpecFailed) { |e|
-          e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+          e.message.should match(/expected markup to be valid, but validation produced these errors/)
           e.message.should match(/0012>>:/)
           e.message.should match(/0015  :/)
           e.message.should_not match(/0016  :/)
@@ -129,7 +144,7 @@ describe 'be_valid_xhtml' do
     it "should fail when passed a response with a blank body" do
       response = MockResponse.new('')
       lambda {
-        response.should be_valid_xhtml
+        response.should be_valid_markup
       }.should raise_error(SpecFailed)
     end
 
@@ -142,7 +157,7 @@ describe 'be_valid_xhtml' do
       Net::HTTP.stub!(:start).and_return(h)
 
       lambda {
-        html.should be_valid_xhtml
+        html.should be_valid_markup
       }.should raise_error
     end
 
@@ -151,8 +166,8 @@ describe 'be_valid_xhtml' do
 
       html = get_file('valid.html')
       lambda {
-        html.should be_valid_xhtml
-      }.should raise_error(Spec::Example::ExamplePendingError)
+        html.should be_valid_markup
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end
@@ -170,25 +185,25 @@ describe 'be_valid_xhtml' do
     it "should validate a valid string and cache the response" do
       html = get_file('valid.html')
       count = Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size
-      html.should be_valid_xhtml
+      html.should be_valid_markup
       Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size.should eql(count + 1)
     end
 
     it "should validate a valid string using the cached response" do
       html = get_file('valid.html')
-      html.should be_valid_xhtml
+      html.should be_valid_markup
 
       Net::HTTP.should_not_receive(:start)
-      html.should be_valid_xhtml
+      html.should be_valid_markup
     end
 
     it "should not validate an invalid response, but still cache the response" do
       response = MockResponse.new(get_file('invalid.html'))
       count = Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size
       lambda {
-        response.should be_valid_xhtml
+        response.should be_valid_markup
       }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+        e.message.should match(/expected markup to be valid, but validation produced these errors/)
         e.message.should match(/Invalid markup: line 12: end tag for "b" omitted, but OMITTAG NO was specified/)
         e.message.should match(/Invalid markup: line 12: end tag for element "b" which is not open/)
       }
@@ -197,13 +212,13 @@ describe 'be_valid_xhtml' do
 
     it "should not validate an invalid response, but use the cached response" do
       response = MockResponse.new(get_file('invalid.html'))
-      response.should_not be_valid_xhtml
+      response.should_not be_valid_markup
 
       Net::HTTP.should_not_receive(:start)
       lambda {
-        response.should be_valid_xhtml
+        response.should be_valid_markup
       }.should raise_error(SpecFailed) { |e|
-        e.message.should match(/expected xhtml to be valid, but validation produced these errors/)
+        e.message.should match(/expected markup to be valid, but validation produced these errors/)
         e.message.should match(/Invalid markup: line 12: end tag for "b" omitted, but OMITTAG NO was specified/)
         e.message.should match(/Invalid markup: line 12: end tag for element "b" which is not open/)
       }
@@ -219,19 +234,19 @@ describe 'be_valid_xhtml' do
       Net::HTTP.stub!(:start).and_return(h)
 
       lambda {
-        html.should be_valid_xhtml
+        html.should be_valid_markup
       }.should raise_error
       Dir.glob(BeValidAsset::Configuration.cache_path + '/*').size.should eql(count)
     end
 
     it "should use the cached result (if available) when network tests disabled" do
       html = get_file('valid.html')
-      html.should be_valid_xhtml
+      html.should be_valid_markup
 
       ENV['NONET'] = 'true'
 
       Net::HTTP.should_not_receive(:start)
-      html.should be_valid_xhtml
+      html.should be_valid_markup
 
       ENV.delete('NONET')
     end
@@ -241,8 +256,8 @@ describe 'be_valid_xhtml' do
 
       html = get_file('valid.html')
       lambda {
-        html.should be_valid_xhtml
-      }.should raise_error(Spec::Example::ExamplePendingError)
+        html.should be_valid_markup
+      }.should raise_error(RSpec::Core::Pending::PendingDeclaredInExample)
 
       ENV.delete('NONET')
     end
@@ -261,26 +276,22 @@ describe 'be_valid_xhtml' do
     it "should use direct http without ENV['http_proxy']" do
       ENV.delete('http_proxy')
       Net::HTTP.should_receive(:start).with(BeValidAsset::Configuration.markup_validator_host).and_return(@http)
-      @html.should be_valid_xhtml
+      @html.should be_valid_markup
     end
 
     it "should use proxied http connection with ENV['http_proxy']" do
       ENV['http_proxy'] = "http://user:pw@localhost:3128"
       Net::HTTP.should_receive(:start).with(BeValidAsset::Configuration.markup_validator_host, nil, 'localhost', 3128, "user", "pw").and_return(@http)
-      @html.should be_valid_xhtml
+      @html.should be_valid_markup
       ENV.delete('http_proxy')
     end
 
     it "should raise exception with invalid http_proxy" do
       ENV['http_proxy'] = "http://invalid:uri"
       lambda {
-        @html.should be_valid_xhtml
+        @html.should be_valid_markup
       }.should raise_error(URI::InvalidURIError)
       ENV.delete('http_proxy')
     end
   end
-
-  it "should have a be_valid_html alias method" do
-    method(:be_valid_html).should == method(:be_valid_xhtml)
-  end
 end

data/spec/files/valid.html5

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>Test Valid Page</title>
+</head>
+
+<body>
+
+<h1>Test#valid</h1>
+<p>This is an example valid html5 file</p>
+<br>
+</body>
+</html>

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec/autorun'
+require 'rspec'
 
 begin
   require 'ruby-debug'
@@ -10,7 +10,7 @@ $: << File.join(File.dirname(__FILE__), %w(.. lib))
 
 require 'be_valid_asset'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include BeValidAsset
   
   BeValidAsset::Configuration.cache_path = File.join(File.dirname(__FILE__), 'tmp')
@@ -23,10 +23,14 @@ end
 
 class MockResponse
   def initialize(body_text)
-    @body = body_text
+    @source = @body = body_text
   end
   
   def body
     @body
   end
+  
+  def source
+    @source
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: be_valid_asset
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Alex Tomlins
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-03 00:00:00 +01:00
+date: 2012-05-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ files:
 - lib/be_valid_asset.rb
 - spec/be_valid_asset/be_valid_css_spec.rb
 - spec/be_valid_asset/be_valid_feed_spec.rb
-- spec/be_valid_asset/be_valid_xhtml_spec.rb
+- spec/be_valid_asset/be_valid_markup_spec.rb
 - spec/spec_helper.rb
 - spec/files/invalid.css
 - spec/files/invalid.html
@@ -64,6 +64,7 @@ files:
 - spec/files/valid-3.css
 - spec/files/valid.css
 - spec/files/valid.html
+- spec/files/valid.html5
 - spec/files/valid_feed.xml
 - spec/spec.opts
 has_rdoc: true
@@ -96,11 +97,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Markup validation for RSpec
 test_files: 
 - spec/be_valid_asset/be_valid_css_spec.rb
 - spec/be_valid_asset/be_valid_feed_spec.rb
-- spec/be_valid_asset/be_valid_xhtml_spec.rb
+- spec/be_valid_asset/be_valid_markup_spec.rb