Fix HTML libraries to deal with loading when both have been required by being explicit about which library to use.

gkellogg · gkellogg · commit da1d4c89412a · 2020-03-05T15:40:03.000-08:00
diff --git a/lib/json/ld/api.rb b/lib/json/ld/api.rb
@@ -703,14 +703,14 @@ def self.load_html(input, url:,
         require "json/ld/html/#{library}"
 
         # Parse HTML using the appropriate library
-        @implementation = case library
+        implementation = case library
         when :nokogiri then Nokogiri
         when :rexml then REXML
         end
-        self.extend(@implementation)
+        self.extend(implementation)
 
         input = begin
-          initialize_html(input, **options)
+          self.send("initialize_html_#{library}".to_sym, input, **options)
         rescue
           raise JSON::LD::JsonLdError::LoadingDocumentFailed, "Malformed HTML document: #{$!.message}"
         end
diff --git a/lib/json/ld/html/nokogiri.rb b/lib/json/ld/html/nokogiri.rb
@@ -129,7 +129,7 @@ def method_missing(method, *args)
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [NodeProxy] of root element
-      def initialize_html(input, options = {})
+      def initialize_html_nokogiri(input, options = {})
         require 'nokogiri' unless defined?(::Nokogiri)
         doc = case input
         when ::Nokogiri::HTML::Document, ::Nokogiri::XML::Document
@@ -146,6 +146,7 @@ def initialize_html(input, options = {})
 
         NodeProxy.new(doc.root) if doc && doc.root
       end
+      alias_method :initialize_html, :initialize_html_nokogiri
     end
   end
 end
diff --git a/lib/json/ld/html/rexml.rb b/lib/json/ld/html/rexml.rb
@@ -169,7 +169,7 @@ def method_missing(method, *args)
       #
       # @param  [Hash{Symbol => Object}] options
       # @return [NodeProxy] of document root
-      def initialize_html(input, options = {})
+      def initialize_html_rexml(input, options = {})
         require 'rexml/document' unless defined?(::REXML)
         doc = case input
         when ::REXML::Document
@@ -181,6 +181,7 @@ def initialize_html(input, options = {})
 
         NodeProxy.new(doc.root) if doc && doc.root
       end
+      alias_method :initialize_html, :initialize_html_rexml
     end
   end
 end
diff --git a/spec/context_spec.rb b/spec/context_spec.rb
@@ -503,7 +503,7 @@ def containers
         "@type as object" => {"foo" => {"@type" => {}}},
         "@type as array" => {"foo" => {"@type" => []}},
         "@type as @list" => {"foo" => {"@type" => "@list"}},
-        "@type as @none" => {"@version": 1.1, "foo" => {"@type" => "@none"}},
+        "@type as @none" => {"@version" => 1.1, "foo" => {"@type" => "@none"}},
         "@type as @set" => {"foo" => {"@type" => "@set"}},
         "@container as object" => {"foo" => {"@container" => {}}},
         "@container as empty array" => {"foo" => {"@container" => []}},
diff --git a/spec/expand_spec.rb b/spec/expand_spec.rb
@@ -3386,7 +3386,7 @@
       %w(Nokogiri REXML).each do |impl|
         next unless Module.constants.map(&:to_s).include?(impl)
         context impl do
-          before(:all) {@library = impl.downcase.to_s.to_sym}
+          let(:library) {impl.downcase.to_s.to_sym}
 
           {
             "Expands embedded JSON-LD script element": {
@@ -3525,9 +3525,9 @@
               ]),
               extractAllScripts: true
             },
-            "Expands as empty with no script element": {
+            "Errors no script element": {
               input: %(<html><head></head></html>),
-              output: %([])
+              exception: JSON::LD::JsonLdError::LoadingDocumentFailed
             },
             "Expands as empty with no script element and extractAllScripts": {
               input: %(<html><head></head></html>),
@@ -3742,10 +3742,10 @@
             },
           }.each do |title, params|
             it(title) do
-              skip "rexml" if params[:not] == @library
-              params[:input] = StringIO.new(params[:input])
+              skip "rexml" if params[:not] == library
+              params = params.merge(input: StringIO.new(params[:input]))
               params[:input].send(:define_singleton_method, :content_type) {"text/html"}
-              run_expand params.merge(validate: true, library: @library)
+              run_expand params.merge(validate: true, library: library)
             end
           end
         end
