extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{…

…X,H,XH}TML Conflicts: CHANGELOG.rdoc
adhearsion · Mar 9, 2011 · 5bbed7e · 5bbed7e
1 parent e88eb51
commit 5bbed7e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -3,6 +3,7 @@
 * New Features
 
   * Nokogiri::HTML::Document#title accessor gets and sets the document title.
+  * extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{X,H,XH}TML (refactor)
 
 * Bugfixes
 

diff --git a/lib/nokogiri/html/document.rb b/lib/nokogiri/html/document.rb
@@ -58,10 +58,7 @@ def title=(text)
       #   end
       #
       def serialize options = {}
-        options[:save_with] ||= XML::Node::SaveOptions::FORMAT |
-            XML::Node::SaveOptions::AS_HTML |
-            XML::Node::SaveOptions::NO_DECLARATION |
-            XML::Node::SaveOptions::NO_EMPTY_TAGS
+        options[:save_with] ||= XML::Node::SaveOptions::DEFAULT_HTML
         super
       end
 

diff --git a/lib/nokogiri/xml/node.rb b/lib/nokogiri/xml/node.rb
@@ -740,11 +740,7 @@ def to_html options = {}
         # FIXME: this is a hack around broken libxml versions
         return dump_html if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::FORMAT |
-                                SaveOptions::NO_DECLARATION |
-                                SaveOptions::NO_EMPTY_TAGS |
-                                SaveOptions::AS_HTML
-
+        options[:save_with] ||= SaveOptions::DEFAULT_HTML
         serialize(options)
       end
 
@@ -755,8 +751,7 @@ def to_html options = {}
       #
       # See Node#write_to for a list of +options+
       def to_xml options = {}
-        options[:save_with] ||= SaveOptions::FORMAT | SaveOptions::AS_XML
-
+        options[:save_with] ||= SaveOptions::DEFAULT_XML
         serialize(options)
       end
 
@@ -770,11 +765,7 @@ def to_xhtml options = {}
         # FIXME: this is a hack around broken libxml versions
         return dump_html if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::FORMAT |
-                                SaveOptions::NO_DECLARATION |
-                                SaveOptions::NO_EMPTY_TAGS |
-                                SaveOptions::AS_XHTML
-
+        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
         serialize(options)
       end
 
@@ -817,10 +808,7 @@ def write_html_to io, options = {}
         # FIXME: this is a hack around broken libxml versions
         return (io << dump_html) if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::FORMAT |
-          SaveOptions::NO_DECLARATION |
-          SaveOptions::NO_EMPTY_TAGS |
-          SaveOptions::AS_HTML
+        options[:save_with] ||= SaveOptions::DEFAULT_HTML
         write_to io, options
       end
 
@@ -832,10 +820,7 @@ def write_xhtml_to io, options = {}
         # FIXME: this is a hack around broken libxml versions
         return (io << dump_html) if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::FORMAT |
-          SaveOptions::NO_DECLARATION |
-          SaveOptions::NO_EMPTY_TAGS |
-          SaveOptions::AS_XHTML
+        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
         write_to io, options
       end
 
@@ -846,7 +831,7 @@ def write_xhtml_to io, options = {}
       #
       # See Node#write_to for a list of options
       def write_xml_to io, options = {}
-        options[:save_with] ||= SaveOptions::FORMAT | SaveOptions::AS_XML
+        options[:save_with] ||= SaveOptions::DEFAULT_XML
         write_to io, options
       end
 

diff --git a/lib/nokogiri/xml/node/save_options.rb b/lib/nokogiri/xml/node/save_options.rb
@@ -19,6 +19,13 @@ class SaveOptions
         # Save as HTML
         AS_HTML         = 64
 
+        # the default for XML documents
+        DEFAULT_XML  = FORMAT | AS_XML
+        # the default for HTML document
+        DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        # the default for XHTML document
+        DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
+
         # Integer representation of the SaveOptions
         attr_reader :options