nokogumbo 1.4.12 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2531d6d888b145aff08945f6cd01e269ab97b977
-  data.tar.gz: 1d876cca8aeb18e54c7074aa9be64db88b275819
+  metadata.gz: 4a025ea0b590f29baaaba62289f947c6e97807c7
+  data.tar.gz: e2b4b270b28c5fc6de4b24be437faf548cbf8b4e
 SHA512:
-  metadata.gz: cb9902894b518641b85926745be174c6b38cfe9b31706f141f50f24fa2f1268f5486ec8fd7af763c0b90cf72d5c778002237b08efd06f1da15c988eb7d2fac4b
-  data.tar.gz: 88813c0e2c4e0a7ba933686302daeb522493448aea4e1086faf9ca58e1d201d6466c869e140d2e5fdcea53b9f799e473e52fd20d41dae3a24429763e8a63ef0e
+  metadata.gz: 21c251c64b6d821a9c8ec1c06f3d00930d29390e52a9b5c8587e67bf71d3cd5e5663e77690019d68121d0072fe766819fa817049deb0d8eac93cd98d15fb2791
+  data.tar.gz: b9ef569e5974fb6ef6246434295e61f87fc462b997ea79fd9d9645f76360f0056052ab5f3fc3d4c53e8c3fc989c4185a65f333e453b56eb3bfdbb5e7edfc341b

data/ext/nokogumboc/extconf.rb

@@ -1,18 +1,16 @@
 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)
@@ -21,28 +19,6 @@ 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
 
@@ -52,16 +28,33 @@ 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
   end
 end
 
+# We use some Gumbo Internals, and not all distros ship the internal headers.
+header_typedefs = {
+  'error.h' => 'GumboErrorType',
+  'insertion_mode.h' => 'GumboInsertionMode',
+  'parser.h' => 'GumboParser',
+  'string_buffer.h' => 'GumboStringBuffer',
+  'token_type.h' => 'GumboTokenType',
+}
+
+header_typedefs.each_pair do |header, type|
+  unless find_type(type, header)
+    require 'fileutils'
+    FileUtils.cp Dir["#{rakehome}/gumbo-parser/src/#{header}"],
+      "#{rakehome}/ext/nokogumboc"
+  end
+end
+
 create_makefile('nokogumboc')

metadata

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