tnetstring 0.2.0 → 0.3.0

data/lib/tnetstring/version.rb

@@ -1,5 +1,5 @@
 module TNetstring # :nodoc:
   module Version # :nodoc:
-    STRING = '0.2.0'
+    STRING = '0.3.0'
   end
 end

data/lib/tnetstring.rb

@@ -1,10 +1,6 @@
 module TNetstring
   def self.parse(tnetstring)
-    parse_tnetstring(tnetstring)[0]
-  end
-
-  def self.parse_tnetstring(data)
-    payload, payload_type, remain = parse_payload(data)
+    payload, payload_type, remain = parse_payload(tnetstring)
     value = case payload_type
     when '#'
       payload.to_i
@@ -43,11 +39,11 @@ module TNetstring
   def self.parse_list(data)
     return [] if data.length == 0
     list = []
-    value, remain = parse_tnetstring(data)
+    value, remain = parse(data)
     list << value
 
     while remain.length > 0
-      value, remain = parse_tnetstring(remain)
+      value, remain = parse(remain)
       list << value
     end
     list
@@ -67,9 +63,9 @@ module TNetstring
   end
 
   def self.parse_pair(data)
-    key, extra = parse_tnetstring(data)
+    key, extra = parse(data)
     assert extra, "Unbalanced dictionary store."
-    value, extra = parse_tnetstring(extra)
+    value, extra = parse(extra)
     assert value, "Got an invalid value, null not allowed."
 
     [key, value, extra]
@@ -86,6 +82,39 @@ module TNetstring
     end
   end
 
+  def self.encode(obj)
+    if obj.kind_of?(Integer)
+      int_str = obj.to_s
+      "#{int_str.length}:#{int_str}#"
+    elsif obj.kind_of?(String)
+      "#{obj.length}:#{obj},"
+    elsif obj.is_a?(TrueClass) || obj.is_a?(FalseClass)
+      bool_str = obj.to_s
+      "#{bool_str.length}:#{bool_str}!"
+    elsif obj == nil
+      "0:~"
+    elsif obj.kind_of?(Array)
+      encode_list(obj)
+    elsif obj.kind_of?(Hash)
+      encode_dictionary(obj)
+    else
+      assert false, "Object must be of a primitive type"
+    end
+  end
+
+  def self.encode_list(list)
+    contents = list.map {|item| encode(item)}.join
+    "#{contents.length}:#{contents}]"
+  end
+
+  def self.encode_dictionary(dict)
+    contents = dict.map do |key, value|
+      assert key.kind_of?(String), "Dictionary keys must be Strings"
+      "#{encode(key)}#{encode(value)}"
+    end.join
+    "#{contents.length}:#{contents}}"
+  end
+
   def self.assert(truthy, message)
     raise message unless truthy
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matt Yoho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +01:00
+date: 2011-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
         version: 1.0.12
   type: :development
   version_requirements: *id002
-description: Ruby implementation of the typed netstring specification, a simple data interchange format better suited to low-level network communication than JSON. See http://tnetstrings.org/ for more details.
+description: Ruby implementation of the tagged netstring specification, a simple data interchange format better suited to low-level network communication than JSON. See http://tnetstrings.org/ for more details.
 email: mby@mattyoho.com
 executables: []
 
@@ -93,6 +93,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby implementation of the typed netstring specification.
+summary: Ruby implementation of the tagged netstring specification.
 test_files: []