nokogiri 1.6.6.4-x86-mingw32 → 1.6.7.rc2-x86-mingw32

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -32,6 +32,22 @@ module Nokogiri
     # * Nokogiri::XML::Node#next
     # * Nokogiri::XML::Node#previous
     #
+    #
+    # When printing or otherwise emitting a document or a node (and
+    # its subtree), there are a few methods you might want to use:
+    #
+    # * content, text, inner_text, to_str: emit plaintext
+    #  
+    #   These methods will all emit the plaintext version of your
+    #   document, meaning that entities will be replaced (e.g., "<"
+    #   will be replaced with "<"), meaning that any sanitizing will
+    #   likely be un-done in the output.
+    #
+    # * to_s, to_xml, to_html, inner_html: emit well-formed markup
+    #
+    #   These methods will all emit properly-escaped markup, meaning
+    #   that it's suitable for consumption by browsers, parsers, etc.
+    #
     # You may search this node's subtree using Searchable#xpath and Searchable#css
     class Node
       include Nokogiri::XML::PP::Node

data/patches/sort-patches-by-date

@@ -0,0 +1,25 @@
+#! /usr/bin/env ruby
+
+require "date"
+
+dir = ARGV[0] || raise("ERROR: arg1 must be dir")
+
+Dir.chdir dir
+
+files_and_times = {}
+Dir["*.patch"].sort.each do |filename|
+  dateline = `cat #{filename} | grep "Date:"`
+  datestr = dateline.split("Date:").last.strip
+  time = DateTime.parse datestr
+  files_and_times[filename] = time
+end
+
+count = 0
+files_and_times.sort_by {|k,v| v}.each do |filename, time|
+  count += 1
+  _, patch_name = filename.split("-", 2)
+  new_filename = sprintf("%4.4d-%s", count, patch_name)
+  printf "mv -f %s %s # %s\n", filename, new_filename, time
+end
+
+STDERR.print "\n**\n** REMEMBER TO UPDATE THE Manifest.txt FILE\n**\n"

data/test/html/test_document.rb

@@ -88,9 +88,9 @@ module Nokogiri
       def test_document_parse_method_with_url
         require 'open-uri'
         begin
-          html = open('http://google.com').read
-        rescue
-          skip("This test needs the internet. Skips if no internet available.")
+          html = open('https://www.yahoo.com').read
+        rescue Exception => e
+          skip("This test needs the internet. Skips if no internet available. (#{e})")
         end
         doc = Nokogiri::HTML html ,"http:/foobar.foobar/"
         refute_empty doc.to_s, "Document should not be empty"
@@ -637,6 +637,24 @@ eohtml
         assert_equal original_errors.length+1, doc1.errors.length
         assert_match(/ID unique already defined/, doc1.errors.last.to_s)
       end
+
+      def test_silencing_nonparse_errors_during_attribute_insertion_1262
+        # see https://github.com/sparklemotion/nokogiri/issues/1262
+        #
+        # libxml2 emits a warning when this happens; the JRuby
+        # implementation does not. so rather than capture the error in
+        # doc.errors in a platform-dependent way, I'm opting to have
+        # the error silenced.
+        #
+        # So this test doesn't look meaningful, but we want to avoid
+        # having `ID unique-issue-1262 already defined` emitted to
+        # stderr when running the test suite.
+        #
+        doc = Nokogiri::HTML::Document.new
+        Nokogiri::XML::Element.new("div", doc).set_attribute('id', 'unique-issue-1262')
+        Nokogiri::XML::Element.new("div", doc).set_attribute('id', 'unique-issue-1262')
+        assert_equal 0, doc.errors.length
+      end
     end
   end
 end

data/test/xml/sax/test_parser.rb

@@ -376,6 +376,17 @@ module Nokogiri
 
           assert_equal [['Root', []], ['Data', []], ['Item', []], ['Data', []], ['Item', []]], @parser.document.start_elements
         end
+
+        def test_square_bracket_in_text  # issue 1261
+          xml = <<-eoxml
+<tu tuid="87dea04cf60af103ff09d1dba36ae820" segtype="block">
+  <prop type="x-smartling-string-variant">en:#:home_page:#:stories:#:[6]:#:name</prop>
+  <tuv xml:lang="en-US"><seg>Sandy S.</seg></tuv>
+</tu>
+          eoxml
+          @parser.parse(xml)
+          assert @parser.document.data.must_include "en:#:home_page:#:stories:#:[6]:#:name"
+        end
       end
     end
   end

data/test/xml/test_document.rb

@@ -689,6 +689,17 @@ module Nokogiri
         refute_nil doc
       end
 
+      def test_parse_works_with_an_object_that_responds_to_read
+        klass = Class.new do
+          def read *args
+            "<div>foo</div>"
+          end
+        end
+
+        doc = Nokogiri::XML.parse klass.new
+        doc.at_css("div").content.must_equal("foo")
+      end
+
       def test_search_on_empty_documents
         doc = Nokogiri::XML::Document.new
         ns = doc.search('//foo')

data/test_all

@@ -14,11 +14,11 @@
 RUBIES="\
   ruby-2.2 \
   ruby-2.1 \
-  ruby-2.0.0-p647 \
+  ruby-2.0.0-p598 \
   ruby-1.9.3-p551 \
   ruby-1.9.2-p330 \
-  jruby-9.0.4.0 \
-  jruby-1.7.19
+  jruby-9.0.0.0.pre1 \
+  jruby-1.7.18
   "
 
 TEST_LOG=test.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.6.4
+  version: 1.6.7.rc2
 platform: x86-mingw32
 authors:
 - Aaron Patterson
@@ -12,182 +12,197 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0.rc2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hoe-debugging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: rexical
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.13'
 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.
+  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.
+  XML is like violence - if it doesn’t solve your problems, you are not
+  using enough of it.
 email:
 - aaronp@rubyforge.org
 - mike.dalessio@gmail.com
@@ -201,9 +216,9 @@ extra_rdoc_files:
 - CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
 - C_CODING_STYLE.rdoc
+- LICENSE.txt
 - Manifest.txt
-- README.ja.rdoc
-- README.rdoc
+- README.md
 - ROADMAP.md
 - STANDARD_RESPONSES.md
 - Y_U_NO_GEMSPEC.md
@@ -243,22 +258,23 @@ extra_rdoc_files:
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xslt_stylesheet.c
 files:
-- .autotest
-- .cross_rubies
-- .editorconfig
-- .gemtest
-- .travis.yml
+- ".autotest"
+- ".cross_rubies"
+- ".editorconfig"
+- ".gemtest"
+- ".travis.yml"
 - 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
@@ -336,6 +352,7 @@ files:
 - lib/nokogiri/1.9/nokogiri.so
 - lib/nokogiri/2.0/nokogiri.so
 - lib/nokogiri/2.1/nokogiri.so
+- lib/nokogiri/2.2/nokogiri.so
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/node.rb
 - lib/nokogiri/css/parser.rb
@@ -397,6 +414,7 @@ files:
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
 - lib/xsd/xmlparser/nokogiri.rb
+- patches/sort-patches-by-date
 - suppressions/README.txt
 - suppressions/nokogiri_ree-1.8.7.358.supp
 - suppressions/nokogiri_ruby-1.8.7.370.supp
@@ -517,20 +535,23 @@ metadata: {}
 post_install_message: |
   Nokogiri is built with the packaged libraries: libxml2-2.9.2, libxslt-1.1.28, zlib-1.2.8, libiconv-1.14.
 rdoc_options:
-- --main
-- README.rdoc
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8