torrents 1.0.5 → 1.0.6

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-authentication/*
+authentication/*
+tmp/*

data/Isolate

@@ -0,0 +1,13 @@
+env :production do
+  gem "rest-client"
+  gem "nokogiri"
+  gem "rchardet19"
+  gem "classify", "~> 0.0.3"
+  gem "movie_searcher", "~> 0.1.4"
+  gem "undertexter", "~> 0.1.5"
+end
+
+env :development do
+  gem "rspec"
+  gem "isolate"
+end

data/lib/torrents.rb

@@ -1,6 +1,7 @@
 $:.push File.expand_path("../../lib/torrents", __FILE__)
 $:.push File.expand_path("../../lib/torrents/trackers", __FILE__)
 
+require "isolate/now"
 require 'rest_client'
 require 'nokogiri'
 require 'torrents/container'

data/lib/torrents/container.rb

@@ -15,16 +15,17 @@ module Container
     include Trackers
     # Downloads the URL, returns an empty string if an error occurred
     # Here we try to convert the downloaded content to UTF8, 
-    # if we"re at least 60% sure that the content that was downloaded actally is was we think
-    # The timeout is set to 10 seconds, after that time, an empty string will be returned 
+    # if we're at least 80% sure that the content that was downloaded actally is was we think.
+    # The timeout is set to 10 seconds, after that time, an empty string will be returned.
     # {url} (String) The URL to download
     def download(url)
       begin
         data = RestClient.get self.url_cleaner(url), {:timeout => 10, :cookies => @cookies}
-        cd = CharDet.detect(data)
-        return (cd["confidence"] > 0.9) ? (Iconv.conv(cd["encoding"] + "//IGNORE", "UTF-8", data) rescue data) : data
-      rescue
-        self.error("Something when wrong when trying to fetch #{url}", $!)
+        cd = CharDet.detect(data, silent: true)     
+        raise Exception.new("The confidence level for #{url} is to low: #{cd.confidence}") if not cd.encoding.to_s.match(/^UTF(-)?8$/) and cd.confidence < 0.8
+        return Iconv.conv(cd.encoding + "//IGNORE", "UTF-8", data) rescue data
+      rescue Exception => error
+        self.error("Something when wrong when trying to fetch #{url}", error)
       end
       
       # The default value, if {RestClient} for some reason craches (like wrong encoding or a timeout)

data/spec/shared_spec.rb

@@ -5,16 +5,45 @@ describe Container::Shared do
     @shared = Container::Shared.new
   end
   context "the download method" do
+    def rest_client(data = "123")
+      RestClient.should_receive(:get).with("http://example.com", {:timeout => 10, :cookies => nil}).exactly(1).times.and_return(data)
+    end
+    
+    def char_det(encoding, confidence)
+      CharDet.should_receive(:detect).with("123", silent: true).and_return(Struct.new(:encoding, :confidence).new(encoding, confidence))
+    end
+    
     it "should return an empty string when trying to download an empty or non valid URL" do
       @shared.download("non_working_url").should be_empty
       @shared.download(nil).should be_empty
     end
 
     it "should return the content of the site if called with the right url" do
-      RestClient.should_receive(:get).with("http://example.com", {:timeout => 10, :cookies => nil}).exactly(1).times.and_return("123")
+      rest_client
       @shared.download("http://example.com").should eq("123")
     end
-  end
+    
+    it "should return an empty string when the confidence level is to low. encoding = Latin 1" do
+      rest_client; char_det("Latin 1", 0.6)
+      @shared.download("http://example.com").should be_empty
+    end
+    
+    it "should not return an empty string when the confidence level is to low. encoding = UTF8" do
+      rest_client; char_det("UTF8", 0.6)
+      @shared.download("http://example.com").should eq("123")
+    end
+    
+    it "should not return an empty string when the confidence level is okey. encoding = UTF-8" do
+      rest_client; char_det("UTF-8", 0.9)
+      @shared.download("http://example.com").should eq("123")
+    end
+    
+    it "should try to encode the string if the confidence level is okey and the string isn't UTF8" do
+      rest_client("123"); char_det("Latin 1", 0.9)
+      Iconv.should_receive(:conv).with("Latin 1//IGNORE", "UTF-8", "123").and_return("my value")
+      @shared.download("http://example.com").should eq("my value")
+    end
+  end  
   
   context "the error method" do
     it "should have a error method" do

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-require 'rspec'
-require 'torrents'
-require 'torrents/container'
-require 'uri'
-require 'yaml'
+require "isolate/now"
+require "rspec"
+require "torrents"
+require "torrents/container"
+require "uri"
+require "yaml"
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/torrents.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "torrents"
-  s.version     = "1.0.5"
+  s.version     = "1.0.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency('undertexter', '~> 0.1.5')
   
   s.add_development_dependency('rspec')
+  s.add_development_dependency('isolate')
   
   s.required_ruby_version = '>= 1.9.0'
 end

metadata

@@ -2,7 +2,7 @@
 name: torrents
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Linus Oleander
@@ -90,6 +90,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: "Search and download torrents from your favorite bittorrent tracker using Ruby 1.9. \n    Get information like; subtitles, movie information from IMDB (actors, grade, original title, length, trailers and so on.), direct download link to the torrent.\n  "
 email: 
 - linus@oleander.nu
@@ -103,6 +114,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- Isolate
 - README.md
 - Rakefile
 - lib/torrents.rb