bencodr 3.0.0 → 3.0.1

data/.rvmrc

@@ -1 +1 @@
-rvm --create use 1.9.2@bencodr
+rvm --create use 1.9.3@bencodr

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree

data/README.md

@@ -4,12 +4,11 @@
 * **Gem** http://gemcutter.org/gems/bencodr
 * **Source** http://github.com/blatyo/bencodr
 * **Issue Tracker** http://github.com/blatyo/bencodr/issues
+* **Build Status** [![Build Status](http://travis-ci.org/blatyo/bencodr.png)](http://travis-ci.org/blatyo/bencodr)
 
 ## Synopsis
 This gem provides a way to encode and parse bencodings used by the Bit Torrent protocol.
 
-_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
 
 Install the gem:
@@ -165,7 +164,7 @@ You can also write and read bencodings.
     # read from file
     File.bdecode("a.bencode")           #=> "string"
 
-    file = File.open("a.bencode", "wb")
+    file = File.open("a.bencode", "rb")
     file.bdecode                        #=> "string"
 ```
 
@@ -197,6 +196,9 @@ When using bencodings it may be useful to translate your own objects into bencod
     MyClass.new.bencode #=> "d1:a1:a1:b1:be"
 ```
 
+## Contributors
+* [Andrew Nikolaev](https://github.com/quaternion) - Fixed encoding issue
+
 ## Note on Reporting Issues
 
 * Try to make a failing test case

data/Rakefile

@@ -4,4 +4,6 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bencodr.gemspec

@@ -13,9 +13,10 @@ Gem::Specification.new do |s|
   s.description = "This gem provides a way to encode and decode bencode used by the Bit Torrent protocol. Normal ruby objects can be marshalled as bencode and demarshalled back to ruby."
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_development_dependency "rspec",   "~> 2.1.0"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec",   "~> 2.8.0"
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "fuubar",  ">= 0.0.1"
+  s.add_development_dependency "fuubar",  ">= 1.0.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bencodr/io.rb

@@ -6,22 +6,22 @@ module BEncodr
       def bencode(fd, object)
         open(fd, "wb") {|file| file.bencode(object)}
       end
-      
+
       def bdecode(fd)
         open(fd, "rb") {|file| file.bdecode}
       end
     end
-    
+
     def bencode(object)
       write(Object.bencode(object))
     end
-    
+
     def bdecode
-      Object.bdecode(read.force_encoding('UTF-8'))
+      Object.bdecode(read)
     end
-    
+
     def self.included(base)
       base.extend ClassMethods
     end
   end
-end
+end

data/lib/bencodr/parser.rb

@@ -38,7 +38,11 @@ module BEncodr
         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')
+        if RUBY_VERSION =~ /1\.9/
+          byte_string.encode('UTF-8') rescue byte_string.force_encoding('UTF-8')
+        else
+          byte_string
+        end
       end
 
       # This method parases a bencoded integer.

data/lib/bencodr/version.rb

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

data/spec/bencodr/io_spec.rb

@@ -1,35 +1,58 @@
 # encoding: UTF-8
 require "spec_helper"
+require 'tempfile'
 
 describe File do
   before :all do
-    @path = "tmp"
-    Dir.mkdir(@path) unless File.exists? @path
     BEncodr.include!
   end
 
-  before :each do
-    @file = File.join(@path, 'test.bencodr')
-    @object = "string"
-    File.bencode(@file, @object)
+  let(:file)   { Tempfile.new('test.bencodr') }
+  let(:object) { "string" }
+
+  describe ".bencode" do
+    it "should encode object to file" do
+      File.bencode(file.path, object)
+      file.rewind
+      file.read.should == "6:string"
+    end
   end
-  
+
   describe "#bencode" do
-    subject{ File }
-    
-    it{ File.should exist(@file) }
-  end
-  
-  describe "#bdecode" do
-    subject{ File }
-    it{ should bdecode(@file).to(@object) }
-  end
-  
-  after :each do
-    File.delete(@file)
+    it "should encode object to file" do
+      file.bencode(object)
+      file.rewind
+      file.read.should == "6:string"
+    end
   end
 
-  after :all do
-    Dir.delete(@path) if File.exists? @path
+  context "decode" do
+    let(:sample_path) { 'spec/samples/bencodr.torrent' }
+
+    before do
+      file.bencode(object)
+      file.rewind
+    end
+
+    describe ".bdecode" do
+      it "should decode object from file" do
+        File.bdecode(file.path).should == object
+      end
+
+      it "should decode sample file without error" do
+        expect{ File.bdecode(sample_path) }.to_not raise_error
+      end
+    end
+
+    describe "#bdecode" do
+      it "should decode object from file" do
+        file.bdecode.should == object
+      end
+
+      it "should decode sample file without error" do
+        f = File.open(sample_path, 'rb')
+        expect{ f.bdecode }.to_not raise_error
+      end
+    end
   end
-end
+end

data/spec/custom_matchers.rb

@@ -1,10 +1,11 @@
 RSpec::Matchers.define :bencode_to do |expected|
   match do |actual|
-    actual.bencode.should equal(expected)
+    @got = actual.bencode
+    @got.should equal(expected)
   end
   
   failure_message_for_should do |actual|
-    "expected that #{actual} would bencode to #{expected}"
+    "expected that #{actual.inspect} would bencode to #{expected.inspect}, but got #{@got.inspect}}"
   end
 end
 
@@ -14,11 +15,12 @@ RSpec::Matchers.define :bencode do |actual|
   end
   
   match do |klass|
-    klass.bencode(actual).should == @_expected
+    @got = klass.bencode(actual)
+    @got.should == @_expected
   end
   
   failure_message_for_should do |klass|
-    "expected #{klass.name} to bencode #{actual} to #{@_expected}"
+    "expected #{klass.name} to bencode #{actual.inspect} to #{@_expected.inspect}, but got #{@got.inspect}"
   end
 end
 
@@ -33,11 +35,12 @@ RSpec::Matchers.define :parse do |actual|
   
   match do |klass|
     scanner = StringScanner.new(actual)
-    klass.send(:"parse_#{@type}", scanner).should == @_expected
+    @got = klass.send(:"parse_#{@type}", scanner)
+    @got.should == @_expected
   end
   
   failure_message_for_should do |klass|
-    "expected #{klass.name} to bdencode #{actual} as #{@type} to #{@_expected}"
+    "expected #{klass.name} to bdencode #{actual.inspect} as #{@type} to #{@_expected.inspect}, but got #{@got.inspect}"
   end
 end
 

data/spec/shared_examples.rb

@@ -53,21 +53,38 @@ shared_examples_for "BEncodr::Dictionary" do |obj|
       it{ should bencode({:symbol => :symbol}).to("d6:symbol6:symbole") }
       it{ should bencode({1 => 1}).to("d1:1i1ee")}
       it{ should bencode({1.1 => 1.1}).to("d3:1.1i1ee") }
-      it{ should bencode({{} => {}}).to("d2:{}dee") }
       
-      it{
-        uri = URI.parse("http://github.com/blatyo/bencode")
-        should bencode({uri => uri}).to("d32:http://github.com/blatyo/bencode32:http://github.com/blatyo/bencodee")
-      }
+      describe "ruby 1.9.x", :if => $ruby19 do
+        it{ should bencode({{} => {}}).to("d2:{}dee") }
 
-      it{
-        time = Time.utc(0)
-        should bencode({time => time}).to("d23:0000-01-01 00:00:00 UTCi-62167219200ee")
-      }
+        it{
+          time = Time.utc(0)
+          should bencode({time => time}).to("d23:0000-01-01 00:00:00 UTCi-62167219200ee")
+        }
+
+        it{
+          array = (1..4).to_a
+          should bencode({array => array}).to("d12:[1, 2, 3, 4]li1ei2ei3ei4eee")
+        }
+      end
+
+      describe "ruby 1.8.x", :unless => $ruby19 do
+        it{ should bencode({{} => {}}).to("d0:dee") }
+
+        it{
+          time = Time.utc(0)
+          should bencode({time => time}).to("d28:Sat Jan 01 00:00:00 UTC 2000i946684800ee")
+        }
+
+        it{
+          array = (1..4).to_a
+          should bencode({array => array}).to("d4:1234li1ei2ei3ei4eee")
+        }
+      end
 
       it{
-        array = (1..4).to_a
-        should bencode({array => array}).to("d12:[1, 2, 3, 4]li1ei2ei3ei4eee")
+        uri = URI.parse("http://github.com/blatyo/bencode")
+        should bencode({uri => uri}).to("d32:http://github.com/blatyo/bencode32:http://github.com/blatyo/bencodee")
       }
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require 'fuubar'
 require 'custom_matchers'
 require 'shared_examples'
 
-Rspec.configure do |c|
+$ruby19 = RUBY_VERSION =~ /1\.9/
+
+RSpec.configure do |c|
   c.formatter = Fuubar
   c.color_enabled = true
-end
+end

metadata

@@ -1,65 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bencodr
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.1
   prerelease: 
-  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Allen Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-24 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2012-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70267883845840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70267883845840
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70267883844340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70267883844340
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70267883842840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70267883842840
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70267883841280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-  version_requirements: *id003
-description: This gem provides a way to encode and decode bencode used by the Bit Torrent protocol. Normal ruby objects can be marshalled as bencode and demarshalled back to ruby.
-email: 
+  prerelease: false
+  version_requirements: *70267883841280
+description: This gem provides a way to encode and decode bencode used by the Bit
+  Torrent protocol. Normal ruby objects can be marshalled as bencode and demarshalled
+  back to ruby.
+email:
 - blatyo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .document
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -91,35 +100,32 @@ files:
 - spec/samples/python.torrent
 - spec/shared_examples.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/blatyo/bencodr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: This gem provides a way to encode and decode bencode used by the Bit Torrent protocol.
-test_files: 
+summary: This gem provides a way to encode and decode bencode used by the Bit Torrent
+  protocol.
+test_files:
 - spec/bencode_spec.rb
 - spec/bencodr/dictionary_spec.rb
 - spec/bencodr/ext_spec.rb