rvs 0.1.2 → 0.1.3

data/lib/rvs/parse.rb

@@ -1,5 +1,6 @@
 require 'strscan'
 require 'bigdecimal'
+require 'yajl'
 
 module RVS
 class Parser
@@ -22,10 +23,9 @@ class Parser
         get_chars(1)
         ''
       else
-        reverse_special_chars(@scan.scan(/.*?"/).chop)
+        strval = '"' + @scan.scan(/.*?[^\\]+?\"/)
+        Yajl::Parser.new.parse(strval)
       end
-    elsif next_char == 's'
-      reverse_special_chars(get_chars(@scan.scan_until(/:/).chop.to_i))
     elsif next_char == ':'
       @scan.scan(/[a-zA-z_]+\w*/).to_sym
     elsif next_char == 'd'
@@ -104,10 +104,6 @@ class Parser
     retval
   end
 
-  def reverse_special_chars(str)
-    str.gsub(/\\n/, "\n").gsub(/\\r/, "\r").gsub(/\\t/, "\t")
-  end
-
   def get_chars(count)
     retval = @scan.peek(count)
     @scan.pos = @scan.pos + count

data/lib/rvs/to_rvs.rb

@@ -1,16 +1,11 @@
 require 'bigdecimal'
 require 'date'
 require 'time'
+require 'yajl'
 
 class String
   def to_rvs
-    raise "non-ascii strings aren't currently supported" unless ascii_only?
-    no_specials = gsub(/\n/, '\n').gsub(/\r/, '\r').gsub(/\t/, '\t')
-    if index('"') || index('\\')
-      "s#{size}:#{no_specials}"
-    else
-      %Q{"#{no_specials}"}
-    end
+    Yajl::Encoder.encode(self)
   end
 end
 

data/test/rvs.dt.rb

@@ -87,8 +87,8 @@ class Test_rvs < DohTest::TestGroup
     verify('blahblee', %q{"blahblee"})
     verify("blahblee\n\r\t", %q{"blahblee\n\r\t"})
     verify('blahb\'lee', %q{"blahb'lee"})
-    verify('blahb\\lee', %q{s9:blahb\lee})
-    verify('blahb"lee', %q{s9:blahb"lee})
-    verify('blahb\'le"e', %q{s10:blahb'le"e})
+    verify('blahb\\lee', %q{"blahb\\\lee"})
+    verify('blahb"lee', %q{"blahb\"lee"})
+    verify('blahb\'le"e', %q{"blahb'le\"e"})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70310398318060 !ruby/object:Gem::Requirement
+  requirement: &70185437504820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70310398318060
+  version_requirements: *70185437504820
 description: serialization of common ruby value classes to ascii text
 email:
 - devinfo@atpsoft.com