nokogiri 1.6.7.2-java → 1.6.8-java

data/ext/java/nokogiri/XsltStylesheet.java

@@ -35,6 +35,7 @@ package nokogiri;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.stringOrBlank;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
@@ -58,6 +59,8 @@ import javax.xml.transform.stream.StreamSource;
 
 import nokogiri.internals.NokogiriXsltErrorListener;
 
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.serializer.SerializationHandler;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -194,10 +197,14 @@ public class XsltStylesheet extends RubyObject {
     }
 
     @JRubyMethod
-    public IRubyObject serialize(ThreadContext context, IRubyObject doc) {
-        return RuntimeHelpers.invoke(context,
-                RuntimeHelpers.invoke(context, doc, "root"),
-                "to_s");
+    public IRubyObject serialize(ThreadContext context, IRubyObject doc) throws IOException, TransformerException {
+    	XmlDocument xmlDoc = (XmlDocument) doc;
+    	TransformerImpl transformer = (TransformerImpl) this.sheet.newTransformer();
+    	ByteArrayOutputStream writer = new ByteArrayOutputStream();
+    	StreamResult streamResult = new StreamResult(writer);
+    	SerializationHandler serializationHandler = transformer.createSerializationHandler(streamResult);
+    	serializationHandler.serialize(xmlDoc.getNode());
+    	return context.getRuntime().newString(writer.toString());
     }
 
     @JRubyMethod(rest = true, required=1, optional=2)

data/ext/java/nokogiri/internals/HtmlDomParserContext.java

@@ -65,7 +65,9 @@ import org.w3c.dom.NodeList;
  */
 public class HtmlDomParserContext extends XmlDomParserContext {
 
-    public HtmlDomParserContext(Ruby runtime, IRubyObject options) {
+    private String encoding;
+
+	public HtmlDomParserContext(Ruby runtime, IRubyObject options) {
         super(runtime, options);
     }
     
@@ -102,6 +104,11 @@ public class HtmlDomParserContext extends XmlDomParserContext {
         setFeature("http://cyberneko.org/html/features/report-errors", true);
         setFeature("http://xml.org/sax/features/namespaces", false);
     }
+    
+    @Override
+    public void setEncoding(String encoding) {
+		super.setEncoding(encoding);
+    }
 
     /**
      * Enable NekoHTML feature for balancing tags in a document fragment.

data/ext/java/nokogiri/internals/NokogiriErrorHandler.java

@@ -80,7 +80,6 @@ public abstract class NokogiriErrorHandler implements ErrorHandler, XMLErrorHand
     }
 
     protected boolean usesNekoHtml(String domain) {
-        if ("http://cyberneko.org/html".equals(domain)) return true;
-        else return false;
+        return "http://cyberneko.org/html".equals(domain);
     }
 }

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -119,12 +119,12 @@ public class NokogiriHelpers {
         if (node.getNodeType() == Node.ATTRIBUTE_NODE && isNamespace(node.getNodeName())) {
             XmlDocument xmlDocument = (XmlDocument)node.getOwnerDocument().getUserData(CACHED_NODE);
             if (!(xmlDocument instanceof HtmlDocument)) {
-            String prefix = getLocalNameForNamespace(((Attr)node).getName());
-            prefix = prefix != null ? prefix : "";
-            String href = ((Attr)node).getValue();
-            XmlNamespace xmlNamespace = xmlDocument.getNamespaceCache().get(prefix, href);
-            if (xmlNamespace != null) return xmlNamespace;
-            else return XmlNamespace.createFromAttr(ruby, (Attr)node);
+                String prefix = getLocalNameForNamespace(((Attr)node).getName());
+                prefix = prefix != null ? prefix : "";
+                String href = ((Attr)node).getValue();
+                XmlNamespace xmlNamespace = xmlDocument.getNamespaceCache().get(prefix, href);
+                if (xmlNamespace != null) return xmlNamespace;
+                else return XmlNamespace.createFromAttr(ruby, (Attr)node);
             }
         }
         XmlNode xmlNode = getCachedNode(node);
@@ -134,7 +134,7 @@ public class NokogiriHelpers {
         }
         return xmlNode;
     }
-    
+
     /**
      * Construct a new XmlNode wrapping <code>node</code>.  The proper
      * subclass of XmlNode is chosen based on the type of

data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java

@@ -115,7 +115,7 @@ public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler
      * @param e Exception.
      */
     public void warning(String domain, String key, XMLParseException e) {
-        //noop. NekoHtml adds too many warnings.
+        errors.add(e);
     }
 
 }

data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java

@@ -75,5 +75,4 @@ public class NokogiriStrictErrorHandler extends NokogiriErrorHandler {
         if (!nowarning) throw e;
         if (!usesNekoHtml(domain)) errors.add(e);
     }
-
 }

data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java

@@ -52,17 +52,17 @@ public class NokogiriXsltErrorListener implements ErrorListener {
     private String errorMessage = null;
     private Exception exception = null;
 
-    public void warning(TransformerException ex) throws TransformerException {
+    public void warning(TransformerException ex) {
         type = ErrorType.WARNING;
         setError(ex);
     }
 
-    public void error(TransformerException ex) throws TransformerException {
+    public void error(TransformerException ex) {
        type = ErrorType.ERROR;
        setError(ex);
     }
 
-    public void fatalError(TransformerException ex) throws TransformerException {
+    public void fatalError(TransformerException ex) {
         type = ErrorType.FATAL;
         setError(ex);
     }

data/ext/java/nokogiri/internals/ParserContext.java

@@ -190,6 +190,10 @@ public class ParserContext extends RubyObject {
         }
         return false;
     }
+    
+    protected void setEncoding(String encoding) {
+    	source.setEncoding(encoding);
+    }
 
     /**
      * Set the InputSource to read from <code>file</code>, a String filename.

data/ext/java/nokogiri/internals/SaveContextVisitor.java

@@ -741,6 +741,10 @@ public class SaveContextVisitor {
       return htmlDoc && text.getParentNode().getNodeName().equals("script");
     }
 
+    private boolean isHtmlStyle(Text text) {
+      return htmlDoc && text.getParentNode().getNodeName().equals("style");
+    }
+
     private static char lineSeparator = '\n'; // System.getProperty("line.separator"); ?
     public boolean enter(Text text) {
         String textContent = text.getNodeValue();
@@ -752,7 +756,7 @@ public class SaveContextVisitor {
             }
         }
 
-        if (NokogiriHelpers.shouldEncode(text) && !isHtmlScript(text)) {
+        if (NokogiriHelpers.shouldEncode(text) && !isHtmlScript(text) && !isHtmlStyle(text)) {
             textContent = encodeJavaString(textContent);
         }
 
@@ -761,24 +765,25 @@ public class SaveContextVisitor {
         return true;
     }
 
-    private String getEncoding(Text text) {
-        if (encoding != null) return encoding;
-        encoding = text.getOwnerDocument().getInputEncoding();
-        return encoding;
-    }
-
     private String encodeStringToHtmlEntity(String text) {
         if (encoding == null)
           return text;
         CharsetEncoder encoder = Charset.forName(encoding).newEncoder();
-        int last = 126; // = U+007E. No need to encode under U+007E.
         StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < text.length(); i++) {
-            char ch = text.charAt(i);
-            if (encoder.canEncode(ch)) sb.append(ch);
-            else sb.append("&#x" + Integer.toHexString(ch) + ";");
+        // make sure we can handle code points that are higher than 2 bytes
+        for (int i = 0; i < text.length();) {
+            int code = text.codePointAt(i);
+            // TODO not sure about bigger offset then 2 ?!
+            int offset = code > 65535 ? 2 : 1;
+            boolean canEncode = encoder.canEncode(text.substring(i, i + offset));
+            if (canEncode) {
+                sb.append(text.substring(i, i + offset));
+            }
+            else {
+                sb.append("&#x" + Integer.toHexString(code) + ";");
+            }
+            i += offset;
         }
         return new String(sb);
     }
-
 }

data/ext/nokogiri/extconf.rb

@@ -8,6 +8,42 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 #
 # functions
 #
+def windows?
+  RbConfig::CONFIG['target_os'] =~ /mingw32|mswin/
+end
+
+def solaris?
+  RbConfig::CONFIG['target_os'] =~ /solaris/
+end
+
+def darwin?
+  RbConfig::CONFIG['target_os'] =~ /darwin/
+end
+
+def nix?
+  ! (windows? || solaris? || darwin?)
+end
+
+def sh_export_path path
+  # because libxslt 1.1.29 configure.in uses AC_PATH_TOOL which treats ":"
+  # as a $PATH separator, we need to convert windows paths from
+  #
+  #   C:/path/to/foo
+  #
+  # to
+  #
+  #   /C/path/to/foo
+  #
+  # which is sh-compatible, in order to find things properly during
+  # configuration
+  if windows?
+    match = Regexp.new("^([A-Z]):(/.*)").match(path)
+    if match && match.length == 3
+      return File.join("/", match[1], match[2])
+    end
+  end
+  path
+end
 
 def do_help
   print <<HELP
@@ -55,10 +91,9 @@ def do_clean
     # nokogiri.so is yet to be copied to lib.
 
     # clean the ports build directory
-    Pathname.glob(pwd.join('tmp', '*', 'ports')) { |dir|
+    Pathname.glob(pwd.join('tmp', '*', 'ports')) do |dir|
       FileUtils.rm_rf(dir, verbose: true)
-      FileUtils.rmdir(dir.parent, parents: true, verbose: true)
-    }
+    end
 
     if enable_config('static')
       # ports installation can be safely removed if statically linked.
@@ -71,6 +106,29 @@ def do_clean
   exit! 0
 end
 
+# The gem version constraint in the Rakefile is not respected at install time.
+# Keep this version in sync with the one in the Rakefile !
+require 'rubygems'
+gem 'pkg-config', '~> 1.1.7'
+require 'pkg-config'
+message "Using pkg-config version #{PKGConfig::VERSION}\n"
+
+def package_config pkg, options={}
+  package = pkg_config(pkg)
+  return package if package
+
+  return nil unless PKGConfig.have_package(pkg)
+
+  cflags  = PKGConfig.cflags(pkg)
+  ldflags = PKGConfig.libs_only_L(pkg)
+  libs    = PKGConfig.libs_only_l(pkg)
+
+  Logging::message "PKGConfig package configuration for %s\n", pkg
+  Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
+
+  [cflags, ldflags, libs]
+end
+
 def nokogiri_try_compile
   args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
            ["int main() {return 0;}"]
@@ -80,6 +138,23 @@ def nokogiri_try_compile
   try_compile(*args)
 end
 
+def check_libxml_version version=nil
+  source = if version.nil?
+             <<-SRC
+#include <libxml/xmlversion.h>
+             SRC
+           else
+             version_int = sprintf "%d%2.2d%2.2d", *(version.split("."))
+             <<-SRC
+#include <libxml/xmlversion.h>
+#if LIBXML_VERSION < #{version_int}
+#error libxml2 is older than #{version}
+#endif
+             SRC
+           end
+
+  try_cpp source
+end
 
 def add_cflags(flags)
   print "checking if the C compiler accepts #{flags}... "
@@ -113,9 +188,9 @@ def asplode(lib)
 end
 
 def have_iconv?(using = nil)
-  checking_for(using ? "iconv using #{using}" : 'iconv') {
-    ['', '-liconv'].any? { |opt|
-      preserving_globals {
+  checking_for(using ? "iconv using #{using}" : 'iconv') do
+    ['', '-liconv'].any? do |opt|
+      preserving_globals do
         yield if block_given?
 
         try_link(<<-'SRC', opt)
@@ -129,22 +204,22 @@ int main(void)
     return EXIT_SUCCESS;
 }
         SRC
-      }
-    }
-  }
+      end
+    end
+  end
 end
 
 def iconv_configure_flags
   # If --with-iconv-dir or --with-opt-dir is given, it should be
   # the first priority
-  %w[iconv opt].each { |name|
+  %w[iconv opt].each do |name|
     if (config = preserving_globals { dir_config(name) }).any? &&
-       have_iconv?("--with-#{name}-* flags") { dir_config(name) }
-      idirs, ldirs = config.map { |dirs|
-        Array(dirs).flat_map { |dir|
+        have_iconv?("--with-#{name}-* flags") { dir_config(name) }
+      idirs, ldirs = config.map do |dirs|
+        Array(dirs).flat_map do |dir|
           dir.split(File::PATH_SEPARATOR)
-        } if dirs
-      }
+        end if dirs
+      end
 
       return [
         '--with-iconv=yes',
@@ -152,14 +227,14 @@ def iconv_configure_flags
         *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}" if ldirs),
       ]
     end
-  }
+  end
 
   if have_iconv?
     return ['--with-iconv=yes']
   end
 
-  if (config = preserving_globals { pkg_config('libiconv') }) &&
-     have_iconv?('pkg-config libiconv') { pkg_config('libiconv') }
+  if (config = preserving_globals { package_config('libiconv') }) &&
+     have_iconv?('pkg-config libiconv') { package_config('libiconv') }
     cflags, ldflags, libs = config
 
     return [
@@ -193,13 +268,13 @@ def process_recipe(name, version, static_p, cross_p)
 
     yield recipe
 
-    env = Hash.new { |hash, key|
+    env = Hash.new do |hash, key|
       hash[key] = "#{ENV[key]}"  # (ENV[key].dup rescue '')
-    }
+    end
 
     recipe.configure_options.flatten!
 
-    recipe.configure_options.delete_if { |option|
+    recipe.configure_options.delete_if do |option|
       case option
       when /\A(\w+)=(.*)\z/
         env[$1] = $2
@@ -207,7 +282,7 @@ def process_recipe(name, version, static_p, cross_p)
       else
         false
       end
-    }
+    end
 
     if static_p
       recipe.configure_options += [
@@ -230,16 +305,16 @@ def process_recipe(name, version, static_p, cross_p)
     end
 
     if RbConfig::CONFIG['target_cpu'] == 'universal'
-      %w[CFLAGS LDFLAGS].each { |key|
+      %w[CFLAGS LDFLAGS].each do |key|
         unless env[key].include?('-arch')
           env[key] << ' ' << RbConfig::CONFIG['ARCH_FLAG']
         end
-      }
+      end
     end
 
-    recipe.configure_options += env.map { |key, value|
+    recipe.configure_options += env.map do |key, value|
       "#{key}=#{value}"
-    }
+    end
 
     message <<-"EOS"
 ************************************************************************
@@ -251,9 +326,9 @@ Building Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.p
     unless recipe.patch_files.empty?
       message "with the following patches applied:\n"
 
-      recipe.patch_files.each { |patch|
+      recipe.patch_files.each do |patch|
         message "\t- %s\n" % File.basename(patch)
-      }
+      end
     end
 
     message <<-"EOS"
@@ -325,7 +400,10 @@ when arg_config('--clean')
 end
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+# use same c compiler for libxml and libxslt
+ENV['CC'] = RbConfig::MAKEFILE_CONFIG['CC']
 
+# TODO: deprecate MacRuby: https://github.com/sparklemotion/nokogiri/issues/1474
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
   $LIBRUBYARG_STATIC.gsub!(/-static/, '')
 end
@@ -335,17 +413,20 @@ $LIBS << " #{ENV["LIBS"]}"
 # Read CFLAGS from ENV and make sure compiling works.
 add_cflags(ENV["CFLAGS"])
 
-case RbConfig::CONFIG['target_os']
-when 'mingw32', /mswin/
-  windows_p = true
+if windows?
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
-when /solaris/
+end
+
+if solaris?
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
-when /darwin/
-  darwin_p = true
+end
+
+if darwin?
   # Let Apple LLVM/clang 5.1 ignore unknown compiler flags
   add_cflags("-Wno-error=unused-command-line-argument-hard-error-in-future")
-else
+end
+
+if nix?
   $CFLAGS << " -g -DXP_UNIX"
 end
 
@@ -369,31 +450,21 @@ when using_system_libraries?
   # Using system libraries means we rely on the system libxml2 with
   # regard to the iconv support.
 
-  dir_config('xml2').any?  or pkg_config('libxml-2.0')
-  dir_config('xslt').any?  or pkg_config('libxslt')
-  dir_config('exslt').any? or pkg_config('libexslt')
-
-  try_cpp(<<-SRC) or abort "libxml2 version 2.6.21 or later is required!"
-#include <libxml/xmlversion.h>
+  dir_config('xml2').any?  or package_config('libxml-2.0')
+  dir_config('xslt').any?  or package_config('libxslt')
+  dir_config('exslt').any? or package_config('libexslt')
 
-#if LIBXML_VERSION < 20621
-#error libxml2 is way too old
-#endif
-  SRC
+  check_libxml_version or abort "ERROR: cannot discover where libxml2 is located on your system. please make sure `pkg-config` is installed."
+  check_libxml_version("2.6.21") or abort "ERROR: libxml2 version 2.6.21 or later is required!"
+  check_libxml_version("2.9.3") or warn "WARNING: libxml2 version 2.9.3 or later is highly recommended, but proceeding anyway."
 
-  try_cpp(<<-SRC) or warn "libxml2 version 2.9.2 or later is highly recommended, but proceeding anyway."
-#include <libxml/xmlversion.h>
-
-#if LIBXML_VERSION < 20902
-#error libxml2 is too old
-#endif
-  SRC
 else
   message "Building nokogiri using packaged libraries.\n"
 
   # The gem version constraint in the Rakefile is not respected at install time.
   # Keep this version in sync with the one in the Rakefile !
-  gem "mini_portile2", "~> 2.0.0.rc2"
+  require 'rubygems'
+  gem 'mini_portile2', '~> 2.1.0'
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
@@ -407,9 +478,12 @@ else
   dependencies = YAML.load_file(File.join(ROOT, "dependencies.yml"))
 
   cross_build_p = enable_config("cross-build")
-  if cross_build_p || windows_p
-    zlib_recipe = process_recipe("zlib", dependencies["zlib"], static_p, cross_build_p) do |recipe|
-      recipe.files = ["http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz"]
+  if cross_build_p || windows?
+    zlib_recipe = process_recipe("zlib", dependencies["zlib"]["version"], static_p, cross_build_p) do |recipe|
+      recipe.files = [{
+          url: "http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz",
+          md5: dependencies["zlib"]["md5"]
+        }]
       class << recipe
         attr_accessor :cross_build_p
 
@@ -443,8 +517,11 @@ else
       recipe.cross_build_p = cross_build_p
     end
 
-    libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"], static_p, cross_build_p) do |recipe|
-      recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
+    libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"]["version"], static_p, cross_build_p) do |recipe|
+      recipe.files = [{
+          url: "http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz",
+          md5: dependencies["libiconv"]["md5"]
+        }]
       recipe.configure_options += [
         "CPPFLAGS=-Wall",
         "CFLAGS=-O2 -g",
@@ -453,7 +530,7 @@ else
       ]
     end
   else
-    if darwin_p && !have_header('iconv.h')
+    if darwin? && !have_header('iconv.h')
       abort <<'EOM'.chomp
 -----
 The file "iconv.h" is missing in your build environment,
@@ -469,17 +546,21 @@ EOM
     end
   end
 
-  unless windows_p
+  unless windows?
     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 = ["http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz"]
+  libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
+    recipe.files = [{
+        url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
+        md5: dependencies["libxml2"]["md5"]
+      }]
     recipe.configure_options += [
       "--without-python",
       "--without-readline",
+      *(zlib_recipe ? ["--with-zlib=#{zlib_recipe.path}", "CFLAGS=-I#{zlib_recipe.path}/include"] : []),
       *(libiconv_recipe ? "--with-iconv=#{libiconv_recipe.path}" : iconv_configure_flags),
       "--with-c14n",
       "--with-debug",
@@ -487,13 +568,16 @@ EOM
     ]
   end
 
-  libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"], static_p, cross_build_p) do |recipe|
-    recipe.files = ["http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz"]
+  libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"]["version"], static_p, cross_build_p) do |recipe|
+    recipe.files = [{
+        url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
+        md5: dependencies["libxslt"]["md5"]
+      }]
     recipe.configure_options += [
       "--without-python",
       "--without-crypto",
       "--with-debug",
-      "--with-libxml-prefix=#{libxml2_recipe.path}"
+      "--with-libxml-prefix=#{sh_export_path(libxml2_recipe.path)}"
     ]
   end
 
@@ -505,13 +589,13 @@ EOM
     have_library('lzma')
   }
 
-  $libs = $libs.shellsplit.tap { |libs|
-    [libxml2_recipe, libxslt_recipe].each { |recipe|
+  $libs = $libs.shellsplit.tap do |libs|
+    [libxml2_recipe, libxslt_recipe].each do |recipe|
       libname = recipe.name[/\Alib(.+)\z/, 1]
-      File.join(recipe.path, "bin", "#{libname}-config").tap { |config|
+      File.join(recipe.path, "bin", "#{libname}-config").tap do |config|
         # call config scripts explicit with 'sh' for compat with Windows
         $CPPFLAGS = `sh #{config} --cflags`.strip << ' ' << $CPPFLAGS
-        `sh #{config} --libs`.strip.shellsplit.each { |arg|
+        `sh #{config} --libs`.strip.shellsplit.each do |arg|
           case arg
           when /\A-L(.+)\z/
             # Prioritize ports' directories
@@ -525,8 +609,8 @@ EOM
           else
             $LDFLAGS << ' ' << arg.shellescape
           end
-        }
-      }
+        end
+      end
 
       # Defining a macro that expands to a C string; double quotes are significant.
       $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATH=\"#{recipe.path}\"".inspect
@@ -545,11 +629,11 @@ EOM
         # -lexslt, so add it manually.
         libs.unshift('-lexslt')
       end
-    }
-  }.shelljoin
+    end
+  end.shelljoin
 
   if static_p
-    $libs = $libs.shellsplit.map { |arg|
+    $libs = $libs.shellsplit.map do |arg|
       case arg
       when '-lxml2'
         File.join(libxml2_recipe.path, 'lib', lib_a(arg))
@@ -558,7 +642,7 @@ EOM
       else
         arg
       end
-    }.shelljoin
+    end.shelljoin
   end
 end
 
@@ -566,12 +650,12 @@ end
   "xml2"  => ['xmlParseDoc',            'libxml/parser.h'],
   "xslt"  => ['xsltParseStylesheetDoc', 'libxslt/xslt.h'],
   "exslt" => ['exsltFuncRegister',      'libexslt/exslt.h'],
-}.each { |lib, (func, header)|
+}.each do |lib, (func, header)|
   have_func(func, header) ||
   have_library(lib, func, header) ||
   have_library("lib#{lib}", func, header) or
     asplode("lib#{lib}")
-}
+end
 
 have_func('xmlHasFeature') or abort "xmlHasFeature() is missing."
 have_func('xmlFirstElementChild')
@@ -591,14 +675,14 @@ create_makefile('nokogiri/nokogiri')
 
 if enable_config('clean', true)
   # Do not clean if run in a development work tree.
-  File.open('Makefile', 'at') { |mk|
+  File.open('Makefile', 'at') do |mk|
     mk.print <<EOF
 all: clean-ports
 
 clean-ports: $(DLLIB)
 	-$(Q)$(RUBY) $(srcdir)/extconf.rb --clean --#{static_p ? 'enable' : 'disable'}-static
 EOF
-  }
+  end
 end
 
 # :startdoc: