ruby_rnv 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce96c14db6a65519b008b024bdd445baa77d7fd8dc7c4058036069b570137ffc
-  data.tar.gz: ea3d0f24683bc0534c59ed42780e3f09fec6065fa4d45cb338661000d04e9e4f
+  metadata.gz: a97a5b35a39aa2ad603660b81b9c13e04375dafbc9f537fec0720357befd53f8
+  data.tar.gz: 54dff4be913ec5e3e356cb43c5d58a936aa6aa76f38212212a19f3057875f22c
 SHA512:
-  metadata.gz: fbf7ae9c188ca229dcc96c468dc5cf5b4cade193d49dd65fdc1ad9e1e7fcf124fb7a536c8b0a8a89a6c80706ab5ca94ff5b8a88bb7fa1d97b8376064e26c00d3
-  data.tar.gz: e949052b38a2cece1846fbcb4f365112de0f9674c0e55eb10fd5646f19f61e6034796d8923807736e17b7e8ad5e3081d2aecd60899d6cd6921b3863c516956fa
+  metadata.gz: bacdd196d95d59883413268ab7dc70d68bd39d4d93876ca156687aceabd7d76cd917a09dbeea4537a3f3c96cbc883bd6f7cd35bf152ac0c421e6e9183f14c2a9
+  data.tar.gz: c43c097908014a8dc61fedab76ab407012077ec471fdc256aeca28d8261e3c90a4678f50a7b4308aa66efd96c008e1eb2e86f6fafe3ef1418b433b0da74a146c

data/ext/rnv/ruby_rnv.c

@@ -489,10 +489,11 @@ VALUE rb_document_load_string(VALUE self, VALUE r_str)
                            document->fn,
                            RSTRING_PTR(r_str), RSTRING_LEN(r_str));
 
-  document_load(document);
-
   if (document->opened)
+  {
+    document_load(document);
     return Qtrue;
+  }
   else
     return Qfalse;
 }
@@ -507,27 +508,21 @@ VALUE rb_document_load_file(VALUE self, VALUE r_fn)
   document_t *document;
   Data_Get_Struct(self, document_t, document);
 
-  switch (TYPE(r_fn))
-  {
-  case T_STRING:
-    document->fn = RSTRING_PTR(r_fn);
+  Check_Type(r_fn, T_STRING);
 
-    document->opened = rnl_fn(document->rnv,
-                              document->rnc_st,
-                              document->rn_st,
-                              document->rnd_st,
-                              document->fn);
-    break;
-  case T_FILE: // TODO
-  default:
-    rb_raise(rb_eTypeError, "invalid argument");
-    break;
-  }
+  document->fn = RSTRING_PTR(r_fn);
 
-  document_load(document);
+  document->opened = rnl_fn(document->rnv,
+                            document->rnc_st,
+                            document->rn_st,
+                            document->rnd_st,
+                            document->fn);
 
   if (document->opened)
+  {
+    document_load(document);
     return Qtrue;
+  }
   else
     return Qfalse;
 }

data/lib/rnv/validator.rb

@@ -76,6 +76,7 @@ module RNV
 
       parser = Nokogiri::XML::SAX::Parser.new(rnv_doc)
       parser.parse_memory(str) do |ctx|
+        ctx.replace_entities = true
         rnv_doc.ctx = ctx
       end
 
@@ -94,6 +95,7 @@ module RNV
 
       parser = Nokogiri::XML::SAX::Parser.new(rnv_doc)
       parser.parse(file) do |ctx|
+        ctx.replace_entities = true
         rnv_doc.ctx = ctx
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Julien Boulnois