ya2yaml 0.30 → 0.31

data/README.rdoc

@@ -1,6 +1,6 @@
 = Ya2YAML - An UTF8 safe YAML dumper
 
-Project Contact: Akira FUNAI <mailto:funai.akira@gmail.com>
+Project Contact: Akira FUNAI <akira -at- funai -dot- com>
 
 Ya2YAML is "yet another to_yaml". It emits YAML document with complete UTF8 support (string/binary detection, "\u" escape sequences and Unicode specific line breaks). I hope someone might find it useful until Syck/RbYAML come out with UTF8/16 support.
 
@@ -67,6 +67,7 @@ A String which contains any non-UTF8 character will be regarded as "binary" and
     :printable_with_syck  => true,
     :escape_b_specific    => true,
     :escape_as_utf8       => true
+    :preserve_order       => true
   )
 
   # or simply set this for a safe roundtrip with Syck.
@@ -98,6 +99,10 @@ A String which contains any non-UTF8 character will be regarded as "binary" and
   - default: false
   - When set to true, Ya2YAML uses Ruby-like escape sequences in UTF8 code instead of "\uXXXX" style in UCS code. It also suppresses use of "\L" and "\P" (escape sequences for LS and PS).
 
+- :preserve_order
+  - default: false
+  - When set to true, the order of keys in hashes will be the natural hash order rather than sorted alphabetically or explicitelly (usefull for syck/psych roundtrip and ruby >= 1.9.2)
+
 - :syck_compatible
   - default: false
   - When set to true, These options are set to true at once. You have to set this to false when you set them individually.

data/lib/ya2yaml.rb

@@ -54,6 +54,8 @@ class Ya2YAML
               o = (x_order <=> y_order)
               (o != 0) ? o : (x.to_s <=> y.to_s)
             }
+          elsif @options[:preserve_order]
+            hash_keys = obj.keys
           else
             hash_keys = obj.keys.sort {|x, y| x.to_s <=> y.to_s }
           end

data/test/test.rb

@@ -137,6 +137,21 @@ class TC_Ya2YAML < Test::Unit::TestCase
     }
   end
 
+  def test_preserve_order
+    h = {}
+    h['a'] = 1
+    h['c'] = 3
+    h['b'] = 2
+    y = h.ya2yaml(
+      :preserve_order => true
+    )
+    assert_equal(
+      "--- \na: 1\nc: 3\nb: 2\n",
+      y,
+      'the natural hash order should be preserved'
+    )
+  end if RUBY_VERSION >= "1.9"
+
   def test_normalize_line_breaks
     [
       ["\n\n\n\n",           "--- \"\\n\\n\\n\\n\"\n"],

metadata

@@ -4,15 +4,15 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 30
-  version: "0.30"
+  - 31
+  version: "0.31"
 platform: ruby
 authors: 
 - Akira FUNAI
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-08-28 00:00:00 +09:00
+date: 2012-02-20 00:00:00 +09:00
 default_executable: 
 dependencies: []