nokogiri 1.6.0 → 1.13.2

data/lib/nokogiri/xml/dtd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     class DTD < Nokogiri::XML::Node
@@ -12,10 +14,20 @@ module Nokogiri
         attributes.keys
       end
 
-      def each &block
-        attributes.each { |key, value|
-          block.call([key, value])
-        }
+      def each
+        attributes.each do |key, value|
+          yield([key, value])
+        end
+      end
+
+      def html_dtd?
+        name.casecmp("html").zero?
+      end
+
+      def html5_dtd?
+        html_dtd? &&
+          external_id.nil? &&
+          (system_id.nil? || system_id == "about:legacy-compat")
       end
     end
   end

data/lib/nokogiri/xml/element_content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     ###

data/lib/nokogiri/xml/element_decl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     class ElementDecl < Nokogiri::XML::Node
@@ -6,7 +8,7 @@ module Nokogiri
       undef_method :line if method_defined?(:line)
 
       def inspect
-        "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{to_s.inspect}>"
+        "#<#{self.class.name}:#{format("0x%x", object_id)} #{to_s.inspect}>"
       end
     end
   end

data/lib/nokogiri/xml/entity_decl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     class EntityDecl < Nokogiri::XML::Node
@@ -7,12 +9,12 @@ module Nokogiri
       undef_method :namespace_definitions
       undef_method :line if method_defined?(:line)
 
-      def self.new name, doc, *args
+      def self.new(name, doc, *args)
         doc.create_entity(name, *args)
       end
 
       def inspect
-        "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{to_s.inspect}>"
+        "#<#{self.class.name}:#{format("0x%x", object_id)} #{to_s.inspect}>"
       end
     end
   end

data/lib/nokogiri/xml/entity_reference.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Nokogiri
+  module XML
+    class EntityReference < Nokogiri::XML::Node
+      def children
+        # libxml2 will create a malformed child node for predefined
+        # entities. because any use of that child is likely to cause a
+        # segfault, we shall pretend that it doesn't exist.
+        #
+        # see https://github.com/sparklemotion/nokogiri/issues/1238 for details
+        NodeSet.new(document)
+      end
+
+      def inspect_attributes
+        [:name]
+      end
+    end
+  end
+end

data/lib/nokogiri/xml/namespace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     class Namespace
@@ -5,6 +7,7 @@ module Nokogiri
       attr_reader :document
 
       private
+
       def inspect_attributes
         [:prefix, :href]
       end

data/lib/nokogiri/xml/node/save_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module XML
     class Node
@@ -21,7 +23,7 @@ module Nokogiri
 
         if Nokogiri.jruby?
           # Save builder created document
-          AS_BUILDER    = 128
+          AS_BUILDER = 128
           # the default for XML documents
           DEFAULT_XML  = AS_XML # https://github.com/sparklemotion/nokogiri/issues/#issue/415
           # the default for HTML document
@@ -33,13 +35,15 @@ module Nokogiri
           DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
         end
         # the default for XHTML document
-        DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
+        DEFAULT_XHTML = FORMAT | NO_DECLARATION | AS_XHTML
 
         # Integer representation of the SaveOptions
         attr_reader :options
 
         # Create a new SaveOptions object with +options+
-        def initialize options = 0; @options = options; end
+        def initialize(options = 0)
+          @options = options
+        end
 
         constants.each do |constant|
           class_eval %{
@@ -54,7 +58,7 @@ module Nokogiri
           }
         end
 
-        alias :to_i :options
+        alias_method :to_i, :options
       end
     end
   end