nokogiri 1.6.5-x64-mingw32 → 1.6.6.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce098a9830086f0b961036a06291b1d35873313
-  data.tar.gz: 32153b0d7caf19bbfae65c2342b8b5d318950831
+  metadata.gz: 7a25692c8b1ceba84bd237a42083da992920e5df
+  data.tar.gz: 003de117e19b29e8e75f2be2c39e15a3f3177a45
 SHA512:
-  metadata.gz: 66268301e8c0efc342e7f46f099ac7572dfa578adc9d721de18960b99a114f151866a1e67f090d0a5cbf4f1b39a8989717c49a2e75f525590ac90579c579b410
-  data.tar.gz: 0864d5bc9bb15fbdadcca046e987845387c80544c80a44cc957d255e7bf6f5a05472bb7d8a6409f72270700770fa03ac9a1468a9d80ce727a22f6adc2cbc7fdf
+  metadata.gz: 37b5fb59ca0cb46136f5615eecfcd94d48bb70412b26057eedb3bc4668b04ff0c713596f3a36f8a1b74f2b9bf3bdbf56b00b7b5d45f995ef27fda053a20f9f32
+  data.tar.gz: edef9e10d9d8facc7d9c9307db056dc18bdd65de76d30bfa8e66d2e473ee8aed27abd4f3d04fea52421a226de332641f8d286de3db6b4f1c39e906cd03a123af

data/.cross_rubies

@@ -0,0 +1,5 @@
+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

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.3
-  - ruby-head
+  - ruby-1.9.2
+  - ruby-1.9.3
+  - ruby-2.0
+  - ruby-2.1
+  - ruby-2.2
   - jruby-19mode
-  - jruby-20mode
+  - jruby-1.7.18
+  - jruby-9.0.0.0.pre1
   - rbx-19mode
+  - rbx-2
 
 os:
   - linux
@@ -14,22 +18,8 @@ os:
 
 jdk:
   - openjdk7
-  - openjdk6
 
 matrix:
   allow_failures:
     - os: osx
-    - rvm: rbx-19mode
-    # currently broken on Travis CI
-    - rvm: jruby-20mode
-  exclude:
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.1.3
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: rbx-19mode
-      jdk: openjdk7
+    - rvm: jruby-9.0.0.0.pre1

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,31 @@
-=== 1.6.5 / 未リリース
+=== 1.6.6.1 / 2015年01月22日
+
+Note that 1.6.6.0 was not released.
+
+==== 機能
+
+* Unified Node and NodeSet implementations of #search, #xpath and #css.
+* Added Node#lang and Node#lang=.
+* bin/nokogiri passes the URI to parse() if an HTTP URL is given.
+* bin/nokogiri now loads ~/.nokogirirc so user can define helper methods, etc.
+* bin/nokogiri can be configured to use Pry instead of IRB by adding a couple of lines to ~/.nokogirirc. (#1198)
+* bin/nokogiri can better handle urls from STDIN (aiding use of xargs). (#1065)
+* JRuby 9K support.
+
+
+==== バグ修正
+
+* DocumentFragment#search now matches against root nodes. (#1205)
+* (MRI) More fixes related to handling libxml2 parse errors during DocumentFragment#dup. (#1196)
+* (JRuby) Builder now handles namespace hrefs properly when there is a default ns. (#1039)
+* (JRuby) Clear the XPath cache on attr removal. (#1109)
+* `XML::Comment.new` argument types are now consistent and safe (and documented) across MRI and JRuby. (#1224)
+* (MRI) Restoring support for Ruby 1.9.2 that was broken in v1.6.4.1 and v1.6.5. (#1207)
+* Check if `zlib` is available before building `libxml2`. (#1188)
+* (JRuby) HtmlSaxPushParser now exists. (#1147) (Thanks, Piotr Szmielew!)
+
+
+=== 1.6.5 / 2014年11月26日
 
 ==== 機能
 

data/CHANGELOG.rdoc

@@ -1,4 +1,31 @@
-=== 1.6.5 / unreleased
+=== 1.6.6.1 / 2015-01-22
+
+Note that 1.6.6.0 was not released.
+
+==== Features
+
+* Unified Node and NodeSet implementations of #search, #xpath and #css.
+* Added Node#lang and Node#lang=.
+* bin/nokogiri passes the URI to parse() if an HTTP URL is given.
+* bin/nokogiri now loads ~/.nokogirirc so user can define helper methods, etc.
+* bin/nokogiri can be configured to use Pry instead of IRB by adding a couple of lines to ~/.nokogirirc. (#1198)
+* bin/nokogiri can better handle urls from STDIN (aiding use of xargs). (#1065)
+* JRuby 9K support.
+
+
+==== Bug fixes
+
+* DocumentFragment#search now matches against root nodes. (#1205)
+* (MRI) More fixes related to handling libxml2 parse errors during DocumentFragment#dup. (#1196)
+* (JRuby) Builder now handles namespace hrefs properly when there is a default ns. (#1039)
+* (JRuby) Clear the XPath cache on attr removal. (#1109)
+* `XML::Comment.new` argument types are now consistent and safe (and documented) across MRI and JRuby. (#1224)
+* (MRI) Restoring support for Ruby 1.9.2 that was broken in v1.6.4.1 and v1.6.5. (#1207)
+* Check if `zlib` is available before building `libxml2`. (#1188)
+* (JRuby) HtmlSaxPushParser now exists. (#1147) (Thanks, Piotr Szmielew!)
+
+
+=== 1.6.5 / 2014-11-26
 
 ==== Features
 

data/Gemfile

@@ -8,7 +8,7 @@ gem "mini_portile", "~>0.6.0"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
-gem "hoe-debugging", ">=1.0.3", :group => [:development, :test]
+gem "hoe-debugging", "~>1.2.0", :group => [:development, :test]
 gem "hoe-gemspec", ">=1.0", :group => [:development, :test]
 gem "hoe-git", ">=1.4", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.cross_rubies
 .editorconfig
 .gemtest
 .travis.yml
@@ -21,6 +22,7 @@ ext/java/nokogiri/HtmlDocument.java
 ext/java/nokogiri/HtmlElementDescription.java
 ext/java/nokogiri/HtmlEntityLookup.java
 ext/java/nokogiri/HtmlSaxParserContext.java
+ext/java/nokogiri/HtmlSaxPushParser.java
 ext/java/nokogiri/NokogiriService.java
 ext/java/nokogiri/XmlAttr.java
 ext/java/nokogiri/XmlAttributeDecl.java
@@ -230,6 +232,7 @@ lib/nokogiri/xml/sax/parser.rb
 lib/nokogiri/xml/sax/parser_context.rb
 lib/nokogiri/xml/sax/push_parser.rb
 lib/nokogiri/xml/schema.rb
+lib/nokogiri/xml/searchable.rb
 lib/nokogiri/xml/syntax_error.rb
 lib/nokogiri/xml/text.rb
 lib/nokogiri/xml/xpath.rb
@@ -253,12 +256,12 @@ ports/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.
 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/sort-patches-by-date
 suppressions/README.txt
 suppressions/nokogiri_ree-1.8.7.358.supp
 suppressions/nokogiri_ruby-1.8.7.370.supp
 suppressions/nokogiri_ruby-1.9.2.320.supp
 suppressions/nokogiri_ruby-1.9.3.327.supp
-tasks/nokogiri.org.rb
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
@@ -303,6 +306,7 @@ test/files/xinclude.xml
 test/helper.rb
 test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb
+test/html/sax/test_push_parser.rb
 test/html/test_builder.rb
 test/html/test_document.rb
 test/html/test_document_encoding.rb

data/README.ja.rdoc

@@ -38,24 +38,25 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
   require 'nokogiri'
   require 'open-uri'
-  
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
-  
+
+  # Fetch and parse HTML document
+  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
+
   ####
   # Search for nodes by css
-  doc.css('h3.r a.l').each do |link|
+  doc.css('nav ul.menu li a').each do |link|
     puts link.content
   end
-  
+
   ####
   # Search for nodes by xpath
-  doc.xpath('//h3/a[@class="l"]').each do |link|
+  doc.xpath('//h2 | //h3').each do |link|
     puts link.content
   end
-  
+
   ####
   # Or mix and match.
-  doc.search('h3.r a.l', '//h3/a[@class="l"]').each do |link|
+  doc.search('code.sh', '//h2').each do |link|
     puts link.content
   end
 
@@ -81,7 +82,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 (The MIT License)
 
-Copyright (c) 2008 - 2014:
+Copyright (c) 2008 - 2015:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/README.rdoc

@@ -45,27 +45,24 @@ The IRC channel is #nokogiri on freenode.
   require 'nokogiri'
   require 'open-uri'
 
-  # Get a Nokogiri::HTML::Document for the page we’re interested in...
-
-  doc = Nokogiri::HTML(open('http://www.google.com/search?q=sparklemotion'))
-
-  # Do funky things with it using Nokogiri::XML::Node methods...
+  # Fetch and parse HTML document
+  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
 
   ####
   # Search for nodes by css
-  doc.css('h3.r a').each do |link|
+  doc.css('nav ul.menu li a').each do |link|
     puts link.content
   end
 
   ####
   # Search for nodes by xpath
-  doc.xpath('//h3/a').each do |link|
+  doc.xpath('//h2 | //h3').each do |link|
     puts link.content
   end
 
   ####
   # Or mix and match.
-  doc.search('h3.r a.l', '//h3/a').each do |link|
+  doc.search('code.sh', '//h2').each do |link|
     puts link.content
   end
 
@@ -150,7 +147,7 @@ Then run rake:
 
 (The MIT License)
 
-Copyright (c) 2008 - 2014:
+Copyright (c) 2008 - 2015:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/ROADMAP.md

@@ -57,6 +57,7 @@
   - https://github.com/sparklemotion/nokogiri/issues/370
   - https://github.com/sparklemotion/nokogiri/issues/454
   - https://github.com/sparklemotion/nokogiri/issues/572
+  could we fix this by making DocumentFragment be a subclass of NodeSet?
 
 
 ## Better Syntax for custom XPath function handler
@@ -70,9 +71,6 @@
   * we should standardize on a hash of options for these and other calls
 * what should NodeSet#xpath return?
   * https://github.com/sparklemotion/nokogiri/issues/656
-* also, clean up or unify the implementations of #xpath-and-friends in Node and NodeSet
-  * implementations are very similar, but no shared code :(
-  * decorate nodes in a consistent manner
 
 ## Encoding
 
@@ -87,3 +85,17 @@ Somebody who knows encoding well should head this up.
 
 It's fundamentally broken, in that we can't stop people from crashing
 their application if they want to use object reference unsafely.
+
+
+## Class methods that require Document
+
+There are a few methods, like `Nokogiri::XML::Comment.new` that
+require a Document object.
+
+We should probably make Document instance methods to wrap this, since
+it's a non-obvious expectation and thus fails as a convention.
+
+So, instead, let's make alternative methods like
+`Nokogiri::XML::Document#new_comment`, and recommend those as the
+proper convention.
+

data/Rakefile

@@ -101,8 +101,6 @@ CROSS_RUBIES = File.read('.cross_rubies').lines.flat_map { |line|
 
 ENV['RUBY_CC_VERSION'] ||= CROSS_RUBIES.map(&:ver).uniq.join(":")
 
-require 'tasks/nokogiri.org'
-
 HOE = Hoe.spec 'nokogiri' do
   developer 'Aaron Patterson', 'aaronp@rubyforge.org'
   developer 'Mike Dalessio',   'mike.dalessio@gmail.com'
@@ -142,7 +140,7 @@ HOE = Hoe.spec 'nokogiri' do
 
   self.extra_dev_deps += [
     ["hoe-bundler",     ">= 1.1"],
-    ["hoe-debugging",   ">= 1.0.3"],
+    ["hoe-debugging",   "~> 1.2.0"],
     ["hoe-gemspec",     ">= 1.0"],
     ["hoe-git",         ">= 1.4"],
     ["minitest",        "~> 2.2.2"],

data/bin/nokogiri

@@ -1,14 +1,41 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require 'open-uri'
-require 'irb'
 require 'uri'
 require 'rubygems'
 require 'nokogiri'
+autoload :IRB, 'irb'
 
 parse_class = Nokogiri
 encoding = nil
 
+# This module provides some tunables with the nokogiri CLI for use in
+# your ~/.nokogirirc.
+module Nokogiri::CLI
+  class << self
+    # Specify the console engine, defaulted to IRB.
+    #
+    # call-seq:
+    #   require 'pry'
+    #   Nokogiri::CLI.console = Pry
+    attr_writer :console
+
+    def console
+      case @console
+      when Symbol
+        Kernel.const_get(@console)
+      else
+        @console
+      end
+    end
+
+    attr_accessor :rcfile
+  end
+
+  self.rcfile  = File.expand_path('~/.nokogirirc')
+  self.console = :IRB
+end
+
 opts = OptionParser.new do |opts|
   opts.banner = "Nokogiri: an HTML, XML, SAX, and Reader parser"
   opts.define_head "Usage: nokogiri <uri|path> [options]"
@@ -20,11 +47,15 @@ opts = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on("--type [TYPE]", [:xml, :html]) do |v|
+  opts.on("--type type", "Parse as type: xml or html (default: auto)", [:xml, :html]) do |v|
     parse_class = {:xml => Nokogiri::XML, :html => Nokogiri::HTML}[v]
   end
 
-  opts.on("-E", "--encoding encoding", "Read as encoding (default #{encoding})") do |v|
+  opts.on("-C file", "Specifies initialization file to load (default #{Nokogiri::CLI.rcfile})") do |v|
+    Nokogiri::CLI.rcfile = v
+  end
+
+  opts.on("-E", "--encoding encoding", "Read as encoding (default: #{encoding || 'none'})") do |v|
     encoding = v
   end
 
@@ -48,15 +79,24 @@ opts = OptionParser.new do |opts|
 end
 opts.parse!
 
-uri = ARGV.shift
+url = ARGV.shift
 
-if uri.to_s.strip.empty? && $stdin.tty?
+if url.to_s.strip.empty? && $stdin.tty?
   puts opts
   exit 1
 end
 
-if $stdin.tty?
-  @doc = parse_class.parse(open(uri).read, nil, encoding)
+if File.file?(Nokogiri::CLI.rcfile)
+  load Nokogiri::CLI.rcfile
+end
+
+if url || $stdin.tty?
+  case uri = (URI(url) rescue url)
+  when URI::HTTP
+    @doc = parse_class.parse(uri.read, url, encoding)
+  else
+    @doc = parse_class.parse(open(url).read, nil, encoding)
+  end
 else
   @doc = parse_class.parse($stdin, nil, encoding)
 end
@@ -72,7 +112,7 @@ else
     eval @script, binding, '<main>'
   else
     puts "Your document is stored in @doc..."
-    IRB.start
+    Nokogiri::CLI.console.start
   end
 end
 

data/ext/nokogiri/extconf.rb

@@ -71,10 +71,19 @@ def do_clean
   exit! 0
 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
+end
+
+
 def add_cflags(flags)
   print "checking if the C compiler accepts #{flags}... "
   with_cflags("#{$CFLAGS} #{flags}") do
-    if try_compile("int main() {return 0;}", '', werror: true)
+    if nokogiri_try_compile
       puts 'yes'
       true
     else
@@ -225,7 +234,7 @@ def process_recipe(name, version, static_p, cross_p)
 ************************************************************************
 IMPORTANT NOTICE:
 
-Buidling Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.patch_files.empty?}
+Building Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.patch_files.empty?}
     EOS
 
     unless recipe.patch_files.empty?
@@ -294,7 +303,7 @@ def monkey_patch_mini_portile
       @patch_files.each do |full_path|
         next unless File.exists?(full_path)
         output "Running patch with #{full_path}..."
-        execute('patch', %Q(patch -p1 < #{full_path}))
+        execute('patch', %Q(patch -p1 < "#{full_path}"))
       end
     end
   end
@@ -452,6 +461,12 @@ EOM
     end
   end
 
+  unless windows_p
+    preserving_globals {
+      have_library('z', 'gzdopen', 'zlib.h')
+    } or abort 'zlib is missing; necessary for building libxml2'
+  end
+
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"], static_p, cross_build_p) do |recipe|
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options += [