simonmenke-bencoding 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,12 @@
+== 0.0.3 3008-09-13
+
+* 5 major enhancement:
+ * Allow loading URIs and file paths
+ * automatic detection of input type
+ * no more ungetc (I didn't like it)
+ * better error handeling
+ * more tests
+
 == 0.0.2 2008-09-01
 
 * 3 major enhancement:

data/README.txt

@@ -13,6 +13,11 @@ this gem loads and dumps bencoded data
 
 == SYNOPSIS:
 
+  Bencoding.load(path)
+  Bencoding.load(url)
+  Bencoding.load(string)
+  Bencoding.load(io)
+
   File.open("path/to/file.bencoding", "r") do |f|
     data = Bencoding.load(f)
   end

data/lib/bencoding.rb

@@ -1,12 +1,16 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require "stringio"
+require 'stringio'
+require 'open-uri'
 
 module Bencoding
-  def self.load(io)
+  def self.load!(io)
     Parser.load(io)
   end
+  def self.load(io)
+    return load!(io) rescue nil
+  end
   def self.dump(object)
     object.to_bencoding
   end

data/lib/bencoding/parser.rb

@@ -1,5 +1,6 @@
 module Bencoding
-  class ParseError < Exception ; end
+  class ParseError   < Exception ; end
+  class InvalidInput < Exception ; end
   
   module Parser
     
@@ -8,12 +9,38 @@ module Bencoding
     INTEGER_TOKEN    = 105 # i # :nodoc:
     TERMINATOR_TOKEN = 101 # e # :nodoc:
     SEPERATOR_TOKEN  = 58  # : # :nodoc:
-    ZERO_TOKEN       = 48  # : # :nodoc:
-    NINE_TOKEN       = 57  # : # :nodoc:
+    ZERO_TOKEN       = 48  # 0 # :nodoc:
+    NINE_TOKEN       = 57  # 9 # :nodoc:
+    MINUS_TOKEN      = 45  # - # :nodoc:
     
     def load(io)
-      io = StringIO.new(io) if io.is_a? String
-      parse_anytype(io)
+      any_io(io) do |io|
+        parse_anytype(io)
+      end
+    end
+    
+    def any_io(io)
+      close_io = false
+      if io.is_a? String
+        if io =~ %r{^(http(s?)|file)://}
+          io = open(io)
+          close_io = true
+        elsif File.exist?(io)
+          io = File.open(io)
+          close_io = true
+        else
+          io = StringIO.new(io)
+        end
+      end
+      
+      raise InvalidInput unless io.respond_to?(:getc)
+      raise InvalidInput unless io.respond_to?(:read)
+      raise InvalidInput unless io.respond_to?(:close) or not close_io
+      
+      return_value = yield(io)
+      
+      io.close if close_io
+      return return_value
     end
     
     def parse_anytype(io, typechar=nil) # :nodoc:
@@ -23,8 +50,7 @@ module Bencoding
       when LIST_TOKEN       then parse_list(io)
       when INTEGER_TOKEN    then parse_integer(io)
       when (ZERO_TOKEN..NINE_TOKEN)
-        io.ungetc typechar
-        parse_string(io)
+        parse_string(io, typechar)
       else
         raise ParseError
       end
@@ -34,8 +60,7 @@ module Bencoding
       dictionary = ::Hash.new
       until (c = io.getc) == TERMINATOR_TOKEN
         raise ParseError if c.nil?
-        io.ungetc c
-        key = parse_string(io)
+        key = parse_string(io, c)
         val = parse_anytype(io)
         dictionary[key] = val
       end
@@ -52,18 +77,23 @@ module Bencoding
       list
     end
     
-    def parse_integer(io, terminator=TERMINATOR_TOKEN) # :nodoc:
+    def parse_integer(io, terminator=TERMINATOR_TOKEN, first_char=nil) # :nodoc:
       integer_string = ""
+      integer_string << first_char unless first_char.nil?
       until (c = io.getc) == terminator
-        raise ParseError if c.nil?
-        integer_string << c.chr
+        raise ParseError if c.nil? 
+        raise ParseError unless (ZERO_TOKEN..NINE_TOKEN).member?(c) or MINUS_TOKEN == c
+        integer_string << c
       end
       integer_string.to_i
     end
     
-    def parse_string(io) # :nodoc:
-      length = parse_integer(io, SEPERATOR_TOKEN)
-      io.read(length)
+    def parse_string(io, first_char) # :nodoc:
+      length = parse_integer(io, SEPERATOR_TOKEN, first_char)
+      raise ParseError if length < 0
+      string = io.read(length)
+      raise ParseError if length != string.length
+      string
     end
     
     extend self

data/lib/bencoding/version.rb

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

data/test/test_bencoding.rb

@@ -10,6 +10,10 @@ class TestBencoding < Test::Unit::TestCase
     test_load "i17e", 17
   end
   
+  def test_load_negative_integer
+    test_load "i-17e", -17
+  end
+  
   def test_load_list
     test_load "l5:helloi17ee", ["hello", 17]
   end
@@ -22,10 +26,36 @@ class TestBencoding < Test::Unit::TestCase
   def test_load_fake
     str  = "d5:key_ai16e5:a_key4:helloe"
     assert_raise Bencoding::ParseError do
-      out  = Bencoding.load(str)
+      out  = Bencoding.load!(str)
+    end
+  end
+  
+  def test_load_partial_integer
+    str  = "i12"
+    assert_raise Bencoding::ParseError do
+      out  = Bencoding.load!(str)
+    end
+  end
+  
+  def test_load_partial_integer_in_list
+    str  = "li12i45ee"
+    assert_raise Bencoding::ParseError do
+      out  = Bencoding.load!(str)
+    end
+  end
+  
+  def test_load_partial_string
+    str  = "5:hel"
+    assert_raise Bencoding::ParseError do
+      out  = Bencoding.load!(str)
     end
   end
   
+  def test_load_form_uri
+    uri = "http://torrents.thepiratebay.org/4385574/Ubuntu_8.10_(Intrepid_Ibex)_Alpha_5.4385574.TPB.torrent"
+    assert Bencoding.load!(uri)['announce']=='http://tpb.tracker.thepiratebay.org:80/announce'
+  end
+  
   def test_dump_string
     test_dump "hello", "5:hello"
   end
@@ -34,6 +64,10 @@ class TestBencoding < Test::Unit::TestCase
     test_dump 25, "i25e"
   end
   
+  def test_dump_negative_integer
+    test_dump -25, "i-25e"
+  end
+  
   def test_dump_float
     test_dump 25.4, "i25e"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-bencoding
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -07:00
+date: 2008-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency