bencoder 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c62bd7987598ff7a2b4b56a1e69c24827c9f0b
-  data.tar.gz: c15edd8914036432bdec89a8494349de123e11a1
+  metadata.gz: 51e49c375c750bc8fc138694c480243464b72569
+  data.tar.gz: 61d783b6a72ed79143a178e0b3238d66285174cb
 SHA512:
-  metadata.gz: 49581f10345b062663e1030505a961b30229bfdc399c1c09cab863302264e8dafe81b610b273898b3c1589a29373572f8daa82014c80d8b66f6c58ccf72f2e2e
-  data.tar.gz: aad379db9c60f0f096c0c3e3123d1d0ae92c9f66b02d6aa1744c39f358cb66c06c102cd9f2c6eb98f86867bce7f7307404623b4979e6d411fb54b10c7b4d7311
+  metadata.gz: 624aefbb8c412f1ad58f8df03a6a3492af110859065e7bff4541d286361e6bee0113fbc0fdbfa388f5c183e4c4b036080fefe036bcdba4cfc08341384fa9b17d
+  data.tar.gz: 65232d1a24bfcb6cf2e5abea661df2fba8ff0a2441aacbe696fdb0417b8b0ff82a38cdddadaa7bf8058ffeee74c563648b5537b0ab45b866d20d67af39338724

data/README.md

@@ -3,6 +3,15 @@ bencoder
 
 Bittorrent encoding in ruby
 
+BEncoder will encode the 4 data types in the specification:
+
+ - Strings
+ - Integers
+ - Arrays
+ - Hashes
+
+Additionally, it will pass symbols as strings, to allow for easier hash convertion.
+
 install with
 
     gem install bencoder
@@ -13,7 +22,13 @@ Usage is easy:
 BEncoder.encode "herp"
 => "4:herp"
 
+BEncoder.decode "4:herp"
+=> "herp"
+
 BEncoder.encode ['what', 'strange', { data: 'I', have: 'here' }, 666]
 => "l4:what7:stranged4:data1:I4:have4:hereei666ee"
+
+BEncoder.decode 'l4:what7:stranged4:data1:I4:have4:hereei666ee'
+=> ['what', 'strange', { data: 'I', have: 'here' }, 666]
 ```
 Intentionally minimalistic.

data/lib/bencoder.rb

@@ -1,18 +1,125 @@
+require 'stringio'
 class BEncoder
-  def self.encode(object)
-    case object
-    when Symbol
-      encode object.to_s
-    when String
-      "#{object.length}:#{object}"
-    when Integer
-      "i#{object}e"
-    when Array
-      encoded_content = object.inject("l") { |result, el| result += encode(el) }
-      encoded_content += "e"
-    when Hash
-      encoded = object.inject("d") { |result, (k,v)| result += "#{encode(k.to_s)}#{encode(v)}" }
-      encoded += "e"
+  class << self
+    def encode(object)
+      case object
+      when Symbol
+        encode object.to_s
+      when String
+        encode_string object
+      when Integer
+        encode_int object
+      when Array
+        encode_array object
+      when Hash
+        encode_hash object
+      end
+    end
+
+    def decode(string)    
+      parse string
+    end
+
+
+
+    private
+
+    def parse(string)
+      case string[0]
+      when 'i'
+        parse_int string
+      when 'l'
+        parse_list string
+      when 'd'
+        parse_dict string
+      else
+        parse_string string
+      end
+    end
+
+    def parse_list(string)
+      if string.is_a? StringIO
+        str = string
+        str.getc if peek(str) == 'l'
+      elsif string[0] == 'l' && string[-1] == 'e'
+        str = StringIO.new string[1..-2]
+      else 
+        raise 'Not a list'
+      end
+      list = []
+      until peek(str) == 'e' || str.eof?
+        case peek(str)
+        when 'i'
+          list << parse_int(str.gets sep='e')
+        when 'l'
+          list << parse_list(str)
+        when 'd'
+          list << parse_dict(str)
+        when ->(e) { e =~ /\d/ }
+          length = str.gets(sep=':').to_i
+          list << str.gets(length)
+        else
+          raise str.read
+        end
+      end
+      str.getc
+      list
+    end
+
+    def parse_dict(string)
+      if string.is_a? StringIO
+        string.getc if peek(string) == 'd'
+        list_of_keys_and_values = parse_list(string)
+      elsif string[0] == 'd' && string[-1] == 'e'
+        list_of_keys_and_values = parse_list("l#{string[1..-2]}e")
+      else
+        raise 'Something in hash is wrong!'
+      end
+      hash = {}
+      list_of_keys_and_values.each_slice(2) do |k,v|
+        hash[k] = v
+      end
+      hash
+    end
+
+    def parse_int(string)
+      if string[0] == 'i' && string[-1] == 'e'
+        string[1..-2].to_i
+      else
+        raise 'Int is formatted wrong'
+      end
+    end
+
+    def parse_string(string)
+      length, content = string.split ':'
+      if content.length == length.to_i
+        content
+      else
+        raise 'String length is messed up'
+      end
+    end
+
+    def encode_string(string)
+      "#{string.length}:#{string}"
+    end
+
+    def encode_int(int)
+      "i#{int}e"
+    end
+
+    def encode_array(array)
+      array.inject("l") { |result, el| result += encode(el) } + "e"
+    end
+
+    def encode_hash(hash)
+      hash.inject("d") { |result, (k,v)| result += "#{encode(k.to_s)}#{encode(v)}" } + 'e'
+    end
+
+    def peek(io)
+      char = io.getc
+      io.ungetc char
+      puts char
+      char
     end
   end
 end

data/test/test_bencoder.rb

@@ -1,10 +1,13 @@
 require 'minitest/autorun'
 require 'bencoder'
 
-class TestBencoder < Minitest::Unit::TestCase
+class TestBencoder < Minitest::Test
   def setup
     @be = BEncoder
   end
+
+  #encoding
+
   def test_string_encoding
     assert_equal '7:Someday', @be.encode('Someday')
   end
@@ -21,7 +24,29 @@ class TestBencoder < Minitest::Unit::TestCase
     assert_equal 'd4:what2:is2:up4:dawge', @be.encode({what: 'is', up: 'dawg'})
   end
 
-  def test_nested_values
+  def test_nested_encoding
     assert_equal 'ld4:somel5:times3:youe5:gotta3:let2:go1:!ei2e5:wooooli1e1:21:3ee', @be.encode([{'some' => ['times', 'you'], gotta: 'let', go: '!'}, 2, "woooo", [1, '2', "3"]])
   end
+
+  #decoding
+
+  def test_string_decoding
+    assert_equal "I'm free!", @be.decode("9:I'm free!")
+  end
+
+  def test_int_decoding
+    assert_equal 321, @be.decode('i321e')
+  end
+
+  def test_array_decoding
+    assert_equal ['1', 2, 3], @be.decode('l1:1i2ei3ee')
+  end
+
+  def test_hash_decoding
+    assert_equal({'abc' => 'def', 'ghi' => 32}, @be.decode("d3:abc3:def3:ghii32ee"))
+  end
+
+  def test_nested_decoding
+    assert_equal [{'some' => ['times', 'you'], 'gotta' => 'let', 'go' => '!'}, 2, "woooo", [1, '2', "3"]], @be.decode('ld4:somel5:times3:youe5:gotta3:let2:go1:!ei2e5:wooooli1e1:21:3ee')
+  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: bencoder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Kasper Holbek Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies: []
-description: Minimalistic bencoder gem
+description: Minimalistic BEncoding gem
 email: kholbekj@gmail.com
 executables: []
 extensions: []