Changeset 10863

Timestamp:

05/01/08 11:24:22 (5 years ago)

Author:

lyokato

Message:

lang/ruby/atomutil: ver 0.0.6

Location:

lang/ruby/atomutil/trunk

Files:

• History.txt (modified) (1 diff)
• lib/atomutil.rb (modified) (3 diffs)
• spec/person_spec.rb (modified) (3 diffs)

lang/ruby/atomutil/trunk/History.txt

@@ +1 @@
+== 0.0.6 2008-05-01
+
+Removed dependency on REXML::Formatters::Pretty,
+because REXML::Formatters::Pretty inserts linebreaks into each tags...
+But this isn't best solution.
+
 == 0.0.5 2008-04-30
 
 * bugfix: Atom::Content didn't work as expected with multibyte UTF-8 string.
-          Atom::Element::to_s didn't work well on ruby 1.8.6 or above.
+          Atom::Element::to_s didn't work well on ruby 1.8.6 or above, because
+          REXML::Document::to_s is deprecated and has a bug on 1.8.6 or 1.9 patched release.
           require 'sha1' -> require 'digest/sha1'
 

lang/ruby/atomutil/trunk/lib/atomutil.rb

@@ -42 +42 @@
 require 'rexml/document'
 
-ATOM_CAN_PRETTY_INDENT = true
-begin
-  require 'rexml/formatters/pretty'
-rescue LoadError
-  ATOM_CAN_PRETTY_INDENT = false
-end
-
 # = Utilities for AtomPub / Atom Syndication Format
 #
@@ -63 +56 @@
     MAJOR = 0
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -602 +595 @@
       doc.add_element @elem.deep_clone
       if indent
-        if ATOM_CAN_PRETTY_INDENT
-          result = ""
-          REXML::Formatters::Pretty.new(0, false).write(doc, result)
-          result
-        else
-          if RUBY_VERSION >= "1.8.6"
-            warn "REXML::Document::to_s( param ) is deprecated and has a bug under 1.8.6 or above."
-          end
-          doc.to_s(0)
-        end
+        doc.to_s(0)
       else
         doc.to_s

lang/ruby/atomutil/trunk/spec/person_spec.rb

@@ -28 +28 @@
     person_xml = @person.to_s
     person_xml.should =~ /<author(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>/
-    person_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?Lyo Kato\s*?<\/name>/
-    person_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?lyo\.kato\@gmail\.com\s*?<\/email>/
+    person_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>Lyo Kato<\/name>/
+    person_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>lyo\.kato\@gmail\.com<\/email>/
   end
 
@@ -41 +41 @@
     author_xml = author.to_s
     author_xml.should =~ /<author(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>/
-    author_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?Lyo Kato\s*?<\/name>/
-    author_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?lyo\.kato\@gmail\.com\s*?<\/email>/
+    author_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>Lyo Kato<\/name>/
+    author_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>lyo\.kato\@gmail\.com<\/email>/
   end
 
@@ -54 +54 @@
     contributor_xml = contributor.to_s
     contributor_xml.should =~ /<contributor(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')>/
-    contributor_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?Lyo Kato\s*?<\/name>/
-    contributor_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>\s*?lyo\.kato\@gmail\.com\s*?<\/email>/
+    contributor_xml.should =~ /<name(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>Lyo Kato<\/name>/
+    contributor_xml.should =~ /<email(?: xmlns='http:\/\/www\.w3\.org\/2005\/Atom')?>lyo\.kato\@gmail\.com<\/email>/
   end