lib/markup_validity/MarkUp.html lib/markup_validity/SCHEMA.html lib/markup_validity/examples.html lib/markup_validity/templates.html lib/markup_validity/xframes-1.xsd lib/markup_validity/xhtml-access-1.xsd lib/markup_validity/xhtml-applet-1.xsd lib/markup_validity/xhtml-attribs-1.xsd lib/markup_validity/xhtml-base-1.xsd lib/markup_validity/xhtml-basic-form-1.xsd lib/markup_validity/xhtml-basic-table-1.xsd lib/markup_validity/xhtml-basic10-model-1.xsd lib/markup_validity/xhtml-basic10-module-redefines-1.xsd lib/markup_validity/xhtml-basic10-modules-1.xsd lib/markup_validity/xhtml-basic10.xsd lib/markup_validity/xhtml-basic11-model-1.xsd lib/markup_validity/xhtml-basic11-modules-1.xsd lib/markup_validity/xhtml-basic11.xsd lib/markup_validity/xhtml-bdo-1.xsd lib/markup_validity/xhtml-blkphras-1.xsd lib/markup_validity/xhtml-blkpres-1.xsd lib/markup_validity/xhtml-blkstruct-1.xsd lib/markup_validity/xhtml-charent-1.xsd lib/markup_validity/xhtml-copyright-1.xsd lib/markup_validity/xhtml-csismap-1.xsd lib/markup_validity/xhtml-datatypes-1.xsd lib/markup_validity/xhtml-edit-1.xsd lib/markup_validity/xhtml-events-1.xsd lib/markup_validity/xhtml-form-1.xsd lib/markup_validity/xhtml-frames-1.xsd lib/markup_validity/xhtml-framework-1.xsd lib/markup_validity/xhtml-hypertext-1.xsd lib/markup_validity/xhtml-iframe-1.xsd lib/markup_validity/xhtml-image-1.xsd lib/markup_validity/xhtml-inlphras-1.xsd lib/markup_validity/xhtml-inlpres-1.xsd lib/markup_validity/xhtml-inlstruct-1.xsd lib/markup_validity/xhtml-inlstyle-1.xsd lib/markup_validity/xhtml-inputmode-1.xsd lib/markup_validity/xhtml-legacy-1.xsd lib/markup_validity/xhtml-link-1.xsd lib/markup_validity/xhtml-list-1.xsd lib/markup_validity/xhtml-meta-1.xsd lib/markup_validity/xhtml-metaAttributes-1.xsd lib/markup_validity/xhtml-misc-1.xsd lib/markup_validity/xhtml-nameident-1.xsd lib/markup_validity/xhtml-notations-1.xsd lib/markup_validity/xhtml-object-1.xsd lib/markup_validity/xhtml-param-1.xsd lib/markup_validity/xhtml-pres-1.xsd lib/markup_validity/xhtml-print-1.xsd lib/markup_validity/xhtml-print-model-1.xsd lib/markup_validity/xhtml-print-modules-1.xsd lib/markup_validity/xhtml-rdfa-1.dtd lib/markup_validity/xhtml-rdfa-1.xsd lib/markup_validity/xhtml-rdfa-model-1.xsd lib/markup_validity/xhtml-rdfa-modules-1.xsd lib/markup_validity/xhtml-ruby-1.xsd lib/markup_validity/xhtml-ruby-basic-1.xsd lib/markup_validity/xhtml-script-1.xsd lib/markup_validity/xhtml-ssismap-1.xsd lib/markup_validity/xhtml-struct-1.xsd lib/markup_validity/xhtml-style-1.xsd lib/markup_validity/xhtml-table-1.xsd lib/markup_validity/xhtml-target-1.xsd lib/markup_validity/xhtml-text-1.xsd lib/markup_validity/xhtml11-model-1.xsd lib/markup_validity/xhtml11-module-redefines-1.xsd lib/markup_validity/xhtml11-modules-1.xsd lib/markup_validity/xhtml11.xsd lib/markup_validity/xhtml2.xsd lib/markup_validity/xml-events-1.xsd lib/markup_validity/xml-events-2.xsd lib/markup_validity/xml-events-attribs-1.xsd lib/markup_validity/xml-events-attribs-2.xsd lib/markup_validity/xml-events-copyright-1.xsd lib/markup_validity/xml-events-copyright-2.xsd lib/markup_validity/xml-handlers-1.xsd lib/markup_validity/xml-handlers-2.xsd lib/markup_validity/xml-script-1.xsd @@ -4,14 +4,102 @@ Manifest.txt README.rdoc Rakefile lib/markup_validity.rb +lib/markup_validity/MarkUp.html +lib/markup_validity/SCHEMA.html lib/markup_validity/assertions.rb +lib/markup_validity/examples.html lib/markup_validity/rspec.rb +lib/markup_validity/templates.html lib/markup_validity/validator.rb +lib/markup_validity/xframes-1.xsd +lib/markup_validity/xhtml-access-1.xsd +lib/markup_validity/xhtml-applet-1.xsd +lib/markup_validity/xhtml-attribs-1.xsd +lib/markup_validity/xhtml-base-1.xsd +lib/markup_validity/xhtml-basic-form-1.xsd +lib/markup_validity/xhtml-basic-table-1.xsd +lib/markup_validity/xhtml-basic10-model-1.xsd +lib/markup_validity/xhtml-basic10-module-redefines-1.xsd +lib/markup_validity/xhtml-basic10-modules-1.xsd +lib/markup_validity/xhtml-basic10.xsd +lib/markup_validity/xhtml-basic11-model-1.xsd +lib/markup_validity/xhtml-basic11-modules-1.xsd +lib/markup_validity/xhtml-basic11.xsd +lib/markup_validity/xhtml-bdo-1.xsd +lib/markup_validity/xhtml-blkphras-1.xsd +lib/markup_validity/xhtml-blkpres-1.xsd +lib/markup_validity/xhtml-blkstruct-1.xsd +lib/markup_validity/xhtml-charent-1.xsd +lib/markup_validity/xhtml-copyright-1.xsd +lib/markup_validity/xhtml-csismap-1.xsd +lib/markup_validity/xhtml-datatypes-1.xsd +lib/markup_validity/xhtml-edit-1.xsd +lib/markup_validity/xhtml-events-1.xsd +lib/markup_validity/xhtml-form-1.xsd +lib/markup_validity/xhtml-frames-1.xsd +lib/markup_validity/xhtml-framework-1.xsd +lib/markup_validity/xhtml-hypertext-1.xsd +lib/markup_validity/xhtml-iframe-1.xsd +lib/markup_validity/xhtml-image-1.xsd +lib/markup_validity/xhtml-inlphras-1.xsd +lib/markup_validity/xhtml-inlpres-1.xsd +lib/markup_validity/xhtml-inlstruct-1.xsd +lib/markup_validity/xhtml-inlstyle-1.xsd +lib/markup_validity/xhtml-inputmode-1.xsd +lib/markup_validity/xhtml-lat1.ent +lib/markup_validity/xhtml-legacy-1.xsd +lib/markup_validity/xhtml-link-1.xsd +lib/markup_validity/xhtml-list-1.xsd +lib/markup_validity/xhtml-meta-1.xsd +lib/markup_validity/xhtml-metaAttributes-1.xsd +lib/markup_validity/xhtml-misc-1.xsd +lib/markup_validity/xhtml-nameident-1.xsd +lib/markup_validity/xhtml-notations-1.xsd +lib/markup_validity/xhtml-object-1.xsd +lib/markup_validity/xhtml-param-1.xsd +lib/markup_validity/xhtml-pres-1.xsd +lib/markup_validity/xhtml-print-1.xsd +lib/markup_validity/xhtml-print-model-1.xsd +lib/markup_validity/xhtml-print-modules-1.xsd +lib/markup_validity/xhtml-rdfa-1.dtd +lib/markup_validity/xhtml-rdfa-1.xsd +lib/markup_validity/xhtml-rdfa-model-1.xsd +lib/markup_validity/xhtml-rdfa-modules-1.xsd +lib/markup_validity/xhtml-ruby-1.xsd +lib/markup_validity/xhtml-ruby-basic-1.xsd +lib/markup_validity/xhtml-script-1.xsd +lib/markup_validity/xhtml-special.ent +lib/markup_validity/xhtml-ssismap-1.xsd +lib/markup_validity/xhtml-struct-1.xsd +lib/markup_validity/xhtml-style-1.xsd +lib/markup_validity/xhtml-symbol.ent +lib/markup_validity/xhtml-table-1.xsd +lib/markup_validity/xhtml-target-1.xsd +lib/markup_validity/xhtml-text-1.xsd +lib/markup_validity/xhtml1-strict.dtd lib/markup_validity/xhtml1-strict.xsd +lib/markup_validity/xhtml1-transitional.dtd lib/markup_validity/xhtml1-transitional.xsd +lib/markup_validity/xhtml11-model-1.xsd +lib/markup_validity/xhtml11-module-redefines-1.xsd +lib/markup_validity/xhtml11-modules-1.xsd +lib/markup_validity/xhtml11.xsd +lib/markup_validity/xhtml2.xsd +lib/markup_validity/xml-events-1.xsd +lib/markup_validity/xml-events-2.xsd +lib/markup_validity/xml-events-attribs-1.xsd +lib/markup_validity/xml-events-attribs-2.xsd +lib/markup_validity/xml-events-copyright-1.xsd +lib/markup_validity/xml-events-copyright-2.xsd +lib/markup_validity/xml-handlers-1.xsd +lib/markup_validity/xml-handlers-2.xsd +lib/markup_validity/xml-script-1.xsd lib/markup_validity/xml.xsd spec/matcher_spec.rb +test/assets/invalid_entity.xhtml +test/assets/invalid_entity_transitional.xhtml test/assets/order.xml test/assets/shipment.xsd test/helper.rb test/test_markup_validity.rb + Manifest.txt @@ -4,7 +4,7 @@ require 'markup_validity/assertions' require 'markup_validity/rspec' module MarkupValidity - VERSION = '1.0.0' + VERSION = '1.0.1' end if defined? Test::Unit::TestCase lib/markup_validity.rb @@ -16,6 +16,13 @@ module MarkupValidity end ### + # Assert that +xhtml+ is valid XHTML+RDFa + def asser_xhtml_rdfa xhtml + validator = Validator.new xhtml, Validator::XHTML1_RDFA + assert validator.valid?, validator.inspect + end + + ### # Assert that +xml+ conforms to +schema+ def assert_schema schema, xml validator = Validator.new xml, Nokogiri::XML::Schema(schema) lib/markup_validity/assertions.rb @@ -37,6 +37,25 @@ module Spec end ### + # Assert that something is XHTML+RDFa + def be_xhtml_rdfa + Matcher.new :be_xhtml_strict do + validator = nil + match do |xhtml| + validator = MarkupValidity::Validator.new( + xhtml, + MarkupValidity::Validator::XHTML1_RDFA + ) + validator.valid? + end + + failure_message_for_should do |actual| + validator.inspect + end + end + end + + ### # Assert that something validates given +schema+ def be_valid_with_schema schema Matcher.new :be_valid_with_schema, schema do |_schema_| lib/markup_validity/rspec.rb @@ -5,6 +5,7 @@ module MarkupValidity File.read('xhtml1-transitional.xsd') ) XHTML1_STRICT = Nokogiri::XML::Schema(File.read('xhtml1-strict.xsd')) + XHTML1_RDFA = Nokogiri::XML::Schema(File.read('xhtml-rdfa-1.xsd')) end DTD_REFS = { @@ -16,6 +17,10 @@ module MarkupValidity 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd', 'xhtml1-transitional.dtd' ], + XHTML1_RDFA => [ + 'http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd', + 'xhtml-rdfa-1.dtd' + ] } attr_reader :errors lib/markup_validity/validator.rb @@ -26,6 +26,14 @@ module Spec Matchers.invalid_document.should_not be_xhtml_strict end + it "is xhtml+rdfa" do + Matchers.valid_document.should be_xhtml_rdfa + end + + it "is no xhtml+rdfa" do + Matchers.invalid_document.should_not be_xhtml_rdfa + end + XSD = File.read( File.expand_path( File.join(File.dirname(__FILE__),'..','test','assets','shipment.xsd') spec/matcher_spec.rb 20dc4e8ded9785f4f8ef912ba42f31be578c7035 Jason Ronallo jason@jaron.(none) http://github.com/tenderlove/markup_validity/commit/c6601c29b958e7a1ecc8b0a5d59cf8a88fecad2e c6601c29b958e7a1ecc8b0a5d59cf8a88fecad2e 2009-08-04T12:48:25-07:00 2009-08-04T12:48:25-07:00 adding support for validating XHTML+RDFa 18d1ebb13a51098f4c8f71cb31e8ba49622ed4fb Jason Ronallo jason@jaron.(none)