torckapi 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979d317e486ddd5e74790d41d1f987a637eb12ef
-  data.tar.gz: 9a46f9e9944e82e5087e026c1feab81801e94922
+  metadata.gz: 146de8f36529a36d19b6c31bf0cc3db2e4df945b
+  data.tar.gz: 632d8cbb3b34f871a593caf454044cc45d913417
 SHA512:
-  metadata.gz: acffe09aa8a0c9170b82e6d8d96c1b0fb03ee6c24369353941447e8aa748f49e3d5bcc160a3c1c3a16883155f24eb97c9ffdd3d2185b459b33eb0fa2d881bf85
-  data.tar.gz: 7556ff3679e20b19aded7e54cccc42f1458433d2de7f88ecdd96ef8d4984698daf6ecfc76680294899c7b31ce7ba111578c6b2a9bf9fccb0dac6309be0831279
+  metadata.gz: df12478369270ec572cc28e5faa599aa2f1adcfce84d89830d562dfced6d391af7529e62db2f953521d6e612f188a9f3c8ff3dd53d24440dd7c6a5540c217107
+  data.tar.gz: f507f6057952a51ed1e6858e51d9fe32ff0ba8ad7238f8e9febe42be5be12e0e92f80bda239e2d35e98767a7c95cf8468fab4dff6f21dc518489554b930a99f1

data/lib/torckapi/tracker/http.rb

@@ -5,32 +5,41 @@ module Torckapi
   module Tracker
 
     class HTTP < Base
+      REQUEST_ACTIONS = [Announce = 1, Scrape = 2].freeze
 
       # (see Base#announce)
       def announce info_hash
         super info_hash
-        @url.query += info_hash_params [info_hash]
-
-        Torckapi::Response::Announce.from_http info_hash, Net::HTTP.get(@url)
+        Torckapi::Response::Announce.from_http(info_hash, perform_request(url_for(@url.dup, Announce, info_hash)))
       end
 
       # (see Base#scrape)
       def scrape info_hashes=[]
         super info_hashes
-        @url.query += info_hash_params info_hashes
-        @url.path.gsub!(/announce/, 'scrape')
-
-        Torckapi::Response::Scrape.from_http Net::HTTP.get(@url)
+        Torckapi::Response::Scrape.from_http(perform_request(url_for(@url.dup, Scrape, info_hashes)))
       end
 
       private
 
       def initialize url, options={}
         super url, options
-
         @url.query ||= ""
       end
 
+      def url_for url, action, data
+        url.query += info_hash_params [*data]
+        url.path.gsub!(/announce/, 'scrape') if Scrape == action
+        url
+      end
+
+      def perform_request url
+        begin
+          Net::HTTP.get(url)
+        rescue Errno::ECONNRESET, Errno::ETIMEDOUT, Timeout::Error
+          raise CommunicationFailedError
+        end
+      end
+
       def info_hash_params info_hashes
         info_hashes.map { |i| "info_hash=%s" % URI.encode([i].pack('H*')) }.join('&')
       end

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Dennis Krupenik