nokogumbo 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDM4N2U1MTA3MjkzNGQ1ZmU1OGY4NjljY2NiNzdlMGEwNzYyYTkwMA==
+    ZmRkOWYwNjM2OTdmNTc1MjIzNjg4MDBhNzJmZmMzNTgwMWNmNjJiNA==
   data.tar.gz: !binary |-
-    YzQ1MTYzYTJjZjM1YjFkZTU2NThlZWFkMzhmODFjMTI4MDk2YzVlYw==
+    ODA3OTkxNDYwZTM3NjI3ZGE1OGYyYjllYWU0ZDk5ODU5M2RlYWZkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDM3MDI2MjkwMzAyNTQ2ZmRhNDc3NmRlNjIzMjBlZjE5OGU2MGU3M2MyZDcw
-    MTgxOTBhOGUxZjkxYmZlZGZlN2I1NTVmYTBlM2E3NWZkNmFiODE4ZThjMjdj
-    N2E1M2RkNDljYjc4YWY0YmIxOGYyYTNjYTM1OWQzNDA0NjBiOTQ=
+    ZWJjNGEwMDg2OTVjNjBhYTA5YTM1NTM4ZWNjOTFiN2NjZTM5MmFiYWFmY2U4
+    MDliNGVhMWU3ZWI0ZTMxMjg4ZDRkMTNlMzQ5YzE3ZTg1NGU3MDAyOTcyOWQz
+    ZGYxYjU3YTE4Y2ZmNjNkNDZmN2NlN2Y5Y2MwOWE2MDFiY2E1NzA=
   data.tar.gz: !binary |-
-    NmFkYjA3MjA3Njk5YTJiMmIyZWEyM2EyNGQ0ZjQxYzAwMTY2NDQwZmM3YmUz
-    YWQwM2YzNjFlOGM2OTljNjc1MzZlMTZmNDM1ODUwYmZkZjZhNzcyZGE0ZGMy
-    N2Y4YzA5ZWI4NjZiY2M5NGI2Nzk5MjNiZDE5MzMzNmM4Y2M2OWE=
+    MTU3MjVmNWViNDdiMDJlOWI4MmNiMzU0NTBjZWVkNTg3YWMzZTFlYWYxODVi
+    MzM4YWE4NDdlZjdlNzdlZDc0N2FkMGE2MTY4ZGVmN2ZkYzYzNzdjNTViNDQ3
+    YzNmMzhiODQ0ZGQwMDk3ZDkxMDQ5NTFmNDcyMzNmZmZiOTJiMDc=

data/README.md

@@ -34,7 +34,7 @@ Notes
 
 * The `Nokogiri::HTML5.parse` function takes a string and passes it to the
 <code>gumbo_parse_with_options</code> method, using the default options.
-The resulting Gumbo parse tree is the walked.
+The resulting Gumbo parse tree is then walked.
   * If the necessary Nokogiri and [libxml2](http://xmlsoft.org/html/) headers
     can be found at installation time then an
     [xmlDoc](http://xmlsoft.org/html/libxml-tree.html#xmlDoc) tree is produced

data/gumbo-parser/src/gumbo.h

@@ -164,11 +164,12 @@ typedef enum {
   // http://www.whatwg.org/specs/web-apps/current-work/multipage/scripting-1.html#scripting-1
   GUMBO_TAG_SCRIPT,
   GUMBO_TAG_NOSCRIPT,
+  GUMBO_TAG_TEMPLATE,
   // http://www.whatwg.org/specs/web-apps/current-work/multipage/sections.html#sections
   GUMBO_TAG_BODY,
+  GUMBO_TAG_ARTICLE,
   GUMBO_TAG_SECTION,
   GUMBO_TAG_NAV,
-  GUMBO_TAG_ARTICLE,
   GUMBO_TAG_ASIDE,
   GUMBO_TAG_H1,
   GUMBO_TAG_H2,
@@ -193,6 +194,7 @@ typedef enum {
   GUMBO_TAG_DD,
   GUMBO_TAG_FIGURE,
   GUMBO_TAG_FIGCAPTION,
+  GUMBO_TAG_MAIN,
   GUMBO_TAG_DIV,
   // http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#text-level-semantics
   GUMBO_TAG_A,
@@ -204,6 +206,7 @@ typedef enum {
   GUMBO_TAG_Q,
   GUMBO_TAG_DFN,
   GUMBO_TAG_ABBR,
+  GUMBO_TAG_DATA,
   GUMBO_TAG_TIME,
   GUMBO_TAG_CODE,
   GUMBO_TAG_VAR,
@@ -213,6 +216,7 @@ typedef enum {
   GUMBO_TAG_SUP,
   GUMBO_TAG_I,
   GUMBO_TAG_B,
+  GUMBO_TAG_U,
   GUMBO_TAG_MARK,
   GUMBO_TAG_RUBY,
   GUMBO_TAG_RT,
@@ -284,8 +288,8 @@ typedef enum {
   // http://www.whatwg.org/specs/web-apps/current-work/multipage/interactive-elements.html#interactive-elements
   GUMBO_TAG_DETAILS,
   GUMBO_TAG_SUMMARY,
-  GUMBO_TAG_COMMAND,
   GUMBO_TAG_MENU,
+  GUMBO_TAG_MENUITEM,
   // Non-conforming elements that nonetheless appear in the HTML5 spec.
   // http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#non-conforming-features
   GUMBO_TAG_APPLET,
@@ -313,7 +317,6 @@ typedef enum {
   GUMBO_TAG_NOBR,
   GUMBO_TAG_SPACER,
   GUMBO_TAG_TT,
-  GUMBO_TAG_U,
   // Used for all tags that don't have special handling in HTML.
   GUMBO_TAG_UNKNOWN,
   // A marker value to indicate the end of the enum, for iterating over it.

data/gumbo-parser/src/insertion_mode.h

@@ -22,6 +22,8 @@ extern "C" {
 #endif
 
 // http://www.whatwg.org/specs/web-apps/current-work/complete/parsing.html#insertion-mode
+// If new enum values are added, be sure to update the kTokenHandlers dispatch
+// table in parser.c.
 typedef enum {
   GUMBO_INSERTION_MODE_INITIAL,
   GUMBO_INSERTION_MODE_BEFORE_HTML,
@@ -40,6 +42,7 @@ typedef enum {
   GUMBO_INSERTION_MODE_IN_CELL,
   GUMBO_INSERTION_MODE_IN_SELECT,
   GUMBO_INSERTION_MODE_IN_SELECT_IN_TABLE,
+  GUMBO_INSERTION_MODE_IN_TEMPLATE,
   GUMBO_INSERTION_MODE_AFTER_BODY,
   GUMBO_INSERTION_MODE_IN_FRAMESET,
   GUMBO_INSERTION_MODE_AFTER_FRAMESET,

data/gumbo-parser/src/parser.c

@@ -354,6 +354,10 @@ typedef struct GumboInternalParserState {
   // http://www.whatwg.org/specs/web-apps/current-work/complete/parsing.html#the-list-of-active-formatting-elements
   GumboVector /*GumboNode*/ _active_formatting_elements;
 
+  // The stack of template insertion modes.
+  // http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#the-insertion-mode
+  GumboVector /*InsertionMode*/ _template_insertion_modes;
+
   // http://www.whatwg.org/specs/web-apps/current-work/complete/parsing.html#the-element-pointers
   GumboNode* _head_element;
   GumboNode* _form_element;
@@ -482,6 +486,7 @@ static void parser_state_init(GumboParser* parser) {
   gumbo_string_buffer_init(parser, &parser_state->_text_node._buffer);
   gumbo_vector_init(parser, 10, &parser_state->_open_elements);
   gumbo_vector_init(parser, 5, &parser_state->_active_formatting_elements);
+  gumbo_vector_init(parser, 5, &parser_state->_template_insertion_modes);
   parser_state->_head_element = NULL;
   parser_state->_form_element = NULL;
   parser_state->_current_token = NULL;
@@ -494,6 +499,7 @@ static void parser_state_destroy(GumboParser* parser) {
   GumboParserState* state = parser->_parser_state;
   gumbo_vector_destroy(parser, &state->_active_formatting_elements);
   gumbo_vector_destroy(parser, &state->_open_elements);
+  gumbo_vector_destroy(parser, &state->_template_insertion_modes);
   gumbo_string_buffer_destroy(parser, &state->_text_node._buffer);
   gumbo_parser_deallocate(parser, state);
 }
@@ -531,6 +537,25 @@ static bool is_in_static_list(
   return false;
 }
 
+static void push_template_insertion_mode(
+    GumboParser* parser, GumboInsertionMode mode) {
+  gumbo_vector_add(
+      parser, (void*) mode, &parser->_parser_state->_template_insertion_modes);
+}
+
+static void pop_template_insertion_mode(GumboParser* parser) {
+  gumbo_vector_pop(parser, &parser->_parser_state->_template_insertion_modes);
+}
+
+static GumboInsertionMode get_current_template_insertion_mode(
+    GumboParser* parser) {
+  GumboVector* template_insertion_modes =
+      &parser->_parser_state->_template_insertion_modes;
+  assert(template_insertion_modes->length > 0);
+  return (GumboInsertionMode) template_insertion_modes->data[
+      template_insertion_modes->length - 1];
+}
+
 static void set_insertion_mode(GumboParser* parser, GumboInsertionMode mode) {
   parser->_parser_state->_insertion_mode = mode;
 }
@@ -718,7 +743,7 @@ static bool is_html_integration_point(const GumboNode* node) {
 static void append_node(
     GumboParser* parser, GumboNode* parent, GumboNode* node) {
   assert(node->parent == NULL);
-  assert(node->index_within_parent = -1);
+  assert(node->index_within_parent == -1);
   GumboVector* children;
   if (parent->type == GUMBO_NODE_ELEMENT) {
     children = &parent->v.element.children;
@@ -737,7 +762,7 @@ static void append_node(
 static void insert_node(
     GumboParser* parser, GumboNode* parent, int index, GumboNode* node) {
   assert(node->parent == NULL);
-  assert(node->index_within_parent = -1);
+  assert(node->index_within_parent == -1);
   assert(parent->type == GUMBO_NODE_ELEMENT);
   GumboVector* children = &parent->v.element.children;
   assert(index >= 0);
@@ -1520,7 +1545,7 @@ static bool is_special_node(const GumboNode* node) {
            GUMBO_TAG_BASEFONT, GUMBO_TAG_BGSOUND, GUMBO_TAG_BLOCKQUOTE,
            GUMBO_TAG_BODY, GUMBO_TAG_BR, GUMBO_TAG_BUTTON, GUMBO_TAG_CAPTION,
            GUMBO_TAG_CENTER, GUMBO_TAG_COL, GUMBO_TAG_COLGROUP,
-           GUMBO_TAG_COMMAND, GUMBO_TAG_DD, GUMBO_TAG_DETAILS, GUMBO_TAG_DIR,
+           GUMBO_TAG_MENUITEM, GUMBO_TAG_DD, GUMBO_TAG_DETAILS, GUMBO_TAG_DIR,
            GUMBO_TAG_DIV, GUMBO_TAG_DL, GUMBO_TAG_DT, GUMBO_TAG_EMBED,
            GUMBO_TAG_FIELDSET, GUMBO_TAG_FIGCAPTION, GUMBO_TAG_FIGURE,
            GUMBO_TAG_FOOTER, GUMBO_TAG_FORM, GUMBO_TAG_FRAME,
@@ -2105,7 +2130,7 @@ static bool handle_in_head(GumboParser* parser, GumboToken* token) {
   } else if (tag_is(token, kStartTag, GUMBO_TAG_HTML)) {
     return handle_in_body(parser, token);
   } else if (tag_in(token, kStartTag, GUMBO_TAG_BASE, GUMBO_TAG_BASEFONT,
-                    GUMBO_TAG_BGSOUND, GUMBO_TAG_COMMAND, GUMBO_TAG_LINK,
+                    GUMBO_TAG_BGSOUND, GUMBO_TAG_MENUITEM, GUMBO_TAG_LINK,
                     GUMBO_TAG_LAST)) {
     insert_element_from_token(parser, token);
     pop_current_node(parser);
@@ -2316,7 +2341,7 @@ static bool handle_in_body(GumboParser* parser, GumboToken* token) {
     merge_attributes(parser, token, parser->_output->root);
     return false;
   } else if (tag_in(token, kStartTag, GUMBO_TAG_BASE, GUMBO_TAG_BASEFONT,
-                    GUMBO_TAG_BGSOUND, GUMBO_TAG_COMMAND, GUMBO_TAG_LINK,
+                    GUMBO_TAG_BGSOUND, GUMBO_TAG_MENUITEM, GUMBO_TAG_LINK,
                     GUMBO_TAG_META, GUMBO_TAG_NOFRAMES, GUMBO_TAG_SCRIPT,
                     GUMBO_TAG_STYLE, GUMBO_TAG_TITLE, GUMBO_TAG_LAST)) {
     return handle_in_head(parser, token);
@@ -3415,6 +3440,12 @@ static bool handle_in_select_in_table(GumboParser* parser, GumboToken* token) {
   }
 }
 
+// http://www.whatwg.org/specs/web-apps/current-work/multipage/tree-construction.html#parsing-main-intemplate
+static bool handle_in_template(GumboParser* parser, GumboToken* token) {
+  // TODO(jdtang): Implement this.
+  return true;
+}
+
 // http://www.whatwg.org/specs/web-apps/current-work/complete/tokenization.html#parsing-main-afterbody
 static bool handle_after_body(GumboParser* parser, GumboToken* token) {
   if (token->type == GUMBO_TOKEN_WHITESPACE ||
@@ -3586,6 +3617,7 @@ static const TokenHandler kTokenHandlers[] = {
   handle_in_cell,
   handle_in_select,
   handle_in_select_in_table,
+  handle_in_template,
   handle_after_body,
   handle_in_frameset,
   handle_after_frameset,
@@ -3594,7 +3626,7 @@ static const TokenHandler kTokenHandlers[] = {
 };
 
 static bool handle_html_content(GumboParser* parser, GumboToken* token) {
-  return kTokenHandlers[parser->_parser_state->_insertion_mode](
+  return kTokenHandlers[(unsigned int) parser->_parser_state->_insertion_mode](
       parser, token);
 }
 

data/gumbo-parser/src/tag.c

@@ -34,10 +34,11 @@ const char* kGumboTagNames[] = {
   "style",
   "script",
   "noscript",
+  "template",
   "body",
+  "article",
   "section",
   "nav",
-  "article",
   "aside",
   "h1",
   "h2",
@@ -61,6 +62,7 @@ const char* kGumboTagNames[] = {
   "dd",
   "figure",
   "figcaption",
+  "main",
   "div",
   "a",
   "em",
@@ -71,6 +73,7 @@ const char* kGumboTagNames[] = {
   "q",
   "dfn",
   "abbr",
+  "data",
   "time",
   "code",
   "var",
@@ -80,6 +83,7 @@ const char* kGumboTagNames[] = {
   "sup",
   "i",
   "b",
+  "u",
   "mark",
   "ruby",
   "rt",
@@ -143,8 +147,8 @@ const char* kGumboTagNames[] = {
   "meter",
   "details",
   "summary",
-  "command",
   "menu",
+  "menuitem",
   "applet",
   "acronym",
   "bgsound",
@@ -170,7 +174,6 @@ const char* kGumboTagNames[] = {
   "nobr",
   "spacer",
   "tt",
-  "u",
   "",                   // TAG_UNKNOWN
   "",                   // TAG_LAST
 };

data/lib/nokogumbo.rb

@@ -67,7 +67,8 @@ module Nokogiri
         doc
       when Net::HTTPRedirection
         response.value if limit <= 1
-        get(response['location'], options.merge(:follow_limit => limit-1))
+        location = URI.join(uri, response['location'])
+        get(location, options.merge(:follow_limit => limit-1))
       else
         response.value
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogumbo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri