oga 2.14 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0184b6dd3129310044ca8c4bfa74f279566d8b50d93fe0bd313384fd635cc74c'
-  data.tar.gz: '088ee09d1c4b398bf80f478f5e3072fd7341de0a7ec50547827f1243bbc13391'
+  metadata.gz: c63e4b4004bf4af6d575ffe513b552cba8282fb259db82423b500f8360f3292a
+  data.tar.gz: 1e872c97b653e35fef9b7ad0178c07b3976a2bc0c98c324536ae9e3fff077e49
 SHA512:
-  metadata.gz: 84f951cd7414fa3a312380e343dc997ae9f94bdec825cff45b5ad8574a84276281cd4de71fb434a3c5fef08f0d76991810fb142d75176f37f66da6ca5c4e3f32
-  data.tar.gz: 5fbd1267ed3bcac28fd9dcec7c2735bdfc9437b717cd45c640ca2285cf974ea4deb3c12c896605531d918860de5e73eb6fd819c4dd9e7fd316785c63d696a729
+  metadata.gz: ac793a9b79020aeffd99458a5200077c366d939d69ab9284dfc4a16be7f32cc2f469d4c75a0cf7d539f39033e5ba423688009d7da366e33fbb275b688bc23277
+  data.tar.gz: 490d98fbef2aa6c98f22f6815c4fc16da1573f53d4a686877707f5e57cdd1e6995451deee1521c480e5956624c0fa003470cdb2c4b2a3944a6fb0d52babf852f

data/README.md

@@ -172,9 +172,9 @@ Querying a document using a namespace:
 
 | Ruby     | Required      | Recommended |
 |:---------|:--------------|:------------|
-| MRI      | >= 1.9.3      | >= 2.1.2    |
-| Rubinius | >= 2.2        | >= 2.2.10   |
+| MRI      | >= 2.3.0      | >= 2.6.0    |
 | JRuby    | >= 1.7        | >= 1.7.12   |
+| Rubinius | Not supported |             |
 | Maglev   | Not supported |             |
 | Topaz    | Not supported |             |
 | mruby    | Not supported |             |
@@ -227,15 +227,14 @@ And if you want to specify an explicit namespace URI, you can use this:
 
     descendant::*[local-name() = "bar" and namespace-uri() = "http://example.com"]
 
-Unlike Nokogiri, Oga does _not_ provide a way to create "dynamic" namespaces.
-That is, Nokogiri allows one to query the above document as following:
+Like Nokogiri, Oga provides a way to create "dynamic" namespaces.
+That is, Oga allows one to query the above document as following:
 
-    document = Nokogiri::XML('<root xmlns="http://example.com"><bar>bar</bar></root>')
+    document = Oga.parse_xml('<root xmlns="http://example.com"><bar>bar</bar></root>')
 
-    document.xpath('x:root/x:bar', :x => 'http://example.com')
+    document.xpath('x:root/x:bar', namespaces: {'x' => 'http://example.com'})
 
-Oga does have a small trick you can use to cut down the size of your XPath
-queries. Because Oga assigns the name "xmlns" to default namespaces you can use
+Moreover, because Oga assigns the name "xmlns" to default namespaces you can use
 this in your XPath queries:
 
     document = Oga.parse_xml('<root xmlns="http://example.com"><bar>bar</bar></root>')
@@ -246,9 +245,6 @@ When using this you can still restrict the query to the correct namespace URI:
 
     document.xpath('xmlns:root[namespace-uri() = "http://example.com"]/xmlns:bar')
 
-In the future I might add an API to ease this process, although at this time I
-have little interest in providing an API similar to Nokogiri.
-
 ## HTML5 Support
 
 Oga fully supports HTML5 including the omission of certain tags. For example,

data/ext/c/lexer.c

@@ -1179,6 +1179,8 @@ case 57:
 		case 83: goto st65;
 		case 91: goto tr88;
 		case 96: goto st0;
+		case 112: goto st60;
+		case 115: goto st65;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1208,7 +1210,7 @@ st58:
 	if ( ++p == pe )
 		goto _test_eof58;
 case 58:
-#line 1212 "ext/c/lexer.c"
+#line 1214 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr89;
 		case 96: goto tr89;
@@ -1243,6 +1245,7 @@ case 60:
 		case 47: goto tr91;
 		case 85: goto st61;
 		case 96: goto tr91;
+		case 117: goto st61;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1264,6 +1267,7 @@ case 61:
 		case 47: goto tr91;
 		case 66: goto st62;
 		case 96: goto tr91;
+		case 98: goto st62;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1285,6 +1289,7 @@ case 62:
 		case 47: goto tr91;
 		case 76: goto st63;
 		case 96: goto tr91;
+		case 108: goto st63;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1306,6 +1311,7 @@ case 63:
 		case 47: goto tr91;
 		case 73: goto st64;
 		case 96: goto tr91;
+		case 105: goto st64;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1327,6 +1333,7 @@ case 64:
 		case 47: goto tr91;
 		case 67: goto tr96;
 		case 96: goto tr91;
+		case 99: goto tr96;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1348,6 +1355,7 @@ case 65:
 		case 47: goto tr91;
 		case 89: goto st66;
 		case 96: goto tr91;
+		case 121: goto st66;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1369,6 +1377,7 @@ case 66:
 		case 47: goto tr91;
 		case 83: goto st67;
 		case 96: goto tr91;
+		case 115: goto st67;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1390,6 +1399,7 @@ case 67:
 		case 47: goto tr91;
 		case 84: goto st68;
 		case 96: goto tr91;
+		case 116: goto st68;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1411,6 +1421,7 @@ case 68:
 		case 47: goto tr91;
 		case 69: goto st69;
 		case 96: goto tr91;
+		case 101: goto st69;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1432,6 +1443,7 @@ case 69:
 		case 47: goto tr91;
 		case 77: goto tr96;
 		case 96: goto tr91;
+		case 109: goto tr96;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
@@ -1518,7 +1530,7 @@ st70:
 case 70:
 #line 1 "NONE"
 	{ts = p;}
-#line 1522 "ext/c/lexer.c"
+#line 1534 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr103;
 		case 39: goto tr104;
@@ -1548,7 +1560,7 @@ st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 1552 "ext/c/lexer.c"
+#line 1564 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr106;
 		case 96: goto tr106;
@@ -1575,7 +1587,7 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1579 "ext/c/lexer.c"
+#line 1591 "ext/c/lexer.c"
 	if ( (*p) == 62 )
 		goto tr109;
 	goto tr108;
@@ -1612,7 +1624,7 @@ st73:
 case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1616 "ext/c/lexer.c"
+#line 1628 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st0;
 		case 96: goto st0;
@@ -1694,7 +1706,7 @@ st75:
 case 75:
 #line 1 "NONE"
 	{ts = p;}
-#line 1698 "ext/c/lexer.c"
+#line 1710 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr114;
 		case 62: goto tr115;
@@ -1722,7 +1734,7 @@ st76:
 	if ( ++p == pe )
 		goto _test_eof76;
 case 76:
-#line 1726 "ext/c/lexer.c"
+#line 1738 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr116;
 		case 58: goto tr118;
@@ -1800,7 +1812,7 @@ st77:
 case 77:
 #line 1 "NONE"
 	{ts = p;}
-#line 1804 "ext/c/lexer.c"
+#line 1816 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr121;
 		case 32: goto tr120;
@@ -1820,7 +1832,7 @@ st78:
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
-#line 1824 "ext/c/lexer.c"
+#line 1836 "ext/c/lexer.c"
 	if ( (*p) == 10 )
 		goto tr120;
 	goto tr123;
@@ -1849,7 +1861,7 @@ st79:
 case 79:
 #line 1 "NONE"
 	{ts = p;}
-#line 1853 "ext/c/lexer.c"
+#line 1865 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr125;
 		case 32: goto tr125;
@@ -1903,7 +1915,7 @@ st81:
 case 81:
 #line 1 "NONE"
 	{ts = p;}
-#line 1907 "ext/c/lexer.c"
+#line 1919 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr128;
 		case 39: goto tr129;
@@ -1980,7 +1992,7 @@ st82:
 case 82:
 #line 1 "NONE"
 	{ts = p;}
-#line 1984 "ext/c/lexer.c"
+#line 1996 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 10: goto tr132;
 		case 13: goto st84;
@@ -2065,7 +2077,7 @@ st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2069 "ext/c/lexer.c"
+#line 2081 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr144;
 		case 58: goto st20;
@@ -2199,7 +2211,7 @@ st89:
 case 89:
 #line 1 "NONE"
 	{ts = p;}
-#line 2203 "ext/c/lexer.c"
+#line 2215 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 10: goto tr148;
 		case 13: goto st91;
@@ -2283,7 +2295,7 @@ st94:
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 2287 "ext/c/lexer.c"
+#line 2299 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr159;
 		case 58: goto st21;
@@ -2400,7 +2412,7 @@ st96:
 case 96:
 #line 1 "NONE"
 	{ts = p;}
-#line 2404 "ext/c/lexer.c"
+#line 2416 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr162;
 	goto tr161;
@@ -2414,7 +2426,7 @@ st97:
 	if ( ++p == pe )
 		goto _test_eof97;
 case 97:
-#line 2418 "ext/c/lexer.c"
+#line 2430 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr164;
 	goto tr161;
@@ -2430,7 +2442,7 @@ st98:
 	if ( ++p == pe )
 		goto _test_eof98;
 case 98:
-#line 2434 "ext/c/lexer.c"
+#line 2446 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 60: goto tr164;
 		case 64: goto tr161;
@@ -2463,7 +2475,7 @@ st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 2467 "ext/c/lexer.c"
+#line 2479 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 60: goto tr164;
 		case 64: goto tr161;
@@ -2527,7 +2539,7 @@ st100:
 case 100:
 #line 1 "NONE"
 	{ts = p;}
-#line 2531 "ext/c/lexer.c"
+#line 2543 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr168;
 	goto tr167;
@@ -2541,7 +2553,7 @@ st101:
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 2545 "ext/c/lexer.c"
+#line 2557 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr169;
 	goto tr167;
@@ -2557,7 +2569,7 @@ st102:
 	if ( ++p == pe )
 		goto _test_eof102;
 case 102:
-#line 2561 "ext/c/lexer.c"
+#line 2573 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st22;
 		case 60: goto tr171;
@@ -2622,7 +2634,7 @@ st103:
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 2626 "ext/c/lexer.c"
+#line 2638 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr171;
 	goto tr169;
@@ -2669,7 +2681,7 @@ st104:
 case 104:
 #line 1 "NONE"
 	{ts = p;}
-#line 2673 "ext/c/lexer.c"
+#line 2685 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr173;
 	goto tr172;
@@ -2683,7 +2695,7 @@ st105:
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 2687 "ext/c/lexer.c"
+#line 2699 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr174;
 	goto tr172;
@@ -2699,7 +2711,7 @@ st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 2703 "ext/c/lexer.c"
+#line 2715 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st29;
 		case 60: goto tr176;
@@ -2757,7 +2769,7 @@ st107:
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 2761 "ext/c/lexer.c"
+#line 2773 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr176;
 	goto tr174;

data/ext/java/org/liboga/xml/Lexer.java

@@ -73,11 +73,11 @@ private static short[] init__java_lexer_key_offsets_0()
 	   23,   24,   25,   26,   27,   38,   48,   49,   50,   60,   70,   71,
 	   72,   73,   74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
 	   84,   96,  100,  111,  121,  133,  145,  146,  147,  148,  149,  150,
-	  151,  152,  153,  154,  155,  156,  157,  158,  159,  160,  180,  181,
-	  191,  202,  213,  224,  235,  246,  257,  268,  279,  290,  301,  314,
-	  324,  325,  335,  346,  357,  368,  374,  375,  380,  385,  387,  402,
-	  403,  414,  415,  425,  436,  446,  461,  462,  472,  473,  483,  494,
-	  504,  505,  506,  519,  532,  533,  534,  536,  537,  538,  539,  541
+	  151,  152,  153,  154,  155,  156,  157,  158,  159,  160,  182,  183,
+	  193,  205,  217,  229,  241,  253,  265,  277,  289,  301,  313,  326,
+	  336,  337,  347,  358,  369,  380,  386,  387,  392,  397,  399,  414,
+	  415,  426,  427,  437,  448,  458,  473,  474,  484,  485,  495,  506,
+	  516,  517,  518,  531,  544,  545,  546,  548,  549,  550,  551,  553
 	};
 }
 
@@ -101,17 +101,18 @@ private static char[] init__java_lexer_trans_keys_0()
 	  127,   47,   58,   96,  108,    0,   44,   59,   64,   91,   94,  123,
 	  127,   45,   45,   45,   93,   93,   93,   63,   63,   62,   39,   39,
 	   34,   34,   93,   93,    9,   10,   13,   32,   34,   39,   47,   62,
-	   80,   83,   91,   96,    0,   44,   58,   64,   92,   94,  123,  127,
-	   10,   47,   96,    0,   44,   58,   64,   91,   94,  123,  127,   47,
-	   85,   96,    0,   44,   58,   64,   91,   94,  123,  127,   47,   66,
-	   96,    0,   44,   58,   64,   91,   94,  123,  127,   47,   76,   96,
-	    0,   44,   58,   64,   91,   94,  123,  127,   47,   73,   96,    0,
-	   44,   58,   64,   91,   94,  123,  127,   47,   67,   96,    0,   44,
-	   58,   64,   91,   94,  123,  127,   47,   89,   96,    0,   44,   58,
-	   64,   91,   94,  123,  127,   47,   83,   96,    0,   44,   58,   64,
-	   91,   94,  123,  127,   47,   84,   96,    0,   44,   58,   64,   91,
-	   94,  123,  127,   47,   69,   96,    0,   44,   58,   64,   91,   94,
-	  123,  127,   47,   77,   96,    0,   44,   58,   64,   91,   94,  123,
+	   80,   83,   91,   96,  112,  115,    0,   44,   58,   64,   92,   94,
+	  123,  127,   10,   47,   96,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   85,   96,  117,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   66,   96,   98,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   76,   96,  108,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   73,   96,  105,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   67,   96,   99,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   89,   96,  121,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   83,   96,  115,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   84,   96,  116,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   69,   96,  101,    0,   44,   58,   64,   91,   94,  123,
+	  127,   47,   77,   96,  109,    0,   44,   58,   64,   91,   94,  123,
 	  127,   34,   39,   47,   63,   96,    0,   44,   58,   64,   91,   94,
 	  123,  127,   47,   96,    0,   44,   58,   64,   91,   94,  123,  127,
 	   62,   47,   96,    0,   44,   58,   64,   91,   94,  123,  127,   47,
@@ -146,8 +147,8 @@ private static byte[] init__java_lexer_single_lengths_0()
 	    1,    1,    1,    1,    3,    2,    1,    1,    2,    2,    1,    1,
 	    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
 	    4,    2,    3,    2,    4,    4,    1,    1,    1,    1,    1,    1,
-	    1,    1,    1,    1,    1,    1,    1,    1,    1,   12,    1,    2,
-	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    5,    2,
+	    1,    1,    1,    1,    1,    1,    1,    1,    1,   14,    1,    2,
+	    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    5,    2,
 	    1,    2,    3,    3,    3,    4,    1,    3,    3,    2,    7,    1,
 	    3,    1,    2,    3,    2,    7,    1,    2,    1,    2,    3,    2,
 	    1,    1,    3,    3,    1,    1,    2,    1,    1,    1,    2,    1
@@ -182,11 +183,11 @@ private static short[] init__java_lexer_index_offsets_0()
 	   33,   35,   37,   39,   41,   49,   56,   58,   60,   67,   74,   76,
 	   78,   80,   82,   84,   86,   88,   90,   92,   94,   96,   98,  100,
 	  102,  111,  115,  123,  130,  139,  148,  150,  152,  154,  156,  158,
-	  160,  162,  164,  166,  168,  170,  172,  174,  176,  178,  195,  197,
-	  204,  212,  220,  228,  236,  244,  252,  260,  268,  276,  284,  294,
-	  301,  303,  310,  318,  326,  334,  340,  342,  347,  352,  355,  367,
-	  369,  377,  379,  386,  394,  401,  413,  415,  422,  424,  431,  439,
-	  446,  448,  450,  459,  468,  470,  472,  475,  477,  479,  481,  484
+	  160,  162,  164,  166,  168,  170,  172,  174,  176,  178,  197,  199,
+	  206,  215,  224,  233,  242,  251,  260,  269,  278,  287,  296,  306,
+	  313,  315,  322,  330,  338,  346,  352,  354,  359,  364,  367,  379,
+	  381,  389,  391,  398,  406,  413,  425,  427,  434,  436,  443,  451,
+	  458,  460,  462,  471,  480,  482,  484,  487,  489,  491,  493,  496
 	};
 }
 
@@ -211,15 +212,16 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   35,   35,   35,   38,   44,   43,   42,   43,   18,   42,   47,   46,
 	   45,   46,   19,   45,   50,   49,   48,   49,   48,   48,   51,   52,
 	   51,   52,   53,   54,   53,   54,   55,   56,   55,   56,   57,   57,
-	   58,   57,   57,   57,    0,   57,   60,   65,   57,    0,    0,    0,
-	    0,    0,   59,   57,   57,   57,   57,   57,   57,   57,   57,   59,
-	   57,   61,   57,   57,   57,   57,   57,   59,   57,   62,   57,   57,
-	   57,   57,   57,   59,   57,   63,   57,   57,   57,   57,   57,   59,
-	   57,   64,   57,   57,   57,   57,   57,   59,   57,   59,   57,   57,
-	   57,   57,   57,   59,   57,   66,   57,   57,   57,   57,   57,   59,
-	   57,   67,   57,   57,   57,   57,   57,   59,   57,   68,   57,   57,
-	   57,   57,   57,   59,   57,   69,   57,   57,   57,   57,   57,   59,
-	   57,   59,   57,   57,   57,   57,   57,   59,   70,   70,   70,   72,
+	   58,   57,   57,   57,    0,   57,   60,   65,   57,    0,   60,   65,
+	    0,    0,    0,    0,   59,   57,   57,   57,   57,   57,   57,   57,
+	   57,   59,   57,   61,   57,   61,   57,   57,   57,   57,   59,   57,
+	   62,   57,   62,   57,   57,   57,   57,   59,   57,   63,   57,   63,
+	   57,   57,   57,   57,   59,   57,   64,   57,   64,   57,   57,   57,
+	   57,   59,   57,   59,   57,   59,   57,   57,   57,   57,   59,   57,
+	   66,   57,   66,   57,   57,   57,   57,   59,   57,   67,   57,   67,
+	   57,   57,   57,   57,   59,   57,   68,   57,   68,   57,   57,   57,
+	   57,   59,   57,   69,   57,   69,   57,   57,   57,   57,   59,   57,
+	   59,   57,   59,   57,   57,   57,   57,   59,   70,   70,   70,   72,
 	   70,   70,   70,   70,   70,   71,   70,   70,   70,   70,   70,   70,
 	   71,   70,   70,    0,    0,    0,    0,    0,    0,   74,   73,   73,
 	   73,   73,   73,   73,   73,   74,   75,   75,   75,   75,   75,   75,
@@ -269,14 +271,15 @@ private static short[] init__java_lexer_trans_actions_0()
 	   17,    1,    0,   17,    1,    1,   23,    1,   21,   23,   25,    1,
 	   27,    1,   29,    1,   31,    1,   33,    1,   35,    1,   47,   45,
 	    0,   47,   41,   39,    0,   43,    0,    0,   37,    0,    0,    0,
-	    0,    0,  183,   45,   51,   53,   53,   53,   53,   53,   53,  183,
-	   49,    0,   49,   49,   49,   49,   49,  183,   49,    0,   49,   49,
-	   49,   49,   49,  183,   49,    0,   49,   49,   49,   49,   49,  183,
-	   49,    0,   49,   49,   49,   49,   49,  183,   49,  180,   49,   49,
-	   49,   49,   49,  183,   49,    0,   49,   49,   49,   49,   49,  183,
-	   49,    0,   49,   49,   49,   49,   49,  183,   49,    0,   49,   49,
-	   49,   49,   49,  183,   49,    0,   49,   49,   49,   49,   49,  183,
-	   49,  180,   49,   49,   49,   49,   49,  183,  195,  192,  168,    1,
+	    0,    0,    0,    0,  183,   45,   51,   53,   53,   53,   53,   53,
+	   53,  183,   49,    0,   49,    0,   49,   49,   49,   49,  183,   49,
+	    0,   49,    0,   49,   49,   49,   49,  183,   49,    0,   49,    0,
+	   49,   49,   49,   49,  183,   49,    0,   49,    0,   49,   49,   49,
+	   49,  183,   49,  180,   49,  180,   49,   49,   49,   49,  183,   49,
+	    0,   49,    0,   49,   49,   49,   49,  183,   49,    0,   49,    0,
+	   49,   49,   49,   49,  183,   49,    0,   49,    0,   49,   49,   49,
+	   49,  183,   49,    0,   49,    0,   49,   49,   49,   49,  183,   49,
+	  180,   49,  180,   49,   49,   49,   49,  183,  195,  192,  168,    1,
 	  168,  168,  168,  168,  168,    1,   57,   57,   57,   57,   57,   57,
 	    0,   55,   59,    0,    0,    0,    0,    0,    0,    0,   63,   61,
 	   63,   63,   63,   63,   63,    0,  171,  198,  171,  171,  171,  171,
@@ -346,15 +349,15 @@ private static final short _java_lexer_from_state_actions[] = init__java_lexer_f
 private static short[] init__java_lexer_eof_trans_0()
 {
 	return new short [] {
-	    0,  502,  502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-	  502,  502,  502,  502,  502,  523,  504,  505,  506,  507,  514,  514,
-	  514,  514,  514,  514,  514,  520,  520,  520,  520,  520,  520,    0,
-	  521,  522,  523,  526,  526,  526,    0,  528,  528,    0,  530,  530,
-	    0,  532,  532,    0,  533,    0,  534,    0,  535,    0,  536,  537,
-	  547,  547,  547,  547,  547,  547,  547,  547,  547,  547,    0,  548,
-	  549,    0,  550,    0,  551,    0,  552,    0,  553,    0,    0,  554,
-	  555,  557,  557,  559,  559,    0,  560,  561,  563,  563,  565,  565,
-	    0,  568,  568,  568,    0,  571,  571,  571,    0,  574,  574,  574
+	    0,  514,  514,  514,  514,  514,  514,  514,  514,  514,  514,  514,
+	  514,  514,  514,  514,  514,  535,  516,  517,  518,  519,  526,  526,
+	  526,  526,  526,  526,  526,  532,  532,  532,  532,  532,  532,    0,
+	  533,  534,  535,  538,  538,  538,    0,  540,  540,    0,  542,  542,
+	    0,  544,  544,    0,  545,    0,  546,    0,  547,    0,  548,  549,
+	  559,  559,  559,  559,  559,  559,  559,  559,  559,  559,    0,  560,
+	  561,    0,  562,    0,  563,    0,  564,    0,  565,    0,    0,  566,
+	  567,  569,  569,  571,  571,    0,  572,  573,  575,  575,  577,  577,
+	    0,  580,  580,  580,    0,  583,  583,  583,    0,  586,  586,  586
 	};
 }
 
@@ -484,7 +487,7 @@ static final int java_lexer_en_main = 35;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 488 "ext/java/org/liboga/xml/Lexer.java"
+// line 491 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -513,7 +516,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 517 "ext/java/org/liboga/xml/Lexer.java"
+// line 520 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -1345,7 +1348,7 @@ case 3:
 	}
 	}
 	break;
-// line 1349 "ext/java/org/liboga/xml/Lexer.java"
+// line 1352 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -1359,7 +1362,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1363 "ext/java/org/liboga/xml/Lexer.java"
+// line 1366 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 

data/ext/ragel/base_lexer.rl

@@ -289,7 +289,7 @@
     # Machine for processing doctypes. Doctype values such as the public
     # and system IDs are treated as T_STRING tokens.
     doctype := |*
-        'PUBLIC' | 'SYSTEM' => {
+        'PUBLIC'i | 'SYSTEM'i => {
             callback(id_on_doctype_type, data, encoding, ts, te);
         };
 

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '2.14'
+  VERSION = '3.3'
 end # Oga

data/lib/oga/xml/lexer.rb

@@ -58,7 +58,11 @@ module Oga
 
       HTML_SCRIPT_ELEMENTS = Whitelist.new(%w{script template})
 
-      HTML_TABLE_ROW_ELEMENTS = Whitelist.new(%w{tr}) + HTML_SCRIPT_ELEMENTS
+      # The elements that may occur in a thead, tbody, or tfoot.
+      #
+      # Technically "th" is not allowed per the HTML5 spec, but it's so commonly
+      # used in these elements that we allow it anyway.
+      HTML_TABLE_ROW_ELEMENTS = Whitelist.new(%w{tr th}) + HTML_SCRIPT_ELEMENTS
 
       # Elements that should be closed automatically before a new opening tag is
       # processed.

data/lib/oga/xml/querying.rb

@@ -10,6 +10,7 @@ module Oga
       #     document = Oga.parse_xml <<-EOF
       #     <people>
       #       <person age="25">Alice</person>
+      #       <ns:person xmlns:ns="http://example.net">Bob</ns:person>
       #     </people>
       #     EOF
       #
@@ -25,15 +26,23 @@ module Oga
       #
       #     document.xpath('people/person[@age = $age]', 'age' => 25)
       #
+      # Using namespace aliases:
+      #
+      #     namespaces = {'example' => 'http://example.net'}
+      #     document.xpath('people/example:person', namespaces: namespaces)
+      #
       # @param [String] expression The XPath expression to run.
       #
       # @param [Hash] variables Variables to bind. The keys of this Hash should
       #  be String values.
       #
+      # @param [Hash] namespaces Namespace aliases. The keys of this Hash should
+      #  be String values.
+      #
       # @return [Oga::XML::NodeSet]
-      def xpath(expression, variables = {})
+      def xpath(expression, variables = {}, namespaces: nil)
         ast   = XPath::Parser.parse_with_cache(expression)
-        block = XPath::Compiler.compile_with_cache(ast)
+        block = XPath::Compiler.compile_with_cache(ast, namespaces: namespaces)
 
         block.call(self, variables)
       end
@@ -54,8 +63,8 @@ module Oga
       #
       # @see [#xpath]
       # @return [Oga::XML::Node|Oga::XML::Attribute]
-      def at_xpath(*args)
-        result = xpath(*args)
+      def at_xpath(*args, namespaces: nil)
+        result = xpath(*args, namespaces: namespaces)
 
         result.is_a?(XML::NodeSet) ? result.first : result
       end

data/lib/oga/xml/to_xml.rb

@@ -7,6 +7,8 @@ module Oga
       def to_xml
         Generator.new(self).to_xml
       end
+
+      alias_method :to_s, :to_xml
     end
   end
 end

data/lib/oga/xpath/compiler.rb

@@ -42,12 +42,16 @@ module Oga
       # Compiles and caches an AST.
       #
       # @see [#compile]
-      def self.compile_with_cache(ast)
-        CACHE.get_or_set(ast) { new.compile(ast) }
+      def self.compile_with_cache(ast, namespaces: nil)
+        cache_key = namespaces ? [ast, namespaces] : ast
+        CACHE.get_or_set(cache_key) { new(namespaces: namespaces).compile(ast) }
       end
 
-      def initialize
+      # @param [Hash] namespaces
+      def initialize(namespaces: nil)
         reset
+
+        @namespaces = namespaces
       end
 
       # Resets the internal state.
@@ -1385,7 +1389,23 @@ module Oga
         end
 
         if ns and ns != STAR
-          ns_match  = input.namespace_name.eq(string(ns))
+          if @namespaces
+            ns_uri = @namespaces[ns]
+            ns_match =
+              if ns_uri
+                input.namespace.and(input.namespace.uri.eq(string(ns_uri)))
+              else
+                self.false
+              end
+          else
+            ns_match =
+              if ns == XML::Element::XMLNS_PREFIX
+                input
+              else
+                input.namespace_name.eq(string(ns))
+              end
+          end
+
           condition = condition ? condition.and(ns_match) : ns_match
         end
 

data/oga.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |s|
     s.extensions = ['ext/c/extconf.rb']
   end
 
-  s.has_rdoc              = 'yard'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency 'ast'
   s.add_dependency 'ruby-ll', '~> 2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: '2.14'
+  version: '3.3'
 platform: ruby
 authors:
 - Yorick Peterse
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -210,7 +210,7 @@ homepage: https://gitlab.com/yorickpeterse/oga/
 licenses:
 - MPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,16 +218,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.0
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Oga is an XML/HTML parser written in Ruby.
 test_files: []