nokogiri 1.7.2 → 1.8.0

data/test/xml/test_xpath.rb

@@ -56,6 +56,10 @@ module Nokogiri
           def value
             123.456
           end
+
+          def anint
+            1230456
+          end
         }.new
       end
 
@@ -200,12 +204,7 @@ module Nokogiri
         end
         stop = Time.now
         elapsed_time = stop - start
-        time_limit =
-          if ENV['TRAVIS'] && ENV['CI']
-            20 # Travis CI box slowness
-          else
-            10
-          end
+        time_limit = 20
         assert_send [elapsed_time, :<, time_limit], "XPath is taking too long"
       end
 
@@ -346,6 +345,15 @@ module Nokogiri
         assert_equal 123.456, value
       end
 
+      def test_custom_xpath_without_arguments_returning_int
+        if Nokogiri.uses_libxml?
+          value = @xml.xpath('anint()', @handler)
+        else
+          value = @xml.xpath('nokogiri:anint()', @ns, @handler)
+        end
+        assert_equal 1230456, value
+      end
+
       def test_custom_xpath_with_bullshit_arguments
         xml = %q{<foo> </foo>}
         doc = Nokogiri::XML.parse(xml)
@@ -440,6 +448,15 @@ XML
         assert_equal 1, sections.size
         assert_equal "[TEXT_INSIDE_SECTION]", sections.first.text
       end
+
+      def test_xpath_syntax_error
+        doc = Nokogiri::XML('<ns1:Root></ns1:Root>')
+        begin
+          doc.xpath('//ns1:Root')
+        rescue => e
+          assert_equal false, e.message.include?('0:0')
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
@@ -104,42 +104,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: concourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,8 @@ extra_rdoc_files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
-- LICENSE.txt
+- LICENSE-DEPENDENCIES.md
+- LICENSE.md
 - Manifest.txt
 - README.md
 - ROADMAP.md
@@ -265,7 +280,9 @@ files:
 - CONTRIBUTING.md
 - C_CODING_STYLE.rdoc
 - Gemfile
-- LICENSE.txt
+- Gemfile-libxml-ruby
+- LICENSE-DEPENDENCIES.md
+- LICENSE.md
 - Manifest.txt
 - README.md
 - ROADMAP.md
@@ -417,10 +434,6 @@ files:
 - ports/archives/libxml2-2.9.4.tar.gz
 - ports/archives/libxslt-1.1.29.tar.gz
 - 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/test.rb
 - test/css/test_nthiness.rb
 - test/css/test_parser.rb
@@ -530,7 +543,6 @@ files:
 - test/xml/test_xpath.rb
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
-- test_all
 homepage: http://nokogiri.org
 licenses:
 - MIT

data/suppressions/nokogiri_ree-1.8.7.358.supp

@@ -1,61 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr8
-   fun:garbage_collect
-   fun:rb_newobj
-   fun:rb_node_newnode
-   fun:ruby_yyparse
-   fun:yycompile
-   fun:load_file
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_call0
-   fun:rb_call
-   fun:eval_fcall
-   fun:rb_eval
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_call0
-   fun:rb_call
-   fun:eval_fcall
-   fun:rb_eval
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_protect
-   fun:require_libraries
-   fun:proc_options
-   fun:ruby_process_options
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr8
-   fun:garbage_collect_0
-   fun:rb_newobj
-   fun:rb_node_newnode
-   fun:ruby_yyparse
-   fun:yycompile
-   fun:load_file
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_call0
-   fun:rb_call
-   fun:eval_fcall
-   fun:rb_eval
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_call0
-   fun:rb_call
-   fun:eval_fcall
-   fun:rb_eval
-   fun:rb_load
-   fun:rb_require_safe
-   fun:rb_protect
-   fun:require_libraries
-   fun:proc_options
-   fun:ruby_process_options
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr8
-   fun:rb_gc_wipe_stack
-}

data/suppressions/nokogiri_ruby-1.9.2.320.supp

@@ -1,28 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:glob_helper
-   fun:ruby_glob0
-   fun:rb_push_glob
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:rb_yield
-   fun:rb_ary_each
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-   fun:rb_iterate
-   fun:rb_block_call
-   fun:enum_find_all
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-   fun:rb_class_new_instance
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-}

data/suppressions/nokogiri_ruby-1.9.3.327.supp

@@ -1,28 +0,0 @@
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:glob_helper
-   fun:ruby_glob0
-   fun:rb_push_glob
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:rb_yield
-   fun:rb_ary_each
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-   fun:rb_iterate
-   fun:rb_block_call
-   fun:enum_find_all
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-   fun:rb_class_new_instance
-   fun:vm_call_method
-   fun:vm_exec_core
-   fun:vm_exec
-   fun:vm_call0
-}

data/test_all

@@ -1,105 +0,0 @@
-#! /usr/bin/env bash
-#
-#  script to run tests on all relevant rubies, and valgrind on supported rubies.
-#  outputs tests to `test.log` and valgrind output to `valgrind.log`.
-#
-#  requires `rvm` to be installed. sorry about that, multiruby dudes.
-#
-#  it's worth periodically using hoe-debugger's ability to generate
-#  valgrind suppression files to remove spurious valgrind messages
-#  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
-#
-
-# 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 \
-  jruby-9.1.6.0 \
-  jruby-1.7.19
-  "
-
-TEST_LOG=test.log
-VALGRIND_LOG=valgrind.log
-
-# make sure we can test with libxml-ruby installed
-export BUNDLE_GEMFILE="$(pwd)/Gemfile_test_all"
-cat > $BUNDLE_GEMFILE <<EOF
-gem "libxml-ruby", :platform => :mri, :require => false
-eval_gemfile File.join(File.dirname(ENV['BUNDLE_GEMFILE']),"Gemfile")
-EOF
-
-# Load RVM into a shell session *as a function*
-if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
-    source "$HOME/.rvm/scripts/rvm"
-elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-    source "/usr/local/rvm/scripts/rvm"
-else
-    echo "ERROR: An RVM installation was not found.\n"
-fi
-
-> $TEST_LOG
-> $VALGRIND_LOG
-set -o errexit
-
-function rvm_use {
-    current_ruby=$1
-    rvm use "${1}@nokogiri" --create
-}
-
-function clean {
-    bundle exec rake clean clobber 2>&1 > /dev/null
-}
-
-function compile {
-    echo "** compiling ..."
-    bundle exec rake compile 2>&1 > /dev/null
-}
-
-# quick check that we have All The Rubies
-for ruby in $RUBIES ; do
-  rvm_use ${ruby}
-done
-
-for ruby in $RUBIES ; do
-  rvm_use ${ruby}
-  if ! [[ $(bundle -v) =~ "1.12." ]] ; then
-    yes | gem uninstall --force bundler
-    gem install bundler -v 1.12.5
-    bundle -v
-  fi
-  bundle install --quiet --local || bundle install
-  clean
-done
-
-for ruby in $RUBIES ; do
-  rvm_use ${ruby}
-  echo -e "**\n** testing nokogiri on ${ruby}\n**"
-  clean
-  compile
-  echo "** running tests ..."
-  bundle exec rake test 2>&1
-  if [[ ! $ruby =~ "jruby" ]] ; then
-    echo "** running tests again with libxml-ruby loaded ..."
-    if ! gem list libxml-ruby | fgrep 2.8.0 ; then
-      gem install libxml-ruby
-    fi
-    bundle exec rake test:libxml-ruby 2>&1
-  fi
-  clean
-done | tee -a $TEST_LOG
-
-for ruby in $RUBIES ; do
-  if [[ ! $ruby =~ "jruby" ]] ; then
-    rvm_use ${ruby}
-    echo -e "**\n** nokogiri prerelease: ${ruby}\n**"
-    clean
-    compile
-    echo "** running valgrind on tests ..."
-    bundle exec rake test:valgrind 2>&1
-    echo "** running valgrind again with libxml-ruby loaded ..."
-    bundle exec rake test:valgrind:libxml-ruby 2>&1
-    clean
-  fi
-done | tee -a $VALGRIND_LOG