nokogiri 1.5.2-x86-mswin32-60 → 1.5.3.rc2-x86-mswin32-60

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,18 @@
+== 1.5.3 / unreleased
+
+* Bugfixes
+
+  * Custom xpath functions with empty nodeset arguments cause a segfault. #634.
+  * Nokogiri::XML::Node#css now works for XML documents with default
+    namespaces when the rule contains attribute selector without
+    namespace.
+
+
+== 1.5.2 / 2012-03-09
+
+Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
+
+
 == 1.5.1 / 2012年3月9日
 
 * 新機能

data/CHANGELOG.rdoc

@@ -1,7 +1,18 @@
+== 1.5.3 / unreleased
+
+* Bugfixes
+
+  * Custom xpath functions with empty nodeset arguments cause a segfault. #634.
+  * Nokogiri::XML::Node#css now works for XML documents with default
+    namespaces when the rule contains attribute selector without
+    namespace.
+
+
 == 1.5.2 / 2012-03-09
 
 Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
 
+
 == 1.5.1 / 2012-03-09
 
 * Features

data/Manifest.txt

@@ -2,11 +2,16 @@
 .gemtest
 CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
+C_CODING_STYLE.rdoc
 Manifest.txt
 README.ja.rdoc
 README.rdoc
+ROADMAP.md
 Rakefile
+STANDARD_RESPONSES.md
+Y_U_NO_GEMSPEC.md
 bin/nokogiri
+build_all
 ext/java/nokogiri/EncodingHandler.java
 ext/java/nokogiri/HtmlDocument.java
 ext/java/nokogiri/HtmlElementDescription.java
@@ -198,7 +203,6 @@ lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
-nokogiri_help_responses.md
 tasks/cross_compile.rb
 tasks/nokogiri.org.rb
 tasks/test.rb
@@ -228,7 +232,9 @@ test/files/staff.dtd
 test/files/staff.xml
 test/files/staff.xslt
 test/files/tlm.html
+test/files/to_be_xincluded.xml
 test/files/valid_bar.xml
+test/files/xinclude.xml
 test/helper.rb
 test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb
@@ -256,6 +262,7 @@ test/xml/sax/test_push_parser.rb
 test/xml/test_attr.rb
 test/xml/test_attribute_decl.rb
 test/xml/test_builder.rb
+test/xml/test_c14n.rb
 test/xml/test_cdata.rb
 test/xml/test_comment.rb
 test/xml/test_document.rb
@@ -271,9 +278,9 @@ test/xml/test_namespace.rb
 test/xml/test_node.rb
 test/xml/test_node_attributes.rb
 test/xml/test_node_encoding.rb
+test/xml/test_node_inheritance.rb
 test/xml/test_node_reparenting.rb
 test/xml/test_node_set.rb
-test/xml/test_node_inheritance.rb
 test/xml/test_parse_options.rb
 test/xml/test_processing_instruction.rb
 test/xml/test_reader_encoding.rb
@@ -282,6 +289,8 @@ test/xml/test_schema.rb
 test/xml/test_syntax_error.rb
 test/xml/test_text.rb
 test/xml/test_unparented_node.rb
+test/xml/test_xinclude.rb
 test/xml/test_xpath.rb
 test/xslt/test_custom_functions.rb
 test/xslt/test_exception_handling.rb
+test_all

data/ROADMAP.md

@@ -0,0 +1,65 @@
+# Roadmap for 2.0
+
+## overhaul serialize/pretty printing API
+
+* https://github.com/tenderlove/nokogiri/issues/530
+  XHTML formatting can't be turned off
+
+* https://github.com/tenderlove/nokogiri/issues/415
+  XML formatting should be no formatting
+
+
+## overhaul and optimize the SAX parsing
+
+* see fairy wing throwdown - SAX parsing is wicked slow.
+
+
+## improve CSS query parsing
+
+* https://github.com/tenderlove/nokogiri/issues/528
+  support `:not()` with a nontrivial argument, like `:not(div p.c)`
+
+* https://github.com/tenderlove/nokogiri/issues/451
+  chained :not pseudoselectors
+
+* better jQuery selector support:
+  * https://github.com/tenderlove/nokogiri/issues/621
+  * https://github.com/tenderlove/nokogiri/issues/342
+  * https://github.com/tenderlove/nokogiri/issues/628
+
+* https://github.com/tenderlove/nokogiri/issues/394
+  nth-of-type is wrong, and possibly other selectors as well
+
+* https://github.com/tenderlove/nokogiri/issues/309
+  incorrect query being executed
+
+* https://github.com/tenderlove/nokogiri/issues/350
+  :has is wrong?
+
+
+## DocumentFragment
+
+* there are a few tickets about searches not working properly if you
+  use or do not use the context node as part of the search.
+  - https://github.com/tenderlove/nokogiri/issues/213
+  - https://github.com/tenderlove/nokogiri/issues/370
+  - https://github.com/tenderlove/nokogiri/issues/454
+  - https://github.com/tenderlove/nokogiri/issues/572
+
+
+## Better Syntax for custom XPath function handler
+
+* https://github.com/tenderlove/nokogiri/pull/464
+
+
+## Encoding
+
+We have a lot of issues open around encoding. Is this really an issue?
+Somebody who knows something about encoding, and cares, should point
+this one.
+
+
+## Reader
+
+It's fundamentally broken, in that we can't stop people from crashing
+their application if they want to use object reference unsafely.

data/{nokogiri_help_responses.md → STANDARD_RESPONSES.md}

@@ -1,4 +1,10 @@
-# not-enough-information
+# Standard Responses to Requests
+
+These responses are needed often enough that I figured, let's just
+check them in for future reference and use.
+
+
+# Not enough information to help
 
 Hello!
 
@@ -22,7 +28,8 @@ take a look at http://bit.ly/nokohelp
 
 Thank you so much!
 
-# not-a-bug
+
+# Not a bug
 
 Hello!
 

data/Y_U_NO_GEMSPEC.md

@@ -0,0 +1,155 @@
+(note: this was originally a blog post published at http://blog.flavorjon.es/2012/03/y-u-no-gemspec.html)
+
+## tl;dr
+
+1. Team Nokogiri are not 10-foot-tall code-crunching robots, so `master` is usually unstable.
+2. Unstable code can corrupt your data and crash your application, which would make everybody look bad.
+3. Therefore, the _risk_ associated with using unstable code is severe; for you _and_ for Team Nokogiri.
+4. The absence of a gemspec is a risk mitigation tactic.
+5. You can always ask for an RC release.
+
+
+## Why Isn't There a Gemspec!?
+
+OHAI! Thank you for asking this question!
+
+Team Nokogiri gets asked this pretty frequently. Just a sample from
+the historical record:
+
+* [Issue #274](https://github.com/tenderlove/nokogiri/issues/274)
+* [Issue #371](https://github.com/tenderlove/nokogiri/issues/371)
+* [A commit removing nokogiri.gemspec](https://github.com/tenderlove/nokogiri/commit/7f17a643a05ca381d65131515b54d4a3a61ca2e1#commitcomment-667477)
+* [A nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/4706b002e492d23f)
+* [Another nokogiri-talk thread](http://groups.google.com/group/nokogiri-talk/browse_thread/thread/0b201bb80ea3eea0)
+
+Sometimes people imply that we've forgotten, or that we don't how to
+properly manage our codebase. Those people are super fun to respond
+to!
+
+We've gone back and forth a couple of times over the past few years,
+but the current policy of Team Nokogiri is to **not** provide a
+gemspec in the Github repo. This is a conscious choice, not an
+oversight.
+
+
+## But You Didn't Answer the Question!
+
+Ah, I was hoping you wouldn't notice. Well, OK, let's do this, if
+you're serious about it.
+
+I'd like to start by talking about _risk_. Specifically, the risk
+associated with using a known-unstable version of Nokogiri.
+
+
+### Risk
+
+One common way to evaluate the _risk_ of an incident is:
+
+    risk = probability x impact
+
+You can read more about this on [the internets](http://en.wikipedia.org/wiki/Risk_Matrix).
+
+The _risk_ associated with a Nokogiri bug could be loosely defined by
+answering the questions:
+
+* "How likely is it that a bug exists?" (probability)
+* "How severe will the consequences of a bug be?" (impact)
+
+
+### Probability
+
+The `master` branch should be considered unstable. Team Nokogiri are
+not 10-foot-tall code-crunching robots; we are humans. We make
+mistakes, and as a result, any arbitrary commit on `master` is likely
+to contain bugs.
+
+Just as an example, Nokogiri `master` was unstable for about five
+months between November 2011 and March 2012. It was unstable not
+because we were sloppy, or didn't care, but because the fixes were
+hard and unobvious.
+
+When we release Nokogiri, we test for memory leaks and invalid memory
+access on all kinds of platforms with many flavors of Ruby and lots of
+versions of libxml2. Because these tests are time-consuming, we don't
+run them on every commit. We run them often when preparing a release.
+
+If we're releasing Nokogiri, it means we think it's rock solid.
+
+And if we're not releasing it, it means there are probably bugs.
+
+
+### Impact
+
+Nokogiri is a gem with native extensions. This means it's not pure
+Ruby -- there's C or Java code being compiled and run, which means
+that there's always a chance that the gem will crash your application,
+or worse. Possible outcomes include:
+
+* leaking memory
+* corrupting data
+* making benign code crash (due to memory corruption)
+
+So, then, a bug in a native extension can have much worse downside
+than you might think. It's not just going to do something unexpected;
+it's possibly going to do terrible, awful things to your application
+and data.
+
+**Nobody** wants that to happen. Especially Team Nokogiri.
+
+
+### Risk, Redux
+
+So, if you accept the equation
+
+    risk = probability x impact
+
+and you believe me when I say that:
+
+* the probablility of a bug in unreleased code is high, and
+* the impact of a bug is likely to be severe,
+
+then you should easily see that the _risk_ associated with a bug in
+Nokogiri is quite high.
+
+Part of Team Nokogiri's job is to try to mitigate this risk. We have a
+number of tactics that we use to accomplish this:
+
+* we respond quickly to bug reports, particularly when they are possible memory issues
+* we review each others' commits
+* we have a thorough test suite, and we test-drive new features
+* we discuss code design and issues on a core developer mailing list
+* we use valgrind to test for memory issues (leaks and invalid
+  access) on multiple combinations of OS, libxml2 and Ruby
+* we package release candidates, and encourage devs to use them
+* **we do NOT commit a gemspec in our git repository**
+
+Yes, that's right, the absence of a gemspec is a risk mitigation
+tactic. Not only does Team Nokogiri not want to imply support for
+`master`, we want to **actively discourage** people from using
+it. Because it's not stable.
+
+
+## But I Want to Do It Anyway
+
+Another option, is to email the [nokogiri-talk
+list](http://groups.google.com/group/nokogiri-talk) and ask for a
+release candidate to be built. We're pretty accommodating if there's a
+bugfix that's a blocker for you. And if we can't release an RC, we'll
+tell you why.
+
+And in the end, nothing is stopping you from cloning the repo and
+generating a private gemspec. This is an extra step or two, but it has
+the benefit of making sure developers have thought through the costs
+and risks involved; and it tends to select for developers who know
+what they're doing.
+
+
+## In Conclusion
+
+Team Nokogiri takes stability very seriously. We want everybody who
+uses Nokogiri to have a pleasant experience. And so we want to make
+sure that you're using the best software we can make.
+
+Please keep in mind that we're trying very hard to do the right thing
+for all Nokogiri users out there in Rubyland. Nokogiri loves you very
+much, and we hope you love it back.

data/build_all

@@ -0,0 +1,58 @@
+#! /usr/bin/env bash
+#
+#  script to build gems for all relevant platforms:
+#  - MRI et al (standard gem)
+#  - windows (x86-mingw32 and x86-msin32-60)
+#  - jruby
+#
+#  prerequisite is the mingw32 packages.
+#  on ubuntu, `sudo apt-get install mingw32`
+#  for others, read up at https://github.com/luislavena/rake-compiler
+#
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+    source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+    source "/usr/local/rvm/scripts/rvm"
+else
+    echo "ERROR: An RVM installation was not found.\n"
+fi
+
+function rvm_use {
+    current_ruby=$1
+    rvm use "${1}@nokogiri" --create
+}
+
+set -o errexit
+
+# initialize
+rvm_use 1.8.7
+rm -rf tmp pkg
+bundle exec rake clean clobber
+
+# holding pen
+rm -rf gems
+mkdir -p gems
+
+# MRI
+rvm_use 1.8.7
+bundle exec rake gem
+cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
+
+# windows
+rvm_use 1.8.7
+bundle exec rake-compiler cross-ruby VERSION=1.8.7-p330
+bundle exec rake-compiler cross-ruby VERSION=1.9.2-p136
+bundle exec rake cross
+rake gem:windows # don't use bundler here. it blows up. *shrug*
+cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
+
+# jruby
+rvm_use jruby-1.6.5
+bundle exec rake clean clobber
+rvm_use 1.8.7
+bundle exec rake generate
+rvm_use jruby-1.6.5
+bundle exec rake gem
+cp -v pkg/nokogiri*java.gem gems

data/ext/nokogiri/xml_node_set.c

@@ -427,7 +427,7 @@ VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document)
     rb_funcall(document, decorate, 1, new_set);
   }
 
-  if (node_set->nodeTab) {
+  if (node_set && node_set->nodeTab) {
     for (i = 0; i < node_set->nodeNr; i++) {
       cur = node_set->nodeTab[i];
       if (cur && cur->type == XML_NAMESPACE_DECL) {

data/lib/nokogiri/css/parser.rb

@@ -14,92 +14,94 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,    57,    28,    23,    13,    25,    61,    58,     5,     1,
-     6,    60,    13,    58,    66,    24,    17,     1,    83,    20,
-    94,    93,     6,    13,     9,    11,    14,    20,    17,    42,
-     6,     5,     9,    11,    14,    13,    17,    76,    42,     5,
-     1,     6,    65,    13,    11,    62,    63,    17,     1,    60,
-    20,     5,    63,     6,    84,     9,    11,    14,    20,    17,
-     1,     6,    30,     9,    11,    14,    13,    17,    13,    85,
-    20,     1,    64,    13,    59,     9,    88,    13,    13,    89,
-    28,    54,    13,    55,     6,    42,     6,    11,    14,    11,
-    17,     6,    17,    45,    11,     6,     6,    17,    11,    11,
-     6,    17,    17,    11,     5,    92,    17,    69,    71,    28,
-    54,    22,    55,    50,    28,    54,    95,    55,    70,    72,
-    73,   -24,    75,    20,    69,    71,    67,    97,     9,    98,
-   nil,   nil,    34,    36,    38,    70,    72,    73,   nil,    75,
-   nil,   nil,    33,    67,    35,    37,    28,    54,   nil,    55 ]
+     5,    59,    28,    23,    12,    25,    63,    60,     5,     1,
+     6,    62,    12,    60,    69,    24,    17,     1,    86,    20,
+    98,    97,     6,    12,     9,    10,    14,    20,    17,    70,
+     6,     5,     9,    10,    14,    12,    17,   -24,    44,     5,
+     1,     6,    44,    12,    10,    64,    65,    17,     1,    68,
+    20,     5,    67,     6,    62,     9,    10,    14,    20,    17,
+    29,     6,    31,     9,    10,    14,    12,    17,    12,    65,
+    20,     1,    87,    12,    88,     9,    66,    12,    12,    61,
+    28,    56,    12,    57,     6,    91,     6,    10,    14,    10,
+    17,     6,    17,    92,    10,     6,     6,    17,    10,    10,
+     6,    17,    17,    10,     5,    44,    17,    72,    75,    28,
+    56,    46,    57,    52,    28,    56,    95,    57,    73,    76,
+    77,    96,    78,    20,    72,    75,    71,    22,     9,    99,
+   -24,   101,    36,    38,    40,    73,    76,    77,   102,    78,
+   nil,   nil,    35,    71,    37,    39,    28,    56,   nil,    57 ]
 
 racc_action_check = [
-     0,    21,     5,     5,     0,     5,    23,    43,     9,     0,
-    15,    23,     9,    21,    28,     5,    15,     9,    43,     0,
-    74,    74,     0,     8,     0,     0,     0,     9,     0,    40,
-     9,    32,     9,     9,     9,    32,     9,    30,     8,    58,
-    32,     8,    27,    58,     8,    25,    25,     8,    58,    54,
-    32,     6,    55,    32,    56,    32,    32,    32,    58,    32,
-     6,    58,     6,    58,    58,    58,    42,    58,    80,    57,
-     6,    42,    26,    10,    22,     6,    61,    19,    18,    62,
-    60,    60,    16,    60,    42,    12,    80,    42,    42,    80,
-    42,    10,    80,    11,    10,    19,    18,    10,    19,    18,
-    16,    19,    18,    16,    17,    68,    16,    31,    31,    20,
-    20,     4,    20,    17,    63,    63,    77,    63,    31,    31,
-    31,     1,    31,    17,    29,    29,    31,    82,    17,    89,
-   nil,   nil,     7,     7,     7,    29,    29,    29,   nil,    29,
-   nil,   nil,     7,    29,     7,     7,    66,    66,   nil,    66 ]
+     0,    21,     5,     5,     0,     5,    23,    45,     9,     0,
+    15,    23,     9,    21,    30,     5,    15,     9,    45,     0,
+    79,    79,     0,     8,     0,     0,     0,     9,     0,    31,
+     9,    34,     9,     9,     9,    34,     9,    29,     8,    60,
+    34,     8,    42,    60,     8,    25,    25,     8,    60,    28,
+    34,     6,    27,    34,    56,    34,    34,    34,    60,    34,
+     6,    60,     6,    60,    60,    60,    44,    60,    83,    57,
+     6,    44,    58,    19,    59,     6,    26,    18,    13,    22,
+    62,    62,    16,    62,    44,    63,    83,    44,    44,    83,
+    44,    19,    83,    64,    19,    18,    13,    19,    18,    13,
+    16,    18,    13,    16,    17,    11,    16,    32,    32,    20,
+    20,    10,    20,    17,    65,    65,    69,    65,    32,    32,
+    32,    74,    32,    17,    33,    33,    32,     4,    17,    80,
+     1,    85,     7,     7,     7,    33,    33,    33,    92,    33,
+   nil,   nil,     7,    33,     7,     7,    68,    68,   nil,    68 ]
 
 racc_action_pointer = [
-    -2,    92,   nil,   nil,    82,    -8,    49,   125,    17,     6,
-    67,    82,    64,   nil,   nil,   -14,    76,   102,    72,    71,
-    99,     1,    63,    -1,   nil,    34,    49,    19,     2,   121,
-    12,   104,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     8,   nil,    60,    -5,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    37,    40,    31,    69,    37,   nil,
-    70,    63,    72,   104,   nil,   nil,   136,   nil,    80,   nil,
-   nil,   nil,   nil,   nil,    10,   nil,   nil,    91,   nil,   nil,
-    62,   nil,   104,   nil,   nil,   nil,   nil,   nil,   nil,   116,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+    -2,   101,   nil,   nil,    98,    -8,    49,   125,    17,     6,
+   100,    84,   nil,    72,   nil,   -14,    76,   102,    71,    67,
+    99,     1,    68,    -1,   nil,    34,    53,    29,    37,     8,
+   -15,     4,   104,   121,    29,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    21,   nil,    60,    -5,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    42,    57,    49,    74,
+    37,   nil,    70,    72,    86,   104,   nil,   nil,   136,   105,
+   nil,   nil,   nil,   nil,    96,   nil,   nil,   nil,   nil,    10,
+   104,   nil,   nil,    62,   nil,   108,   nil,   nil,   nil,   nil,
+   nil,   nil,   125,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil ]
 
 racc_action_default = [
-   -25,   -23,   -20,    -2,   -70,   -70,   -25,   -18,   -46,   -25,
-   -51,   -70,   -16,   -55,   -21,   -12,   -54,   -70,   -53,   -52,
-   -70,   -70,   -70,   -39,   -29,   -37,   -70,   -70,   -38,   -58,
-   -70,   -58,   -25,    -5,    -3,    -8,    -4,    -7,    -6,    -9,
-   -45,   -11,   -25,   -70,   -47,   -19,   -15,   -13,   -14,   -50,
-   -44,   -43,   -49,   -48,   -39,   -37,   -70,   -70,   -25,   -22,
-   -70,   -70,   -42,   -70,   -30,   -31,   -70,   -59,   -70,   -64,
-   -60,   -65,   -61,   -62,   -70,   -63,   -28,   -70,   -17,   -10,
-   -67,   -69,   -70,   -33,   -32,    99,    -1,   -36,   -41,   -70,
-   -34,   -35,   -26,   -56,   -57,   -27,   -68,   -66,   -40 ]
+   -25,   -23,   -20,    -2,   -72,   -72,   -25,   -18,   -48,   -25,
+   -72,   -16,   -57,   -53,   -21,   -12,   -56,   -72,   -55,   -54,
+   -72,   -72,   -72,   -41,   -31,   -39,   -72,   -72,   -40,   -30,
+   -72,   -72,   -60,   -60,   -25,    -5,    -3,    -8,    -4,    -7,
+    -6,    -9,   -47,   -11,   -25,   -72,   -19,   -15,   -49,   -13,
+   -14,   -52,   -46,   -45,   -51,   -50,   -41,   -39,   -72,   -72,
+   -25,   -22,   -72,   -72,   -44,   -72,   -32,   -33,   -72,   -72,
+   -28,   -61,   -66,   -62,   -72,   -67,   -63,   -64,   -65,   -72,
+   -72,   -17,   -10,   -69,   -71,   -72,   -35,   -34,   103,    -1,
+   -38,   -43,   -72,   -36,   -37,   -29,   -26,   -58,   -59,   -27,
+   -70,   -68,   -42 ]
 
 racc_goto_table = [
-    40,    26,    44,    41,    78,    21,    31,    46,    49,    29,
-    52,    53,    47,    68,    43,    77,    56,    51,    48,    39,
-    80,    32,    27,    82,   nil,   nil,   nil,   nil,   nil,   nil,
-    86,   nil,   nil,   nil,    81,    79,   nil,   nil,   nil,   nil,
+    42,    26,    81,    43,    33,    48,    47,    49,    51,    21,
+    54,    55,    74,    80,    41,    53,    58,    50,    45,    30,
+    32,    83,    34,    27,    85,   nil,   nil,   nil,    89,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    84,    82,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    87,   nil,   nil,    90,
-   nil,   nil,    91,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    96 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    90,   nil,
+   nil,    93,   nil,   nil,    94,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   100 ]
 
 racc_goto_check = [
-     7,    16,     7,     8,     2,     1,     9,     8,     7,    13,
-     7,     7,    10,    15,     1,    15,    16,     9,    11,     6,
-     5,     3,    17,    20,   nil,   nil,   nil,   nil,   nil,   nil,
-     2,   nil,   nil,   nil,     7,     8,   nil,   nil,   nil,   nil,
+     7,    17,     2,     8,     9,     7,     8,    10,     7,     1,
+     7,     7,    16,    16,     6,     9,    17,    11,     1,    14,
+    15,     5,     3,    18,    21,   nil,   nil,   nil,     2,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     7,     8,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,    16,
-   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     7 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,   nil,
+   nil,    17,   nil,   nil,    17,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     5,   -28,    14,   nil,   -22,    11,    -8,    -5,     0,
-    -3,     3,   nil,     3,   nil,   -16,    -4,    17,   nil,   nil,
-   -19 ]
+   nil,     9,   -32,    15,   nil,   -23,     6,    -8,    -5,    -2,
+    -8,     2,   nil,   nil,    13,    14,   -20,    -4,    18,   nil,
+   nil,   -20 ]
 
 racc_goto_default = [
-   nil,   nil,     3,   nil,     7,     8,   nil,    12,   nil,    15,
-    16,    18,    19,     2,     4,   nil,   nil,   nil,    10,    74,
-   nil ]
+   nil,   nil,     3,   nil,     7,     8,   nil,    11,   nil,    15,
+    16,    18,    19,     2,     4,   nil,   nil,   nil,   nil,    13,
+    79,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -131,51 +133,53 @@ racc_reduce_table = [
   4, 42, :_reduce_26,
   4, 42, :_reduce_27,
   3, 42, :_reduce_28,
-  2, 40, :_reduce_29,
-  3, 40, :_reduce_30,
-  3, 40, :_reduce_31,
+  3, 46, :_reduce_29,
+  1, 46, :_reduce_30,
+  2, 40, :_reduce_31,
   3, 40, :_reduce_32,
   3, 40, :_reduce_33,
-  3, 47, :_reduce_34,
-  3, 47, :_reduce_35,
-  3, 47, :_reduce_36,
-  1, 47, :_reduce_none,
-  1, 47, :_reduce_none,
-  1, 47, :_reduce_39,
-  4, 48, :_reduce_40,
-  3, 48, :_reduce_41,
-  2, 48, :_reduce_42,
-  2, 41, :_reduce_43,
-  2, 41, :_reduce_44,
+  3, 40, :_reduce_34,
+  3, 40, :_reduce_35,
+  3, 48, :_reduce_36,
+  3, 48, :_reduce_37,
+  3, 48, :_reduce_38,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_41,
+  4, 49, :_reduce_42,
+  3, 49, :_reduce_43,
+  2, 49, :_reduce_44,
+  2, 41, :_reduce_45,
+  2, 41, :_reduce_46,
   1, 37, :_reduce_none,
   0, 37, :_reduce_none,
-  2, 38, :_reduce_47,
-  2, 38, :_reduce_48,
   2, 38, :_reduce_49,
   2, 38, :_reduce_50,
+  2, 38, :_reduce_51,
+  2, 38, :_reduce_52,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
-  1, 49, :_reduce_55,
-  2, 46, :_reduce_56,
-  2, 46, :_reduce_57,
-  0, 46, :_reduce_none,
-  1, 50, :_reduce_59,
-  1, 50, :_reduce_60,
-  1, 50, :_reduce_61,
-  1, 50, :_reduce_62,
-  1, 50, :_reduce_63,
-  1, 50, :_reduce_64,
-  1, 50, :_reduce_65,
-  3, 39, :_reduce_66,
-  1, 51, :_reduce_none,
-  2, 51, :_reduce_none,
-  1, 51, :_reduce_none ]
-
-racc_reduce_n = 70
-
-racc_shift_n = 99
+  1, 50, :_reduce_57,
+  2, 47, :_reduce_58,
+  2, 47, :_reduce_59,
+  0, 47, :_reduce_none,
+  1, 51, :_reduce_61,
+  1, 51, :_reduce_62,
+  1, 51, :_reduce_63,
+  1, 51, :_reduce_64,
+  1, 51, :_reduce_65,
+  1, 51, :_reduce_66,
+  1, 51, :_reduce_67,
+  3, 39, :_reduce_68,
+  1, 52, :_reduce_none,
+  2, 52, :_reduce_none,
+  1, 52, :_reduce_none ]
+
+racc_reduce_n = 72
+
+racc_shift_n = 103
 
 racc_token_table = {
   false => 0,
@@ -277,6 +281,7 @@ Racc_token_to_s_table = [
   "class",
   "namespaced_ident",
   "namespace",
+  "attrib_name",
   "attrib_val_0or1",
   "expr",
   "an_plus_b",
@@ -459,19 +464,23 @@ def _reduce_28(val, _values, result)
 end
 
 def _reduce_29(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip])
+        result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
       
     result
 end
 
 def _reduce_30(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+        # Default namespace is not applied to attributes.
+        # So we don't add prefix "xmlns:" as in namespaced_ident.
+        result = Node.new(:ELEMENT_NAME, [val.first])
       
     result
 end
 
 def _reduce_31(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+        result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
@@ -489,12 +498,14 @@ def _reduce_33(val, _values, result)
 end
 
 def _reduce_34(val, _values, result)
- result = [val.first, val.last] 
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
     result
 end
 
 def _reduce_35(val, _values, result)
- result = [val.first, val.last] 
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
     result
 end
 
@@ -503,11 +514,21 @@ def _reduce_36(val, _values, result)
     result
 end
 
-# reduce 37 omitted
+def _reduce_37(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
+
+def _reduce_38(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
+
+# reduce 39 omitted
 
-# reduce 38 omitted
+# reduce 40 omitted
 
-def _reduce_39(val, _values, result)
+def _reduce_41(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -525,7 +546,7 @@ def _reduce_39(val, _values, result)
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_42(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -535,7 +556,7 @@ def _reduce_40(val, _values, result)
     result
 end
 
-def _reduce_41(val, _values, result)
+def _reduce_43(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -551,7 +572,7 @@ def _reduce_41(val, _values, result)
     result
 end
 
-def _reduce_42(val, _values, result)
+def _reduce_44(val, _values, result)
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -563,116 +584,116 @@ def _reduce_42(val, _values, result)
     result
 end
 
-def _reduce_43(val, _values, result)
+def _reduce_45(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_44(val, _values, result)
+def _reduce_46(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 45 omitted
+# reduce 47 omitted
 
-# reduce 46 omitted
+# reduce 48 omitted
 
-def _reduce_47(val, _values, result)
+def _reduce_49(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_48(val, _values, result)
+def _reduce_50(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_49(val, _values, result)
+def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_50(val, _values, result)
+def _reduce_52(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-# reduce 51 omitted
-
-# reduce 52 omitted
-
 # reduce 53 omitted
 
 # reduce 54 omitted
 
-def _reduce_55(val, _values, result)
+# reduce 55 omitted
+
+# reduce 56 omitted
+
+def _reduce_57(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_56(val, _values, result)
+def _reduce_58(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_57(val, _values, result)
+def _reduce_59(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 58 omitted
+# reduce 60 omitted
 
-def _reduce_59(val, _values, result)
+def _reduce_61(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_60(val, _values, result)
+def _reduce_62(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_61(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_65(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_66(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_65(val, _values, result)
+def _reduce_67(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_66(val, _values, result)
+def _reduce_68(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 67 omitted
+# reduce 69 omitted
 
-# reduce 68 omitted
+# reduce 70 omitted
 
-# reduce 69 omitted
+# reduce 71 omitted
 
 def _reduce_none(val, _values, result)
   val[0]

data/lib/nokogiri/css/parser.y

@@ -88,7 +88,7 @@ rule
     |
     ;
   attrib
-    : LSQUARE namespaced_ident attrib_val_0or1 RSQUARE {
+    : LSQUARE attrib_name attrib_val_0or1 RSQUARE {
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -105,6 +105,18 @@ rule
         )
       }
     ;
+  attrib_name
+    : namespace '|' IDENT {
+        result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
+      }
+    | IDENT {
+        # Default namespace is not applied to attributes.
+        # So we don't add prefix "xmlns:" as in namespaced_ident.
+        result = Node.new(:ELEMENT_NAME, [val.first])
+      }
+    ;
   function
     : FUNCTION RPAREN {
         result = Node.new(:FUNCTION, [val.first.strip])

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.5.2'
+  VERSION = '1.5.3.rc2'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/css/test_parser.rb

@@ -6,6 +6,10 @@ module Nokogiri
       def setup
         super
         @parser = Nokogiri::CSS::Parser.new
+        @parser_with_ns = Nokogiri::CSS::Parser.new({
+          "xmlns" => "http://default.example.com/",
+          "hoge" => "http://hoge.example.com/",
+        })
       end
 
       def test_extra_single_quote
@@ -292,6 +296,13 @@ module Nokogiri
         # assert_xpath ['//x/y', '//y/z'], @parser.parse('x > y | y > z')
       end
 
+      def test_attributes_with_namespace
+        ## Default namespace is not applied to attributes.
+        ## So this must be @class, not @xmlns:class.
+        assert_xpath "//xmlns:a[@class = 'bar']", @parser_with_ns.parse("a[class='bar']")
+        assert_xpath "//xmlns:a[@hoge:class = 'bar']", @parser_with_ns.parse("a[hoge|class='bar']")
+      end
+
       def assert_xpath expecteds, asts
         expecteds = [expecteds].flatten
         expecteds.zip(asts).each do |expected, actual|

data/test/files/to_be_xincluded.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<included>this snippet is to be included from xinclude.xml</included>

data/test/files/xinclude.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<test xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="to_be_xincluded.xml"/>
+</test>

data/test/xml/test_document.rb

@@ -358,13 +358,17 @@ module Nokogiri
       def test_subclass_parse
         klass = Class.new(Nokogiri::XML::Document)
         doc = klass.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, doc.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, doc.root.to_s
         assert_instance_of klass, doc
       end
 
       def test_document_parse_method
         xml = Nokogiri::XML::Document.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, xml.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, xml.root.to_s
       end
 
       def test_encoding=

data/test/xml/test_unparented_node.rb

@@ -252,8 +252,8 @@ module Nokogiri
         doc = Nokogiri::XML "<root>foo</root>"
         pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo.xsl"})
         doc.root.add_previous_sibling pi
-        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>\n}
-        assert_equal expected_doc, doc.to_xml
+        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>}
+        assert_includes doc.to_xml, expected_doc
       end
 
       def test_find_by_css_with_tilde_eql

data/test/xml/test_xpath.rb

@@ -254,6 +254,17 @@ module Nokogiri
         end
         assert_equal 123.456, value
       end
+
+      def test_custom_xpath_with_bullshit_arguments
+        xml = %q{<foo> </foo>}
+        doc = Nokogiri::XML.parse(xml)
+        foo = doc.xpath('//foo[bool_function(bar/baz)]', Class.new {
+            def bool_function(value)
+              true
+            end
+          }.new)
+        assert_equal foo, doc.xpath("//foo")
+      end
     end
   end
 end

data/test_all

@@ -0,0 +1,84 @@
+#! /usr/bin/env bash
+#
+#  script to run tests on all relevant rubies, and valgrind on supported rubies.
+#  outputs tests to `test.log` and valgrind output to `valgrind.log`.
+#
+#  requires `rvm` to be installed. sorry about that, multiruby dudes.
+#
+
+RUBIES="ruby-1.9.3 jruby-1.6.5 ree-1.8.7 ruby-1.9.2 ruby-1.8.7"
+TEST_LOG=test.log
+VALGRIND_LOG=valgrind.log
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+    source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+    source "/usr/local/rvm/scripts/rvm"
+else
+    echo "ERROR: An RVM installation was not found.\n"
+fi
+
+> $TEST_LOG
+> $VALGRIND_LOG
+set -o errexit
+
+function rvm_use {
+    current_ruby=$1
+    rvm use "${1}@nokogiri" --create
+}
+
+function generate_parser_and_tokenizer {
+    old_ruby=$current_ruby
+    rvm_use ruby-1.8.7
+    bundle exec rake generate 2>&1 > /dev/null
+    rvm_use $old_ruby
+}
+
+function clean {
+    bundle exec rake clean clobber 2>&1 > /dev/null
+}
+
+function compile {
+    echo "** compiling ..."
+    generate_parser_and_tokenizer
+    bundle exec rake compile 2>&1 > /dev/null
+}
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    if gem list bundler | fgrep -v 1.1.rc 2>&1 > /dev/null ; then
+        gem install bundler --pre
+    fi
+    bundle install --quiet --local || bundle install
+    clean
+done
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    echo -e "**\n** testing nokogiri on ${ruby}\n**" | tee -a $TEST_LOG
+    clean
+    compile
+    echo "** running tests ..."
+    if [[ $ruby =~ "jruby" ]] ; then
+        # I get:
+        #   /usr/lib/jvm/java-7-oracle/bin/java: symbol lookup error: /home/mike/.rvm/gems/jruby-1.6.5@nokogiri/gems/racc-1.4.7/lib/racc/cparse.so: undefined symbol: rb_catch
+        # if I use 'bundle exec' with jruby. Anybody?
+        rake test 2>&1 | tee -a $TEST_LOG
+    else
+        bundle exec rake test 2>&1 | tee -a $TEST_LOG
+    fi
+    clean
+done
+
+for ruby in $RUBIES ; do
+    if [[ ! $ruby =~ "jruby" ]] ; then
+        rvm_use ${ruby}
+        echo -e "**\n** nokogiri prerelease: ${ruby}\n**" | tee -a $VALGRIND_LOG
+        clean
+        compile
+        echo "** running valgrind on tests ..."
+        bundle exec rake test:valgrind 2>&1 | tee -a $VALGRIND_LOG
+        clean
+    fi
+done

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: -3391518352
+  prerelease: 6
   segments: 
   - 1
   - 5
+  - 3
+  - rc
   - 2
-  version: 1.5.2
+  version: 1.5.3.rc2
 platform: x86-mswin32-60
 authors: 
 - Aaron Patterson
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe-bundler
@@ -248,11 +250,16 @@ files:
 - .gemtest
 - CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
+- C_CODING_STYLE.rdoc
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- ROADMAP.md
 - Rakefile
+- STANDARD_RESPONSES.md
+- Y_U_NO_GEMSPEC.md
 - bin/nokogiri
+- build_all
 - ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
@@ -384,7 +391,6 @@ files:
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
 - lib/xsd/xmlparser/nokogiri.rb
-- nokogiri_help_responses.md
 - tasks/cross_compile.rb
 - tasks/nokogiri.org.rb
 - tasks/test.rb
@@ -414,7 +420,9 @@ files:
 - test/files/staff.xml
 - test/files/staff.xslt
 - test/files/tlm.html
+- test/files/to_be_xincluded.xml
 - test/files/valid_bar.xml
+- test/files/xinclude.xml
 - test/helper.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
@@ -442,6 +450,7 @@ files:
 - test/xml/test_attr.rb
 - test/xml/test_attribute_decl.rb
 - test/xml/test_builder.rb
+- test/xml/test_c14n.rb
 - test/xml/test_cdata.rb
 - test/xml/test_comment.rb
 - test/xml/test_document.rb
@@ -457,9 +466,9 @@ files:
 - test/xml/test_node.rb
 - test/xml/test_node_attributes.rb
 - test/xml/test_node_encoding.rb
+- test/xml/test_node_inheritance.rb
 - test/xml/test_node_reparenting.rb
 - test/xml/test_node_set.rb
-- test/xml/test_node_inheritance.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb
 - test/xml/test_reader_encoding.rb
@@ -468,12 +477,11 @@ files:
 - test/xml/test_syntax_error.rb
 - test/xml/test_text.rb
 - test/xml/test_unparented_node.rb
+- test/xml/test_xinclude.rb
 - test/xml/test_xpath.rb
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
-- test/xml/test_c14n.rb
-- test/xml/test_xinclude.rb
-- C_CODING_STYLE.rdoc
+- test_all
 - lib/nokogiri/nokogiri.rb
 - lib/nokogiri/1.8/nokogiri.so
 - lib/nokogiri/1.9/nokogiri.so
@@ -500,16 +508,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"