nokogiri 1.6.6.4 → 1.6.7.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1587aee5e8349fb69b32edab60adb3cca21227dd
-  data.tar.gz: 2827b6fde906ec74e2ab3e621943c6d5cd4cbf48
+  metadata.gz: c732038b7cbf3bd702bb75173453260302c33fc4
+  data.tar.gz: edde1b0fb8377b7f397f4c1acc475aa37730470d
 SHA512:
-  metadata.gz: a9d7f11af4d7eff36a166b23d9422358cd3c609c59a2c2d6a2d243c247ece98a4e1797bcefc5fe409bfae41eb0eb5970dab86e0b21ad99da025aa07846c79fc8
-  data.tar.gz: 998b77a82ae47d9215bac769b4c758434aeee595abd86ff87190636bf8a936321af032562b045b54f88ae2d4b1393d8442ce8b0114c1c32d6450a456e6323a74
+  metadata.gz: 5089b1d372b425c161ad2d10387d6da413cc47f46bfde949521576a63b599402dbf50fb3d02f62b5cff9b21c5a8f2c1003d11ac9ea9d3e027366ed8acf179238
+  data.tar.gz: 9fb2ed0edf093eda038337e152fe28603746177db2f35457b9d585a256f0a356f01e86fb440d32da52048abba60e03aaea0a111436fdebcff26086defb7b8270

data/.cross_rubies

@@ -1,5 +1,7 @@
-1.9.3-p547:i586-mingw32msvc
-2.0.0-p576:i686-w64-mingw32
-2.0.0-p576:x86_64-w64-mingw32
-2.1.3:i686-w64-mingw32
-2.1.3:x86_64-w64-mingw32
+1.9.3-p551:i586-mingw32msvc
+2.0.0-p645:i686-w64-mingw32
+2.0.0-p645:x86_64-w64-mingw32
+2.1.6:i686-w64-mingw32
+2.1.6:x86_64-w64-mingw32
+2.2.2:i686-w64-mingw32
+2.2.2:x86_64-w64-mingw32

data/.travis.yml

@@ -1,38 +1,41 @@
 language: ruby
 
+sudo: false
+
 rvm:
-  - ruby-1.9.2
-  - ruby-1.9.3
-  - ruby-2.0
-  - ruby-2.1
-  - ruby-2.2
-  - jruby-19mode
-  - jruby-1.7.18
-  - jruby-9.0.0.0.pre1
-  - rbx-19mode
-  - rbx-2
+- ruby-1.9.2
+- ruby-1.9.3
+- ruby-2.0.0
+- ruby-2.1.7
+- ruby-2.2.2
+- jruby-19mode
+- jruby-1.7.22
+- jruby-9.0.0.0
+- rbx-19mode
+- rbx-2
 
 os:
-  - linux
-  - osx
+- linux
+- osx
 
 matrix:
-  allow_failures:
-    - os: osx
-    - rvm: jruby-9.0.0.0.pre1
-
   exclude:
-    - os: osx
-      rvm: ruby-1.9.2
-    - os: osx
-      rvm: ruby-2.2
-    - os: osx
-      rvm: jruby-19mode
-    - os: osx
-      rvm: jruby-1.7.18
-    - os: osx
-      rvm: jruby-9.0.0.0.pre1
-    - os: osx
-      rvm: rbx-19mode
-    - os: osx
-      rvm: rbx-2
+  - os: osx
+    rvm: ruby-1.9.2
+  - os: osx
+    rvm: jruby-19mode
+  - os: osx
+    rvm: jruby-1.7.22
+  - os: osx
+    rvm: jruby-9.0.0.0
+  - os: osx
+    rvm: rbx-19mode
+  - os: osx
+    rvm: rbx-2
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#nokogiri"
+    use_notice: true
+    skip_join: true

data/CHANGELOG.ja.rdoc

@@ -1,30 +1,26 @@
-=== 1.6.6.4 / 2015-11-19
+=== 1.6.7.rc2 / 2015年08月31日
 
-This version pulls in an upstream patche to the vendored libxml2 to address:
+Note that rc1 was not released.
 
-* unclosed comment uninitialized access issue (#1376)
-
-This issue does not have a CVE assigned to it as this time.
 
+==== 機能
 
-=== 1.6.6.3 / 2015-11-16
+* Cross-built gems now have a proper ruby version requirement. (#1266)
+* Ruby 2.2.x is supported on Windows.
+* Native build is supported on Windows.
 
-This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
 
-* CVE-2015-1819
-* CVE-2015-7941_1
-* CVE-2015-7941_2
-* CVE-2015-7942
-* CVE-2015-7942-2
-* CVE-2015-8035
-* CVE-2015-7995
+==== バグ修正
 
-See #1374 for details.
+* [JRuby] Document#parse should support IO objects that respond to #read. (#1124) (Thanks, Jake Byman!)
+* [MRI] Duplicate-id errors when setting the `id` attribute on HTML documents are now silenced. (#1262)
+* [JRuby] 角括弧([, ])がテキスト内に存在すると、SAXパーザがテキストを分割してしまう。(#1261)
+* [JRuby] ネームスペース付きのアトリビュートがremove_attributeで削除されない。 (#1299)
 
 
 === 1.6.6.2 / 2015年01月23日
 
-==== Bug fixes
+==== バグ修正
 
 * Fixed installation issue affecting compiler arguments. (#1230)
 
@@ -33,6 +29,7 @@ See #1374 for details.
 
 Note that 1.6.6.0 was not released.
 
+
 ==== 機能
 
 * Unified Node and NodeSet implementations of #search, #xpath and #css.
@@ -183,7 +180,7 @@ libxml2 2.6.21 以上が必要に. (従前は 2.6.17 以上)
 
 === 1.6.1 / 2013年12月14日
 
-* Bugfixes
+* バグ修正
 
   * (JRuby) 不正なドキュメントをパースするときにメモリ不足に陥るバグを修正
   * (JRuby) Billion-laughs攻撃対策のリグレッションを修正 #586
@@ -223,7 +220,7 @@ libxml2 2.6.21 以上が必要に. (従前は 2.6.17 以上)
 
 === 1.5.11 / 2013年12月14日
 
-* Bugfixes
+* バグ修正
 
   * (JRuby) 不正なドキュメントをパースするときにメモリ不足に陥るバグを修正
   * (JRuby) Billion-laughs攻撃対策のリグレッションを修正 #586

data/CHANGELOG.rdoc

@@ -1,25 +1,21 @@
-=== 1.6.6.4 / 2015-11-19
+=== 1.6.7.rc2 / 2015-08-31
 
-This version pulls in an upstream patche to the vendored libxml2 to address:
+Note that rc1 was not released.
 
-* unclosed comment uninitialized access issue (#1376)
-
-This issue does not have a CVE assigned to it as this time.
 
+==== Features
 
-=== 1.6.6.3 / 2015-11-16
+* Cross-built gems now have a proper ruby version requirement. (#1266)
+* Ruby 2.2.x is supported on Windows.
+* Native build is supported on Windows.
 
-This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
 
-* CVE-2015-1819
-* CVE-2015-7941_1
-* CVE-2015-7941_2
-* CVE-2015-7942
-* CVE-2015-7942-2
-* CVE-2015-8035
-* CVE-2015-7995
+==== Bug fixes
 
-See #1374 for details.
+* [JRuby] Document#parse should support IO objects that respond to #read. (#1124) (Thanks, Jake Byman!)
+* [MRI] Duplicate-id errors when setting the `id` attribute on HTML documents are now silenced. (#1262)
+* [JRuby] SAX parser cuts texts in peices when quare brackets exist. (#1261)
+* [JRuby] Namespaced attributes aren't removed by remove_attribute. (#1299)
 
 
 === 1.6.6.2 / 2015-01-23
@@ -33,6 +29,7 @@ See #1374 for details.
 
 Note that 1.6.6.0 was not released.
 
+
 ==== Features
 
 * Unified Node and NodeSet implementations of #search, #xpath and #css.

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "https://rubygems.org/"
 
-gem "mini_portile", "~>0.6.0"
+gem "mini_portile", "~>0.7.0.rc2"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -14,6 +14,7 @@ gem "hoe-git", ">=1.4", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]
 gem "rake", ">=0.9", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.4.2", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
 gem "hoe", "~>3.13", :group => [:development, :test]

data/LICENSE.txt

@@ -0,0 +1,31 @@
+(The MIT License)
+
+Copyright (c) 2008 - 2015:
+
+* [Aaron Patterson](http://tenderlovemaking.com)
+* [Mike Dalessio](http://mike.daless.io)
+* [Charles Nutter](http://blog.headius.com)
+* [Sergio Arbeo](http://www.serabe.com)
+* [Patrick Mahoney](http://polycrystal.org)
+* [Yoko Harada](http://yokolet.blogspot.com)
+* [Akinori MUSHA](https://akinori.org)
+* [John Shahid](https://github.com/jvshahid)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -7,13 +7,14 @@ CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
 C_CODING_STYLE.rdoc
 Gemfile
+LICENSE.txt
 Manifest.txt
-README.ja.rdoc
-README.rdoc
+README.md
 ROADMAP.md
 Rakefile
 STANDARD_RESPONSES.md
 Y_U_NO_GEMSPEC.md
+appveyor.yml
 bin/nokogiri
 build_all
 dependencies.yml
@@ -242,28 +243,7 @@ lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
-ports/patches/libxml2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
-ports/patches/libxml2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
-ports/patches/libxml2/0003-Stop-parsing-on-entities-boundaries-errors.patch
-ports/patches/libxml2/0004-Cleanup-conditional-section-error-handling.patch
-ports/patches/libxml2/0005-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch
-ports/patches/libxml2/0006-Another-variation-of-overflow-in-Conditional-section.patch
-ports/patches/libxml2/0007-Fix-an-error-in-previous-Conditional-section-patch.patch
-ports/patches/libxml2/0008-CVE-2015-8035-Fix-XZ-compression-support-loop.patch
-ports/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch
-ports/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch
-ports/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch
-ports/patches/libxslt/0004-EXSLT-function-str-replace-is-broken-as-is.patch
-ports/patches/libxslt/0006-Fix-str-padding-to-work-with-UTF-8-strings.patch
-ports/patches/libxslt/0007-Separate-function-for-predicate-matching-in-patterns.patch
-ports/patches/libxslt/0008-Fix-direct-pattern-matching.patch
-ports/patches/libxslt/0009-Fix-certain-patterns-with-predicates.patch
-ports/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.patch
-ports/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch
-ports/patches/libxslt/0014-Fix-for-bug-436589.patch
-ports/patches/libxslt/0015-Fix-mkdir-for-mingw.patch
-ports/patches/libxslt/0016-Fix-for-type-confusion-in-preprocessing-attributes.patch
-ports/patches/sort-patches-by-date
+patches/sort-patches-by-date
 suppressions/README.txt
 suppressions/nokogiri_ree-1.8.7.358.supp
 suppressions/nokogiri_ruby-1.8.7.370.supp

data/README.md

@@ -0,0 +1,170 @@
+# Nokogiri
+
+* http://nokogiri.org
+* Installation: http://nokogiri.org/tutorials/installing_nokogiri.html
+* Tutorials:    http://nokogiri.org
+* README:       https://github.com/sparklemotion/nokogiri
+* Mailing List: https://groups.google.com/group/nokogiri-talk
+* Bug Reports:  https://github.com/sparklemotion/nokogiri/issues
+
+
+## Status
+
+[![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri)
+[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master)
+[![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.png)](https://codeclimate.com/github/sparklemotion/nokogiri)
+[![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
+
+
+## Description
+
+Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
+Nokogiri's many features is the ability to search documents via XPath
+or CSS3 selectors.
+
+XML is like violence - if it doesn’t solve your problems, you are not
+using enough of it.
+
+
+## Features
+
+* XML/HTML DOM parser which handles broken HTML
+* XML/HTML SAX parser
+* XML/HTML Push parser
+* XPath 1.0 support for document searching
+* CSS3 selector support for document searching
+* XML/HTML builder
+* XSLT transformer
+
+Nokogiri parses and searches XML/HTML using native libraries (either C
+or Java, depending on your Ruby), which means it's fast and
+standards-compliant.
+
+
+## Installation
+
+If this doesn't work:
+
+```
+gem install nokogiri
+```
+
+then please start troubleshooting here:
+
+> http://www.nokogiri.org/tutorials/installing_nokogiri.html
+
+There are currently 1,237 Stack Overflow questions about Nokogiri
+installation. The vast majority of them are out of date and therefore
+incorrect. __Please do not use Stack Overflow.__
+
+Instead, [tell us](http://nokogiri.org/tutorials/getting_help.html)
+when the above instructions don't work for you. This allows us to both
+help you directly and improve the documentation.
+
+
+### Binary packages
+
+Binary packages are available for some distributions.
+
+* Debian: https://packages.debian.org/sid/ruby-nokogiri
+* SuSE: https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/
+* Fedora: http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756
+
+
+## Support
+
+There are open-source tutorials (to which we invite contributions!) here: http://nokogiri.org/tutorials
+
+* The Nokogiri mailing list is active: https://groups.google.com/group/nokogiri-talk
+* The Nokogiri bug tracker is here: https://github.com/sparklemotion/nokogiri/issues
+* Before filing a bug report, please read our submission guidelines: http://nokogiri.org/tutorials/getting_help.html
+* The IRC channel is #nokogiri on freenode.
+
+
+## Synopsis
+
+Nokogiri is a large library, but here is example usage for parsing and examining a document:
+
+```ruby
+  require 'nokogiri'
+  require 'open-uri'
+
+  # Fetch and parse HTML document
+  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
+
+  ####
+  # Search for nodes by css
+  doc.css('nav ul.menu li a').each do |link|
+    puts link.content
+  end
+
+  ####
+  # Search for nodes by xpath
+  doc.xpath('//h2 | //h3').each do |link|
+    puts link.content
+  end
+
+  ####
+  # Or mix and match.
+  doc.search('code.sh', '//h2').each do |link|
+    puts link.content
+  end
+```
+
+
+## Requirements
+
+* Ruby 1.9.3 or higher, including any development packages necessary
+  to compile native extensions.
+
+* In Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
+  gem, but if you want to use the system versions:
+
+  * at install time, set the environment variable
+    `USING_SYSTEM_ALLOCATOR_LIBRARY` or else use the
+    `--use-system-libraries` argument. (See
+    http://nokogiri.org/tutorials/installing_nokogiri.html#using_your_system_libraries
+    for specifics.)
+
+  * libxml2 >=2.6.21 with iconv support
+    (libxml2-dev/-devel is also required)
+
+  * libxslt, built with and supported by the given libxml2
+    (libxslt-dev/-devel is also required)
+
+
+## Encoding
+
+Strings are always stored as UTF-8 internally.  Methods that return
+text values will always return UTF-8 encoded strings.  Methods that
+return a string containing markup (like `to_xml`, `to_html` and
+`inner_html`) will return a string encoded like the source document.
+
+__WARNING__
+
+Some documents declare one encoding, but actually use a different
+one. In these cases, which encoding should the parser choose?
+
+Data is just a stream of bytes. Humans add meaning to that stream. Any
+particular set of bytes could be valid characters in multiple
+encodings, so detecting encoding with 100% accuracy is not
+possible. `libxml2` does its best, but it can't be right all the time.
+
+If you want Nokogiri to handle the document encoding properly, your
+best bet is to explicitly set the encoding.  Here is an example of
+explicitly setting the encoding to EUC-JP on the parser:
+
+```ruby
+  doc = Nokogiri.XML('<foo><bar /><foo>', nil, 'EUC-JP')
+```
+
+## Development
+
+```bash
+  bundle install
+  bundle exec rake
+```
+
+## License
+
+MIT. See the `LICENSE.txt` file.