rmtools 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9334478c59f448c6ac5a6693e6a91975533614e2
-  data.tar.gz: c1377abc4ccb7bfb4ae55b636ecbae31906a4ab5
+  metadata.gz: 4f89fb064bdad91177d656c4ce69b064c7418b80
+  data.tar.gz: d548260567cfd5d51c58967dd7ee154d9d1bae82
 SHA512:
-  metadata.gz: 79964bcde63bb715714903d516507f60411510cb35de71fc83e441e7bb205f6b443ddfee9139f90a4f4447c95c5c9d7bb87eaf298ab2d2e1116755a57a16c437
-  data.tar.gz: aec618b40383d704a4ed558127bb77f52c950416769900ed56138c850ef916dd705fb8f45bc92939a6314d3ae642f10545a02d81c274752d09473865d1f4d507
+  metadata.gz: 6c912ac5bbbaf5e3333d0bf2e7bfefe34852ba599e13d830130c4e179ab1f773dc7de797e91be3d93de00a9f07bd3647df6720fbdfd62caf1d53102fba21ccbd
+  data.tar.gz: a1e616a1043461150d5b918e411e668c2bb745121bb9c96edb6951c79daeac9b40d35c7b83811b09f0e65a9532b0d26cb5ca7f258f8c47caba05ecd5d55bff4d

data/README.md

@@ -27,7 +27,7 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
-##### Version 2.3.4
+##### Version 2.3.5
 
 * Ruby 2+ behaviour:
   * Disabled C-extension
@@ -35,18 +35,17 @@ It's still randomly documented since it's just my working tool.
   
 * String
   * Updated #digit_date to parse full english month names
+  * #to_html and #to_xml make, respectively, html- and xml- formed documents by LibXML::XML
+  * #to_doc now is deprecated and is alias of #to_html
 
-##### Version 2.2.6
+##### Version 2.2.5
 
 * String
-  * Added #utf? and #find_compatible_encoding. Currently, latter one differentiates only utf-8 and ansi-1251.
+  * Added #fix_encoding! It differentiates only utf-8 and ansi-1251, though
 
 * Range
   * #include? never raises an exception
 
-* Array/Set
-  * Added #is_subset_of?
-
 ##### Version 2.2.4
 
 * Hash

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.3.4'
+  VERSION = '2.3.5'
 end

data/lib/rmtools/xml/string.rb

@@ -57,24 +57,49 @@ class String
     
   end
   
-  def to_doc(forceutf=nil)
+  def to_html(forceutf=nil)
     str = b || "<html/>"
     doc = if forceutf
-        XML::HTMLParser.string(str.xml_to_utf, :options => 97,
-                                                             :encoding => XML::Encoding::UTF_8).parse
+        LibXML::XML::HTMLParser.string(str.xml_to_utf, :options => 97,
+          :encoding => LibXML::XML::Encoding::UTF_8).parse
       else
         begin
           if RUBY_VERSION > '1.9'
-            XML::HTMLParser.string(str, :options => 97, 
-                                                  :encoding => XML::Encoding.const_get(__ENCODING__.to_s.tr('-','_').to_sym)).parse
+            LibXML::XML::HTMLParser.string(str, :options => 97, 
+              :encoding => LibXML::XML::Encoding.const_get(__ENCODING__.to_s.tr('-','_').to_sym)).parse
           else
-            XML::HTMLParser.string(str, :options => 97).parse
+            LibXML::XML::HTMLParser.string(str, :options => 97).parse
           end
         rescue
           if enc = xml_charset
-            XML::HTMLParser.string(str, :options => 97, 
-                           :encoding => XML::Encoding.const_get(enc.upcase.tr('-','_').to_sym)).parse
-          else to_doc :force
+            LibXML::XML::HTMLParser.string(str, :options => 97, 
+              :encoding => LibXML::XML::Encoding.const_get(enc.upcase.tr('-','_').to_sym)).parse
+          else to_html :forceutf
+          end
+        end   
+      end
+    doc.order_elements!
+    doc
+  end
+  alias :to_doc :to_html # DEPRECATED
+  
+  def to_xml(forceutf=nil)
+    doc = if forceutf
+        LibXML::XML::Document.string(xml_to_utf, :options => 97,
+          :encoding => LibXML::XML::Encoding::UTF_8)
+      else
+        begin
+          if RUBY_VERSION > '1.9'
+            LibXML::XML::Document.string(self, :options => 97, 
+              :encoding => LibXML::XML::Encoding.const_get(__ENCODING__.to_s.tr('-','_').to_sym))
+          else
+            LibXML::XML::Document.string(self, :options => 97)
+          end
+        rescue
+          if enc = xml_charset
+            LibXML::XML::Document.string(self, :options => 97, 
+              :encoding => LibXML::XML::Encoding.const_get(enc.upcase.tr('-','_').to_sym))
+          else to_xml :forceutf
           end
         end   
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport