nokogiri 1.6.6.4-java → 1.6.7-java

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/xml/test_schema.rb

@@ -94,9 +94,22 @@ EOF
       end
 
       def test_validate_invalid_document
-        read_doc = File.read(PO_XML_FILE).gsub(/<city>[^<]*<\/city>/, '')
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
 
-        assert errors = @xsd.validate(Nokogiri::XML(read_doc))
+        assert errors = @xsd.validate(doc)
+        assert_equal 2, errors.length
+      end
+
+      def test_validate_invalid_file
+        tempfile = Tempfile.new("xml")
+
+        doc = Nokogiri::XML File.read(PO_XML_FILE)
+        doc.css("city").unlink
+        tempfile.write doc.to_xml
+        tempfile.close
+
+        assert errors = @xsd.validate(tempfile.path)
         assert_equal 2, errors.length
       end
 

data/test/xml/test_xpath.rb

@@ -425,6 +425,21 @@ END
         assert_equal 1, xml_doc.xpath('//mods:titleInfo',ns_hash).length
         assert_equal 'finnish', xml_doc.xpath('//mods:titleInfo[1]/@lang',ns_hash).first.value
       end
+
+      def test_xpath_after_reset_doc_via_innerhtml
+        xml = <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
+  <text:section name="Section1">[TEXT_INSIDE_SECTION]</text:section>
+</document>
+XML
+
+        doc = Nokogiri::XML(xml)
+        doc.inner_html = doc.inner_html
+        sections = doc.xpath(".//text:section[@name='Section1']")
+        assert_equal 1, sections.size
+        assert_equal "[TEXT_INSIDE_SECTION]", sections.first.text
+      end
     end
   end
 end

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
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -126,6 +126,20 @@ dependencies:
         version: 0.9.2
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: racc
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,11 +183,12 @@ dependencies:
   prerelease: false
   type: :development
 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
@@ -187,9 +202,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
@@ -238,13 +253,14 @@ files:
 - 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
@@ -474,28 +490,7 @@ files:
 - 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
@@ -616,7 +611,7 @@ metadata: {}
 post_install_message:
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/README.ja.rdoc

@@ -1,112 +0,0 @@
-= Nokogiri (鋸) {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri]
-
-* http://nokogiri.org
-* https://github.com/sparklemotion/nokogiri
-* https://groups.google.com/group/nokogiri-talk
-* https://github.com/sparklemotion/nokogiri/issues
-
-== DESCRIPTION:
-
-Nokogiri はHTMLとXMLとSAXとXSLTとReaderのパーサーです。とりわけ重要な特徴は、
-ドキュメントをXPathやCSS3セレクター経由で探索する機能を持つことです。
-
-XMLは暴力に似ている - XMLが君の問題を解決しないとしたら、君はXMLを十分に
-使いこなしていない事になる。
-
-== FEATURES:
-
-* XPath 1.0による探索
-* CSS3 のセレクターによる探索
-* XML/HTMLのビルダー
-
-XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath 1.0をサポートしています。
-
-== SUPPORT:
-
-日本語でNokogiriの
-{メーリングリスト}[https://groups.google.com/group/nokogiri-list]
-
-  * https://groups.google.com/group/nokogiri-list
-
-{バグ報告}[https://github.com/sparklemotion/nokogiri/issues]
-
-  * https://github.com/sparklemotion/nokogiri/issues
-
-IRCのチャンネルはfreenodeの #nokogiri です。
-
-== SYNOPSIS:
-
-  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以上
-
-* Nokogiri 1.6.0以降ではlibxml2とlibxsltは同梱されているが、
-  もしインストール済みのものを使いたい場合:
-
-  * libxml2 2.6.21以上, iconvサポート付きのもの
-    (libxml2-dev/-develパッケージも必要)
-
-  * libxslt 上記のlibxml2でビルドされ、サポートされているもの
-    (libxslt-dev/-develパッケージも必要)
-
-== INSTALL:
-
-* sudo gem install nokogiri
-
-== LICENSE:
-
-(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]
-
-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/README.rdoc

@@ -1,177 +0,0 @@
-= Nokogiri {<img src="https://secure.travis-ci.org/sparklemotion/nokogiri.png?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/nokogiri] {<img src="https://codeclimate.com/github/sparklemotion/nokogiri.png" />}[https://codeclimate.com/github/sparklemotion/nokogiri] {<img src="https://www.versioneye.com/ruby/nokogiri/badge.png" alt="Dependency Status" />}[https://www.versioneye.com/ruby/nokogiri]
-
-* http://nokogiri.org
-* https://github.com/sparklemotion/nokogiri
-* https://groups.google.com/group/nokogiri-talk
-* https://github.com/sparklemotion/nokogiri/issues
-
-== 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:
-
-* XPath 1.0 support for document searching
-* CSS3 selector support for document searching
-* XML/HTML builder
-
-Nokogiri parses and searches XML/HTML very quickly, and also has
-correctly implemented CSS3 selector support as well as XPath 1.0 support.
-
-== SUPPORT:
-
-Before filing a bug report, please read our {submission guidelines}[http://nokogiri.org/tutorials/getting_help.html] at:
-
-  * http://nokogiri.org/tutorials/getting_help.html
-
-The Nokogiri {mailing list}[https://groups.google.com/group/nokogiri-talk]
-is available here:
-
-  * https://groups.google.com/group/nokogiri-talk
-
-The {bug tracker}[https://github.com/sparklemotion/nokogiri/issues]
-is available here:
-
-  * https://github.com/sparklemotion/nokogiri/issues
-
-The IRC channel is #nokogiri on freenode.
-
-== SYNOPSIS:
-
-  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
-
-* in Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
-  gem, but if you want to use them installed on the system:
-
-  * libxml2 >=2.6.21 with iconv support
-    (libxml2-dev/-devel is required too)
-
-  * libxslt, built with and supported by the given libxml2
-    (libxslt-dev/-devel is required too)
-
-== ENCODING:
-
-Strings are always stored as UTF-8 internally.  Methods that return
-text values will always return UTF-8 encoded strings.  Methods that
-return XML (like to_xml, to_html and inner_html) will return a string
-encoded like the source document.
-
-*WARNING*
-
-Some documents declare one particular encoding, but use a different
-one. So, which encoding should the parser choose?
-
-Remember that data is just a stream of bytes. Only we 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
-100% of 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:
-
-    doc = Nokogiri.XML('<foo><bar /><foo>', nil, 'EUC-JP')
-
-== INSTALL:
-
-* sudo gem install nokogiri
-
-=== Binary packages
-
-Binary packages are available for:
-
-* SuSE[https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
-* Fedora[http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756]
-
-== DEVELOPMENT:
-
-=== Developing on C Ruby (MRI)
-
-Developing Nokogiri requires racc and rexical to generate the parser and
-tokenizer.  To start development, make sure you have `libxml2` and `libxslt`
-installed.
-
-Then install core gems and bootstrap:
-
-    $ gem install hoe rake-compiler mini_portile
-    $ rake newb
-
-=== Developing on JRuby
-
-Currently, development with JRuby depends on CRuby being installed.  With
-CRuby, install racc and rexical:
-
-    $ gem install racc rexical
-
-Make sure hoe and rake compiler are installed with JRuby:
-
-    $ jgem install hoe rake-compiler
-
-Then run rake:
-
-    $ jruby -S rake
-
-== LICENSE:
-
-(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]
-
-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.