0
@@ -135,11 +135,15 @@ VALUE fastxml_doc_initialize(int argc, VALUE* argv, VALUE self)
0
     }
0
 
0
     if (opts != Qnil) {
0
-        if (rb_hash_aref(opts, rb_sValidateDtd) != Qnil) 
0
+        if (rb_hash_aref(opts, rb_sValidateDtd) == Qtrue) {
0
             parser_opts = parser_opts | XML_PARSE_DTDLOAD | XML_PARSE_DTDATTR | XML_PARSE_DTDVALID;
0
-        
0
-        if (rb_hash_aref(opts, rb_sForgivingParse) != Qnil) 
0
+			rb_iv_set( self, "@validate_dtd", Qtrue );
0
+        }
0
+
0
+        if (rb_hash_aref(opts, rb_sForgivingParse) == Qtrue) {
0
             parser_opts = parser_opts | XML_PARSE_RECOVER;
0
+			rb_iv_set( self, "@forgiving", Qtrue );
0
+		}
0
     }
0
 
0
   if (rb_respond_to( xml_doc_str, s_readlines )) {

0
@@ -36,6 +36,14 @@ class FastXml::Doc
0
     nil
0
   end
0
   
0
+  def forgiving?
0
+    (@forgiving ||= false)
0
+  end
0
+  
0
+  def  validate?
0
+    (@validate_dtd ||= false)
0
+  end
0
+  
0
   def xpath
0
     "/"
0
   end

0
@@ -18,6 +18,20 @@ describe FastXml::Doc, " functionality" do
0
     doc = FastXml::Doc.new( @data_str, { :forgiving => true } )
0
     doc.should_not be_nil
0
   end
0
+  
0
+  it 'should support a forgiving option' do
0
+    doc = FastXml::Doc.new( @data_str, { :forgiving => true } )
0
+    doc.forgiving?.should == true
0
+    alt_doc = FastXml::Doc.new( @data_str, { :forgiving => false } )
0
+    alt_doc.forgiving?.should == false
0
+  end 
0
+  
0
+  it 'should support a validate option' do
0
+    doc = FastXml::Doc.new( @data_str, { :validate => true } )
0
+    doc.validate?.should == true
0
+    alt_doc = FastXml::Doc.new( @data_str, { :validate => false } )
0
+    alt_doc.validate?.should == false    
0
+  end
0
 
0
   it 'should have a root node accessor' do
0
     @doc.should respond_to( :root )