t411 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf86e54528a1bc67ef08542b86d6812632ac91ff
-  data.tar.gz: 7a0d798a575eb467c74c1be400ade8ffbdf6817e
+  metadata.gz: 1efd77610ac402fe8352e9eea5b43a047dc409ca
+  data.tar.gz: 0c5d20775e48acf4683ac574e0957204eec9ae9a
 SHA512:
-  metadata.gz: 47940e18813603eacbe3c760569a63de3e216454ed78599f390f9aa81748104bc36e6b6e15d92a1afbf720ad1d2a14d532434aa5d1aca2f913da0fc537c966e4
-  data.tar.gz: 13bf4117b713043b39289dd2376128b0085a81de1df1f33407f4f3e39c46cdd9455d1c2dca1f6c0efc298af5c224c985cd97a84ea06c14c535627b98fa9b6db7
+  metadata.gz: 72f682306353b36f149290f7dfd87be047fbdec2dbfed2823d67b3839e8d2e169766663fd8f69f8bb39b1212a774dbf8d40793bc4fa6ab5de6ed79ef8a9c29e5
+  data.tar.gz: 3f8736ca236c9550d68c077e4ec0347da42eb574a7822f88c259f2a93fa57b8f66911956481bc91da7cf8404f0fd674e251111a3805191849efe4fd2fed2c550

data/README.md

@@ -45,13 +45,15 @@ Get all terms
      {"234":{"11":{"type":"Application - Genre","mode":"single","terms":{"152":"Contr\u00f4le parental","184":"Science","1062":"Permis","163":"G\u00e9n\u00e9alogie","131":"Anonymat","174":"Nettoyage et Opti
 
 #### Search
-Search a torrent based on name, limit is optional. Default = 100
+Search a torrent based on name, limit and category id are optional. Default limit = 100
 
-     T411::Torrents.search('debian',25)
+     T411::Torrents.search('debian', limit: 25)
      {"query":"debian","offset":0,"limit":"25","total":"13","torrents":[{"id":"4856719","name":"Debian 7.0 - \"Wheezy\" - amd64-netinst LITE","category":"234","rewritename":"debian-7-0-wheezy-amd64-netinst-
 
-     T411::Torrents.search_with_category_id('debian',234)
-     {"query":"debian","offset":0,"limit":"50","total":"9","torrents":[{"id":"4856719","name":"Debian 7.0 - \"Wheezy\" - amd64-netinst LITE","category":"234","rewritename":"debian-7-0-wheezy-amd64-netinst-l
+     T411::Torrents.search('debian', cid: 234)
+     {"query":"debian","offset":0,"limit":"100","total":"9","torrents":[{"id":"4856719","name":"Debian 7.0 - \"Wheezy\" - amd64-netinst LITE","category":"234","rewritename":"debian-7-0-wheezy-amd64-netinst-l
+
+     T411::Torrents.search('debian', cid: 234, limit: 10)
 
 #### Details
 Details of a torrent
@@ -72,6 +74,8 @@ Download the torrent file. Path is optional, default = current working directory
 
      T411::Torrents.month
 
+     T411::Torrents.week
+
 ### Bookmarks
 
 #### Save

data/lib/t411/torrents.rb

@@ -6,20 +6,15 @@ module T411
       define_method(:"#{request}") {T411::Api.request_data(URI.parse($t411_base_url + "/#{request}/tree"))}
     end
 
-    def self.search(query, limit = 100)
-      uri = URI.join($t411_base_url, '/torrents/','search/',"#{query.gsub(' ','+')}","?&limit=#{limit}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      req = Net::HTTP::Get.new("/torrents/search/#{query.gsub(' ','+')}?&limit=#{limit}")
-      req['Authorization'] = T411::Api.shared_token
-      http.request(req).body
+    %w(today week month top100).each do |request|
+      define_method(:"#{request}") {T411::Api.request_data(URI.parse($t411_base_url + "/torrents/top/#{request.gsub('top100','100')}"))}
     end
 
-    def self.search_with_category_id(query,cid,limit = 100)
-      uri = URI.join($t411_base_url, '/torrents/','search/',"#{query.gsub(' ','+')}","?&cid=#{cid}&limit=#{limit}")
-      http = Net::HTTP.new(uri.host, uri.port)
-      req = Net::HTTP::Get.new("/torrents/search/#{query.gsub(' ','+')}?&cid=#{cid}&limit=#{limit}")
-      req['Authorization'] = T411::Api.shared_token
-      http.request(req).body
+    def self.search(query, options={})
+      options = {limit: 100, cid: nil}.merge(options)
+      path = "/torrents/search/#{query.gsub(' ','+')}?&limit=#{options[:limit]}&cid=#{options[:cid]}" if options[:cid] != nil && options[:cid].is_a?(Integer) || "/torrents/search/#{query.gsub(' ','+')}?&limit=#{options[:limit]}"
+      req = Net::HTTP::Get.new(path); req['Authorization'] = T411::Api.shared_token
+      Net::HTTP.new($t411_base_url.gsub('http://','')).request(req).body
     end
 
     def self.details(id)
@@ -32,15 +27,7 @@ module T411
       end
     end
 
-    def self.top100
-      T411::Api.request_data(URI.parse($t411_base_url + '/torrents/top/100'))
-    end
-
-    %w(today month).each do |request|
-      define_method(:"#{request}") {T411::Api.request_data(URI.parse($t411_base_url + "/torrents/top/#{request}"))}
-    end
   end
 end
 
 
-

data/lib/t411/version.rb

@@ -1,3 +1,3 @@
 module T411
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t411
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christophe Augello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler