bencodr 2.0.1 → 3.0.0

data/README.md

@@ -8,7 +8,7 @@
 ## Synopsis
 This gem provides a way to encode and parse bencodings used by the Bit Torrent protocol.
 
-_Note: If using ruby 1.9.x, use a bencodr version >= 3.0.0 as it takes advantage of 1.9.x's encoding features._
+_Note: If using ruby 1.8.x, use bencodr version 2.1.0. 3.0.0 is 1.9.x only, because it uses the 1.9.x encoding features._
 
 ## Installation
 
@@ -67,6 +67,7 @@ This will extend:
     * Hash
 * BEncodr::IO
     * IO
+    * File
 
 ### String
 BEncoded strings are length-prefixed base ten followed by a colon and the string.

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/bencodr/ext.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module BEncodr
   module Ext
     def self.include!

data/lib/bencodr/io.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module BEncodr
   module IO
     module ClassMethods
@@ -15,7 +17,7 @@ module BEncodr
     end
     
     def bdecode
-      Object.bdecode(read)
+      Object.bdecode(read.force_encoding('UTF-8'))
     end
     
     def self.included(base)

data/lib/bencodr/object.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module BEncodr
   module Object
     def self.bencode(object)
@@ -25,7 +27,8 @@ module BEncodr
     end
     
     def self.bdecode(string)
-      object = Parser.parse_object(StringScanner.new(string))
+      scanner = StringScanner.new(string)
+      object = Parser.parse_object(scanner)
       object or raise BEncodeError, "BEncodr::Object.bdecode was unable to parse the string passed in."
     end
     

data/lib/bencodr/parser.rb

@@ -35,9 +35,10 @@ module BEncodr
       # @param [StringScanner] scanner the scanner of a bencoded string
       # @return [::String] the parsed string
       def parse_string(scanner)
-        length = scanner.scan(/[1-9][0-9]*|0/)    or raise BEncodeError, "Invalid string: length invalid. #{scanner.pos}"
-        scanner.scan(/:/)                         or raise BEncodeError, "Invalid string: missing colon(:). #{scanner.pos}"
-        scanner.scan(/.{#{length}}/m)             or raise BEncodeError, "Invalid string: length too long(#{length}) #{scanner.pos}."
+        length = scanner.scan(/[1-9][0-9]*|0/)        or raise BEncodeError, "Invalid string: length invalid. #{scanner.pos}"
+        scanner.scan(/:/)                             or raise BEncodeError, "Invalid string: missing colon(:). #{scanner.pos}"
+        byte_string = scanner.scan(/.{#{length}}/m)   or raise BEncodeError, "Invalid string: length too long(#{length}) #{scanner.pos}."
+        byte_string.encode('UTF-8') rescue byte_string.force_encoding('UTF-8')
       end
 
       # This method parases a bencoded integer.

data/lib/bencodr/version.rb

@@ -1,3 +1,3 @@
 module BEncodr
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

data/spec/bencode_spec.rb

@@ -27,7 +27,7 @@ describe BEncodr do
   describe "#bdecode_file" do
     it "should parse a bencoded file" do
       dirname = File.dirname(__FILE__)
-      BEncodr.bdecode_file("#{dirname}/samples/mini.bencode").should == {"ba" => 3}
+      BEncodr.bdecode_file("#{dirname}/samples/mini.bencode").should == {"£" => 3}
     end
   end
 
@@ -75,7 +75,7 @@ describe BEncodr do
   context "when parsing and then encoding" do
     it "should be equal to the pre-parsed and encoded bencoded string" do
       file = File.dirname(__FILE__) + "/samples/bencode.rb.torrent"
-      BEncodr.bencode(BEncodr.bdecode_file(file)).should == File.open(file, "rb") {|f| f.read}
+      BEncodr.bencode(BEncodr.bdecode_file(file)).should == File.open(file, "r:UTF-8") {|f| f.read}
     end
   end
 end

data/spec/bencodr/io_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "spec_helper"
 
 describe File do

data/spec/samples/bencodr.torrent

@@ -0,0 +1 @@
+d8:announce38:udp://tracker.publicbt.com:80/announce7:comment11:Awesome! £10:created by13:uTorrent/102013:creation datei1308787427e12:encoded ratei-1e8:encoding5:UTF-84:infod6:lengthi785e4:name10:bencodr.rb12:piece lengthi16384e6:pieces20:�b��F�������O�ګ�ee

data/spec/samples/mini.bencode

@@ -1 +1 @@
-d2:bai3ee
+d2:£i3ee

data/spec/shared_examples.rb

@@ -1,8 +1,11 @@
+# encoding: UTF-8
+
 shared_examples_for "BEncodr::String" do |obj|
   subject{ obj }
   
   describe "#bencode" do
     it{ should bencode("string").to("6:string") }
+    it{ should bencode("£").to("2:£") }
     it{ should bencode("").to("0:") }
     it{ should bencode(:symbol).to("6:symbol") }
     it{ should bencode(URI.parse("http://github.com/blatyo/bencodr")).to("32:http://github.com/blatyo/bencodr") }

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), '..', 'lib', 'bencodr')
 require 'rspec'
 require 'fuubar'

metadata

@@ -2,7 +2,7 @@
 name: bencodr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors: 
 - Allen Madsen
@@ -86,6 +86,7 @@ files:
 - spec/bencodr/string_spec.rb
 - spec/custom_matchers.rb
 - spec/samples/bencode.rb.torrent
+- spec/samples/bencodr.torrent
 - spec/samples/mini.bencode
 - spec/samples/python.torrent
 - spec/shared_examples.rb
@@ -130,6 +131,7 @@ test_files:
 - spec/bencodr/string_spec.rb
 - spec/custom_matchers.rb
 - spec/samples/bencode.rb.torrent
+- spec/samples/bencodr.torrent
 - spec/samples/mini.bencode
 - spec/samples/python.torrent
 - spec/shared_examples.rb