@@ -19,8 +19,12 @@ module Nokogiri end end + def self.uses_libxml? # :nodoc: + !Nokogiri::VERSION_INFO['libxml'].nil? + end + def self.ffi? # :nodoc: - Nokogiri::VERSION_INFO['libxml']['binding'] == 'ffi' + uses_libxml? && Nokogiri::VERSION_INFO['libxml']['binding'] == 'ffi' end def self.is_2_6_16? # :nodoc: lib/nokogiri/version.rb @@ -71,7 +71,7 @@ class TestReader < Nokogiri::TestCase </x> eoxml reader = Nokogiri::XML::Reader(xml) - if Nokogiri::VERSION_INFO['libxml']['binding'] == 'ffi' + if Nokogiri.ffi? assert_not_nil reader.source assert reader.source.is_a?(FFI::MemoryPointer) else test/test_reader.rb a3cce7874618cde91606c149eeddde0ef95a4d98 Mike Dalessio mike@csa.net http://github.com/tenderlove/nokogiri/commit/53a62edb8bf057b1a85e2af8462b01aa3fafee16 53a62edb8bf057b1a85e2af8462b01aa3fafee16 2009-06-05T13:50:37-07:00 2009-06-05T13:49:22-07:00 Refactoring of Nokogiri.ffi? to support the pure-java version. Thanks to Sergio Arbeo (serabe) for this patch. 0cb6bb87bf5f44fb2f7624a1b01be32bd28deaec Mike Dalessio mike@csa.net