nokogiri 1.6.8.1-java → 1.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851e5661ef0fc4070c2305cc3b6f70187b48966c
-  data.tar.gz: 113797bd7cbf2ffe3df45f178b14c7b891639108
+  metadata.gz: b8e17ea9c382916ed4c16382e74a340b1857d854
+  data.tar.gz: 20b41227814668966e31456b64fb7d2cfaac54d1
 SHA512:
-  metadata.gz: ff8deb5980f4fd7b6f14dad2d4f1e6d916a6e67bf341b813d030e81d9b2b7e9b7383d17e92a6cd642cda6c3f687b949d00f59e74ee7f9c870c5637c9c681c402
-  data.tar.gz: 35575f378e879b96d02f1d029a383066d1182f9df98061ac7df7d1df01085a2a7c00af6f00afa93fda55c4d181907a44164d5bc5e129cf0b3be9e5f658cacbff
+  metadata.gz: 10738bfe73012dd0e4a773f1d7669a3e084da60cca59bb5bb8dbcb662cfa5ec1a1b02d1bf82c4369b4503cdff94ba158fb8ba8fbbd20a302b8808c19b21b5dea
+  data.tar.gz: 1748575c0a6e9483c8b3a5eeb90b270ea55d0748fe85c85ba08e41bc8b156b06343f3fdbd7d44bd2ab03250cebb84f63acb203ad467afa6182155fb8a362e2ac

data/.autotest

@@ -12,11 +12,7 @@ end
 
 Autotest.add_hook :run_command do |at|
   at.unit_diff = 'cat'
-  if ENV['ONENINE']
-    system "rake1.9 compile"
-  else
-    system "rake compile"
-  end
+  system "rake compile"
 end
 
 Autotest.add_hook :ran_command do |at|

data/.cross_rubies

@@ -1,6 +1,3 @@
-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

data/.travis.yml

@@ -3,18 +3,14 @@ language: ruby
 sudo: false
 
 rvm:
-- ruby-1.9.2
-- 1.9.3
 - 2.0
 - 2.1
-- 2.2.3
-- 2.3.0
-- jruby-19mode
+- 2.2.5
+- 2.3.1
+- 2.4.0
+- jruby-1.7
 - jruby
-- jruby-9.0.4.0
-- jruby-head
-- rbx-19mode
-- rbx-2
+- rbx
 
 os:
 - linux
@@ -24,21 +20,18 @@ matrix:
   allow_failures:
   # https://github.com/travis-ci/travis-ci/issues/5361
   - os: osx
-    rvm: 2.3.0
-  - rvm: jruby-head
-  exclude:
+    rvm: 2.2.5
   - os: osx
-    rvm: ruby-1.9.2
+    rvm: 2.3.1
+  - os: linux
+    rvm: rbx
+  exclude:
   - os: osx
-    rvm: jruby-19mode
+    rvm: jruby-1.7
   - os: osx
     rvm: jruby
   - os: osx
-    rvm: jruby-9.0.4.0
-  - os: osx
-    rvm: rbx-19mode
-  - os: osx
-    rvm: rbx-2
+    rvm: rbx
 
 notifications:
   irc:

data/{CHANGELOG.rdoc → CHANGELOG.md}

@@ -1,6 +1,24 @@
-=== 1.6.8.1 / 2016-10-03
+# 1.7.0 / 2016-12-26
 
-==== Dependency License Notes
+## Features
+
+* Remove deprecation warnings in Ruby 2.4.0 (#1545) (Thanks, @matthewd!)
+* Support egcc compiler on OpenBSD (#1543) (Thanks, @frenkel and @knu!)
+
+
+## Backwards incompatibilities.
+
+This release ends support for:
+
+* Ruby 1.9.2, for which official support ended on 2014-07-31
+* Ruby 1.9.3, for which official support ended on 2015-02-23
+* Ruby 2.0.0, for which official support ended on 2016-02-24
+* MacRuby, which hasn't been actively supported since 2015-01-13 (see https://github.com/MacRuby/MacRuby/commit/f76b9d6e99c18236db617e8aceb12c27d593a483)
+
+
+# 1.6.8.1 / 2016-10-03
+
+## Dependency License Notes
 
 Removes required dependency on the `pkg-config` gem. This dependency
 was introduced in v1.6.8 and, because it's distributed under LGPL, was
@@ -11,9 +29,9 @@ installed, it's used; but otherwise Nokogiri will attempt to work
 around its absence.
 
 
-=== 1.6.8 / 2016-06-06
+# 1.6.8 / 2016-06-06
 
-==== Security Notes
+## Security Notes
 
 [MRI] Bundled libxml2 is upgraded to 2.9.4, which fixes many security issues. Many of these had previously been patched in the vendored libxml 2.9.2 in the 1.6.7.x branch, but some are newer.
 
@@ -34,7 +52,7 @@ See this libxslt email post for more:
 * https://mail.gnome.org/archives/xslt/2016-May/msg00004.html
 
 
-==== Features
+## Features
 
 Several changes were made to improve performance:
 
@@ -46,7 +64,7 @@ Several changes were made to improve performance:
 * Set document encoding appropriately even on blank document. (#1043) (Thanks, @batter!)
 
 
-==== Bug Fixes
+## Bug Fixes
 
 * [JRuby] fix slow add_child (#692)
 * [JRuby] fix load errors when deploying to JRuby/Torquebox (#1114) (Thanks, @atambo and @jvshahid!)
@@ -73,7 +91,7 @@ Several changes were made to improve performance:
 
 
 
-==== Other Notes
+## Other Notes
 
 * Removed legacy code remaining from Ruby 1.8.x support.
 * Removed legacy code remaining from REE support.
@@ -81,7 +99,7 @@ Several changes were made to improve performance:
 * Handling C strings in a forward-compatible manner, see https://github.com/ruby/ruby/blob/v2_2_0/NEWS#L319
 
 
-=== 1.6.7.2 / 2016-01-20
+# 1.6.7.2 / 2016-01-20
 
 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
 
@@ -92,7 +110,7 @@ Ubuntu classifies this as "Priority: Low", RedHat classifies this as "Impact: Mo
 MITRE record is https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7499
 
 
-=== 1.6.7.1 / 2015-12-16
+# 1.6.7.1 / 2015-12-16
 
 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
 
@@ -108,9 +126,9 @@ This version pulls in several upstream patches to the vendored libxml2 and libxs
 See also http://www.ubuntu.com/usn/usn-2834-1/
 
 
-=== 1.6.7 / 2015-11-29
+# 1.6.7 / 2015-11-29
 
-==== Notes
+## Notes
 
 This version supports native builds on Windows using the RubyInstaller
 DevKit. It also supports Ruby 2.2.x on Windows, as well as making
@@ -121,7 +139,7 @@ This version also includes the security patches already applied in
 v1.6.6.3 and v1.6.6.4 to the vendored libxml2 and libxslt source.
 See #1374 and #1376 for details.
 
-==== Features
+## Features
 
 * Cross-built gems now have a proper ruby version requirement. (#1266)
 * Ruby 2.2.x is supported on Windows.
@@ -130,7 +148,7 @@ See #1374 and #1376 for details.
 * [JRuby] fix error in validating files with jruby (#1355, #1361) (Thanks, @twalpole!)
 * [MRI, OSX] Patch to handle nonstandard location of `iconv.h`. (#1206, #1210, #1218, #1345) (Thanks, @neonichu!)
 
-==== Bug Fixes
+## Bug Fixes
 
 * [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
 * [JRuby] Document#parse should support IO objects that respond to #read. (#1124) (Thanks, Jake Byman!)
@@ -139,7 +157,7 @@ See #1374 and #1376 for details.
 * [JRuby] Namespaced attributes aren't removed by remove_attribute. (#1299)
 
 
-=== 1.6.6.4 / 2015-11-19
+# 1.6.6.4 / 2015-11-19
 
 This version pulls in an upstream patch to the vendored libxml2 to address:
 
@@ -148,7 +166,7 @@ This version pulls in an upstream patch to the vendored libxml2 to address:
 This issue was assigned CVE-2015-8710 after the fact. See http://seclists.org/oss-sec/2015/q4/616 for details.
 
 
-=== 1.6.6.3 / 2015-11-16
+# 1.6.6.3 / 2015-11-16
 
 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
 
@@ -163,19 +181,19 @@ This version pulls in several upstream patches to the vendored libxml2 and libxs
 See #1374 for details.
 
 
-=== 1.6.6.2 / 2015-01-23
+# 1.6.6.2 / 2015-01-23
 
-==== Bug fixes
+## Bug fixes
 
 * Fixed installation issue affecting compiler arguments. (#1230)
 
 
-=== 1.6.6.1 / 2015-01-22
+# 1.6.6.1 / 2015-01-22
 
 Note that 1.6.6.0 was not released.
 
 
-==== Features
+## Features
 
 * Unified Node and NodeSet implementations of #search, #xpath and #css.
 * Added Node#lang and Node#lang=.
@@ -186,7 +204,7 @@ Note that 1.6.6.0 was not released.
 * JRuby 9K support.
 
 
-==== Bug fixes
+## Bug fixes
 
 * DocumentFragment#search now matches against root nodes. (#1205)
 * (MRI) More fixes related to handling libxml2 parse errors during DocumentFragment#dup. (#1196)
@@ -198,31 +216,31 @@ Note that 1.6.6.0 was not released.
 * (JRuby) HtmlSaxPushParser now exists. (#1147) (Thanks, Piotr Szmielew!)
 
 
-=== 1.6.5 / 2014-11-26
+# 1.6.5 / 2014-11-26
 
-==== Features
+## Features
 
 * Implement Slop#respond_to_missing?. (#1176)
 * Optimized the XPath query generated by an `an+b` CSS query.
 
 
-==== Bug fixes
+## Bug fixes
 
 * Capture non-parse errors from Document#dup in Document#errors. (#1196)
 * (JRuby) Document#canonicalize parameters are now consistent with MRI. (#1189)
 
 
-=== 1.6.4.1 / 2014-11-05
+# 1.6.4.1 / 2014-11-05
 
-==== Bug fixes
+## Bug fixes
 
 * (MRI) Fix a bug where CFLAGS passed in are dropped. (#1188)
 * Fix a bug where CSS selector :nth(n) did not work. (#1187)
 
 
-=== 1.6.4 / 2014-11-04
+# 1.6.4 / 2014-11-04
 
-==== Features
+## Features
 
 * (MRI) Bundled Libxml2 is upgraded to 2.9.2.
 * (MRI) `nokogiri --version` will include a list of applied patches.
@@ -230,27 +248,27 @@ Note that 1.6.6.0 was not released.
 * (MRI) Detect and help user fix a missing /usr/include/iconv.h on OS X. (#1111)
 * (MRI) Improve the iconv detection for building libxml2.
 
-==== Bug fixes
+## Bug fixes
 
 * (MRI) Fix DocumentFragment#element_children (#1138).
 * Fix a bug with CSS attribute selector without any prefix where "foo [bar]" was treated as "foo[bar]". (#1174)
 
 
-=== 1.6.3.1 / 2014-07-21
+# 1.6.3.1 / 2014-07-21
 
-==== Bug fixes
+## Bug fixes
 
 * Addressing an Apple Macintosh installation problem for GCC users. #1130 (Thanks, @zenspider!)
 
 
-=== 1.6.3 / 2014-07-20
+# 1.6.3 / 2014-07-20
 
-==== Features
+## Features
 
 * Added Node#document? and Node#processing_instruction?
 
 
-==== Bug fixes
+## Bug fixes
 
 * [JRuby] Fix Ruby memory exhaustion vulnerability. #1087 (Thanks, @ocher)
 * [MRI] Fix segfault during GC when using `libxml-ruby` and `nokogiri` together in multi-threaded environment. #895 (Thanks, @ender672!)
@@ -259,18 +277,18 @@ Note that 1.6.6.0 was not released.
 * Processing instructions can now be added via Node#add_next_sibling.
 
 
-=== 1.6.2.1 / 2014-05-13
+# 1.6.2.1 / 2014-05-13
 
-==== Bug fixes
+## Bug fixes
 
 * Fix statically-linked libxml2 installation when using universal builds of Ruby. #1104
 * Patching `mini_portile` to address the git dependency detailed in #1102.
 * Library load fix to address segfault reported on some systems. #1097
 
 
-=== 1.6.2 / 2014-05-12
+# 1.6.2 / 2014-05-12
 
-==== Security Note
+## Security Note
 
 A set of security and bugfix patches have been backported from the libxml2 and libxslt repositories onto the version of 2.8.0 packaged with Nokogiri, including these notable security fixes:
 
@@ -280,11 +298,11 @@ A set of security and bugfix patches have been backported from the libxml2 and l
 
 It is recommended that you upgrade from 1.6.x to this version as soon as possible.
 
-==== Compatibility Note
+## Compatibility Note
 
 Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
 
-==== Features
+## Features
 
 * Add cross building of fat binary gems for 64-Bit Windows (x64-mingw32) and add support for native builds on Windows. #864, #989, #1072
 * (MRI) Alias CP932 to Windows-31J if iconv does not support Windows-31J.
@@ -303,7 +321,7 @@ Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
 * Fix documentation for XML::Node#namespace. #803 #802 (Thanks, Hoylen Sue)
 * Allow Nokogiri::XML::Node#parse from unparented non-element nodes. #407
 
-==== Bugfixes
+## Bugfixes
 
 * Ensure :only-child pseudo class works within :not pseudo class. #858 (Thanks, Yamagishi Kazutoshi!)
 * Don't call pkg_config when using bundled libraries in extconf.rb #931 (Thanks, Shota Fukumori!)
@@ -323,7 +341,7 @@ Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
 * (JRuby) JRuby-Nokogiri has different comment node name #1080
 * (JRuby) JAXPExtensionsProvider / Java 7 / Secure Processing #1070
 
-=== 1.6.1 / 2013-12-14
+# 1.6.1 / 2013-12-14
 
 * Bugfixes
 
@@ -331,7 +349,7 @@ Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
   * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
-=== 1.6.0 / 2013-06-08
+# 1.6.0 / 2013-06-08
 
 This release was based on v1.5.10 and 1.6.0.rc1, and contains changes
 mentioned in both.
@@ -341,7 +359,7 @@ mentioned in both.
   * Remove pre 1.9 monitoring from Travis.
 
 
-=== 1.6.0.rc1 / 2013-04-14
+# 1.6.0.rc1 / 2013-04-14
 
 This release was based on v1.5.9, and so does not contain any fixes
 mentioned in the notes for v1.5.10.
@@ -367,7 +385,7 @@ mentioned in the notes for v1.5.10.
   * Support for Ruby 1.8.7 and prior has been dropped
 
 
-=== 1.5.11 / 2013-12-14
+# 1.5.11 / 2013-12-14
 
 * Bugfixes
 
@@ -375,7 +393,7 @@ mentioned in the notes for v1.5.10.
   * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
-=== 1.5.10 / 2013-06-07
+# 1.5.10 / 2013-06-07
 
 * Bugfixes
 
@@ -390,7 +408,7 @@ mentioned in the notes for v1.5.10.
   * Fix TypeError when running tests. #900 (Thanks, Cédric Boutillier!)
 
 
-=== 1.5.9 / 2013-03-21
+# 1.5.9 / 2013-03-21
 
 * Bugfixes
 
@@ -399,7 +417,7 @@ mentioned in the notes for v1.5.10.
   * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856
 
 
-=== 1.5.8 / 2013-03-19
+# 1.5.8 / 2013-03-19
 
 * Bugfixes
 
@@ -408,7 +426,7 @@ mentioned in the notes for v1.5.10.
   * Allow use of a prefixed namespace on a root node using Nokogiri::XML::Builder #868
 
 
-=== 1.5.7 / 2013-03-18
+# 1.5.7 / 2013-03-18
 
 * Features
 
@@ -431,7 +449,7 @@ mentioned in the notes for v1.5.10.
   * (MRI) SAX parser handles empty processing instructions. #845
 
 
-=== 1.5.6 / 2012-12-19
+# 1.5.6 / 2012-12-19
 
 * Features
 
@@ -470,7 +488,7 @@ mentioned in the notes for v1.5.10.
   * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
-=== 1.5.5 / 2012-06-24
+# 1.5.5 / 2012-06-24
 
 * Features
 
@@ -492,7 +510,7 @@ mentioned in the notes for v1.5.10.
   * JRuby's Entity resolving should be consistent with C-Nokogiri #704, #647, #703
 
 
-=== 1.5.4 / 2012-06-12
+# 1.5.4 / 2012-06-12
 
 * Features
 
@@ -518,7 +536,7 @@ mentioned in the notes for v1.5.10.
     Insert your own joke about double-negatives here.
 
 
-=== 1.5.3 / 2012-06-01
+# 1.5.3 / 2012-06-01
 
 * Features
 
@@ -548,12 +566,12 @@ mentioned in the notes for v1.5.10.
   * (JRuby) Concurrency issue in XPath parsing. #682
 
 
-=== 1.5.2 / 2012-03-09
+# 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
+# 1.5.1 / 2012-03-09
 
 * Features
 
@@ -598,7 +616,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 
-=== 1.5.0 / 2011-07-01
+# 1.5.0 / 2011-07-01
 
 * Notes
 
@@ -619,7 +637,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Add support for <meta charset="...">.
 
 
-=== 1.5.0 beta3 / 2010/12/02
+# 1.5.0 beta3 / 2010/12/02
 
 * Notes
 
@@ -631,14 +649,14 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Node#inner_text no longer returns nil. (JRuby) #264
 
 
-=== 1.5.0 beta2 / 2010/07/30
+# 1.5.0 beta2 / 2010/07/30
 
 * Notes
 
   * See changelog from 1.4.3
 
 
-=== 1.5.0 beta1 / 2010/05/22
+# 1.5.0 beta1 / 2010/05/22
 
 * Notes
 
@@ -651,7 +669,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * FFI support is removed.
 
 
-=== 1.4.7 / 2011-07-01
+# 1.4.7 / 2011-07-01
 
 * Bugfixes
 
@@ -660,7 +678,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     encoding. Thanks, Timothy Elliott (@ender672)! #478
 
 
-=== 1.4.6 / 2011-06-19
+# 1.4.6 / 2011-06-19
 
 * Notes
 
@@ -668,7 +686,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Ruby 1.8.6 support has been restored.
 
 
-=== 1.4.5 / 2011-05-19
+# 1.4.5 / 2011-05-19
 
 * New Features
 
@@ -691,7 +709,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Reader no longer segfaults when under GC pressure. #439
 
 
-=== 1.4.4 / 2010-11-15
+# 1.4.4 / 2010-11-15
 
 * New Features
 
@@ -718,7 +736,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed NodeSet#wrap on nodes within a fragment. #331
 
 
-=== 1.4.3 / 2010/07/28
+# 1.4.3 / 2010/07/28
 
 * New Features
 
@@ -742,7 +760,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     "//F//G[preceding-sibling::E]".
 
 
-=== 1.4.2 / 2010/05/22
+# 1.4.2 / 2010/05/22
 
 * New Features
 
@@ -795,7 +813,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     were bundled.
 
 
-=== 1.4.1 / 2009/12/10
+# 1.4.1 / 2009/12/10
 
 * New Features
 
@@ -827,7 +845,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fragments containing leading text nodes with newlines now parse properly. GH #178.
 
 
-=== 1.4.0 / 2009/10/30
+# 1.4.0 / 2009/10/30
 
 * Happy Birthday!
 
@@ -870,7 +888,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Hpricot compatibility layer removed
 
 
-=== 1.3.3 / 2009/07/26
+# 1.3.3 / 2009/07/26
 
 * New Features
 
@@ -891,7 +909,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Hpricot compatibility layer will be removed in 1.4.0
 
 
-=== 1.3.2 / 2009-06-22
+# 1.3.2 / 2009-06-22
 
 * New Features
 
@@ -915,7 +933,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     to Nokogiri::XML::SAX::Document#end_element_namespace
 
 
-=== 1.3.1 / 2009-06-07
+# 1.3.1 / 2009-06-07
 
 * Bugfixes
 
@@ -923,7 +941,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Namespace nodes are added to the Document node cache
 
 
-=== 1.3.0 / 2009-05-30
+# 1.3.0 / 2009-05-30
 
 * New Features
 
@@ -967,7 +985,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed intolerance of HTML attributes without values in Node#before/after/inner_html=. (GH#35)
 
 
-=== 1.2.3 / 2009-03-22
+# 1.2.3 / 2009-03-22
 
 * Bugfixes
 
@@ -979,7 +997,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Builder methods take a hash as a second argument
 
 
-=== 1.2.2 / 2009-03-14
+# 1.2.2 / 2009-03-14
 
 * New features
 
@@ -1006,7 +1024,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Document should not have a parent method (LH #64)
 
 
-=== 1.2.1 / 2009-02-23
+# 1.2.1 / 2009-02-23
 
 * Bugfixes
 
@@ -1014,7 +1032,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed Ruby 1.9 String Encoding (Thanks 角谷さん！)
 
 
-=== 1.2.0 / 2009-02-22
+# 1.2.0 / 2009-02-22
 
 * New features
 
@@ -1051,7 +1069,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Nokogiri::HTML.fragment now returns an XML::DocumentFragment (LH #32)
 
 
-=== 1.1.1
+# 1.1.1
 
 * New features
 
@@ -1069,7 +1087,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::NodeSet implements to_xml
 
 
-=== 1.1.0
+# 1.1.0
 
 * New Features
 
@@ -1086,7 +1104,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Node#add_previous_sibling returns new sibling node.
 
 
-=== 1.0.7
+# 1.0.7
 
 * Bugfixes
 
@@ -1098,7 +1116,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed a bug in complex CSS negation selectors
 
 
-=== 1.0.6
+# 1.0.6
 
 * 5 Bugfixes
 
@@ -1109,7 +1127,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * CSS to XPath conversion is now cached
 
 
-=== 1.0.5
+# 1.0.5
 
 * Bugfixes
 
@@ -1118,7 +1136,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Caching results of NodeSet#[] on Document
 
 
-=== 1.0.4
+# 1.0.4
 
 * Bugfixes
 
@@ -1127,7 +1145,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Builder blocks can call methods from surrounding contexts
 
 
-=== 1.0.3
+# 1.0.3
 
 * 5 Bugfixes
 
@@ -1138,14 +1156,14 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * inner_html fixed. (Thanks Yehuda!)
 
 
-=== 1.0.2
+# 1.0.2
 
 * 1 Bugfix
 
   * extconf.rb should not check for frex and racc
 
 
-=== 1.0.1
+# 1.0.1
 
 * 1 Bugfix
 
@@ -1153,7 +1171,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     will link properly.  Thanks lucsky!
 
 
-=== 1.0.0 / 2008-07-13
+# 1.0.0 / 2008-07-13
 
 * 1 major enhancement
 

data/Gemfile

@@ -15,8 +15,8 @@ gem "minitest", "~>5.8.4", :group => [:development, :test]
 gem "rake", "~>10.5.0", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
 gem "rake-compiler-dock", "~>0.5.1", :group => [:development, :test]
-gem "racc", "~>1.4.14", :group => [:development, :test], :platform => :ruby
-gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => :ruby
+gem "racc", "~>1.4.14", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
+gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "hoe", "~>3.14", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Manifest.txt

@@ -3,7 +3,7 @@
 .editorconfig
 .gemtest
 .travis.yml
-CHANGELOG.rdoc
+CHANGELOG.md
 CONTRIBUTING.md
 C_CODING_STYLE.rdoc
 Gemfile

data/README.md

@@ -12,7 +12,7 @@
 
 [![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)
+[![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
 [![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
 
 
@@ -110,13 +110,17 @@ end
 
 ## Requirements
 
-* Ruby 1.9.3 or higher, including any development packages necessary
+* Ruby 2.1.0 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
+  * First, check out [the long list](http://www.xmlsoft.org/news.html)
+    of fixes and changes between releases before deciding to use any
+    version older than is bundled with Nokogiri.
+
+  * At install time, set the environment variable
     `NOKOGIRI_USE_SYSTEM_LIBRARIES` or else use the
     `--use-system-libraries` argument. (See
     http://nokogiri.org/tutorials/installing_nokogiri.html#using_your_system_libraries

data/Rakefile

@@ -31,8 +31,6 @@ CrossRuby = Struct.new(:version, :host) {
     case minor_ver
     when nil
       raise "unsupported version: #{ver}"
-    when '1.9'
-      '191'
     else
       minor_ver.delete('.') << '0'
     end
@@ -113,7 +111,7 @@ HOE = Hoe.spec 'nokogiri' do
   license "MIT"
 
   self.readme_file  = "README.md"
-  self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
+  self.history_file = "CHANGELOG.md"
 
   self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
 
@@ -149,7 +147,7 @@ HOE = Hoe.spec 'nokogiri' do
   else
     self.spec_extras = {
       :extensions => ["ext/nokogiri/extconf.rb"],
-      :required_ruby_version => '>= 1.9.2'
+      :required_ruby_version => '>= 2.1.0'
     }
   end
 
@@ -233,7 +231,7 @@ else
         libs = dependencies.map { |name, dep| "#{name}-#{dep["version"]}" }.join(', ')
 
         spec.required_ruby_version = [
-          '>= 1.9.2',
+          '>= 2.1.0',
           "< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
         ]
 

data/Y_U_NO_GEMSPEC.md

@@ -22,7 +22,7 @@ the historical record:
 * [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
+Sometimes people imply that we've forgotten, or that we don't know how to
 properly manage our codebase. Those people are super fun to respond
 to!
 

data/build_all

@@ -16,7 +16,6 @@ else
 fi
 
 set -o errexit
-#set -x
 
 rm -rf tmp pkg
 bundle exec rake clean clobber

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -548,9 +548,8 @@ public class NokogiriHelpers {
     }
 
     private static boolean nodesAreEqual(Object a, Object b) {
-      return (((a == null) && (a == null)) ||
-                (a != null) && (b != null) &&
-                (b.equals(a)));
+        return (((a == null) && (b == null)) ||
+                ((a != null) && (b != null) && (b.equals(a))));
     }
 
     private static Pattern encoded_pattern = Pattern.compile("&|>|<|
");

data/ext/nokogiri/extconf.rb

@@ -20,6 +20,10 @@ def darwin?
   RbConfig::CONFIG['target_os'] =~ /darwin/
 end
 
+def openbsd?
+  RbConfig::CONFIG['target_os'] =~ /openbsd/
+end
+
 def nix?
   ! (windows? || solaris? || darwin?)
 end
@@ -62,7 +66,7 @@ usage: ruby #{$0} [options]
         Use the zlib library placed under DIR.
 
     --use-system-libraries
-        Use system libraries intead of building and using the bundled
+        Use system libraries instead of building and using the bundled
         libraries.
 
     --with-xml2-dir=DIR / --with-xml2-config=CONFIG
@@ -131,12 +135,7 @@ def package_config pkg, options={}
 end
 
 def nokogiri_try_compile
-  args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
-           ["int main() {return 0;}"]
-         else
-           ["int main() {return 0;}", "", {werror: true}]
-         end
-  try_compile(*args)
+  try_compile "int main() {return 0;}", "", {werror: true}
 end
 
 def check_libxml_version version=nil
@@ -381,14 +380,6 @@ def using_system_libraries?
   arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
 end
 
-#
-# monkey patches
-#
-
-# Workaround for Ruby bug #8074, introduced in Ruby 2.0.0, fixed in Ruby 2.1.0
-# https://bugs.ruby-lang.org/issues/8074
-@libdir_basename = "lib" if RUBY_VERSION < '2.1.0'
-
 #
 # main
 #
@@ -400,15 +391,15 @@ when arg_config('--clean')
   do_clean
 end
 
+if openbsd?
+  ENV['CC'] ||= find_executable('egcc')
+    abort "Please install gcc 4.9+ from ports using `pkg_add -v gcc`"
+end
+
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 # use same c compiler for libxml and libxslt
 ENV['CC'] = RbConfig::MAKEFILE_CONFIG['CC']
 
-# TODO: deprecate MacRuby: https://github.com/sparklemotion/nokogiri/issues/1474
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
-  $LIBRUBYARG_STATIC.gsub!(/-static/, '')
-end
-
 $LIBS << " #{ENV["LIBS"]}"
 
 # Read CFLAGS from ENV and make sure compiling works.

data/ext/nokogiri/nokogiri.c

@@ -36,10 +36,8 @@ void vasprintf_free (void *p)
 #ifdef HAVE_RUBY_UTIL_H
 #include "ruby/util.h"
 #else
-#ifndef __MACRUBY__
 #include "util.h"
 #endif
-#endif
 
 void nokogiri_root_node(xmlNodePtr node)
 {
@@ -63,14 +61,12 @@ void nokogiri_root_nsdef(xmlNsPtr ns, xmlDocPtr doc)
 
 void Init_nokogiri()
 {
-#ifndef __MACRUBY__
   xmlMemSetup(
       (xmlFreeFunc)ruby_xfree,
       (xmlMallocFunc)ruby_xmalloc,
       (xmlReallocFunc)ruby_xrealloc,
       ruby_strdup
   );
-#endif
 
   mNokogiri         = rb_define_module("Nokogiri");
   mNokogiriXml      = rb_define_module_under(mNokogiri, "XML");

data/lib/nokogiri.rb

@@ -26,7 +26,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
 end
 
 begin
-  RUBY_VERSION =~ /(\d+.\d+)/
+  RUBY_VERSION =~ /(\d+\.\d+)/
   require "nokogiri/#{$1}/nokogiri"
 rescue LoadError
   require 'nokogiri/nokogiri'

data/lib/nokogiri/html/document.rb

@@ -161,7 +161,7 @@ module Nokogiri
         # Nokogiri::XML::ParseOptions.
         def parse string_or_io, url = nil, encoding = nil, options = XML::ParseOptions::DEFAULT_HTML
 
-          options = Nokogiri::XML::ParseOptions.new(options) if Fixnum === options
+          options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
           # Give the options to the user
           yield options if block_given?
 

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml.rb

@@ -48,7 +48,7 @@ module Nokogiri
       # Nokogiri::XML::Reader for mor information
       def Reader string_or_io, url = nil, encoding = nil, options = ParseOptions::STRICT
 
-        options = Nokogiri::XML::ParseOptions.new(options) if Fixnum === options
+        options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
         # Give the options to the user
         yield options if block_given?
 

data/lib/nokogiri/xml/document.rb

@@ -41,7 +41,7 @@ module Nokogiri
       # Nokogiri.XML() is a convenience method which will call this method.
       #
       def self.parse string_or_io, url = nil, encoding = nil, options = ParseOptions::DEFAULT_XML, &block
-        options = Nokogiri::XML::ParseOptions.new(options) if Fixnum === options
+        options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
         # Give the options to the user
         yield options if block_given?
 

data/lib/nokogiri/xml/node.rb

@@ -387,7 +387,7 @@ module Nokogiri
         end
 
         options ||= (document.html? ? ParseOptions::DEFAULT_HTML : ParseOptions::DEFAULT_XML)
-        if Fixnum === options
+        if Integer === options
           options = Nokogiri::XML::ParseOptions.new(options)
         end
         # Give the options to the user
@@ -739,7 +739,7 @@ module Nokogiri
       # Nokogiri::XML::ParseOptions object initialized from +options+, will be
       # passed to it, allowing more convenient modification of the parser options.
       def do_xinclude options = XML::ParseOptions::DEFAULT_XML, &block
-        options = Nokogiri::XML::ParseOptions.new(options) if Fixnum === options
+        options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
 
         # give options to user
         yield options if block_given?

data/lib/nokogiri/xml/node_set.rb

@@ -190,6 +190,17 @@ module Nokogiri
 
       ###
       # Get the inner text of all contained Node objects
+      #
+      # Note: This joins the text of all Node objects in the NodeSet:
+      #
+      #    doc = Nokogiri::XML('<xml><a><d>foo</d><d>bar</d></a></xml>')
+      #    doc.css('d').text # => "foobar"
+      #
+      # Instead, if you want to return the text of all nodes in the NodeSet:
+      #
+      #    doc.css('d').map(&:text) # => ["foo", "bar"]
+      #
+      # See Nokogiri::XML::Node#content for more information.
       def inner_text
         collect(&:inner_text).join('')
       end

data/lib/nokogiri/xml/parse_options.rb

@@ -7,11 +7,11 @@ module Nokogiri
     # You can build your own combinations of these parse options by using any of the following methods:
     # *Note*: All examples attempt to set the +RECOVER+ & +NOENT+ options. All examples use Ruby 2 optional parameter syntax.
     # [Ruby's bitwise operators] You can use the Ruby bitwise operators to set various combinations.
-    #   <code>Nokogiri.XML('<content>Chapter 1</content', options: Nokogiri::XML::ParseOptions.new((1 << 0) | (1 << 1)))</code>
+    #   Nokogiri.XML('<content>Chapter 1</content', options: Nokogiri::XML::ParseOptions.new((1 << 0) | (1 << 1)))
     # [Method chaining] Every option has an equivalent method in lowercase. You can chain these methods together to set various combinations.
-    #   <code>Nokogiri.XML('<content>Chapter 1</content', options: Nokogiri::XML::ParseOptions.new.recover.noent)</code>
+    #   Nokogiri.XML('<content>Chapter 1</content', options: Nokogiri::XML::ParseOptions.new.recover.noent)
     # [Using Ruby Blocks] You can also setup parse combinations in the block passed to Nokogiri.XML or Nokogiri.HTML
-    #   <code>Nokogiri.XML('<content>Chapter 1</content') {|config| config.recover.noent}</code>
+    #   Nokogiri.XML('<content>Chapter 1</content') {|config| config.recover.noent}
     #
     # == Removing particular parse options
     # You can also remove options from an instance of +ParseOptions+ dynamically.

data/test_all

@@ -12,13 +12,11 @@
 
 # I'd add rubinius, but rvm errors when building it on my machine. :(
 RUBIES="\
+  ruby-2.4 \
   ruby-2.3 \
   ruby-2.2 \
   ruby-2.1 \
-  ruby-2.0.0-p648 \
-  ruby-1.9.3-p551 \
-  ruby-1.9.2-p330 \
-  jruby-9.0.4.0 \
+  jruby-9.1.6.0 \
   jruby-1.7.19
   "
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.8.1
+  version: 1.7.0
 platform: java
 authors:
 - Aaron Patterson
@@ -12,22 +12,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  name: rdoc
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -168,6 +154,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  name: rdoc
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -196,7 +196,7 @@ executables:
 - nokogiri
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
 - LICENSE.txt
@@ -246,7 +246,7 @@ files:
 - .editorconfig
 - .gemtest
 - .travis.yml
-- CHANGELOG.rdoc
+- CHANGELOG.md
 - CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
 - Gemfile