nokogiri 1.6.5-java → 1.6.6.1-java

data/ext/java/nokogiri/NokogiriService.java

@@ -228,6 +228,9 @@ public class NokogiriService implements BasicLibraryService {
         RubyClass xmlSaxPushParser = xmlSaxModule.defineClassUnder("PushParser", ruby.getObject(), XML_SAXPUSHPARSER_ALLOCATOR);
         xmlSaxPushParser.defineAnnotatedMethods(XmlSaxPushParser.class);
         
+        RubyClass htmlSaxPushParser = htmlSaxModule.defineClassUnder("PushParser", ruby.getObject(), HTML_SAXPUSHPARSER_ALLOCATOR);
+        htmlSaxPushParser.defineAnnotatedMethods(HtmlSaxPushParser.class);
+        
         RubyClass htmlSaxParserContext = htmlSaxModule.defineClassUnder("ParserContext", xmlSaxParserContext, HTML_SAXPARSER_CONTEXT_ALLOCATOR);
         htmlSaxParserContext.defineAnnotatedMethods(HtmlSaxParserContext.class);
     }
@@ -536,6 +539,12 @@ public class NokogiriService implements BasicLibraryService {
             return new XmlSaxPushParser(runtime, klazz);
         }
     };
+    
+    private static ObjectAllocator HTML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
+            return new HtmlSaxPushParser(runtime, klazz);
+        }
+    };
 
     public static final ObjectAllocator XML_SCHEMA_ALLOCATOR = new ObjectAllocator() {
         private XmlSchema xmlSchema = null;

data/ext/java/nokogiri/XmlComment.java

@@ -76,6 +76,8 @@ public class XmlComment extends XmlNode {
         } else if (doc instanceof XmlNode) {
             XmlNode xmlNode = (XmlNode) doc;
             xmlDoc = (XmlDocument)xmlNode.document(context);
+        } else {
+            throw getRuntime().newArgumentError("first argument must be a XML::Document or XML::Node");
         }
         if (xmlDoc != null) {
             Document document = xmlDoc.getDocument();

data/ext/java/nokogiri/XmlNode.java

@@ -590,7 +590,18 @@ public class XmlNode extends RubyObject {
                                                 IRubyObject prefix,
                                                 IRubyObject href) {
         String prefixString = rubyStringToString(prefix);
-        String hrefString = rubyStringToString(href);
+        String hrefString ;
+
+        // try to search the namespace first
+        if (href.isNil()) {
+            hrefString = this.findNamespaceHref(context, rubyStringToString(prefix));
+            if (hrefString == null) {
+                return context.nil;
+            }
+            href = context.getRuntime().newString(hrefString);
+        } else {
+            hrefString = rubyStringToString(href);
+        }
 
         NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCacheFormNode(node);
         XmlNamespace cachedNamespace = nsCache.get(prefixString, hrefString);
@@ -1156,6 +1167,25 @@ public class XmlNode extends RubyObject {
         return content;
     }
 
+    @JRubyMethod
+    public IRubyObject lang(ThreadContext context) {
+        IRubyObject currentObj = this ;
+        while (!currentObj.isNil()) {
+            XmlNode currentNode = asXmlNode(context, currentObj);
+            IRubyObject lang = currentNode.getAttribute(context.getRuntime(), "xml:lang");
+            if (!lang.isNil()) { return lang ; }
+
+            currentObj = currentNode.parent(context);
+        }
+        return context.nil ;
+    }
+
+    @JRubyMethod(name = "lang=")
+    public IRubyObject set_lang(ThreadContext context, IRubyObject lang) {
+        setAttribute(context, "xml:lang", rubyStringToString(lang));
+        return context.nil ;
+    }
+
     /**
      * @param args {IRubyObject io,
      *              IRubyObject encoding,
@@ -1236,33 +1266,35 @@ public class XmlNode extends RubyObject {
     @JRubyMethod(visibility = Visibility.PRIVATE)
     public IRubyObject set(ThreadContext context, IRubyObject rbkey, IRubyObject rbval) {
         if (node instanceof Element) {
-            String key = rubyStringToString(rbkey);
-            String val = rubyStringToString(rbval);
-            Element element = (Element) node;
+            setAttribute(context, rubyStringToString(rbkey), rubyStringToString(rbval));
+            return this;
+        } else {
+            return rbval;
+        }
+    }
+
+    private void setAttribute(ThreadContext context, String key, String val) {
+        Element element = (Element) node;
 
-            String uri = null;
-            int colonIndex = key.indexOf(":");
-            if (colonIndex > 0) {
-              String prefix = key.substring(0, colonIndex);
-              if (prefix.equals("xml")) {
+        String uri = null;
+        int colonIndex = key.indexOf(":");
+        if (colonIndex > 0) {
+            String prefix = key.substring(0, colonIndex);
+            if (prefix.equals("xml")) {
                 uri = "http://www.w3.org/XML/1998/namespace";
-              } else if (prefix.equals("xmlns")) {
+            } else if (prefix.equals("xmlns")) {
                 uri = "http://www.w3.org/2000/xmlns/";
-              } else {
+            } else {
                 uri = findNamespaceHref(context, prefix);
-              }
             }
+        }
 
-            if (uri != null) {
-              element.setAttributeNS(uri, key, val);
-            } else {
-              element.setAttribute(key, val);
-            }
-            clearXpathContext(node);
-            return this;
+        if (uri != null) {
+            element.setAttributeNS(uri, key, val);
         } else {
-            return rbval;
+            element.setAttribute(key, val);
         }
+        clearXpathContext(node);
     }
 
     private String findNamespaceHref(ThreadContext context, String prefix) {
@@ -1309,16 +1341,6 @@ public class XmlNode extends RubyObject {
         return RubyFixnum.newFixnum(context.getRuntime(), this.node.hashCode());
     }
 
-    @JRubyMethod(name = {"remove_attribute", "delete"})
-    public IRubyObject remove_attribute(ThreadContext context, IRubyObject name) {
-        if (node instanceof Element) {
-            String key = name.convertToString().asJavaString();
-            Element element = (Element) node;
-            element.removeAttribute(key);
-        }
-        return this;
-    }
-
     @JRubyMethod(visibility=Visibility.PRIVATE)
     public IRubyObject set_namespace(ThreadContext context, IRubyObject namespace) {
         if (namespace.isNil()) {
@@ -1685,4 +1707,9 @@ public class XmlNode extends RubyObject {
         return this;
     }
 
+    @JRubyMethod(visibility=Visibility.PRIVATE)
+    public IRubyObject clear_xpath_context(ThreadContext context) {
+        clearXpathContext(getNode());
+        return context.nil ;
+    }
 }

data/ext/java/nokogiri/XmlSyntaxError.java

@@ -17,10 +17,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * 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 PURPOSE AND NONINFRINGEMENT.
@@ -58,7 +58,7 @@ public class XmlSyntaxError extends RubyException {
     public XmlSyntaxError(Ruby runtime, RubyClass klazz) {
         super(runtime, klazz);
     }
-    
+
     /**
      * Create and return a copy of this object.
      *
@@ -93,13 +93,13 @@ public class XmlSyntaxError extends RubyException {
     }
 
     public static XmlSyntaxError createNokogiriXmlSyntaxError(Ruby runtime) {
-      return (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        return (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
     }
 
     public void setException(Exception exception) {
         this.exception = exception;
     }
-    
+
     public void setException(Ruby runtime, Exception exception, int level) {
         this.exception = exception;
         setInstanceVariable("@level", runtime.newFixnum(level));
@@ -122,15 +122,17 @@ public class XmlSyntaxError extends RubyException {
         if (exception != null && exception.getMessage() != null)
             return context.getRuntime().newString(exception.getMessage());
         else
-            return super.to_s(context);  
+            return super.to_s(context);
     }
-    
+
     //@Override
     //"to_s" method was branched in 1.8 and 1.9 since JRuby 1.6.6
     // to support older version of JRuby, the annotation is commented out
     @JRubyMethod(name = "to_s", compat = CompatVersion.RUBY1_9)
     public IRubyObject to_s19(ThreadContext context) {
-        return this.to_s(context);
+        if (exception != null && exception.getMessage() != null)
+            return context.getRuntime().newString(exception.getMessage());
+        else
+            return super.to_s19(context);
     }
-    
 }

data/ext/nokogiri/extconf.rb

@@ -71,10 +71,19 @@ def do_clean
   exit! 0
 end
 
+def nokogiri_try_compile
+  args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
+           ["int main() {return 0;}"]
+         else
+           ["int main() {return 0;}", "", {werror: true}]
+         end
+end
+
+
 def add_cflags(flags)
   print "checking if the C compiler accepts #{flags}... "
   with_cflags("#{$CFLAGS} #{flags}") do
-    if try_compile("int main() {return 0;}", '', werror: true)
+    if nokogiri_try_compile
       puts 'yes'
       true
     else
@@ -225,7 +234,7 @@ def process_recipe(name, version, static_p, cross_p)
 ************************************************************************
 IMPORTANT NOTICE:
 
-Buidling Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.patch_files.empty?}
+Building Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.patch_files.empty?}
     EOS
 
     unless recipe.patch_files.empty?
@@ -294,7 +303,7 @@ def monkey_patch_mini_portile
       @patch_files.each do |full_path|
         next unless File.exists?(full_path)
         output "Running patch with #{full_path}..."
-        execute('patch', %Q(patch -p1 < #{full_path}))
+        execute('patch', %Q(patch -p1 < "#{full_path}"))
       end
     end
   end
@@ -452,6 +461,12 @@ EOM
     end
   end
 
+  unless windows_p
+    preserving_globals {
+      have_library('z', 'gzdopen', 'zlib.h')
+    } or abort 'zlib is missing; necessary for building libxml2'
+  end
+
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"], static_p, cross_build_p) do |recipe|
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options += [

data/ext/nokogiri/xml_comment.c

@@ -1,10 +1,13 @@
 #include <xml_comment.h>
 
+static ID document_id ;
+
 /*
  * call-seq:
- *  new(document, content)
+ *  new(document_or_node, content)
  *
- * Create a new Comment element on the +document+ with +content+
+ * Create a new Comment element on the +document+ with +content+.
+ * Alternatively, if a +node+ is passed, the +node+'s document is used.
  */
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
@@ -17,6 +20,16 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &document, &content, &rest);
 
+  if (rb_obj_is_kind_of(document, cNokogiriXmlNode))
+  {
+    document = rb_funcall(document, document_id, 0);
+  }
+  else if (   !rb_obj_is_kind_of(document, cNokogiriXmlDocument)
+           && !rb_obj_is_kind_of(document, cNokogiriXmlDocumentFragment))
+  {
+    rb_raise(rb_eArgError, "first argument must be a XML::Document or XML::Node");
+  }
+
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
   node = xmlNewDocComment(
@@ -51,4 +64,6 @@ void init_xml_comment()
   cNokogiriXmlComment = klass;
 
   rb_define_singleton_method(klass, "new", new, -1);
+
+  document_id = rb_intern("document");
 }

data/ext/nokogiri/xml_node.c

@@ -14,7 +14,7 @@ static void debug_node_dealloc(xmlNodePtr x)
 
 static void mark(xmlNodePtr node)
 {
-  xmlNodePtr doc = node->doc;
+  xmlDocPtr doc = node->doc;
   if(doc->type == XML_DOCUMENT_NODE || doc->type == XML_HTML_DOCUMENT_NODE) {
     if(DOC_RUBY_OBJECT_TEST(doc)) {
       rb_gc_mark(DOC_RUBY_OBJECT(doc));
@@ -234,7 +234,15 @@ ok:
      *  reparent the actual reparentee, so we reparent a duplicate.
      */
     nokogiri_root_node(reparentee);
-    if (!(reparentee = xmlDocCopyNode(reparentee, pivot->doc, 1))) {
+
+    xmlResetLastError();
+    xmlSetStructuredErrorFunc((void *)rb_iv_get(DOC_RUBY_OBJECT(pivot->doc), "@errors"), Nokogiri_error_array_pusher);
+
+    reparentee = xmlDocCopyNode(reparentee, pivot->doc, 1) ;
+
+    xmlSetStructuredErrorFunc(NULL, NULL);
+
+    if (! reparentee) {
       rb_raise(rb_eRuntimeError, "Could not reparent node (xmlDocCopyNode)");
     }
   }
@@ -473,7 +481,13 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, xmlNode, node);
 
+  xmlResetLastError();
+  xmlSetStructuredErrorFunc(NULL, Nokogiri_error_silencer);
+
   dup = xmlDocCopyNode(node, node->doc, (int)NUM2INT(level));
+
+  xmlSetStructuredErrorFunc(NULL, NULL);
+
   if(dup == NULL) return Qnil;
 
   nokogiri_root_node(dup);
@@ -1012,7 +1026,7 @@ static VALUE node_type(VALUE self)
  *
  * Set the content for this Node
  */
-static VALUE native_content(VALUE self, VALUE content)
+static VALUE set_native_content(VALUE self, VALUE content)
 {
   xmlNodePtr node, child, next ;
   Data_Get_Struct(self, xmlNode, node);
@@ -1035,7 +1049,7 @@ static VALUE native_content(VALUE self, VALUE content)
  *
  * Returns the content for this Node
  */
-static VALUE get_content(VALUE self)
+static VALUE get_native_content(VALUE self)
 {
   xmlNodePtr node;
   xmlChar * content;
@@ -1051,6 +1065,50 @@ static VALUE get_content(VALUE self)
   return Qnil;
 }
 
+/*
+ * call-seq:
+ *  lang=
+ *
+ * Set the language of a node, i.e. the values of the xml:lang attribute.
+ */
+static VALUE set_lang(VALUE self_rb, VALUE lang_rb)
+{
+  xmlNodePtr self ;
+  xmlChar* lang ;
+
+  Data_Get_Struct(self_rb, xmlNode, self);
+  lang = (xmlChar*)StringValuePtr(lang_rb);
+
+  xmlNodeSetLang(self, lang);
+
+  return Qnil ;
+}
+
+/*
+ * call-seq:
+ *  lang
+ *
+ * Searches the language of a node, i.e. the values of the xml:lang attribute or
+ * the one carried by the nearest ancestor.
+ */
+static VALUE get_lang(VALUE self_rb)
+{
+  xmlNodePtr self ;
+  xmlChar* lang ;
+  VALUE lang_rb ;
+
+  Data_Get_Struct(self_rb, xmlNode, self);
+
+  lang = xmlNodeGetLang(self);
+  if (lang) {
+    lang_rb = NOKOGIRI_STR_NEW2(lang);
+    xmlFree(lang);
+    return lang_rb ;
+  }
+
+  return Qnil ;
+}
+
 /* :nodoc: */
 static VALUE add_child(VALUE self, VALUE new_child)
 {
@@ -1561,7 +1619,6 @@ void init_xml_node()
   rb_define_method(klass, "next_element", next_element, 0);
   rb_define_method(klass, "previous_element", previous_element, 0);
   rb_define_method(klass, "node_type", node_type, 0);
-  rb_define_method(klass, "content", get_content, 0);
   rb_define_method(klass, "path", path, 0);
   rb_define_method(klass, "key?", key_eh, 1);
   rb_define_method(klass, "namespaced_key?", namespaced_key_eh, 2);
@@ -1581,7 +1638,10 @@ void init_xml_node()
   rb_define_method(klass, "create_external_subset", create_external_subset, 3);
   rb_define_method(klass, "pointer_id", pointer_id, 0);
   rb_define_method(klass, "line", line, 0);
-  rb_define_method(klass, "native_content=", native_content, 1);
+  rb_define_method(klass, "content", get_native_content, 0);
+  rb_define_method(klass, "native_content=", set_native_content, 1);
+  rb_define_method(klass, "lang", get_lang, 0);
+  rb_define_method(klass, "lang=", set_lang, 1);
 
   rb_define_private_method(klass, "process_xincludes", process_xincludes, 1);
   rb_define_private_method(klass, "in_context", in_context, 2);

data/ext/nokogiri/xml_syntax_error.c

@@ -7,6 +7,10 @@ void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error)
   rb_ary_push(list,  Nokogiri_wrap_xml_syntax_error(error));
 }
 
+void Nokogiri_error_silencer(void * ctx, xmlErrorPtr error)
+{
+}
+
 void Nokogiri_error_raise(void * ctx, xmlErrorPtr error)
 {
   rb_exc_raise(Nokogiri_wrap_xml_syntax_error(error));

data/ext/nokogiri/xml_syntax_error.h

@@ -6,6 +6,7 @@
 void init_xml_syntax_error();
 VALUE Nokogiri_wrap_xml_syntax_error(xmlErrorPtr error);
 void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error);
+void Nokogiri_error_silencer(void * ctx, xmlErrorPtr error);
 NORETURN(void Nokogiri_error_raise(void * ctx, xmlErrorPtr error));
 
 extern VALUE cNokogiriXmlSyntaxError;