yaxml 0.0.7 → 0.0.8

data/README

@@ -28,7 +28,7 @@ You can use this module in two ways:
 
 YAXML is <b>standalone library</b>.  It requires no other libraries.  Just Ruby!
 
-Author:: Diego Moreno (dmoreno@dit.upm.es)
+Author:: Diego Moreno (dmoreno AT dit.upm.es)
 License:: GNU Lesser General Public License (aka LGPL)
 
 == Installing YAXML
@@ -44,6 +44,9 @@ You have probably got the gem, right?  To load YAXML:
  require 'rubygems'
  require 'yaxml'
 
-If you've installed the plain source distribution, go ahead and just:
+== Documentation
+
+You can see the documentation in the project home page:
+
+{YAXML Gem Homepage}[http://yaxml.rubyforge.org]
 
- require 'yaxml'

data/Rakefile

@@ -8,7 +8,7 @@ include FileUtils
 
 NAME = "yaxml"
 REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
-VERS = ENV['VERSION'] || "0.0.7" + (REV ? ".#{REV}" : "")
+VERS = ENV['VERSION'] || "0.0.8" + (REV ? ".#{REV}" : "")
 PKG = "#{NAME}-#{VERS}"
 RDOC_OPTS = ['--quiet', '--title', 'The YAXML Module Reference', '--main', 'README', '--inline-source']
 PKG_FILES = %w(CHANGELOG LICENSE README Rakefile) + Dir.glob("{doc,test,lib}/**/*") 
@@ -28,7 +28,7 @@ SPEC =
     s.homepage = 'http://yaxml.rubyforge.com/'
     s.files = PKG_FILES
     s.require_paths = ["lib"]
-#    s.bindir = "bin"
+    s.rubyforge_project = "yaxml"
   end
 
 desc "Does a test run"
@@ -51,3 +51,9 @@ Rake::RDocTask.new do |rdoc|
     rdoc.main = "README"
     rdoc.rdoc_files.add ['README', 'CHANGELOG', 'LICENSE', 'lib/*.rb']
 end
+
+Rake::GemPackageTask.new(SPEC) do |p|
+    p.need_tar = true
+    p.gem_spec = SPEC
+end
+

data/doc/rdoc/classes/YAXML.html

@@ -191,7 +191,7 @@ Example of use:
             onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000002-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 190</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 188</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">json2yaxml</span>( <span class="ruby-identifier">json_to_encode</span>, <span class="ruby-identifier">options</span>={} )
     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">json_to_encode</span>
     
@@ -294,7 +294,7 @@ Example of use:
             onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000001-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 145</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 143</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">yaml2yaxml</span>( <span class="ruby-identifier">source</span>, <span class="ruby-identifier">options</span>={} )
 
     <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:root_name</span>] <span class="ruby-operator">||=</span> <span class="ruby-constant">DEFAULT_ROOT_NAME</span>
@@ -364,7 +364,7 @@ Example of use:
             onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000004-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 289</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 287</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">yaxml2json</span>( <span class="ruby-identifier">source</span> )
     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">source</span>
 
@@ -441,7 +441,7 @@ Example of use:
             onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000003-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 262</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 260</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">yaxml2yaml</span>( <span class="ruby-identifier">source</span> )
     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">yaxml2json</span>( <span class="ruby-identifier">source</span> ).<span class="ruby-identifier">to_yaml</span>
   <span class="ruby-keyword kw">end</span>

data/doc/rdoc/classes/YAXML/Yaxml.html

@@ -157,7 +157,7 @@ Example of use:
             onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000005-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 65</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 63</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>( <span class="ruby-identifier">source</span>, <span class="ruby-identifier">options</span>={} )
       <span class="ruby-keyword kw">super</span>()
       
@@ -199,7 +199,7 @@ object.
             onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000007-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 88</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 86</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_json</span>
       <span class="ruby-constant">YAXML</span><span class="ruby-operator">::</span><span class="ruby-identifier">yaxml2json</span> <span class="ruby-keyword kw">self</span>
     <span class="ruby-keyword kw">end</span>
@@ -226,7 +226,7 @@ object.
             onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000006-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 83</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 81</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_yaml</span>
       <span class="ruby-constant">YAXML</span><span class="ruby-operator">::</span><span class="ruby-identifier">yaxml2yaml</span> <span class="ruby-keyword kw">self</span>
     <span class="ruby-keyword kw">end</span>
@@ -253,7 +253,7 @@ href="../YAXML.html">YAXML</a> object.
             onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000008-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/yaxml.rb, line 93</span>
+<span class="ruby-comment cmt"># File lib/yaxml.rb, line 91</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_yaxml</span>
       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_s</span>
     <span class="ruby-keyword kw">end</span>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Fri, 27 Mar 2009 12:03:41 +0100
+Wed, 01 Apr 2009 11:34:02 +0200

data/doc/rdoc/files/CHANGELOG.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Mar 27 12:02:31 +0100 2009</td>
+      <td>Tue Mar 31 11:07:12 +0200 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/LICENSE.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Mar 27 12:02:31 +0100 2009</td>
+      <td>Tue Mar 31 11:07:12 +0200 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Mar 27 12:02:31 +0100 2009</td>
+      <td>Wed Apr 01 11:33:43 +0200 2009</td>
     </tr>
     </table>
   </div>
@@ -112,7 +112,7 @@ You can use this module in two ways:
 requires no other libraries. Just Ruby!
 </p>
 <table>
-<tr><td valign="top">Author:</td><td>Diego Moreno (dmoreno@dit.upm.es)
+<tr><td valign="top">Author:</td><td>Diego Moreno (dmoreno AT dit.upm.es)
 
 </td></tr>
 <tr><td valign="top">License:</td><td>GNU Lesser General Public License (aka LGPL)
@@ -135,12 +135,13 @@ href="../classes/YAXML.html">YAXML</a>:
  require 'rubygems'
  require 'yaxml'
 </pre>
+<h2>Documentation</h2>
 <p>
-If you&#8216;ve installed the plain source distribution, go ahead and just:
+You can see the documentation in the project home page:
+</p>
+<p>
+<a href="http://yaxml.rubyforge.org">YAXML Gem Homepage</a>
 </p>
-<pre>
- require 'yaxml'
-</pre>
 
     </div>
 

data/doc/rdoc/files/lib/yaxml_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Mar 27 12:02:31 +0100 2009</td>
+      <td>Wed Apr 01 10:58:18 +0200 2009</td>
     </tr>
     </table>
   </div>

data/lib/yaxml.rb

@@ -34,8 +34,6 @@
 # License:: GNU Lesser General Public License (aka LGPL)
 #
 
-#require 'ruby-debug'
-
 require "rexml/document"
 require 'yaml'
 
@@ -336,19 +334,21 @@ module YAXML
   
 end
 
-#doc = YAXML::yaml2yaxml "simple_test.yml"
-#puts doc.to_s
-#doc.write( $stdout, 2 )
-
-#doc = YAXML.yaxml2yaml_from_file "test.xml"
-#puts doc.inspect
-
-#yaxml = YAXML::Yaxml.new 'test2.yml'
-#puts yaxml.to_s
-
-#doc = REXML::Document.new yaxml.to_s
-#doc.write( $stdout, 2 )
-
-#yaxml.write( $stdout, 2 )
-#puts yaxml.to_json.inspect
-#puts yaxml.to_yaml
+# Use examples
+#
+# doc = YAXML::yaml2yaxml "test.yml"
+# puts doc.to_s
+# doc.write( $stdout, 2 )
+#
+# doc = YAXML.yaxml2yaml_from_file "test.xml"
+# puts doc.inspect
+#
+# yaxml = YAXML::Yaxml.new 'test2.yml'
+# puts yaxml.to_s
+#
+# doc = REXML::Document.new yaxml.to_s
+# doc.write( $stdout, 2 )
+#
+# yaxml.write( $stdout, 2 )
+# puts yaxml.to_json.inspect
+# puts yaxml.to_yaml

data/test/files/simple_test.xml

@@ -1,12 +1 @@
-<root xmlns:yaml='http://yaml.org/xml'>
-	<three>
-		<_>apple</_>
-		<_>pear</_>
-	</three>
-      <two> 2.0 </two>
-	<one>1</one>
-	<four>
-		<bb>22</bb>
-		<aa>11</aa>
-	</four>
-</root>
+<root xmlns:yaml='http://yaml.org/xml'><three><_>apple</_><_>pear</_></three><two>2.0</two><one>1</one><four><bb>22</bb><aa>11</aa></four></root>

data/test/files/simple_test.yml

@@ -6,4 +6,3 @@ three:
 four: 
   aa: 11
   bb: 22
-

data/test/files/test.xml

@@ -1,5 +1,5 @@
-<invoice xmlns:yaml='http://yaml.org/xml'><tax>251.42</tax><number>34843</number><comments>Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.</comments><ship-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.                                                                                                                                                              
-Suite #292                                                                                                                                                                                                    
-</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></ship-to><bill-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.                                  
-Suite #292                                                                                                                                                                                                    
-</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></bill-to><total>4443.52</total><date>2001-01-23</date><product><_><price>450.0</price><quantity>4</quantity><sku>BL394D</sku><description>Basketball</description></_><_><price>2392.0</price><quantity>1</quantity><sku>BL4438H</sku><description>Super Hoop</description></_></product></invoice>
+<invoice xmlns:yaml='http://yaml.org/xml'><tax>251.42</tax><number>34843</number><comments>Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.</comments><ship-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.
+Suite #292
+</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></ship-to><bill-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.
+Suite #292
+</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></bill-to><total>4443.52</total><date>2001-01-23</date><product><_><price>450.0</price><quantity>4</quantity><sku>BL394D</sku><description>Basketball</description></_><_><price>2392.0</price><quantity>1</quantity><sku>BL4438H</sku><description>Super Hoop</description></_></product></invoice>

data/test/files/test.yml

@@ -1,28 +1,28 @@
-number: 34843
-date   : 2001-01-23
-bill-to: &id001
-    given  : Chris
-    family : Dumars
-    address:
-        lines: |
-            458 Walkman Dr.
-            Suite #292
-        city    : Royal Oak
-        state   : MI
-        postal  : 48046
-ship-to: *id001
-product:
-    - sku         : BL394D
-      quantity    : 4
-      description : Basketball
-      price       : 450.00
-    - sku         : BL4438H
-      quantity    : 1
-      description : Super Hoop
-      price       : 2392.00
-tax  : 251.42
-total: 4443.52
-comments: >
-    Late afternoon is best.
-    Backup contact is Nancy
-    Billsmer @ 338-4338.
+number: 34843
+date   : 2001-01-23
+bill-to: &id001
+    given  : Chris
+    family : Dumars
+    address:
+        lines: |
+            458 Walkman Dr.
+            Suite #292
+        city    : Royal Oak
+        state   : MI
+        postal  : 48046
+ship-to: *id001
+product:
+    - sku         : BL394D
+      quantity    : 4
+      description : Basketball
+      price       : 450.00
+    - sku         : BL4438H
+      quantity    : 1
+      description : Super Hoop
+      price       : 2392.00
+tax  : 251.42
+total: 4443.52
+comments: >
+    Late afternoon is best.
+    Backup contact is Nancy
+    Billsmer @ 338-4338.

data/test/load_files.rb

@@ -2,7 +2,10 @@ module TestFiles
     file_content = {}
     Dir.chdir(File.dirname(__FILE__)) do
         Dir['files/*.{xml,yaml,yml,json,yaxml}'].each do |fname|
-          file_content[fname] = File.open( fname, "r" ).read
+          string_content_file = File.open( fname, "r" ).read
+          string_content_file.gsub!( /\r\n$/, '' )
+          string_content_file.gsub!( /\n$/, '' )
+          file_content[fname] = string_content_file
         end
     end
     FILES = file_content

data/test/{test_parser.rb → test_complex_parser.rb}

@@ -1,37 +1,18 @@
 #!/usr/bin/env ruby
-#require 'ruby-debug'
+#require 'rubygems'
+#require 'ruby_debug'
 require 'test/unit'
 require 'yaxml'
 require 'load_files'
 
 class TestParser < Test::Unit::TestCase
 
-  def test_parser_from_yaml_to_yaxml_simple_case
-    yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/simple_test.yml'], {:root_name => "root"} )
-    
-    text_to_compare = convert_to_inline TestFiles::FILES['files/simple_test.xml']
-  
-    assert_equal text_to_compare, yaxml.to_s
-  end
-
   def test_parser_from_yaml_to_yaxml_complex_case
     yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/test.yml'], {:root_name => "invoice"} )
 
     assert_equal TestFiles::FILES['files/test.xml'], yaxml.to_s
   end
   
-  def test_parser_from_yaxml_to_yaml_simple_case
-    yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/simple_test.xml'], {:from_yaxml => true} )
-    json_to_compare = yaxml.to_json
-    
-    correct_json = YAML::load(TestFiles::FILES['files/simple_test.yml'])
-    correct_json = stringing_values( correct_json )
-    
-    assert_block "Error parsing from YAXML" do
-      json_to_compare == correct_json
-    end
-  end
-  
   def test_parser_from_yaxml_to_yaml_complex_case
     yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/test.xml'], {:from_yaxml => true} )
     json_to_compare = yaxml.to_json
@@ -46,15 +27,6 @@ class TestParser < Test::Unit::TestCase
   end
   
   private
-  # This method delete EOLs, tabs and spaces after '>' and before '<'
-  def convert_to_inline( string_to_convert )
-    string_to_convert.gsub!(/\n/, '')   # delete EOLs
-    string_to_convert.gsub!(/\r/, '')   # delete EOLs
-    string_to_convert.gsub!(/\t/, '')   # delete tabs
-    string_to_convert.gsub!(/> +/, '>') # delete spaces after '>'
-    string_to_convert.gsub!(/ +</, '<') # delete spaces before '<'
-  end
-  
   # Convert a JSON as:
   # { "one" => 1, "two" => 2 }
   # to:

data/test/test_simple_parser.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+#require 'rubygems'
+#require 'ruby_debug'
+require 'test/unit'
+require 'yaxml'
+require 'load_files'
+
+class TestSimpleParser < Test::Unit::TestCase
+
+  def test_parser_from_yaml_to_yaxml_simple_case
+    yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/simple_test.yml'], {:root_name => "root"} )
+
+    assert_equal TestFiles::FILES['files/simple_test.xml'], yaxml.to_s
+  end
+
+  def test_parser_from_yaxml_to_yaml_simple_case
+    yaxml = YAXML::Yaxml.new( TestFiles::FILES['files/simple_test.xml'], {:from_yaxml => true} )
+    json_to_compare = yaxml.to_json
+    
+    correct_json = YAML::load(TestFiles::FILES['files/simple_test.yml'])
+    correct_json = stringing_values( correct_json )
+    
+    assert_block "Error parsing from YAXML" do
+    json_to_compare == correct_json
+    end
+  end
+  
+  private
+  # Convert a JSON as:
+  # { "one" => 1, "two" => 2 }
+  # to:
+  # { "one" => "1", "two" => "2" }
+  # This make the json easier to compare
+  def stringing_values( hash )
+    if hash.is_a?Hash
+      hash.each_pair do | k, v |
+        hash[k] = stringing_values v
+      end
+    elsif hash.is_a?Array
+      hash.map do | v |
+        stringing_values v
+      end
+    else # case of String, Float, Date...
+      hash = hash.to_s
+    end
+    hash
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yaxml
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Diego Moreno
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 +01:00
+date: 2009-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -45,16 +45,14 @@ files:
 - doc/rdoc/files/lib/yaxml_rb.html
 - doc/rdoc/files/CHANGELOG.html
 - doc/rdoc/files/README.html
-- test/test_parser.rb
+- test/test_simple_parser.rb
 - test/load_files.rb
+- test/test_complex_parser.rb
 - test/files
 - test/files/test.yml
 - test/files/simple_test.xml
 - test/files/simple_test.yml
-- test/files/test.xml~
 - test/files/test.xml
-- lib/simple_test.xml
-- lib/simple_test.yml
 - lib/yaxml.rb
 has_rdoc: true
 homepage: http://yaxml.rubyforge.com/
@@ -82,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: yaxml
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2

data/lib/simple_test.xml

@@ -1,12 +0,0 @@
-<root xmlns:yaml='http://yaml.org/xml'>
-	<three>
-		<_>apple</_>
-		<_>pear</_>
-	</three>
-      <two> 2.0 </two>
-	<one>1</one>
-	<four>
-		<bb>22</bb>
-		<aa>11</aa>
-	</four>
-</root>

data/lib/simple_test.yml

@@ -1,9 +0,0 @@
-one: 1
-two: 2.0 
-three:
-  - apple
-  - pear
-four: 
-  aa: 11
-  bb: 22
-

data/test/files/test.xml~

@@ -1,5 +0,0 @@
-<invoice xmlns:yaml='http://yaml.org/xml'><tax>251.42</tax><number>34843</number><comments>Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.</comments><ship-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.                                                                                                                                                              
-Suite #292                                                                                                                                                                                                    
-</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></ship-to><bill-to><address><city>Royal Oak</city><postal>48046</postal><lines>458 Walkman Dr.                                  
-Suite #292                                                                                                                                                                                                    
-</lines><state>MI</state></address><family>Dumars</family><given>Chris</given></bill-to><total>4443.52</total><date>2001-01-23</date><product><_><price>450.0</price><quantity>4</quantity><sku>BL394D</sku><description>Basketball</description></_><_><price>2392.0</price><quantity>1</quantity><sku>BL4438H</sku><description>Super Hoop</description></_></product></invoice>