torckapi 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca36f5eb458537d0180530ca4c499fd1463825d
-  data.tar.gz: f41250059a73d19bbc6d3b09b9c98ed721ba3854
+  metadata.gz: 2de6d595520b549bc5037203130531b17d001eb0
+  data.tar.gz: ce7fd8f6589710c14c4d078e3429418f03bc869d
 SHA512:
-  metadata.gz: a2cf422fceb42b235e17be8374355aa11e9b20ae4a86e4ad13194c60d76e5fa1b80ca203153ccb278edd25407655a998a1ceeec836fbdd652f004b536949b3d7
-  data.tar.gz: 83a83ce580aef1b5b030f7c945a061691dabaecc704881c4ca7eebf91a805b65682c69492350b00c0c690ac9b61f8bc4a89e3e3347da186e4a3260afffbaeca8
+  metadata.gz: 854bc8b226f4def7aa869860e730c946f54004a0773cbcbca6cdd967242edfa2d2eed537bcf0e9b917170753f9217c6cfd18b3194b91664cf344651810ef1184
+  data.tar.gz: cfda3433018c2178e719dd27c44feeeac68e60f1ac5ea57213438488613fb4b988ce93bc55854e7df3e17677aab19c1439b32e23d2a4c6862543fff4b1e60e0a

data/lib/torckapi/response/announce.rb

@@ -19,11 +19,7 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Announce] response
       def self.from_udp info_hash, data
-        return new(info_hash, nil, nil, []) unless data
-
-        leechers, seeders = data[0..7].unpack('L>2')
-
-        new info_hash, leechers, seeders, peers_from_compact(data[8..-1])
+        new info_hash, *data[4..11].unpack('L>2'), peers_from_compact(data[12..-1])
       end
 
       # Construct response object from http response data
@@ -32,12 +28,8 @@ module Torckapi
       # @param compact [true, false] is peer data in compact format?
       # @return [Torckapi::Response::Announce] response
       def self.from_http info_hash, data, compact=true
-        return new(info_hash, nil, nil, []) unless data
-
         bdecoded_data = BEncode.load(data)
-        leechers, seeders = bdecoded_data.values_at("incomplete", "complete")
-
-        new info_hash, leechers, seeders, peers_from_compact(bdecoded_data["peers"])
+        new info_hash, *bdecoded_data.values_at("incomplete", "complete"), peers_from_compact(bdecoded_data["peers"])
       end
 
       private

data/lib/torckapi/response/error.rb

@@ -0,0 +1,26 @@
+module Torckapi
+  module Response
+    class Error
+      # @!attribute [r] info_hash
+      #   @return [String] 40-char hexadecimal string
+      # @!attribute [r] message
+      #   @return [String] error description
+      attr_reader :info_hash, :message
+
+      # Construct response object from udp response data
+      # @param info_hash [String] 40-char hexadecimal string
+      # @param data [String] UDP response data (omit action and transaction_id)
+      # @return [Torckapi::Response::Error] response
+      def self.from_udp info_hash, data
+        new info_hash, data
+      end
+
+      private
+
+      def initialize info_hash, message
+        @info_hash = info_hash
+        @message = message
+      end
+    end
+  end
+end

data/lib/torckapi/response/scrape.rb

@@ -11,8 +11,6 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Scrape] response
       def self.from_udp info_hashes, data
-        return new({}) unless data
-
         new Hash[info_hashes.zip(data.unpack('a12' * (info_hashes.count)).map { |i| Hash[[:seeders, :completed, :leechers].zip i.unpack('L>3').map(&:to_i)] })]
       end
 
@@ -23,4 +21,4 @@ module Torckapi
       end
     end
   end
-end
+end

data/lib/torckapi/tracker/base.rb

@@ -5,16 +5,16 @@ module Torckapi
     class Base
       # Announce Request
       # @param info_hash [String] 40-char hexadecimal string
-      # @return [Torckapi::AnnounceResponse] a response object
+      # @return [Torckapi::Response::Announce] a response object
       def announce info_hash
         raise Torckapi::InvalidInfohashError if info_hash !~ /\A[0-9a-f]{40}\z/i
       end
 
       # Scrape Request
-      # @param info_hashes [String, Array<String>] A single 40-char hexadecimal string or an array of those
-      # @return [Torckapi::ScrapeResponse] a response object
+      # @param info_hashes [Array<String>] An array of 40-char hexadecimal strings
+      # @return [Torckapi::Response::Scrape] a response object
       def scrape info_hashes=[]
-        raise Torckapi::InvalidInfohashError if [*info_hashes].any? { |i| i !~ /\A[0-9a-f]{40}\z/i }
+        raise Torckapi::InvalidInfohashError if info_hashes.any? { |i| i !~ /\A[0-9a-f]{40}\z/i }
       end
 
       private

data/lib/torckapi/tracker/http.rb

@@ -11,11 +11,12 @@ module Torckapi
         super info_hash
 
         @url.query ||= ""
-        @url.query += "info_hash=%s&num_want=500" % URI.encode([info_hash].pack('H*'))
+        @url.query += "info_hash=%s" % URI.encode([info_hash].pack('H*'))
 
         Torckapi::Response::Announce.from_http info_hash, Net::HTTP.get(@url)
       end
 
+      # (see Base#scrape)
       def scrape info_hashes=[]
         super info_hashes
 

data/lib/torckapi/tracker/udp.rb

@@ -10,30 +10,41 @@ module Torckapi
     class UDP < Base
       CONNECTION_TIMEOUT = 60
 
-      # @see Base#announce
+      # (see Base#announce)
       def announce info_hash
         super info_hash
-
-        data = [[info_hash].pack('H*'), SecureRandom.random_bytes(20), [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4S>')].join
-
-        connect
-        response_body = communicate(1, data)[0] # announce
-
-        Torckapi::Response::Announce.from_udp info_hash, response_body[12..-1]
+        perform_request 1, announce_request_data(info_hash), info_hash
       end
 
+      # (see Base#scrape)
       def scrape info_hashes=[]
         super info_hashes
+        perform_request 2, scrape_request_data(info_hashes), info_hashes
+      end
 
-        data = [*info_hashes].map { |i| [i].pack('H*') }.join
+      private
 
+      def perform_request action, data, *args
         connect
-        response_body = communicate(2, data)[0] # scrape
+        response = communicate action, data
+
+        case response[0][0..3].unpack('L>')[0] # action
+        when 1
+          Torckapi::Response::Announce.from_udp(*args, response[0][8..-1])
+        when 2
+          Torckapi::Response::Scrape.from_udp(*args, response[0][8..-1])
+        when 3
+          Torckapi::Response::Error.from_udp(*args, response[0][8..-1])
+        end
+      end
 
-        Torckapi::Response::Scrape.from_udp [*info_hashes], response_body[8..-1]
+      def announce_request_data info_hash
+        [[info_hash].pack('H*'), SecureRandom.random_bytes(20), [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4S>')].join
       end
 
-      private
+      def scrape_request_data info_hashes
+        info_hashes.map { |i| [i].pack('H*') }.join
+      end
 
       def connect
         return if @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
@@ -56,7 +67,6 @@ module Torckapi
             @socket.send(packet, 0, @url.host, @url.port)
             response = @socket.recvfrom(65536)
             raise TransactionIdMismatchError if transaction_id != response[0][4..7]
-            raise Torckapi::Tracker::Error.new(response[8..-1]) if 3 == response[0][0..3].unpack('L>')[0] # tracker sent error
             @communicated_at = Time.now
           end
         rescue CommunicationTimeoutError

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dennis Krupenik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,7 @@ files:
 - lib/torckapi.rb
 - lib/torckapi/errors.rb
 - lib/torckapi/response/announce.rb
+- lib/torckapi/response/error.rb
 - lib/torckapi/response/scrape.rb
 - lib/torckapi/tracker/base.rb
 - lib/torckapi/tracker/http.rb