nokogiri 1.11.6-arm64-darwin → 1.12.1-arm64-darwin

data/ext/nokogiri/xml_schema.c

@@ -274,6 +274,8 @@ noko_init_xml_schema()
 {
   cNokogiriXmlSchema = rb_define_class_under(mNokogiriXml, "Schema", rb_cObject);
 
+  rb_undef_alloc_func(cNokogiriXmlSchema);
+
   rb_define_singleton_method(cNokogiriXmlSchema, "read_memory", read_memory, -1);
   rb_define_singleton_method(cNokogiriXmlSchema, "from_document", from_document, -1);
 

data/ext/nokogiri/xml_xpath_context.c

@@ -154,20 +154,20 @@ Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, i
     do {
       obj = valuePop(ctx);
       switch (obj->type) {
-      case XPATH_STRING:
-        argv[i] = NOKOGIRI_STR_NEW2(obj->stringval);
-        break;
-      case XPATH_BOOLEAN:
-        argv[i] = obj->boolval == 1 ? Qtrue : Qfalse;
-        break;
-      case XPATH_NUMBER:
-        argv[i] = rb_float_new(obj->floatval);
-        break;
-      case XPATH_NODESET:
-        argv[i] = noko_xml_node_set_wrap(obj->nodesetval, doc);
-        break;
-      default:
-        argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
+        case XPATH_STRING:
+          argv[i] = NOKOGIRI_STR_NEW2(obj->stringval);
+          break;
+        case XPATH_BOOLEAN:
+          argv[i] = obj->boolval == 1 ? Qtrue : Qfalse;
+          break;
+        case XPATH_NUMBER:
+          argv[i] = rb_float_new(obj->floatval);
+          break;
+        case XPATH_NODESET:
+          argv[i] = noko_xml_node_set_wrap(obj->nodesetval, doc);
+          break;
+        default:
+          argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
       }
       xmlXPathFreeNodeSetList(obj);
     } while (i-- > 0);
@@ -181,43 +181,43 @@ Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, i
   free(argv);
 
   switch (TYPE(result)) {
-  case T_FLOAT:
-  case T_BIGNUM:
-  case T_FIXNUM:
-    xmlXPathReturnNumber(ctx, NUM2DBL(result));
-    break;
-  case T_STRING:
-    xmlXPathReturnString(
-      ctx,
-      xmlCharStrdup(StringValueCStr(result))
-    );
-    break;
-  case T_TRUE:
-    xmlXPathReturnTrue(ctx);
-    break;
-  case T_FALSE:
-    xmlXPathReturnFalse(ctx);
-    break;
-  case T_NIL:
-    break;
-  case T_ARRAY: {
-    VALUE args[2];
-    args[0] = doc;
-    args[1] = result;
-    node_set = rb_class_new_instance(2, args, cNokogiriXmlNodeSet);
-    Data_Get_Struct(node_set, xmlNodeSet, xml_node_set);
-    xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
-  }
-  break;
-  case T_DATA:
-    if (rb_obj_is_kind_of(result, cNokogiriXmlNodeSet)) {
-      Data_Get_Struct(result, xmlNodeSet, xml_node_set);
-      /* Copy the node set, otherwise it will get GC'd. */
-      xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
+    case T_FLOAT:
+    case T_BIGNUM:
+    case T_FIXNUM:
+      xmlXPathReturnNumber(ctx, NUM2DBL(result));
+      break;
+    case T_STRING:
+      xmlXPathReturnString(
+        ctx,
+        xmlCharStrdup(StringValueCStr(result))
+      );
+      break;
+    case T_TRUE:
+      xmlXPathReturnTrue(ctx);
+      break;
+    case T_FALSE:
+      xmlXPathReturnFalse(ctx);
       break;
+    case T_NIL:
+      break;
+    case T_ARRAY: {
+      VALUE args[2];
+      args[0] = doc;
+      args[1] = result;
+      node_set = rb_class_new_instance(2, args, cNokogiriXmlNodeSet);
+      Data_Get_Struct(node_set, xmlNodeSet, xml_node_set);
+      xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
     }
-  default:
-    rb_raise(rb_eRuntimeError, "Invalid return type");
+    break;
+    case T_DATA:
+      if (rb_obj_is_kind_of(result, cNokogiriXmlNodeSet)) {
+        Data_Get_Struct(result, xmlNodeSet, xml_node_set);
+        /* Copy the node set, otherwise it will get GC'd. */
+        xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
+        break;
+      }
+    default:
+      rb_raise(rb_eRuntimeError, "Invalid return type");
   }
 }
 
@@ -314,22 +314,22 @@ evaluate(int argc, VALUE *argv, VALUE self)
   assert(DOC_RUBY_OBJECT_TEST(ctx->doc));
 
   switch (xpath->type) {
-  case XPATH_STRING:
-    thing = NOKOGIRI_STR_NEW2(xpath->stringval);
-    xmlFree(xpath->stringval);
-    break;
-  case XPATH_NODESET:
-    thing = noko_xml_node_set_wrap(xpath->nodesetval,
-                                   DOC_RUBY_OBJECT(ctx->doc));
-    break;
-  case XPATH_NUMBER:
-    thing = rb_float_new(xpath->floatval);
-    break;
-  case XPATH_BOOLEAN:
-    thing = xpath->boolval == 1 ? Qtrue : Qfalse;
-    break;
-  default:
-    thing = noko_xml_node_set_wrap(NULL, DOC_RUBY_OBJECT(ctx->doc));
+    case XPATH_STRING:
+      thing = NOKOGIRI_STR_NEW2(xpath->stringval);
+      xmlFree(xpath->stringval);
+      break;
+    case XPATH_NODESET:
+      thing = noko_xml_node_set_wrap(xpath->nodesetval,
+                                     DOC_RUBY_OBJECT(ctx->doc));
+      break;
+    case XPATH_NUMBER:
+      thing = rb_float_new(xpath->floatval);
+      break;
+    case XPATH_BOOLEAN:
+      thing = xpath->boolval == 1 ? Qtrue : Qfalse;
+      break;
+    default:
+      thing = noko_xml_node_set_wrap(NULL, DOC_RUBY_OBJECT(ctx->doc));
   }
 
   xmlXPathFreeNodeSetList(xpath);
@@ -373,6 +373,8 @@ noko_init_xml_xpath_context(void)
    */
   cNokogiriXmlXpathContext = rb_define_class_under(mNokogiriXml, "XPathContext", rb_cObject);
 
+  rb_undef_alloc_func(cNokogiriXmlXpathContext);
+
   rb_define_singleton_method(cNokogiriXmlXpathContext, "new", new, 1);
 
   rb_define_method(cNokogiriXmlXpathContext, "evaluate", evaluate, -1);

data/ext/nokogiri/xslt_stylesheet.c

@@ -64,7 +64,6 @@ parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
   VALUE errstr, exception;
   xsltStylesheetPtr ss ;
   Data_Get_Struct(xmldocobj, xmlDoc, xml);
-  exsltRegisterAll();
 
   errstr = rb_str_new(0, 0);
   xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
@@ -257,6 +256,8 @@ noko_init_xslt_stylesheet()
 
   cNokogiriXsltStylesheet = rb_define_class_under(mNokogiriXslt, "Stylesheet", rb_cObject);
 
+  rb_undef_alloc_func(cNokogiriXsltStylesheet);
+
   rb_define_singleton_method(cNokogiriXsltStylesheet, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
   rb_define_method(cNokogiriXsltStylesheet, "serialize", serialize, 1);
   rb_define_method(cNokogiriXsltStylesheet, "transform", transform, -1);

data/gumbo-parser/CHANGES.md

@@ -0,0 +1,63 @@
+## Gumbo 0.10.1 (2015-04-30)
+
+Same as 0.10.0, but with the version number bumped because the last version-number commit to v0.9.4 makes GitHub think that v0.9.4 is the latest version and so it's not highlighted on the webpage.
+
+## Gumbo 0.10.0 (2015-04-30)
+
+* Full support for `<template>` tag (kevinhendricks, nostrademons).
+* Some fixes for `<rtc>`/`<rt>` handling (kevinhendricks, vmg).
+* All html5lib-trunk tests pass now! (kevinhendricks, vmg, nostrademons)
+* Support for fragment parsing (vmg)
+* A couple additional example programs (kevinhendricks)
+* Performance improvements totaling an estimated 30-40% total improvement (vmg, nostrademons).
+
+## Gumbo 0.9.4 (2015-04-30)
+
+* Additional Visual Studio fixes (lowjoel, nostrademons)
+* Fixed some unused variable warnings.
+* Fix for glibtoolize vs. libtoolize build errors on Mac.
+* Fixed `CDATA` end tag handling.
+
+## Gumbo 0.9.3 (2015-02-17)
+
+* Bugfix for `&AElig;` entities (rgrove)
+* Fix `CDATA` handling; `CDATA` sections now generate a `GUMBO_NODE_CDATA` node rather
+than plain text.
+* Fix `get_title example` to handle whitespace nodes (gsnedders)
+* Visual Studio compilation fixes (fishioon)
+* Take the namespace into account when determining whether a node matches a
+certain tag (aroben)
+* Replace the varargs tag functions with a tagset bytevector, for a 20-30%
+speedup in overall parse time (kevinhendricks, vmg)
+* Add MacOS X support to Travis CI, and fix the deployment/DLL issues this
+uncovered (nostrademons, kevinhendricks, vmg)
+
+## Gumbo 0.9.2 (2014-09-21)
+
+* Performance improvements: Ragel-based char ref decoder and DFA-based UTF8
+decoder, totaling speedups of up to 300%.
+* Added benchmarking program and some sample data.
+* Fixed a compiler error under Visual Studio.
+* Fix an error in the ctypes bindings that could lead to memory corruption in
+the Python bindings.
+* Fix duplicate attributes when parsing `<isindex>` tags.
+* Don't leave semicolons behind when consuming entity references (rgrove)
+* Internally rename some functions in preparation for an amalgamation file
+(jdeng)
+* Add proper cflags for gyp builds (skabbes)
+
+## Gumbo 0.9.1 (2014-08-07)
+
+* First version listed on PyPi.
+* Autotools files excluded from GitHub and generated via autogen.sh. (endgame)
+* Numerous compiler warnings fixed. (bnoordhuis, craigbarnes)
+* Google security audit passed.
+* Gyp support (tfarina)
+* Naming convention for structs changed to avoid C reserved words.
+* Fix several integer and buffer overflows (Maxime2)
+* Some Visual Studio compiler support (bugparty)
+* Python3 compatibility for the ctypes bindings.
+
+## Gumbo 0.9.0 (2013-08-13)
+
+* Initial release open-sourced by Google.

data/gumbo-parser/Makefile

@@ -0,0 +1,101 @@
+.PHONY: all clean check coverage
+
+gumbo_objs := $(patsubst %.c,build/%.o,$(wildcard src/*.c))
+test_objs := $(patsubst %.cc,build/%.o,$(wildcard test/*.cc))
+gtest_lib := googletest/make/gtest_main.a
+
+# make SANITIZEFLAGS='-fsanitize=undefined -fsanitize=address'
+SANITIZEFLAGS :=
+CPPFLAGS := -Isrc
+CFLAGS := -std=c99 -Os -Wall
+CXXFLAGS := -isystem googletest/include -std=c++11 -Os -Wall
+LDFLAGS := -pthread
+
+all: check
+
+src/%.c: src/%.rl
+	ragel -F1 -o $@ $<
+
+build/src:
+	mkdir -p $@
+
+build/test:
+	mkdir -p $@
+
+build/src/%.o: src/%.c build/src/flags | build/src
+	$(CC) -MMD $(CPPFLAGS) $(CFLAGS) $(SANITIZEFLAGS) -c -o $@ $<
+
+build/test/%.o: test/%.cc build/test/flags | build/test
+	$(CXX) -MMD $(CPPFLAGS) $(CXXFLAGS) $(SANITIZEFLAGS) -c -o $@ $<
+
+build/run_tests: $(gumbo_objs) $(test_objs) $(gtest_lib)
+	$(CXX) -o $@ $+ $(LDFLAGS) $(SANITIZEFLAGS)
+
+check: build/run_tests
+	./build/run_tests
+
+coverage:
+	$(RM) build/{src,test}/*.gcda
+	$(RM) build/*.info
+	$(MAKE) CPPFLAGS='-Isrc -DNDEBUG=1' \
+		CFLAGS='-std=c99 --coverage -g -O0' \
+		CXXFLAGS='-isystem googletest/include -std=c++11 --coverage -g -O0' \
+		LDFLAGS='--coverage' \
+		build/run_tests
+	lcov	--no-external \
+		--initial \
+		--capture \
+		--base-directory . \
+		--directory build \
+		--output-file build/coverage-pre.info
+	awk	-F '[:,]' \
+		'/^SF:/ { delete defs } /^FN:/ { defs[$$2]=1 } /^DA:/ { if ($$3 == 0 && $$2 in defs) next } { print }' \
+		build/coverage-pre.info > build/coverage-initial.info
+	./build/run_tests
+	lcov	--no-external \
+		--capture \
+		--base-directory . \
+		--directory build \
+		--rc lcov_branch_coverage=1 \
+		--output-file build/coverage-test.info
+	lcov	--add-tracefile build/coverage-initial.info \
+		--add-tracefile build/coverage-test.info \
+		--rc lcov_branch_coverage=1 \
+		--output-file build/coverage.info
+	lcov	--remove build/coverage.info '$(CURDIR)/googletest/*' \
+		--rc lcov_branch_coverage=1 \
+		--output-file build/coverage.info
+	genhtml --branch-coverage \
+		--output-directory build/coverage \
+		build/coverage.info
+
+clean:
+	$(RM) -r build
+
+build/src/flags: | build/src
+	@echo 'old_CC := $(CC)' > $@
+	@echo 'old_CPPFLAGS := $(CPPFLAGS)' >> $@
+	@echo 'old_CFLAGS := $(CFLAGS)' >>$@
+	@echo 'old_SANITIZEFLAGS := $(SANITIZEFLAGS)' >> $@
+	@echo 'old_LDFLAGS := $(LDFLAGS)' >> $@
+
+build/test/flags: | build/test
+	@echo 'old_CXX := $(CXX)' > $@
+	@echo 'old_CPPFLAGS := $(CPPFLAGS)' >> $@
+	@echo 'old_CXXFLAGS := $(CXXFLAGS)' >> $@
+	@echo 'old_SANITIZEFLAGS := $(SANITIZEFLAGS)' >> $@
+	@echo 'old_LDFLAGS := $(LDFLAGS)' >> $@
+
+ifeq (,$(filter clean coverage,$(MAKECMDGOALS)))
+# Ensure that the flags are up to date.
+-include build/src/flags build/test/flags
+ifneq ($(old_CC) | $(old_CPPFLAGS) | $(old_CFLAGS) | $(old_SANITIZEFLAGS) | $(old_LDFLAGS),$(CC) | $(CPPFLAGS) | $(CFLAGS) | $(SANITIZEFLAGS) | $(LDFLAGS))
+.PHONY: build/src/flags
+endif
+ifneq ($(old_CXX) | $(old_CPPFLAGS) | $(old_CXXFLAGS) | $(old_SANITIZEFLAGS) | $(old_LDFLAGS),$(CXX) | $(CPPFLAGS) | $(CXXFLAGS) | $(SANITIZEFLAGS) | $(LDFLAGS))
+.PHONY: build/test/flags
+endif
+
+# Include dependencies.
+-include $(test_objs:.o=.d) $(gumbo_objs:.o=.d)
+endif

data/gumbo-parser/THANKS

@@ -0,0 +1,27 @@
+Gumbo HTML parser THANKS file
+
+Gumbo was originally written by Jonathan Tang, but many people helped out through suggestions, question-answering, code reviews, bugfixes, and organizational support.  Here is a list of these people.  Help me keep it complete and exempt of errors.
+
+Adam Barth
+Adam Roben
+Ben Noordhuis
+Bowen Han
+Constantinos Michael
+Craig Barnes
+Geoffrey Sneddon
+Ian Hickson
+Jack Deng
+Joel Low
+Jonathan Shneier
+Kevin Hendricks
+Mason Tang
+Maxim Zakharov
+Michal Zalewski
+Neal Norwitz
+Othar Hansson
+Ryan Grove
+Stefan Haustein
+Steffen Meschkat
+Steven Kabbes
+Thiago Farina
+Vicent Marti

data/lib/nokogiri.rb

@@ -2,38 +2,29 @@
 # frozen_string_literal: true
 # Modify the PATH on windows so that the external DLLs will get loaded.
 
-require 'rbconfig'
+require "rbconfig"
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-  require 'nokogiri/jruby/dependencies'
+  require_relative "nokogiri/jruby/dependencies"
 end
 
-require 'nokogiri/extension'
-
-require 'nokogiri/version'
-require 'nokogiri/syntax_error'
-require 'nokogiri/xml'
-require 'nokogiri/xslt'
-require 'nokogiri/html'
-require 'nokogiri/decorators/slop'
-require 'nokogiri/css'
-require 'nokogiri/html/builder'
+require_relative "nokogiri/extension"
 
 # Nokogiri parses and searches XML/HTML very quickly, and also has
 # correctly implemented CSS3 selector support as well as XPath 1.0
 # support.
 #
 # Parsing a document returns either a Nokogiri::XML::Document, or a
-# Nokogiri::HTML::Document depending on the kind of document you parse.
+# Nokogiri::HTML4::Document depending on the kind of document you parse.
 #
 # Here is an example:
 #
 #   require 'nokogiri'
 #   require 'open-uri'
 #
-#   # Get a Nokogiri::HTML:Document for the page we’re interested in...
+#   # Get a Nokogiri::HTML4::Document for the page we’re interested in...
 #
-#   doc = Nokogiri::HTML(URI.open('http://www.google.com/search?q=tenderlove'))
+#   doc = Nokogiri::HTML4(URI.open('http://www.google.com/search?q=tenderlove'))
 #
 #   # Do funky things with it using Nokogiri::XML::Node methods...
 #
@@ -49,27 +40,27 @@ module Nokogiri
   class << self
     ###
     # Parse an HTML or XML document.  +string+ contains the document.
-    def parse string, url = nil, encoding = nil, options = nil
+    def parse(string, url = nil, encoding = nil, options = nil)
       if string.respond_to?(:read) ||
           /^\s*<(?:!DOCTYPE\s+)?html[\s>]/i === string[0, 512]
         # Expect an HTML indicator to appear within the first 512
         # characters of a document. (<?xml ?> + <?xml-stylesheet ?>
         # shouldn't be that long)
-        Nokogiri.HTML(string, url, encoding,
+        Nokogiri.HTML4(string, url, encoding,
           options || XML::ParseOptions::DEFAULT_HTML)
       else
         Nokogiri.XML(string, url, encoding,
           options || XML::ParseOptions::DEFAULT_XML)
-      end.tap { |doc|
+      end.tap do |doc|
         yield doc if block_given?
-      }
+      end
     end
 
     ###
     # Create a new Nokogiri::XML::DocumentFragment
-    def make input = nil, opts = {}, &blk
+    def make(input = nil, opts = {}, &blk)
       if input
-        Nokogiri::HTML.fragment(input).children.first
+        Nokogiri::HTML4.fragment(input).children.first
       else
         Nokogiri(&blk)
       end
@@ -98,10 +89,10 @@ module Nokogiri
       # Make sure to support some popular encoding aliases not known by
       # all iconv implementations.
       {
-        'Windows-31J' => 'CP932',	# Windows-31J is the IANA registered name of CP932.
-      }.each { |alias_name, name|
+        "Windows-31J" => "CP932",	# Windows-31J is the IANA registered name of CP932.
+      }.each do |alias_name, name|
         EncodingHandler.alias(name, alias_name) if EncodingHandler[alias_name].nil?
-      }
+      end
     end
   end
 
@@ -109,15 +100,26 @@ module Nokogiri
 end
 
 ###
-# Parse a document contained in +args+.  Nokogiri will try to guess what
-# type of document you are attempting to parse.  For more information, see
-# Nokogiri.parse
+# Parse a document contained in +args+.  Nokogiri will try to guess what type of document you are
+# attempting to parse.  For more information, see Nokogiri.parse
 #
-# To specify the type of document, use Nokogiri.XML or Nokogiri.HTML.
+# To specify the type of document, use {Nokogiri.XML}, {Nokogiri.HTML4}, or {Nokogiri.HTML5}.
 def Nokogiri(*args, &block)
   if block_given?
-    Nokogiri::HTML::Builder.new(&block).doc.root
+    Nokogiri::HTML4::Builder.new(&block).doc.root
   else
     Nokogiri.parse(*args)
   end
 end
+
+require_relative "nokogiri/version"
+require_relative "nokogiri/syntax_error"
+require_relative "nokogiri/xml"
+require_relative "nokogiri/xslt"
+require_relative "nokogiri/html4"
+require_relative "nokogiri/html"
+require_relative "nokogiri/decorators/slop"
+require_relative "nokogiri/css"
+require_relative "nokogiri/html4/builder"
+
+require_relative "nokogiri/html5" if Nokogiri.uses_gumbo?