Permalink
Browse files

Merge tag 'v1.5.4'

  • Loading branch information...
2 parents 16250b7 + e795d1b commit 804df6835db536eaac3b574ce2440143b669ed20 @libc committed Jun 13, 2012
Showing with 4,845 additions and 1,779 deletions.
  1. +29 −22 .gitignore
  2. +12 −0 .travis.yml
  3. +139 −0 CHANGELOG.ja.rdoc
  4. +137 −4 CHANGELOG.rdoc
  5. +33 −0 C_CODING_STYLE.rdoc
  6. +21 −0 Gemfile
  7. +17 −3 Manifest.txt
  8. +12 −8 README.rdoc
  9. +86 −0 ROADMAP.md
  10. +107 −80 Rakefile
  11. +47 −0 STANDARD_RESPONSES.md
  12. +155 −0 Y_U_NO_GEMSPEC.md
  13. +12 −2 bin/nokogiri
  14. +58 −0 build_all
  15. +0 −5 deps.rip
  16. +47 −3 ext/java/nokogiri/HtmlDocument.java
  17. +10 −2 ext/java/nokogiri/NokogiriService.java
  18. +12 −2 ext/java/nokogiri/XmlAttr.java
  19. +14 −5 ext/java/nokogiri/XmlComment.java
  20. +85 −10 ext/java/nokogiri/XmlDocument.java
  21. +16 −5 ext/java/nokogiri/XmlDocumentFragment.java
  22. +0 −40 ext/java/nokogiri/XmlElement.java
  23. +33 −1 ext/java/nokogiri/XmlNamespace.java
  24. +133 −29 ext/java/nokogiri/XmlNode.java
  25. +4 −1 ext/java/nokogiri/XmlNodeSet.java
  26. +19 −4 ext/java/nokogiri/XmlReader.java
  27. +2 −13 ext/java/nokogiri/XmlSaxParserContext.java
  28. +88 −57 ext/java/nokogiri/XmlSaxPushParser.java
  29. +15 −3 ext/java/nokogiri/XmlSyntaxError.java
  30. +7 −4 ext/java/nokogiri/XmlXpathContext.java
  31. +198 −37 ext/java/nokogiri/XsltStylesheet.java
  32. +42 −3 ext/java/nokogiri/internals/HtmlDomParserContext.java
  33. +171 −10 ext/java/nokogiri/internals/NokogiriHelpers.java
  34. +4 −3 ext/java/nokogiri/internals/NokogiriXsltErrorListener.java
  35. +55 −4 ext/java/nokogiri/internals/ParserContext.java
  36. +0 −411 ext/java/nokogiri/internals/PushInputStream.java
  37. +222 −14 ext/java/nokogiri/internals/SaveContextVisitor.java
  38. +33 −2 ext/java/nokogiri/internals/XmlDomParser.java
  39. +34 −15 ext/java/nokogiri/internals/XmlDomParserContext.java
  40. +25 −7 ext/nokogiri/extconf.rb
  41. +16 −0 ext/nokogiri/html_document.c
  42. +59 −37 ext/nokogiri/html_sax_parser_context.c
  43. +87 −0 ext/nokogiri/html_sax_push_parser.c
  44. +9 −0 ext/nokogiri/html_sax_push_parser.h
  45. +25 −7 ext/nokogiri/nokogiri.c
  46. +5 −5 ext/nokogiri/nokogiri.h
  47. +1 −1 ext/nokogiri/xml_attr.c
  48. +1 −1 ext/nokogiri/xml_cdata.c
  49. +1 −1 ext/nokogiri/xml_comment.c
  50. +103 −5 ext/nokogiri/xml_document.c
  51. +3 −3 ext/nokogiri/xml_document.h
  52. +1 −1 ext/nokogiri/xml_document_fragment.c
  53. +1 −1 ext/nokogiri/xml_entity_reference.c
  54. +1 −1 ext/nokogiri/xml_io.c
  55. +0 −6 ext/nokogiri/xml_namespace.c
  56. +170 −74 ext/nokogiri/xml_node.c
  57. +169 −120 ext/nokogiri/xml_node_set.c
  58. +5 −0 ext/nokogiri/xml_node_set.h
  59. +1 −1 ext/nokogiri/xml_processing_instruction.c
  60. +64 −41 ext/nokogiri/xml_sax_parser_context.c
  61. +2 −0 ext/nokogiri/xml_text.c
  62. +52 −42 ext/nokogiri/xml_xpath_context.c
  63. +1 −0 ext/nokogiri/xml_xpath_context.h
  64. +69 −78 ext/nokogiri/xslt_stylesheet.c
  65. +5 −0 ext/nokogiri/xslt_stylesheet.h
  66. +4 −0 lib/nokogiri/css.rb
  67. +3 −0 lib/nokogiri/css/node.rb
  68. +25 −4 lib/nokogiri/css/parser.y
  69. +1 −1 lib/nokogiri/css/tokenizer.rex
  70. +2 −2 lib/nokogiri/css/xpath_visitor.rb
  71. +1 −0 lib/nokogiri/html.rb
  72. +89 −49 lib/nokogiri/html/document.rb
  73. +1 −1 lib/nokogiri/html/element_description_defaults.rb
  74. +16 −0 lib/nokogiri/html/sax/push_parser.rb
  75. +1 −1 lib/nokogiri/version.rb
  76. +6 −0 lib/nokogiri/xml.rb
  77. +7 −1 lib/nokogiri/xml/builder.rb
  78. +75 −26 lib/nokogiri/xml/document.rb
  79. +6 −1 lib/nokogiri/xml/document_fragment.rb
  80. +46 −12 lib/nokogiri/xml/node.rb
  81. +1 −1 lib/nokogiri/xml/node_set.rb
  82. +9 −4 lib/nokogiri/xml/parse_options.rb
  83. +6 −6 lib/nokogiri/xml/reader.rb
  84. +1 −1 lib/nokogiri/xml/sax/document.rb
  85. +1 −1 lib/nokogiri/xml/sax/parser.rb
  86. +7 −1 lib/nokogiri/xml/schema.rb
  87. +6 −2 lib/nokogiri/xslt.rb
  88. +135 −159 tasks/cross_compile.rb
  89. +24 −0 tasks/nokogiri.org.rb
  90. +2 −1 tasks/test.rb
  91. +38 −0 test/css/test_parser.rb
  92. +6 −0 test/css/test_xpath_visitor.rb
  93. +10 −0 test/files/metacharset.html
  94. +47 −0 test/files/noencoding.html
  95. +2 −0 test/files/to_be_xincluded.xml
  96. +4 −0 test/files/xinclude.xml
  97. +18 −42 test/helper.rb
  98. +5 −3 test/html/sax/test_parser.rb
  99. +8 −10 test/html/sax/test_parser_context.rb
  100. +60 −5 test/html/test_document.rb
  101. +13 −0 test/html/test_document_encoding.rb
  102. +1 −2 test/html/test_document_fragment.rb
  103. +2 −4 test/html/test_node.rb
  104. +85 −5 test/test_memory_leak.rb
  105. +63 −0 test/test_reader.rb
  106. +155 −120 test/test_xslt_transforms.rb
  107. +10 −17 test/xml/sax/test_parser_context.rb
  108. +1 −0 test/xml/sax/test_push_parser.rb
  109. +5 −6 test/xml/test_attr.rb
  110. +46 −8 test/xml/test_builder.rb
  111. +151 −0 test/xml/test_c14n.rb
  112. +1 −3 test/xml/test_cdata.rb
  113. +81 −14 test/xml/test_document.rb
  114. +3 −1 test/xml/test_document_encoding.rb
  115. +32 −8 test/xml/test_document_fragment.rb
  116. +5 −0 test/xml/test_namespace.rb
  117. +118 −1 test/xml/test_node.rb
  118. +19 −0 test/xml/test_node_attributes.rb
  119. +32 −0 test/xml/test_node_inheritance.rb
  120. +32 −3 test/xml/test_node_reparenting.rb
  121. +27 −10 test/xml/test_node_set.rb
  122. +12 −0 test/xml/test_parse_options.rb
  123. +16 −0 test/xml/test_reader_encoding.rb
  124. +5 −0 test/xml/test_schema.rb
  125. +1 −3 test/xml/test_text.rb
  126. +32 −0 test/xml/test_unparented_node.rb
  127. +83 −0 test/xml/test_xinclude.rb
  128. +37 −6 test/xml/test_xpath.rb
  129. +35 −0 test/xslt/test_custom_functions.rb
  130. +84 −0 test_all
View
@@ -1,31 +1,38 @@
-.*.swp
+*.gemspec
+*.rbc
*.tmproj
*~
+.*.swp
+.bundle
+.classpath
+.project
+.rake_tasks
+.rvmrc
+.settings
+Gemfile*
+TAGS
+build
+ext/java/Canna
ext/java/nokogiri/*.class
ext/java/nokogiri/*/*.class
ext/nokogiri/*.dll
-lib/nokogiri/nokogiri.so
-lib/nokogiri/nokogiri.jar
-lib/nokogiri/nokogiri.bundle
-lib/nokogiri/css/parser.rb
-lib/nokogiri/css/tokenizer.rb
+gems
+lib/nokogiri/1.8
+lib/nokogiri/1.9
lib/nokogiri/css/generated_parser.rb
lib/nokogiri/css/generated_tokenizer.rb
-cross
-tags
-*.rbc
-stash
-.rake_tasks
-tmp
-*.gemspec
+lib/nokogiri/css/parser.rb
+lib/nokogiri/css/tokenizer.rb
+lib/nokogiri/nokogiri.bundle
+lib/nokogiri/nokogiri.jar
+lib/nokogiri/nokogiri.rb
+lib/nokogiri/nokogiri.so
pkg
-TAGS
-.classpath
-.project
-.settings
-ext/java/Canna
-build
-test/test_jruby_header.rb
-test/test_jruby_footer.rb
-test/*_mini.rb
+ports
+stash
+tags
test/*/*_mini.rb
+test/*_mini.rb
+test/test_jruby_footer.rb
+test/test_jruby_header.rb
+tmp
View
@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+ - ree
+ - jruby-18mode
+ - jruby-19mode
+ - jruby-head
+ - rbx-18mode
+# - rbx-19mode
View
@@ -1,3 +1,129 @@
+== 1.5.4 / unreleased
+
+* Features
+
+ * The "nokogiri" script now has more verbose output when passed the `--rng` option. #675 (Thanks, Dan Radez!)
+ * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
+ * Better build support for systems with pkg-config. #584
+ * Better build support for systems with multiple iconv installations.
+
+* Bugfixes
+
+ * Segmentation fault when creating a comment node for a DocumentFragment. #677, #678.
+ * Treat '.' as xpath in at() and search(). #690
+
+ * [MRI, Security] Default parse options for XML documents were
+ changed to not make network connections during document parsing,
+ to avoid XXE vulnerability. #693
+
+ To re-enable this behavior, the configuration method `nononet` may
+ be called, like this:
+
+ Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
+
+ Insert your own joke about double-negatives here.
+
+
+== 1.5.3 / 2012-06-01
+
+* Features
+
+ * Support for "prefixless" CSS selectors ~, > and + like jQuery
+ supports. #621, #623. (Thanks, David Lee!)
+ * Attempting to improve installation on homebrew 0.9 (with regards
+ to iconv). Isn't package management convenient?
+
+* 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.
+ * Fixed marshalling bugs around how arguments are passed to (and
+ returned from) XSLT custom xpath functions. #640.
+ * Nokogiri::XML::Reader#outer_xml がJRubyで正しく動作しない #617
+ * Nokogiri::XML::Attribute が JRuby 上で nil namespace を返す #647
+ * Nokogiri::XML::Node#namespace= メソッドが JRuby 上で prefix
+  が無い namespace を設定できない #648
+ * [JRuby] 1.9 モードで rake を実行するとデッドロックを引き起こす #571
+ * HTML::Document#meta_encoding does not raise exception on docs with
+ malformed content-type. #655
+ * Fixing segfault related to unsupported encodings in in-context
+ parsing on 1.8.7. #643
+ * [JRuby] Concurrency issue in XPath parsing. #682
+
+
+== 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日
+
+* 新機能
+
+ * XML::Builder#comment はコメントノードを作れるようになった.
+ * CSS searches now support namespaced attributes. #593
+ * Java integration 機能が追加された. このバージョンから,
+ XML::Document.wrap と XML::Document#to_java メソッドが利用可能。
+ * RelaxNG validator support in the `nokogiri` cli utility. #591 (thanks, Dan Radez!)
+
+* バグの修正
+
+ * エンコーディング自動認識において発生しうるメモリリークを修正.
+ Tim Elliottに感謝!
+ * homebrew はインストールしたら、extconf は homebrew のパスを読む。
+ * Inconsistent behavior of Nokogiri 1.5.0 Java #620
+ * Inheriting from Nokogiri::XML::Node on JRuby (1.6.4/5) fails #560
+ * XML::Attr nodes are not allowed to be added as node children, so an
+ exception is raised. #558
+ * No longer defensively "pickle" adjacent text nodes on
+ Node#add_next_sibling and Node#add_previous_sibling calls. #595.
+ * Java version inconsistency: it returns nil for empty attributes #589
+ * to_xhtml incorrectly generates <p /></p> when tag is empty #557
+ * Document#add_child now accepts a Node, NodeSet, DocumentFragment,
+ or String. #546.
+ * Document#create_element now recognizes namespaces containing
+ non-word characters (like "SOAP-ENV"). This is mostly relevant to
+ users of Builder, which calls Document#create_element for nearly
+ everything. #531.
+ * File encoding broken in 1.5.0 / jruby / windows #529
+ * Java version does not return namespace defs as attrs for ::HTML #542
+ * Bad file descriptor with Nokogiri 1.5.0 #495
+ * remove_namespace! doesn't work in pure java version #492
+ * The Nokogiri Java native build throws a null pointer exception when
+ ActiveSupport's .blank? method is called directly on a parsed object.
+ #489
+ * 1.5.0 Not using correct character encoding #488
+ * Raw XML string in XML Builder broken on JRuby #486
+ * Nokogiri 1.5.0 XML generation broken on JRuby #484
+ * Do not allow multiple root nodes. #550
+ * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
+ * Node#to_xml does not override :save_with if it is provided. #505
+ * Node#set is a private method [JRuby]. #564 (thanks, Nick Sieger!)
+ * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
+
+== 1.5.0 / 2011年7月1日
+
+* 註
+
+ * 1.4.7からの変更点を参照
+
+* 新機能
+
+ * 各文書形式用のデフォルトのNode::SaveOptionsの組合せを定数化.
+ (Node::SaveOptions::DEFAULT_{X,H,XH}TML)
+
+* バグの修正
+
+ * JRuby版ではホワイトスペースの扱いに難があるため、XML出力(to_xml)において
+ 自動整形をデフォルトでは行わないように変更. #415
+ * JRuby版でNodeのないNodeSetでNullPointerExceptionが発生するのを修正. #443
+ * エンコーディング宣言のないHTMLファイルで部分的に重複したドキュメントが生成される問題を修正した. #478
+ * <meta charset="..."> を認識するようになった.
+
+
== 1.5.0 beta3 2010年12月2日
* 註
@@ -27,6 +153,19 @@
* LibXML 2.6.16および古いバージョンは非推奨. インストールできない.
* FFIサポートは削除された.
+=== 1.4.7 / 2011年7月1日
+
+* バグの修正
+
+ * エンコーディング宣言のないHTMLファイルで部分的に重複したドキュメントが生成される問題を修正した. #478
+
+=== 1.4.6 / 2011年6月19日
+
+* ノート
+
+ * このバージョンは、1.4.5と機能的に同じです
+ * Rubyの1.8.6のサポートが復元されている
+
=== 1.4.5 / 未リリース
* 新機能
Oops, something went wrong.

0 comments on commit 804df68

Please sign in to comment.