schematron 0.0.3 → 0.1.0

data/lib/schematron.rb

@@ -43,23 +43,31 @@ module Schematron
       # Validate the xml
       results_doc = @validator_xsl.apply instance_doc
 
-      # compile the errors
+      # compile the errors and log any messages
+      rule_hits(results_doc, instance_doc, 'assert', '//svrl:failed-assert') +
+      rule_hits(results_doc, instance_doc, 'report', '//svrl:successful-report')
+    end
+    
+    # Look for reported or failed rules of a particular type in the instance doc
+    def rule_hits(results_doc, instance_doc, rule_type, xpath)
+      
       results = []
       
-      results_doc.root.find('//svrl:failed-assert', NS_PREFIXES).each do |assert|
-        context = instance_doc.root.find_first assert['location']
-
-        assert.find('svrl:text/text()', NS_PREFIXES).each do |message|
+      results_doc.root.find(xpath, NS_PREFIXES).each do |hit|
+        context = instance_doc.root.find_first hit['location']
+        
+        hit.find('svrl:text/text()', NS_PREFIXES).each do |message|
           results << {
+            :rule_type => rule_type,
             :type => context.node_type_name,
             :name => context.name,
             :line => context.line_num,
             :message => message.content.strip }
         end
-
       end
       
       results
+      
     end
 
   end

data/schematron.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "schematron"
-  spec.version = '0.0.3'
+  spec.version = '0.1.0'
   spec.summary = "ISO Schematron Validation"
   spec.email = "flazzarino@gmail.com"
   spec.homepage = 'http://github.com/flazz/iso-schematron'

data/spec/schema/pim.sch

@@ -22,6 +22,14 @@
       </assert> 
     </rule>
 
- </pattern>
+  </pattern>
+  
+  <pattern name="METS should have embedded PREMIS">
+    <rule context="mets:mets">
+      <report test="not(//mets:mdWrap[@MDTYPE='PREMIS'])">
+        This METS file has no embedded PREMIS
+      </report>
+    </rule>
+  </pattern>
 
 </schema>

data/spec/schema_spec.rb

@@ -40,4 +40,20 @@ describe Schematron::Schema do
     results.should_not be_empty
   end
   
+  it "should log report rules in the results" do
+    schema_file = File.join 'spec', 'schema', 'pim.sch'
+    instance_file = File.join 'spec', 'instances', 'daitss-sip', 'Example1.xml'
+    
+    schema_doc = XML::Parser.file(schema_file).parse
+    instance_doc = XML::Parser.file(instance_file).parse
+    
+    stron = Schematron::Schema.new schema_doc
+    results = stron.validate instance_doc
+    
+    results.length.should == 1
+    results.first[:rule_type].should == 'report'
+    
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schematron
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Francesco Lazzarino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -04:00
+date: 2009-07-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency