pirata 0.1.5 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGM4OTE0MTc4MTNhNWQwOWM1NGViMjRhZWZlYTVjYzk4NjkzZmQyMQ==
-  data.tar.gz: !binary |-
-    OTY5YzNhZTU2ODU0OTZmZWM3ODQyYjk1NzhlMjRhMzA5MjI5OTdhYw==
+SHA1:
+  metadata.gz: 1560be96fd8d128cca19f40579ee6e32d4cf545a
+  data.tar.gz: 6625a8d7d1974015049313e0c6cf9f5de99d6706
 SHA512:
-  metadata.gz: !binary |-
-    ZmUyM2E3NjNkYzUxMGRlOWViNTgwMjIzYTE5YTA5MzNiNjIzODZjOWMwYmYy
-    OTFiZjUyNzhkM2NhMmY1MGEzM2Y0OTc3Y2MyMDdiNzk0NGY3NmMwMGM0Mzcw
-    OGNlMmQyMWE5MTkwNjA2ZDYwNDMwN2ExMzEzZjA2YzhmZDY3ODU=
-  data.tar.gz: !binary |-
-    YjMxZjYzZDAyMDcxNjUyYzQ3ODFlNDEzNmNlNmNiNzVlMzM3OTdhYzI0MjVl
-    ZDUyOTQ5MDU3MWY3ZmEzYTcyZjg4ZGU1OGRmZjM4Y2M3OWI0NzUxNzliODk2
-    MjFjZTRkYzVhYTA4MmYzMGQ1NTZmOWRkZTcyODU1ZWE1YzVkZDY=
+  metadata.gz: 7810208447957abe600a601183d08475f4a58a1969cfeadf9bd846345f1349b130ffa9dd702bfa651187b35364f41ca4297e2a87f7401ef33101573cf69e76ca
+  data.tar.gz: 9621488683654876273b67761aeb2e255b0ad846a5b2b3129a80f0319abe1aae83032fd00cfc272acb4639f2ae46e668abc856c9de0b59527f70001eb019948d

data/lib/pirata/config.rb

@@ -1,6 +1,6 @@
 module Pirata
   module Config
-    
+
     # This is the base URL to query against. Depending on server/mirror
     # availability, blocked URLs, etc, you may need to change this. A
     # list of available mirrors for ThePirateBay may be found at
@@ -9,8 +9,15 @@ module Pirata
     # Note that all URLs should yeild the same results. You are advised
     # to pick a mirror that is closest to your application server for best
     # results though.
-    
-    BASE_URL = "http://thepiratebay.si"
-    
+
+    BASE_URL = "http://thepiratebay.mn"
+
+    # This is the rule used when following HTTPS <-> HTTP redirects.
+    # It accepts :all and :safe
+    # :safe will allow HTTP -> HTTPS redirections
+    # :all will allow both HTTP -> HTTPS redirections as well as HTTPS -> HTTP
+
+    REDIRECT = :all
+
   end
-end
+end

data/lib/pirata/search.rb

@@ -1,17 +1,18 @@
 require 'nokogiri'
+require 'open_uri_redirections'
 require 'open-uri'
-require 'torrent'
-require 'user'
-require 'category'
-require 'sort'
-require 'config'
+require 'pirata/config'
+require 'pirata/torrent'
+require 'pirata/user'
+require 'pirata/category'
+require 'pirata/sort'
 
 module Pirata
   class Search
-    
+
     attr_accessor :results, :pages
     attr_reader :category, :sort_type, :query
-        
+
     def initialize(query, sort_type = Pirata::Sort::RELEVANCE, categories = ["0"])
       @sort_type = sort_type
       @category = categories.join(',')
@@ -19,58 +20,60 @@ module Pirata
       @query = query
       @results = search()
     end
-    
+
     # Perform a search and return an array of Torrent objects
     def search(page = 0)
       #build URL ex: http://thepiratebay.se/search/cats/0/99/0
       url = Pirata::Config::BASE_URL + "/search/#{URI.escape(@query)}" + "/#{page.to_s}" + "/#{@sort_type}" + "/#{@category}"
-      html = Nokogiri::HTML(open(url))
+      html = Nokogiri::HTML(open(url, :allow_redirections => Pirata::Config::REDIRECT))
       Pirata::Search::parse_search_page(html, self)
     end
-    
+
     # Return the n page results of a search, assuming it is multipage
   def search_page(page)
       raise "Search must be multipage to search pages" if !multipage?
       raise "Page must be a valid, positive integer" if page.class != Fixnum || page < 0
       raise "Invalid page range" if page > @pages
-        
+
       self.search(page)
     end
-    
+
     # Return the n most recent torrents from a category
     # Searches all categories if none supplied
     def self.top(category = "all")
-      html = Nokogiri::HTML(open(Pirata::Config::BASE_URL + '/top/' + URI.escape(category)))
+      url = Pirata::Config::BASE_URL + '/top/' + URI.escape(category)
+      html = Nokogiri::HTML(open(url, :allow_redirections => Pirata::Config::REDIRECT))
       Pirata::Search::parse_search_page(html)
     end
-    
+
     # Return an array of the 30 most recent Torrents
     def self.recent
-      html = Nokogiri::HTML(open(Pirata::Config::BASE_URL + '/recent'))
+      url = Pirata::Config::BASE_URL + '/recent'
+      html = Nokogiri::HTML(open(url, :allow_redirections => Pirata::Config::REDIRECT))
       Pirata::Search::parse_search_page(html)
     end
-      
+
     def multipage?
       @pages > 0
     end
-      
+
     private #---------------------------------------------
-    
+
     # From a results table, collect and build all Torrents
     # into an array
     def self.parse_search_page(html, search_object = nil)
       results = []
-      
-      begin 
+
+      begin
         search_object.pages = html.css('#content div a')[-2].text.to_i
       rescue
-      end  
-      
+      end
+
       html.css('#searchResult tr').each do |row|
         title = row.search('.detLink').text
         next if title == ''
         h = {}
-        
+
         begin
           h[:title]       = title
           h[:category]    = row.search('td a')[0].text
@@ -88,6 +91,6 @@ module Pirata
       end
       results
     end
-    
+
   end
 end

data/lib/pirata/torrent.rb

@@ -1,118 +1,123 @@
 require 'nokogiri'
 require 'open-uri'
+require 'open_uri_redirections'
 require 'time'
-require 'config'
+require 'pirata/config'
 
 module Pirata
   class Torrent
 
+    attr_reader :title
+
     def initialize(params_hash)
       @params = params_hash
+      @title = params_hash[:title]
     end
-    
-    def title
-      @params[:title]
-    end
-    
+
+    # def title
+    #   @params[:title]
+    # end
+
     def category
       @params[:category]
     end
-    
+
     def title
       @params[:title]
     end
-    
+
     def url
       @params[:url]
     end
-    
+
     def id
       @params[:id]
     end
-    
+
     def magnet
       unless @params[:magnet]
         update_params
       end
       @params[:magnet]
     end
-    
+
     def seeders
       unless @params[:seeders]
         update_params
       end
       @params[:seeders]
     end
-    
+
     def leechers
       unless @params[:leechers]
         update_params
       end
       @params[:leechers]
     end
-    
+
     def uploader
       unless @params[:uploader]
         update_params
       end
       @params[:uploader]
     end
-    
+
     def files
       unless @params[:files]
         update_params
       end
       @params[:files]
     end
-    
+
     def size
       unless @params[:size]
         update_params
       end
       @params[:size]
     end
-    
+
     def date
       unless @params[:date]
         update_params
       end
       @params[:date]
     end
-    
+
     def comments
       unless @params[:comments]
         update_params
       end
       @params[:comments]
     end
-    
+
     def hash
       unless @params[:hash]
         update_params
       end
       @params[:hash]
     end
-           
+
     # Return a Torrent object from a corresponding ID
     def self.find_by_id(id)
       raise "Invalid torrent ID format. Must be an integer" if id.class != Fixnum
-      html = Nokogiri::HTML(open(Pirata::Config::BASE_URL + "/torrent" + "/#{URI.escape(id.to_s)}"))
+      url = Pirata::Config::BASE_URL + "/torrent" + "/#{URI.escape(id.to_s)}"
+      html = Nokogiri::HTML(open(url, :allow_redirections => Pirata::Config::REDIRECT))
       results_hash = parse_torrent_page(html)
       Pirata::Torrent.new(results_hash)
     end
-    
+
     def update_params
-      html = Nokogiri::HTML(open(@params[:url]))
+      html = Nokogiri::HTML(open(@params[:url], :allow_redirections => Pirata::Config::REDIRECT))
       updated_params = Pirata::Torrent.parse_torrent_page(html)
       @params.merge!(updated_params)
     end
-    
+
     private #-------------------------------------------------
-    
+
     def self.parse_torrent_page(html)
       if html.css("#err").text.include?("404")
         raise "No torrent for supplied ID found"
-      else        
+      else
         row = html.css('#detailsframe').first
         h = {
           :title     => row.search('#title')[0].text.strip,
@@ -130,6 +135,6 @@ module Pirata
       end
       nil
     end
-        
+
   end
-end
+end

data/lib/pirata/user.rb

@@ -1,18 +1,18 @@
-require 'config'
+require 'pirata/config'
 
 module Pirata
   class User
-    
+
     attr_reader :profile_url, :username
-    
+
     def initialize(username)
       @username = username
-      @profile_url = "#{Pirata::Config::BASE_URL}/user/#{@username}" 
+      @profile_url = "#{Pirata::Config::BASE_URL}/user/#{@username}"
     end
-    
+
     def to_s
-      @username  
+      @username
     end
-     
+
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pirata
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Colin Lindsay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: open_uri_redirections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: A Ruby gem that exposes an API for using The Pirate Bay torrent tracker
   service.
 email: clindsay107@gmail.com
@@ -49,17 +63,17 @@ require_paths:
 - lib/pirata
 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.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Pirata - a Ruby API for The Pirate Bay