torckapi 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521381cc5f7043c7b0895498adb494875ab07247
-  data.tar.gz: 0d7a63fd41723fc794232936489e56fac2fd7d87
+  metadata.gz: 979d317e486ddd5e74790d41d1f987a637eb12ef
+  data.tar.gz: 9a46f9e9944e82e5087e026c1feab81801e94922
 SHA512:
-  metadata.gz: 6854a5a7625fd0b28ec785702eccb9e8a789491056f2c2ea1767f92567d30c86a11b655f4a45f18235a249037a7e902f6f1d605cc0746e610f3c992f0437d2dc
-  data.tar.gz: 8a52f192ad8183ce3795824a3c86da5235daf89c0691efa7a2acc3c189aa97aa661891ad7352ea43d3a28b8ed067fd448fa1753b9dd7880ff19880246ff08f6e
+  metadata.gz: acffe09aa8a0c9170b82e6d8d96c1b0fb03ee6c24369353941447e8aa748f49e3d5bcc160a3c1c3a16883155f24eb97c9ffdd3d2185b459b33eb0fa2d881bf85
+  data.tar.gz: 7556ff3679e20b19aded7e54cccc42f1458433d2de7f88ecdd96ef8d4984698daf6ecfc76680294899c7b31ce7ba111578c6b2a9bf9fccb0dac6309be0831279

data/lib/torckapi/errors.rb

@@ -1,6 +1,7 @@
 module Torckapi
   class Error < StandardError; end
   class InvalidInfohashError < Error; end
+  class ArgumentError < Error; end
 
   module Tracker
     class Error < Torckapi::Error; end
@@ -12,9 +13,4 @@ module Torckapi
     class MalformedResponseError < CommunicationError; end
     class TransactionIdMismatchError < CommunicationError; end
   end
-
-  module Response
-    class Error < Torckapi::Error; end
-    class ArgumentError < Error; end
-  end
 end

data/lib/torckapi/response/error.rb

@@ -10,7 +10,7 @@ module Torckapi
       attr_reader :info_hash, :info_hashes, :message
 
       # Construct response object from udp response data
-      # @param info_hash [String] 40-char hexadecimal string
+      # @param info_hashes [String, Array<String>] a 40-char hexadecimal string or an array of those
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Error] response
       def self.from_udp info_hashes, data

data/lib/torckapi/response/scrape.rb

@@ -1,3 +1,5 @@
+require 'bencode'
+
 module Torckapi
   module Response
 
@@ -11,12 +13,30 @@ 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
-        raise ArgumentError, "data does not match info_hashes" if data.length != info_hashes.count * 12
-        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)] })]
+        raise Torckapi::ArgumentError, "data does not match info_hashes" if data.length != info_hashes.count * 12
+        new Hash[info_hashes.zip(data.unpack('a12' * info_hashes.count).map { |i| counts_unpacked(i) })]
+      end
+
+      def self.from_http data
+        bdecoded_data = BEncode.load(data)
+        raise Torckapi::ArgumentError, "invalid data" unless bdecoded_data.is_a? Hash and bdecoded_data.has_key? 'files'
+        new Hash[bdecoded_data["files"].map { |info_hash, counts| [info_hash.unpack('H*').join, counts_translated(counts) ]}]
       end
 
       private
 
+      def self.counts_unpacked data
+        counts_with_block(data, lambda { |data| data.unpack('L>3').map(&:to_i) })
+      end
+
+      def self.counts_translated data
+        counts_with_block(data, lambda { |data| data.values_at("complete", "downloaded", "incomplete") })
+      end
+
+      def self.counts_with_block data, block
+        Hash[[:seeders, :completed, :leechers].zip(block.call(data))]
+      end
+
       def initialize data
         @data = data
       end

data/lib/torckapi/tracker/http.rb

@@ -9,9 +9,7 @@ module Torckapi
       # (see Base#announce)
       def announce info_hash
         super info_hash
-
-        @url.query ||= ""
-        @url.query += "info_hash=%s" % URI.encode([info_hash].pack('H*'))
+        @url.query += info_hash_params [info_hash]
 
         Torckapi::Response::Announce.from_http info_hash, Net::HTTP.get(@url)
       end
@@ -19,11 +17,23 @@ module Torckapi
       # (see Base#scrape)
       def scrape info_hashes=[]
         super info_hashes
+        @url.query += info_hash_params info_hashes
+        @url.path.gsub!(/announce/, 'scrape')
 
-        raise NotImplementedError
+        Torckapi::Response::Scrape.from_http Net::HTTP.get(@url)
       end
 
       private
+
+      def initialize url, options={}
+        super url, options
+
+        @url.query ||= ""
+      end
+
+      def info_hash_params info_hashes
+        info_hashes.map { |i| "info_hash=%s" % URI.encode([i].pack('H*')) }.join('&')
+      end
     end
   end
 end

data/lib/torckapi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Dennis Krupenik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake