nokogiri 1.6.6.4-java → 1.6.7-java

data/Rakefile

@@ -12,7 +12,6 @@ Hoe.add_include_dirs '.'
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
-CROSS_DIR           =  File.join(File.dirname(__FILE__), 'ports')
 
 def java?
   /java/ === RUBY_PLATFORM
@@ -25,14 +24,18 @@ CrossRuby = Struct.new(:version, :host) {
     @ver ||= version[/\A[^-]+/]
   end
 
+  def minor_ver
+    @minor_ver ||= ver[/\A\d\.\d(?=\.)/]
+  end
+
   def api_ver_suffix
-    case ver
-    when /\A([2-9])\.([0-9])\./
-      "#{$1}#{$2}0"
-    when /\A1\.9\./
+    case minor_ver
+    when nil
+      raise "unsupported version: #{ver}"
+    when '1.9'
       '191'
     else
-      raise "unsupported version: #{ver}"
+      minor_ver.delete('.') << '0'
     end
   end
 
@@ -110,7 +113,7 @@ HOE = Hoe.spec 'nokogiri' do
 
   license "MIT"
 
-  self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
+  self.readme_file  = "README.md"
   self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
 
   self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
@@ -119,22 +122,14 @@ HOE = Hoe.spec 'nokogiri' do
   self.clean_globs += [
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
-    'lib/nokogiri/[0-9].[0-9]',
-    'ports/*.installed',
-    'ports/{i[3-6]86,x86_64}-{w64-,}mingw32*',
-    'ports/libxml2',
-    'ports/libxslt',
-    # GENERATED_PARSER,
-    # GENERATED_TOKENIZER
+    'lib/nokogiri/[0-9].[0-9]'
   ]
+  self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
 
   unless java?
     self.extra_deps += [
-      # this dependency locked because we're monkey-punching mini_portile.
-      # for more details, see:
-      # - https://github.com/sparklemotion/nokogiri/issues/1102
-      # - https://github.com/luislavena/mini_portile/issues/32
-      ["mini_portile",    "~> 0.6.0"],
+      # Keep this version in sync with the one in extconf.rb !
+      ["mini_portile2",    "~> 2.0.0.rc2"],
     ]
   end
 
@@ -146,6 +141,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
     ["rake-compiler",   "~> 0.9.2"],
+    ["rake-compiler-dock", "~> 0.4.2"],
     ["racc",            ">= 1.4.6"],
     ["rexical",         ">= 1.0.5"]
   ]
@@ -200,7 +196,6 @@ else
     Rake::ExtensionCompiler.mingw_host
     mingw_available = true
   rescue
-    puts "WARNING: cross compilation not available: #{$!}"
     mingw_available = false
   end
   require "rake/extensiontask"
@@ -214,7 +209,7 @@ else
       version = dependencies[lib]
       archive = File.join("ports", "archives", "#{lib}-#{version}.tar.gz")
       add_file_to_gem archive
-      patchesdir = File.join("ports", "patches", lib)
+      patchesdir = File.join("patches", lib)
       patches = `#{['git', 'ls-files', patchesdir].shelljoin}`.split("\n").grep(/\.patch\z/)
       patches.each { |patch|
         add_file_to_gem patch
@@ -238,6 +233,11 @@ else
       ext.cross_compiling do |spec|
         libs = dependencies.map { |name, version| "#{name}-#{version}" }.join(', ')
 
+        spec.required_ruby_version = [
+          '>= 1.9.2',
+          "< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
+        ]
+
         spec.post_install_message = <<-EOS
 Nokogiri is built with the packaged libraries: #{libs}.
         EOS
@@ -349,6 +349,9 @@ task :cross do
 end
 
 desc "build a windows gem without all the ceremony."
-task "gem:windows" => %w[cross native gem]
+task "gem:windows" do
+  require "rake_compiler_dock"
+  RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{ENV['RUBY_CC_VERSION']}"
+end
 
 # vim: syntax=Ruby

data/appveyor.yml

@@ -0,0 +1,22 @@
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - SET PATH=C:\MinGW\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - ruby --version
+  - gem --version
+  - bundle install
+
+build: off
+
+test_script:
+  - bundle exec rake
+
+environment:
+  matrix:
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "193"

data/build_all

@@ -5,43 +5,6 @@
 #  - windows (x86-mingw32 and x64-mingw32)
 #  - jruby
 #
-#  here's what I recommend for building all the gems:
-#
-#  set up a rake-compiler-dev-box as described here:
-#      https://github.com/tjschuck/rake-compiler-dev-box
-#  It is prepared with all the necessary build tools and environments.
-#
-#  or alternatively do:
-#   1. Setup a ubuntu 12.04+ machine
-#   2. install rvm, and install 1.9.3, 2.0.0 and jruby.
-#   3. `sudo apt-get install mingw32 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64`
-#
-#  as you build, you may run into these problems:
-#
-#  - if you're using Virtualbox shared directories, you'll get a mingw
-#    "Protocol error" at linktime. Boo! Either use NFS or a
-#    locally-checked-out repository.
-#
-#  - on ubuntus 11 and later, you may have issues with building
-#    rake-compiler's rubies against openssl v2. Just comment the lines
-#    out from ossl_ssl.c and you'll be fine.
-#
-#  - you may have issues with Pathname conversion to String in
-#    bundler. Add this to the offending bundler file:
-#
-#      class Pathname
-#        def to_str
-#          to_s
-#        end
-#      end
-#
-#  - you may also have to hack rubygems.rb to eliminate a reference to
-#    RUBY_ENGINE (just comment it out)
-#
-
-DEFAULT_RUBY=2.0.0
-
-HOST=
 
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -52,63 +15,17 @@ else
     echo "ERROR: An RVM installation was not found.\n"
 fi
 
-rvm_use () {
-    current_ruby=$1
-    rvm use "${1}@nokogiri" --create
-}
-
-rvm_do () {
-    local ver=$1
-    shift
-    rvm "${ver}@nokogiri" do "$@"
-}
-
-cross_rubies () {
-    grep -v '#' .cross_rubies
-}
-
-ruby_vers () {
-    cross_rubies | while read -r line; do
-        echo "${line%%[-:]*}"
-    done | uniq
-}
-
 set -o errexit
-
-for ver in `ruby_vers`; do
-    rvm_use $ver
-    gem install bundler --conservative
-    bundle install --quiet --local || bundle install
-done
-
-rvm_use $DEFAULT_RUBY
+set -x
 
 rm -rf tmp pkg
-bundle exec rake clean
+bundle exec rake clean clobber
 
 # holding pen
 rm -rf gems
 mkdir -p gems
 
 # windows
-for verspec in `cross_rubies`; do
-    version="${verspec%%:*}"
-    ver="${version%%-*}"
-    host="${verspec#*:}"
-
-    case $ver in
-        1.9.3)
-            # Parallel make does not work in 1.9.3, as it has a
-            # missing dependency problem with main.o.
-            make="make"
-            ;;
-        *)
-            make="$MAKE"
-    esac
-
-    MAKE="$make" rvm_do $ver rake-compiler cross-ruby VERSION=$version HOST=$host debugflags="-g"
-done
-
 bundle exec rake gem:windows
 cp -v pkg/nokogiri*{x86,x64}-mingw32*.gem gems
 
@@ -118,12 +35,11 @@ bundle exec rake gem
 cp -v pkg/nokogiri*.gem gems
 
 # jruby
-rvm_use jruby
-gem install bundler --conservative
-bundle install --quiet --local || bundle install
 bundle exec rake clean clobber
-rvm_use $DEFAULT_RUBY
 bundle exec rake generate
-rvm_use jruby
+
+rvm jruby-1.7.19
+gem install bundler --conservative
+bundle install --quiet --local || bundle install
 bundle exec rake gem
 cp -v pkg/nokogiri*java.gem gems

data/ext/java/nokogiri/XmlDocument.java

@@ -639,4 +639,9 @@ public class XmlDocument extends XmlNode {
         }
         return this;
     }
+
+    public void resetNamespaceCache(ThreadContext context) {
+        nsCache = new NokogiriNamespaceCache();
+        createAndCacheNamespaces(context.getRuntime(), node);
+    }
 }

data/ext/java/nokogiri/XmlNode.java

@@ -1055,7 +1055,18 @@ public class XmlNode extends RubyObject {
         if (node instanceof Element) {
             String key = rubyStringToString(rbkey);
             Element element = (Element) node;
-            return context.getRuntime().newBoolean(element.hasAttribute(key));
+            if (element.hasAttribute(key)) {
+                return context.getRuntime().getTrue();
+            } else {
+                NamedNodeMap namedNodeMap = element.getAttributes();
+                for (int i=0; i<namedNodeMap.getLength(); i++) {
+                    Node n = namedNodeMap.item(i);
+                    if (key.equals(n.getLocalName())) {
+                        return context.getRuntime().getTrue();
+                    }
+                }
+            }
+            return context.getRuntime().getFalse();
         } else {
             return context.getRuntime().getNil();
         }
@@ -1540,6 +1551,10 @@ public class XmlNode extends RubyObject {
             coalesceTextNodes(context, other, scheme);
         }
 
+        if (this instanceof XmlDocument) {
+            ((XmlDocument) this).resetNamespaceCache(context);
+        }
+
         relink_namespace(context);
         // post_add_child(context, this, other);
 

data/ext/java/nokogiri/XmlSaxPushParser.java

@@ -58,6 +58,7 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.xml.sax.SAXException;
 
 /**
  * Class for Nokogiri::XML::SAX::PushParser
@@ -136,8 +137,11 @@ public class XmlSaxPushParser extends RubyObject {
 
 
         if (isLast.isTrue()) {
-            IRubyObject document = invoke(context, this, "document");
-            invoke(context, document, "end_document");
+            try {
+                parserTask.parser.getNokogiriHandler().endDocument();
+            } catch (SAXException e) {
+                throw context.getRuntime().newRuntimeError(e.getMessage());
+            }
             terminateTask(context);
         } else {
             try {

data/ext/java/nokogiri/XmlSchema.java

@@ -17,10 +17,10 @@
  * 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.
@@ -71,7 +71,7 @@ import org.xml.sax.SAXException;
 
 /**
  * Class for Nokogiri::XML::Schema
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
@@ -82,7 +82,7 @@ public class XmlSchema extends RubyObject {
     public XmlSchema(Ruby ruby, RubyClass klazz) {
         super(ruby, klazz);
     }
-    
+
     /**
      * Create and return a copy of this object.
      *
@@ -100,7 +100,7 @@ public class XmlSchema extends RubyObject {
         schemaFactory.setErrorHandler(new IgnoreSchemaErrorsErrorHandler());
         return schemaFactory.newSchema(source);
     }
-    
+
     private void setValidator(Validator validator) {
         this.validator = validator;
     }
@@ -109,7 +109,7 @@ public class XmlSchema extends RubyObject {
         Ruby runtime = context.getRuntime();
         XmlSchema xmlSchema = (XmlSchema) NokogiriService.XML_SCHEMA_ALLOCATOR.allocate(runtime, klazz);
         xmlSchema.setInstanceVariable("@errors", runtime.newEmptyArray());
-        
+
         try {
             Schema schema = xmlSchema.getSchema(source, context.getRuntime().getCurrentDirectory(), context.getRuntime().getInstanceConfig().getScriptFileName());
             xmlSchema.setValidator(schema.newValidator());
@@ -137,14 +137,14 @@ public class XmlSchema extends RubyObject {
         DOMSource source = new DOMSource(doc.getDocument());
 
         IRubyObject uri = doc.url(context);
-        
+
         if (!uri.isNil()) {
             source.setSystemId(uri.convertToString().asJavaString());
         }
-        
+
         return getSchema(context, (RubyClass)klazz, source);
     }
-    
+
     private static IRubyObject getSchema(ThreadContext context, RubyClass klazz, Source source) {
         String moduleName = klazz.getName();
         if ("Nokogiri::XML::Schema".equals(moduleName)) {
@@ -165,17 +165,17 @@ public class XmlSchema extends RubyObject {
     public IRubyObject validate_document(ThreadContext context, IRubyObject document) {
         return validate_document_or_file(context, (XmlDocument)document);
     }
-    
+
     @JRubyMethod(visibility=Visibility.PRIVATE)
     public IRubyObject validate_file(ThreadContext context, IRubyObject file) {
         Ruby ruby = context.getRuntime();
 
         XmlDomParserContext ctx = new XmlDomParserContext(ruby, RubyFixnum.newFixnum(ruby, 1L));
-        ctx.setInputSource(context, file, context.getRuntime().getNil());
+        ctx.setInputSourceFile(context, file);
         XmlDocument xmlDocument = ctx.parse(context, getNokogiriClass(ruby, "Nokogiri::XML::Document"), ruby.getNil());
         return validate_document_or_file(context, xmlDocument);
     }
-    
+
     IRubyObject validate_document_or_file(ThreadContext context, XmlDocument xmlDocument) {
         RubyArray errors = (RubyArray) this.getInstanceVariable("@errors");
         ErrorHandler errorHandler = new SchemaErrorHandler(context.getRuntime(), errors);
@@ -193,22 +193,22 @@ public class XmlSchema extends RubyObject {
 
         return errors;
     }
-    
+
     protected void setErrorHandler(ErrorHandler errorHandler) {
         validator.setErrorHandler(errorHandler);
     }
-    
+
     protected void validate(Document document) throws SAXException, IOException {
         DOMSource docSource = new DOMSource(document);
         validator.validate(docSource);
     }
-    
+
     private class SchemaResourceResolver implements LSResourceResolver {
         SchemaLSInput lsInput = new SchemaLSInput();
         String currentDir;
         String scriptFileName;
         //String defaultURI;
-        
+
         SchemaResourceResolver(String currentDir, String scriptFileName, Object input) {
             this.currentDir = currentDir;
             this.scriptFileName = scriptFileName;
@@ -231,7 +231,7 @@ public class XmlSchema extends RubyObject {
             return lsInput;
         }
     }
-    
+
     private class SchemaLSInput implements LSInput {
         protected String fPublicId;
         protected String fSystemId;
@@ -241,7 +241,7 @@ public class XmlSchema extends RubyObject {
         protected String fData;
         protected String fEncoding;
         protected boolean fCertifiedText = false;
-        
+
         @Override
         public String getBaseURI() {
             return fBaseSystemId;
@@ -289,7 +289,7 @@ public class XmlSchema extends RubyObject {
 
         @Override
         public void setByteStream(InputStream byteStream) {
-            fByteStream = byteStream;   
+            fByteStream = byteStream;
         }
 
         @Override
@@ -321,6 +321,6 @@ public class XmlSchema extends RubyObject {
         public void setSystemId(String sysId) {
             fSystemId = sysId;
         }
-        
+
     }
 }