rvs 0.1.1 → 0.1.2

data/lib/rvs/parse.rb

@@ -12,20 +12,58 @@ class Parser
   end
 
   def parse_item
-    next_char = @scan.peek(1)
+    next_char = @scan.getch
     if next_char == '['
       parse_array
     elsif next_char == '{'
       parse_hash
+    elsif next_char == '"'
+      if @scan.peek(1) == '"'
+        get_chars(1)
+        ''
+      else
+        reverse_special_chars(@scan.scan(/.*?"/).chop)
+      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'
+      strval = @scan.scan(/[0-9-]+/)
+      if @scan.peek(1) == ' '
+        strval += get_chars(9)
+        DateTime.strptime(strval, '%Y-%m-%d %H:%M:%S')
+      else
+        Date.strptime(strval, '%Y-%m-%d')
+      end
+    elsif next_char == 'f'
+      if @scan.peek(1) == 'a'
+        get_chars(4)
+        false
+      else
+        @scan.scan(/-?[0-9\.]+/).to_f
+      end
+    elsif next_char == 't'
+      if @scan.peek(1) == 'r'
+        get_chars(3)
+        true
+      else
+        Time.strptime(get_chars(19), '%Y-%m-%d %H:%M:%S')
+      end
+    elsif next_char == 'c'
+      BigDecimal(@scan.scan(/-?[0-9\.]+/))
+    elsif next_char == 'n'
+      get_chars(2)
+      nil
+    elsif next_char =~ /[0-9-]/
+      @scan.pos = @scan.pos - 1
+      @scan.scan(/-?\d+/).to_i
     else
-      parse_value
+      raise "unexpected type identifier *#{next_char}*; string remainder is #{@scan.rest}"
     end
   end
 
   def parse_array
-    # throw away the opening [
-    @scan.getch
-
     retval = []
     while !@scan.eos?
       next_char = @scan.peek(1)
@@ -42,9 +80,6 @@ class Parser
   end
 
   def parse_hash
-    # throw away the opening {
-    @scan.getch
-
     retval = {}
     curr_key = nil
     while !@scan.eos?
@@ -54,8 +89,9 @@ class Parser
         @scan.getch
         break
       end
-      # throw away the comma , or >
-      @scan.getch if [',','>'].include?(next_char)
+      # throw away the following delimiter chars
+      @scan.getch if next_char == ','
+      get_chars(2) if next_char == '='
 
       next_value = parse_item
       if curr_key
@@ -68,27 +104,8 @@ class Parser
     retval
   end
 
-  def parse_value
-    type_identifier = @scan.getch
-    if type_identifier == 'b'
-      @scan.getch == '1'
-    elsif type_identifier == 'd'
-      Date.strptime(get_chars(8), '%Y%m%d')
-    elsif type_identifier == 'e'
-      DateTime.strptime(get_chars(14), '%Y%m%d%H%M%S')
-    elsif type_identifier == 't'
-      Time.strptime(get_chars(14), '%Y%m%d%H%M%S')
-    elsif type_identifier == 's'
-      get_chars(@scan.scan_until(/:/).chop.to_i)
-    elsif type_identifier == 'w'
-      @scan.scan(/\d+/).to_i
-    elsif type_identifier == 'c'
-      BigDecimal(@scan.scan(/[0-9\.]+/))
-    elsif type_identifier == 'z'
-      nil
-    else
-      raise "unexpected type identifier"
-    end
+  def reverse_special_chars(str)
+    str.gsub(/\\n/, "\n").gsub(/\\r/, "\r").gsub(/\\t/, "\t")
   end
 
   def get_chars(count)

data/lib/rvs/to_rvs.rb

@@ -4,34 +4,30 @@ require 'time'
 
 class String
   def to_rvs
-    "s#{size}:#{self}"
-  end
-end
-
-module WholeNumberToRvs
-  def to_rvs
-    "w#{self}"
+    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
   end
 end
 
 class Fixnum
-  include WholeNumberToRvs
+  alias :to_rvs :to_s
 end
 
 class Bignum
-  include WholeNumberToRvs
+  alias :to_rvs :to_s
 end
 
 class FalseClass
-  def to_rvs
-    'b0'
-  end
+  alias :to_rvs :to_s
 end
 
 class TrueClass
-  def to_rvs
-    'b1'
-  end
+  alias :to_rvs :to_s
 end
 
 class BigDecimal
@@ -42,19 +38,19 @@ end
 
 class Date
   def to_rvs
-    "d#{strftime('%Y%m%d')}"
+    "d#{strftime('%Y-%m-%d')}"
   end
 end
 
 class DateTime
   def to_rvs
-    "e#{strftime('%Y%m%d%H%M%S')}"
+    "d#{strftime('%Y-%m-%d %H:%M:%S')}"
   end
 end
 
 class Time
   def to_rvs
-    "t#{strftime('%Y%m%d%H%M%S')}"
+    "t#{strftime('%Y-%m-%d %H:%M:%S')}"
   end
 end
 
@@ -69,7 +65,7 @@ class Hash
   def to_rvs
     ary = []
     each_pair do |key, value|
-      ary.push("#{key.to_rvs}>#{value.to_rvs}")
+      ary.push("#{key.to_rvs}=>#{value.to_rvs}")
     end
     "{#{ary.join(',')}}"
   end
@@ -77,6 +73,18 @@ end
 
 class NilClass
   def to_rvs
-    'z'
+    'nil'
+  end
+end
+
+class Symbol
+  def to_rvs
+    ":#{to_s}"
+  end
+end
+
+class Float
+  def to_rvs
+    "f#{to_s}"
   end
 end

data/test/rvs.dt.rb

@@ -12,63 +12,83 @@ class Test_rvs < DohTest::TestGroup
   def test_whole_numbers
     fixnum = 1000
     assert(fixnum.is_a?(Fixnum))
-    verify(fixnum, 'w1000')
+    verify(fixnum, '1000')
 
     bignum = 9999999999999999999999999999999
     assert(bignum.is_a?(Bignum))
-    verify(bignum, 'w9999999999999999999999999999999')
+    verify(bignum, '9999999999999999999999999999999')
+
+    verify(-5, '-5')
   end
 
   def test_boolean
-    verify(true, 'b1')
-    verify(false, 'b0')
+    verify(true, 'true')
+    verify(false, 'false')
   end
 
   def test_bigdecimal
     verify(BigDecimal('100'), 'c100.0')
     verify(BigDecimal('100.14'), 'c100.14')
+    verify(BigDecimal('-100.14'), 'c-100.14')
     verify(BigDecimal('100.143912981212381923'), 'c100.143912981212381923')
   end
 
+  def test_float
+    verify(100.0, 'f100.0')
+    verify(100.14, 'f100.14')
+    verify(-100.14, 'f-100.14')
+  end
+
   def test_date
-    verify(Date.new(2012,2,9), 'd20120209')
+    verify(Date.new(2012,2,9), 'd2012-02-09')
   end
 
   def test_datetime
-    verify(DateTime.new(2012,2,9,1,5,7), 'e20120209010507')
-    verify(DateTime.new(2012,2,9,17,39,45), 'e20120209173945')
+    verify(DateTime.new(2012,2,9,1,5,7), 'd2012-02-09 01:05:07')
+    verify(DateTime.new(2012,2,9,17,39,45), 'd2012-02-09 17:39:45')
   end
 
   def test_time
-    verify(Time.new(2012,2,9,1,5,7), 't20120209010507')
-    verify(Time.new(2012,2,9,17,39,45), 't20120209173945')
+    verify(Time.new(2012,2,9,1,5,7), 't2012-02-09 01:05:07')
+    verify(Time.new(2012,2,9,17,39,45), 't2012-02-09 17:39:45')
   end
 
   def test_array
-    verify([1, 2], '[w1,w2]')
-    verify([1, [2,3]], '[w1,[w2,w3]]')
-    verify([1, [2,[3,4]]], '[w1,[w2,[w3,w4]]]')
+    verify([1, 2], '[1,2]')
+    verify([1, [2,3]], '[1,[2,3]]')
+    verify([1, [2,[3,4]]], '[1,[2,[3,4]]]')
   end
 
   def test_hash
-    verify({1 => 2}, '{w1>w2}')
-    verify({1 => 2, 3 => 4}, '{w1>w2,w3>w4}')
-    verify({1 => 2, 3 => {4 => 5}}, '{w1>w2,w3>{w4>w5}}')
+    verify({1 => 2}, '{1=>2}')
+    verify({1 => 2, 3 => 4}, '{1=>2,3=>4}')
+    verify({1 => 2, 3 => {4 => 5}}, '{1=>2,3=>{4=>5}}')
   end
 
   def test_mixed
-    verify({1 => ['blah'], ['blee',nil] => {4 => 5}}, '{w1>[s4:blah],[s4:blee,z]>{w4>w5}}')
+    verify({1 => ['blah'], ['blee',nil, -4] => {:yeh => 5}}, '{1=>["blah"],["blee",nil,-4]=>{:yeh=>5}}')
   end
 
   def test_nil
-    verify(nil, 'z')
+    verify(nil, 'nil')
+  end
+
+  def test_symbol
+    verify(:blah, ':blah')
+  end
+
+  def test_nonempty_string_following_empty_string
+    verify(['', 'blah'], '["","blah"]')
   end
 
   def test_string
-    verify('', 's0:')
-    verify('blah', 's4:blah')
-    verify('blahblee', 's8:blahblee')
-    verify('blahb\'lee', "s9:blahb'lee")
+    verify('', %q{""})
+    verify('blah', %q{"blah"})
+    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})
   end
 end

metadata

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