simonmenke-bencoding 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.2 2008-09-01
+
+* 3 major enhancement:
+  * Objects can be dumped
+  * Better tests
+  * Better error reporting
+
 == 0.0.1 2008-08-19
 
 * 1 major enhancement:

data/Manifest.txt

@@ -6,12 +6,14 @@ Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/bencoding.rb
-lib/bencoding/version.rb
 lib/bencoding/array.rb
 lib/bencoding/hash.rb
-lib/bencoding/integer.rb
+lib/bencoding/numeric.rb
+lib/bencoding/object.rb
 lib/bencoding/parser.rb
 lib/bencoding/string.rb
+lib/bencoding/symbol.rb
+lib/bencoding/version.rb
 script/console
 script/destroy
 script/generate

data/lib/bencoding/hash.rb

@@ -3,7 +3,7 @@ module Bencoding
   module Hash
     
     def to_bencoding
-      "d"+sort.collect{|key, item|key.to_bencoding+item.to_bencoding}.join+"e"
+      "d"+sort{|a,b|a[0].to_s<=>b[0].to_s}.collect{|key, item|key.to_bencoding+item.to_bencoding}.join+"e"
     end
     
   end

data/lib/bencoding/{integer.rb → numeric.rb}

@@ -1,9 +1,9 @@
 
 module Bencoding
-  module Integer
+  module Numeric
     
     def to_bencoding
-      "i"+to_s+"e"
+      "i"+to_i.to_s+"e"
     end
     
   end

data/lib/bencoding/object.rb

@@ -0,0 +1,21 @@
+
+module Bencoding
+  module Object
+    
+    def attributes_for_bencoding
+      instance_variables
+    end
+    
+    def for_bencoding
+      attributes_for_bencoding.inject({}) do |hash, attribute|
+        hash[attribute.to_s[1..-1]] = instance_variable_get(attribute)
+        hash
+      end
+    end
+    
+    def to_bencoding
+      for_bencoding.to_bencoding
+    end
+    
+  end
+end

data/lib/bencoding/parser.rb

@@ -1,4 +1,6 @@
 module Bencoding
+  class ParseError < Exception ; end
+  
   module Parser
     
     DICTIONARY_TOKEN = 100 # d # :nodoc:
@@ -6,8 +8,11 @@ module Bencoding
     INTEGER_TOKEN    = 105 # i # :nodoc:
     TERMINATOR_TOKEN = 101 # e # :nodoc:
     SEPERATOR_TOKEN  = 58  # : # :nodoc:
+    ZERO_TOKEN       = 48  # : # :nodoc:
+    NINE_TOKEN       = 57  # : # :nodoc:
     
     def load(io)
+      io = StringIO.new(io) if io.is_a? String
       parse_anytype(io)
     end
     
@@ -17,15 +22,18 @@ module Bencoding
       when DICTIONARY_TOKEN then parse_dictionary(io)
       when LIST_TOKEN       then parse_list(io)
       when INTEGER_TOKEN    then parse_integer(io)
-      else
+      when (ZERO_TOKEN..NINE_TOKEN)
         io.ungetc typechar
         parse_string(io)
+      else
+        raise ParseError
       end
     end
     
     def parse_dictionary(io) # :nodoc:
       dictionary = ::Hash.new
       until (c = io.getc) == TERMINATOR_TOKEN
+        raise ParseError if c.nil?
         io.ungetc c
         key = parse_string(io)
         val = parse_anytype(io)
@@ -37,6 +45,7 @@ module Bencoding
     def parse_list(io) # :nodoc:
       list = ::Array.new
       until (c = io.getc) == TERMINATOR_TOKEN
+        raise ParseError if c.nil?
         val = parse_anytype(io, c)
         list << val
       end
@@ -46,6 +55,7 @@ module Bencoding
     def parse_integer(io, terminator=TERMINATOR_TOKEN) # :nodoc:
       integer_string = ""
       until (c = io.getc) == terminator
+        raise ParseError if c.nil?
         integer_string << c.chr
       end
       integer_string.to_i

data/lib/bencoding/symbol.rb

@@ -0,0 +1,10 @@
+
+module Bencoding
+  module Symbol
+    
+    def to_bencoding
+      self.to_s.to_bencoding
+    end
+    
+  end
+end

data/lib/bencoding/version.rb

@@ -2,7 +2,7 @@ module Bencoding
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/bencoding.rb

@@ -1,6 +1,8 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require "stringio"
+
 module Bencoding
   def self.load(io)
     Parser.load(io)
@@ -13,11 +15,14 @@ end
 require File.join(File.dirname(__FILE__), "bencoding/parser")
 require File.join(File.dirname(__FILE__), "bencoding/array")
 require File.join(File.dirname(__FILE__), "bencoding/hash")
-require File.join(File.dirname(__FILE__), "bencoding/integer")
+require File.join(File.dirname(__FILE__), "bencoding/numeric")
 require File.join(File.dirname(__FILE__), "bencoding/string")
+require File.join(File.dirname(__FILE__), "bencoding/symbol")
+require File.join(File.dirname(__FILE__), "bencoding/object")
 
+Object.send  :include, Bencoding::Object
 Array.send   :include, Bencoding::Array
 Hash.send    :include, Bencoding::Hash
-Integer.send :include, Bencoding::Integer
+Numeric.send :include, Bencoding::Numeric
 String.send  :include, Bencoding::String
-
+Symbol.send  :include, Bencoding::Symbol

data/test/test_bencoding.rb

@@ -1,17 +1,72 @@
-require "stringio"
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestBencoding < Test::Unit::TestCase
-
-  def setup
+  
+  def test_load_string
+    test_load "5:hello", "hello"
+  end
+  
+  def test_load_integer
+    test_load "i17e", 17
+  end
+  
+  def test_load_list
+    test_load "l5:helloi17ee", ["hello", 17]
+  end
+  
+  def test_load_dictionary
+    test_load "d5:key_ai16e5:a_key5:helloe",
+      { "key_a" => 16, "a_key" => "hello" }
+  end
+  
+  def test_load_fake
+    str  = "d5:key_ai16e5:a_key4:helloe"
+    assert_raise Bencoding::ParseError do
+      out  = Bencoding.load(str)
+    end
+  end
+  
+  def test_dump_string
+    test_dump "hello", "5:hello"
+  end
+  
+  def test_dump_integer
+    test_dump 25, "i25e"
   end
   
-  def test_truth
-    data = ["hello", "bye", 5, { "simon" => 60 }]
-    str  = "l5:hello3:byei5ed5:simoni60eee"
-    p str
-    out  = Bencoding::Parser.load(StringIO.new(str))
-    p out
-    assert data == out
+  def test_dump_float
+    test_dump 25.4, "i25e"
   end
+  
+  def test_dump_list
+    test_dump([25.4, "hello"], "li25e5:helloe")
+  end
+  
+  def test_dump_dictionary
+    test_dump({ :key_a => 25.4, "a_key" => "hello"}, "d5:a_key5:hello5:key_ai25ee")
+  end
+  
+  class DummyObject
+    def initialize
+      @name = "Simon Menke"
+      @job  = "Web Developer"
+    end
+  end
+  
+  def test_dump_object
+    test_dump(DummyObject.new, "d3:job13:Web Developer4:name11:Simon Menkee")
+  end
+  
+  protected
+  
+  def test_load(input, output)
+    data  = Bencoding.load(input)
+    assert output == data
+  end
+  
+  def test_dump(input, output)
+    data  = Bencoding.dump(input)
+    assert data == output
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-bencoding
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Simon Menke
@@ -21,7 +21,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     version: 
-description: this gem loads and dumps bencoded data.
+description: this gem loads and dumps bencoded data
 email: 
 - simon@5xm.org
 executables: []
@@ -43,12 +43,14 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/bencoding.rb
-- lib/bencoding/version.rb
 - lib/bencoding/array.rb
 - lib/bencoding/hash.rb
-- lib/bencoding/integer.rb
+- lib/bencoding/numeric.rb
+- lib/bencoding/object.rb
 - lib/bencoding/parser.rb
 - lib/bencoding/string.rb
+- lib/bencoding/symbol.rb
+- lib/bencoding/version.rb
 - script/console
 - script/destroy
 - script/generate
@@ -90,7 +92,7 @@ rubyforge_project: bencoding
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: this gem loads and dumps bencoded data.
+summary: this gem loads and dumps bencoded data
 test_files: 
 - test/test_bencoding.rb
 - test/test_helper.rb