torrent_api 0.0.9 → 0.1.0

data/CHANGELOG

@@ -2,3 +2,4 @@
   v0.0.2 dependencies additions/removals, beginning of a readme
   v0.0.3 fixed minor issue with 0.0.2
   v0.0.9 Migrated from tpb to torrent_api (now includes torrent_reactor and demonoid as searches)
+  v0.1.0 Fixed Demonoid. Stable performance on :all and :demonoid.

data/README.markdown

@@ -21,7 +21,7 @@ Using Nokogiri or Hpricot, it takes a search term (and sometimes a category) and
 
 #### Query all torrent websites and work with those torrents
 
-    torrents = TorrentApi.new(:all, 'the royal tenenbaums') # buggy as of 0.0.9
+    torrents = TorrentApi.new(:all, 'the royal tenenbaums')
     torrent = torrents.first
     torrent.name
     => "The.Royal.Tenenbaums.XviD.DVD-Rip"
@@ -49,14 +49,13 @@ Using Nokogiri or Hpricot, it takes a search term (and sometimes a category) and
 
 * TorrentReactor
 * The Piratey Bay
-* Demonoid (still buggy)
+* Demonoid
 
 ### How to help
 
 Add more torrent sites!
 
 ### To do
-* Need to fix demonoid. Still buggy with newer movies.
 * Refactor all three search engines to use a shared torrent model
 * More search engines!
 * Need to add/remove dependencies - awesome_print and nokogiri

data/Rakefile

@@ -1,8 +1,5 @@
 require 'echoe'
-Echoe.new('torrent_api', '0.0.9
-
-
-') do |p|
+Echoe.new('torrent_api', '0.1.0') do |p|
   p.description = "An API to query popular torrent websites"
   p.url = "http://www.github.com/hjhart/torrent_api"
   p.author = "James Hart"

data/lib/demonoid/base.rb

@@ -56,18 +56,18 @@ module Demonoid
 
       demonoid_row = []
       demonoid_table = doc.search('.ctable_content_no_pad table tr')
-      demonoid_table = demonoid_table.select { |row| !(row.search('iframe').count == 1 || row.inner_html =~ /Sponsored links/)}
       demonoid_table.each_with_index do |row, index|
         next if (0..3).include? index # skip the first few rows. It's mostly junk.
         break if index == 154 # end of table
-        
-        demonoid_row << row
-        if index % 3 == 0 # this is the majority of the info
+
+        if row.search('td').count == 9 # the majority of the information is in this tr
+          demonoid_row << row
           result = Demonoid::Result.new(demonoid_row)
-          demonoid_row = []
           @results << result
-        elsif index % 3 == 1 # this contains the date of birth
-        elsif index % 3 == 2 #this contains the title and the cateogyr
+          demonoid_row = []
+        elsif row.search('td').count == 2 # this is a title/category row
+          demonoid_row << row
+        else # this is probably a date created, or some other row.
         end
       end
 

data/lib/demonoid/result.rb

@@ -3,16 +3,14 @@ module Demonoid
     attr_accessor :name, :seeds, :leeches, :category, :link, :magnet_link, :status, :size, :date_created, :detail_link
 
     def initialize(row = [])
-       date_string = row[0].search('.added_today').inner_html.match(/Added on (.*)/)
-       self.date_created = Time.parse(date_string[1]) if date_string
-       self.name = row[1].search('td')[1].search('a').inner_html
-       self.detail_link = row[1].search('td')[1].search('a').first.get_attribute('href')
-       self.link = row[2].search('td')[2].search('a').first.get_attribute('href')
-       self.magnet_link = row[2].search('td')[2].search('a')[1].get_attribute('href')
-       self.seeds = row[2].search('td')[6].search('font').inner_html.to_i
-       self.leeches = row[2].search('td')[7].search('font').inner_html.to_i
+       self.name = row[0].search('td')[1].search('a').inner_html
+       self.detail_link = row[0].search('td')[1].search('a').first.get_attribute('href')
+       self.link = row[1].search('td')[2].search('a').first.get_attribute('href')
+       self.magnet_link = row[1].search('td')[2].search('a')[1].get_attribute('href')
+       self.seeds = row[1].search('td')[6].search('font').inner_html.to_i
+       self.leeches = row[1].search('td')[7].search('font').inner_html.to_i
 
-       raw_filesize =  row[2].search('td')[3].inner_html
+       raw_filesize =  row[1].search('td')[3].inner_html
        self.size = Demonoid::Result.filesize_in_bytes(raw_filesize)
     end
 

data/torrent_api.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{torrent_api}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hart"]
-  s.date = %q{2011-06-24}
+  s.date = %q{2011-06-26}
   s.description = %q{An API to query popular torrent websites}
   s.email = %q{hjhart@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.markdown", "lib/demonoid/base.rb", "lib/demonoid/result.rb", "lib/demonoid/result_set.rb", "lib/pirate_bay/base.rb", "lib/pirate_bay/categories.rb", "lib/pirate_bay/result.rb", "lib/pirate_bay/result_set.rb", "lib/torrent_api.rb", "lib/torrent_reactor/base.rb", "lib/torrent_reactor/result.rb", "lib/torrent_reactor/result_set.rb"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Hart
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -07:00
+date: 2011-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency