nokogumbo 1.4.11 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db71be04413780e16757ce18152b4841db79dc8
-  data.tar.gz: 4b33b6a76a1add1a39615e973218ae89cab22592
+  metadata.gz: 2531d6d888b145aff08945f6cd01e269ab97b977
+  data.tar.gz: 1d876cca8aeb18e54c7074aa9be64db88b275819
 SHA512:
-  metadata.gz: 2f292053fef636c5d57b8f76ecb8a5eda0994149e95a58b5a1968347364050a278a9302f21515bd08c7bf4ce0000f7ae706fca888b1c90b4f3c9f2cdb4c13919
-  data.tar.gz: fd47e4204807f5d0dc0e7821efdc35a292530a08ba1d878d2b155db34acad33bd0f98c4575e3103ebf29f679f3667f2e14bbbe40305a8cc81a8920c0adf7ce0c
+  metadata.gz: cb9902894b518641b85926745be174c6b38cfe9b31706f141f50f24fa2f1268f5486ec8fd7af763c0b90cf72d5c778002237b08efd06f1da15c988eb7d2fac4b
+  data.tar.gz: 88813c0e2c4e0a7ba933686302daeb522493448aea4e1086faf9ca58e1d201d6466c869e140d2e5fdcea53b9f799e473e52fd20d41dae3a24429763e8a63ef0e

data/ext/nokogumboc/extconf.rb

@@ -1,16 +1,18 @@
 require 'mkmf'
-$CFLAGS += " -std=c99"
+$CFLAGS += ' -std=c99'
 
-if have_library('xml2', 'xmlNewDoc') 
+if have_library('xml2', 'xmlNewDoc')
   # libxml2 libraries from http://www.xmlsoft.org/
   pkg_config('libxml-2.0')
 
   # nokogiri configuration from gem install
-  nokogiri_lib = Gem.find_files('nokogiri').
-    select { |name| name.match(%r{gems/nokogiri-([\d.]+)/lib/nokogiri}) }.
-    sort_by {|name| name[/nokogiri-([\d.]+)/,1].split('.').map(&:to_i)}.last
+  nokogiri_lib = Gem
+                 .find_files('nokogiri')
+                 .select { |name| name.match(%r{gems/nokogiri-([\d.]+)/lib/nokogiri}) }
+                 .sort_by { |name| name[/nokogiri-([\d.]+)/, 1].split('.').map(&:to_i) }
+                 .last
   if nokogiri_lib
-    nokogiri_ext = nokogiri_lib.sub(%r(lib/nokogiri(.rb)?$), 'ext/nokogiri')
+    nokogiri_ext = nokogiri_lib.sub(%r{lib/nokogiri(.rb)?$}, 'ext/nokogiri')
 
     # if that doesn't work, try workarounds found in Nokogiri's extconf
     unless find_header('nokogiri.h', nokogiri_ext)
@@ -19,6 +21,28 @@ if have_library('xml2', 'xmlNewDoc')
 
     # if found, enable direct calls to Nokogiri (and libxml2)
     $CFLAGS += ' -DNGLIB' if find_header('nokogiri.h', nokogiri_ext)
+
+    # If libnokogiri is not on the build path, we need to add it.
+    unless have_library('nokogiri', 'Nokogiri_wrap_xml_document')
+      nokogiri_libfile = 'nokogiri.' + RbConfig::CONFIG['DLEXT']
+      nokogiri_libpath = File.join(nokogiri_ext, nokogiri_libfile)
+      if File.exist? nokogiri_libpath
+        $LDFLAGS += " -Wl,-rpath #{nokogiri_ext} -L#{nokogiri_ext} "
+        # GNU ld:
+        # '-lFOO' => looks for a file named 'libFOO.a' or 'libFOO.so*'
+        # '-l:FOO' => looks for a file named exactly 'FOO'
+        # OSX/Mach ld:
+        # - '-l:' is not supported.
+        # - Only links '.dylib', not '.bundle'
+        #
+        # Nokogiri does NOT have a lib prefix, so we need to be creative in
+        # testing; and might have either .dylib or .bundle suffixes.
+        $LIBS += ' ' + nokogiri_libpath + ' ' \
+          if %w(so dylib).include? RbConfig::CONFIG['DLEXT']
+      else
+        puts 'WARNING! Could not find Nokogiri_wrap_xml_document symbol; build might fail.'
+      end
+    end
   end
 end
 
@@ -28,12 +52,12 @@ unless have_library('gumbo', 'gumbo_parse')
   unless File.exist? "#{rakehome}/ext/nokogumboc/gumbo.h"
     require 'fileutils'
     FileUtils.cp Dir["#{rakehome}/gumbo-parser/src/*"],
-      "#{rakehome}/ext/nokogumboc"
+                 "#{rakehome}/ext/nokogumboc"
 
     case RbConfig::CONFIG['target_os']
     when 'mingw32', /mswin/
       FileUtils.cp Dir["#{rakehome}/gumbo-parser/visualc/include/*"],
-        "#{rakehome}/ext/nokogumboc"
+                   "#{rakehome}/ext/nokogumboc"
     end
 
     $srcs = $objs = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogumbo
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri