bencode 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzJhZTUzNzVhM2ZmMzNjOTJhYTkwNGJhOWU4NTFjZTNhOTdjY2Y1Ng==
-  data.tar.gz: !binary |-
-    YWQzMDg5NmM2ODYwY2M1Y2JhZTU4NzA0ZmE5MWRmN2QwODEwNTIxNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjM1ODBjMmNmMjU1YmY3ZGViNDZiMmE5OTlkZTg4NWZjZGFkZGQ0NzEyNmQ3
-    NjEzOTI2NmVjMDEwNGYwNTI0NTAyNGU5YmE3ZWU5ODg4MWExMGJjZGY1MTll
-    YmE2MzljNTg1YzYzYTdhYjljMGQzOWQxYWYwOWQ2NTllM2M1NGQ=
-  data.tar.gz: !binary |-
-    ZmQ4ODY3NDM3NDZiYThjZDc5MTYzOTNiOTdlOGRhMDJmNjhhNDAxY2Q2OTM2
-    NWUwZmFhMWVkNGI0ZGI5ZWZlM2UzMTJmYWIxNDVmOWMzNzliY2RmMWUwMGVj
-    YjdlMDVhN2YxYzQwZWFiNjA1ZDY2OTI1MmU2YTU3OTYwZWZjZjM=
+SHA1:
+  metadata.gz: 07cb5be3744b878726ce641c469802ed586c800a
+  data.tar.gz: 1645e9613e22a9e144f4f766809821bf144ce891
+SHA512:
+  metadata.gz: 59701813409b78eba18008e281fc7c0dbe817baabd2e47d2bef356af3d7f5c43bb8087ba9caefd0ff80e974f61249878021138bb58f46daa62a06fb0a97e073b
+  data.tar.gz: 13aa5d05f693c5386fd6d8500c6e8b76cad3459ed159a03ba60dece5d116d6eb680e53a071d24b303282d80f2965b9b75675168850f9d5cba49f0a077eabf3e9

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-gem "shoulda", :git => "git://github.com/dasch/shoulda.git", :branch => "minitest"

data/bencode.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'bencode'
-  s.version           = '0.8.0'
-  s.date              = '2013-03-15'
+  s.version           = '0.8.1'
+  s.date              = '2014-05-19'
 
   s.summary = "Encode and decode bencoded data"
   s.description = "A simple encoder and decoder for the BitTorrent serialization format."
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.authors = ["Daniel Schierbeck"]
   s.email = "daniel.schierbeck@gmail.com"
   s.homepage = "http://github.com/dasch/ruby-bencode"
+  s.license = 'MIT'
 
   s.require_paths = %w[lib]
 
@@ -41,9 +42,7 @@ Gem::Specification.new do |s|
     lib/bencode/core_ext/io.rb
     lib/bencode/core_ext/object.rb
     lib/bencode/core_ext/string.rb
-    lib/bencode/core_ext/stringio.rb
     lib/bencode/decode.rb
-    lib/bencode/parseio.rb
     lib/bencode/parser.rb
     test/benchmark/decoding.rb
     test/benchmark/encoding.rb

data/lib/bencode.rb

@@ -3,7 +3,7 @@
 #
 # See {BEncode.load} and {BEncode.dump}.
 module BEncode
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 
   class DecodeError < StandardError
   end

data/lib/bencode/core_ext/hash.rb

@@ -9,7 +9,7 @@ class Hash
   def bencode
     pairs = sort.map{|key, val| [key.to_s.bencode, val.bencode] }
     "d#{pairs.join}e"
-  rescue NoMethodError => error
+  rescue NoMethodError
     raise BEncode::EncodeError, "dictionary keys must be strings"
   end
 end

data/lib/bencode/core_ext/io.rb

@@ -1,8 +1,4 @@
-require 'bencode/parseio'
-
-class IO
-  include BEncode::ParseIO
-  
+class IO  
   def self.bdecode(filename)
     open(filename, 'rb') {|io| io.bdecode}
   end

data/lib/bencode/core_ext/string.rb

@@ -2,13 +2,23 @@
 class String
   #
   # Bencodes the String object. Bencoded strings are represented
-  # as <code>x</code>:<code>y</code>, where +y+ is the string and +x+ 
+  # as <code>x</code>:<code>y</code>, where +y+ is the string and +x+
   # is the length of the string.
-  #   
+  #
   #   "foo".bencode   #=> "3:foo"
   #   "".bencode      #=> "0:"
   #
   def bencode
-    "#{length}:#{self}"
+    "#{bytesize}:#{self}"
+  end
+
+  #
+  # Bdecodes the String object and returns the data serialized
+  # through bencoding.
+  #
+  #   "li1ei2ei3ee".bdecode   #=> [1, 2, 3]
+  #
+  def bdecode
+    BEncode.load(self)
   end
 end

data/lib/bencode/decode.rb

@@ -22,7 +22,7 @@ module BEncode
     scanner = BEncode::Parser.new(str)
     obj = scanner.parse!
     raise BEncode::DecodeError unless (opts[:ignore_trailing_junk] || scanner.eos?)
-    return obj
+    obj
   end
 
   # Decodes the file located at +path+.
@@ -34,15 +34,3 @@ module BEncode
     load(File.open(path, 'rb').read, opts)
   end
 end
-
-class String
-  #
-  # Bdecodes the String object and returns the data serialized
-  # through bencoding.
-  #
-  #   "li1ei2ei3ee".bdecode   #=> [1, 2, 3]
-  #
-  def bdecode
-    BEncode.load(self)
-  end
-end

data/lib/bencode/parser.rb

@@ -1,22 +1,22 @@
 require 'stringio'
-require 'bencode/parseio'
 
 module BEncode
   class Parser
     attr_reader :stream
 
     def initialize(stream)
-      if stream.kind_of? BEncode::ParseIO
-        @stream = stream
-      elsif stream.respond_to? :string
-        @stream = StringIO.new stream.string
-      elsif stream.respond_to? :to_s
-        @stream = StringIO.new stream.to_s
-      end
+      @stream =
+        if stream.kind_of?(IO) || stream.kind_of?(StringIO)
+          stream
+        elsif stream.respond_to? :string
+          StringIO.new stream.string
+        elsif stream.respond_to? :to_s
+          StringIO.new stream.to_s
+        end
     end
 
     def parse!
-      case stream.peek
+      case peek
         when ?i then parse_integer!
         when ?l then parse_list!
         when ?d then parse_dict!
@@ -39,7 +39,7 @@ module BEncode
     def parse_list!
       stream.getc
       ary = []
-      ary.push(parse!) until stream.peek == ?e
+      ary.push(parse!) until peek == ?e
       stream.getc
       ary
     end
@@ -47,7 +47,7 @@ module BEncode
     def parse_dict!
       stream.getc
       hsh = {}
-      until stream.peek == ?e
+      until peek == ?e
         key = parse!
 
         unless key.is_a? String or key.is_a? Fixnum
@@ -76,5 +76,11 @@ module BEncode
 
       str
     end
+    
+    def peek
+      c = stream.getc
+      stream.ungetc(c)
+      c
+    end
   end
 end

data/test/bittorrent_test.rb

@@ -1,7 +1,7 @@
 require 'environment'
 
-class BitTorrentTest < MiniTest::Unit::TestCase
-  should "load a bencoded torrent file" do
+describe "bittorrent" do
+  it "should load a bencoded torrent file" do
     BEncode.load_file("test/fixtures/python.torrent")
     pass
   end

data/test/decoding_test.rb

@@ -1,19 +1,17 @@
 require 'environment'
 
-class DecodingTest < MiniTest::Unit::TestCase
-  context "The BEncode decoder" do
-    should_decode 42, "i42e"
-    should_decode 0, "i0e"
-    should_decode -42, "i-42e"
+describe "decoding" do
+  it_should_decode 42, "i42e"
+  it_should_decode 0, "i0e"
+  it_should_decode -42, "i-42e"
 
-    should_decode "foo", "3:foo"
-    should_decode "", "0:"
+  it_should_decode "foo", "3:foo"
+  it_should_decode "", "0:"
 
-    should_decode [1, 2, 3], "li1ei2ei3ee"
-    
-    hsh = {"foo" => "bar", "baz" => "qux"}
-    should_decode hsh, "d3:foo3:bar3:baz3:quxe"
-    
-    should_decode 42, "i42eBOGUS", :ignore_trailing_junk => true
-  end
+  it_should_decode [1, 2, 3], "li1ei2ei3ee"
+  
+  hsh = {"foo" => "bar", "baz" => "qux"}
+  it_should_decode hsh, "d3:foo3:bar3:baz3:quxe"
+  
+  it_should_decode 42, "i42eBOGUS", :ignore_trailing_junk => true
 end

data/test/encoding_test.rb

@@ -1,8 +1,8 @@
+# encoding: utf-8
 require 'environment'
 
-class EncodingTest < MiniTest::Unit::TestCase
-  context "The BEncode encoder" do
-    should_encode "i42e", 42
-    should_encode "3:foo", "foo"
-  end
+describe "encoding" do
+  it_should_encode "i42e", 42
+  it_should_encode "3:foo", "foo"
+  it_should_encode "5:café", "café"
 end

data/test/environment.rb

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'shoulda'
 
-MiniTest::Unit.autorun
-
 require File.dirname(__FILE__) + '/../lib/bencode'
 Dir.glob(File.dirname(__FILE__) + '/shoulda_macros/*.rb').each do |macro|
   require macro

data/test/shoulda_macros/decoding.rb

@@ -1,7 +1,7 @@
 
-class MiniTest::Unit::TestCase
-  def self.should_decode(expected, encoded, opts = {})
-    should "decode #{encoded.inspect} into #{expected.inspect}" do
+class MiniTest::Test
+  def self.it_should_decode(expected, encoded, opts = {})
+    it "should decode #{encoded.inspect} into #{expected.inspect}" do
       assert_equal expected, BEncode.load(encoded, opts)
     end
   end

data/test/shoulda_macros/encoding.rb

@@ -1,7 +1,7 @@
 
-class MiniTest::Unit::TestCase
-  def self.should_encode(expected, value)
-    should "encode #{value.inspect} into #{expected.inspect}" do
+class MiniTest::Test
+  def self.it_should_encode(expected, value)
+    it "should encode #{value.inspect} into #{expected.inspect}" do
       assert_equal expected, value.bencode
     end
   end

data/test/utf8_decoding_test.rb

@@ -1,10 +1,8 @@
 require 'environment'
 
-class UTF8DecodingTest < MiniTest::Unit::TestCase
-  context "The BEncode decoder" do
-    should "be able to handle UTF8-encoded data" do
-      BEncode.load_file('test/fixtures/test.torrent')
-      pass
-    end
+describe "utf encoding" do
+  it "should be able to handle UTF8-encoded data" do
+    BEncode.load_file('test/fixtures/test.torrent')
+    pass
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: bencode
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple encoder and decoder for the BitTorrent serialization format.
@@ -86,9 +86,7 @@ files:
 - lib/bencode/core_ext/io.rb
 - lib/bencode/core_ext/object.rb
 - lib/bencode/core_ext/string.rb
-- lib/bencode/core_ext/stringio.rb
 - lib/bencode/decode.rb
-- lib/bencode/parseio.rb
 - lib/bencode/parser.rb
 - test/benchmark/decoding.rb
 - test/benchmark/encoding.rb
@@ -102,7 +100,8 @@ files:
 - test/shoulda_macros/encoding.rb
 - test/utf8_decoding_test.rb
 homepage: http://github.com/dasch/ruby-bencode
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -111,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 2
 summary: Encode and decode bencoded data

data/lib/bencode/core_ext/stringio.rb

@@ -1,6 +0,0 @@
-require 'stringio'
-require 'bencode/parseio'
-
-class StringIO
-  include BEncode::ParseIO
-end

data/lib/bencode/parseio.rb

@@ -1,9 +0,0 @@
-module BEncode
-  module ParseIO
-    def peek
-      c = self.getc
-      self.ungetc(c)
-      c
-    end
-  end
-end