tnetstring 0.1.0 → 0.2.0

data/lib/tnetstring/version.rb

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

data/lib/tnetstring.rb

@@ -8,12 +8,17 @@ module TNetstring
     value = case payload_type
     when '#'
       payload.to_i
-    when '"'
+    when ','
       payload
     when ']'
       parse_list(payload)
     when '}'
       parse_dictionary(payload)
+    when '~'
+      assert payload.length == 0, "Payload must be 0 length for null."
+      nil
+    when '!'
+      parse_boolean(payload)
     else
       assert false, "Invalid payload type: #{payload_type}"
     end
@@ -24,10 +29,12 @@ module TNetstring
     assert data, "Invalid data to parse, it's empty."
     length, extra = data.split(':', 2)
     length = length.to_i
+    assert length <= 999_999_999, "Data is longer than the specification allows"
+    assert length >= 0, "Data length cannot be negative!"
 
     payload, extra = extra[0, length], extra[length..-1]
     assert extra, "No payload type: %s, %s" % [payload, extra]
-    payload_type, remain = extra[0], extra[1..-1]
+    payload_type, remain = extra[0,1], extra[1..-1]
 
     assert payload.length == length, "Data is wrong length %d vs %d" % [length, payload.length]
     [payload, payload_type, remain]
@@ -68,6 +75,17 @@ module TNetstring
     [key, value, extra]
   end
 
+  def self.parse_boolean(data)
+    case data
+    when "false"
+      false
+    when "true"
+      true
+    else
+      raise "Boolean wasn't 'true' or 'false'"
+    end
+  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
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Yoho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +01:00
+date: 2011-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,22 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id001
-description: Ruby implementation of Zed Shaw's typed netstring experiment, a simple data interchange format better suited to low-level network communication than JSON.
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 12
+        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.
 email: mby@mattyoho.com
 executables: []
 
@@ -41,6 +56,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/tnetstring/version.rb
 - lib/tnetstring.rb
 has_rdoc: true
 homepage: http://github.com/mattyoho/tnetstring-rb
@@ -77,6 +93,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby implementation of Zed Shaw's typed netstring experiment, a simple data interchange format better suited to low-level network communication than JSON.
+summary: Ruby implementation of the typed netstring specification.
 test_files: []