torckapi 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0baba0c9a96c4a5d53910a0aa79c8aae7b7700
-  data.tar.gz: ab9bbfc9b647d4d86051b53f2e4f34cc81ece987
+  metadata.gz: af443d831abf10bd6fbedf125e88dc362488fa49
+  data.tar.gz: de96aca388dc814092a9d8a7a20e75c7569f1d06
 SHA512:
-  metadata.gz: 42281cee6c47ef4a9b9bba6dd237cb21610fd2f79049b85e1d2c9fc36a8a9c320f6ebd43b05f76c884b927eae2a32774e64992586aa2d18847854db7c91ce2b5
-  data.tar.gz: 529731b856d62142d9fdddcf5c50ec48a600c3a6bb8bc3ab37bfbc428eadbc336f669e30878de2fbc2594c8624feaef68f1ef9b70a254b12f6d8db8c5ac67984
+  metadata.gz: 2f3202afa722b9ee81318bd7bb6f4bca4b3d15e6421ceacd2265b2ea542cfd634a4c5d1ec34e4689bd5dbd21ef82277aea6f16fcbab389e584467e5e38c2fe98
+  data.tar.gz: 908c4d75b6966cec35789dbd45f0db581dcc92d72ff23bec8fdaf58651089542a63abed32eca39f60d9a672b1c8eccd379fab637f48d98e80fe8abb09bebf881

data/README.md

@@ -1,5 +1,9 @@
 # Torckapi — torrent tracker querying API
 
+[![Gem Version](https://badge.fury.io/rb/torckapi.png)](http://badge.fury.io/rb/torckapi)
+[![Code Climate](https://codeclimate.com/github/krupenik/torckapi.png)](https://codeclimate.com/github/krupenik/torckapi)
+[![Dependency Status](https://gemnasium.com/krupenik/torckapi.png)](https://gemnasium.com/krupenik/torckapi)
+
 ## Description
 
 Torckapi is a querying interface to torrent trackers.

data/lib/torckapi/errors.rb

@@ -7,10 +7,8 @@ module Torckapi
     class InvalidSchemeError < Error; end
     class ConnectionFailedError < Error; end
     class CommunicationError < Error; end
-    class CommunicationTimeoutError < CommunicationError; end
     class CommunicationFailedError < CommunicationError; end
-    class AnnounceFailedError < CommunicationFailedError; end
-    class ScrapeFailedError < CommunicationFailedError; end
+    class CommunicationTimeoutError < CommunicationError; end
   end
 
   module Response

data/lib/torckapi/response/announce.rb

@@ -19,8 +19,6 @@ 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
-        raise ArgumentError, "info_hash cannot be nil" if info_hash.nil?
-        raise ArgumentError, "data cannot be nil" if data.nil?
         new info_hash, *data[4..11].unpack('L>2'), peers_from_compact(data[12..-1] || '')
       end
 
@@ -30,8 +28,6 @@ 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
-        raise ArgumentError, "info_hash cannot be nil" if info_hash.nil?
-        raise ArgumentError, "data cannot be nil" if data.nil?
         bdecoded_data = BEncode.load(data)
         new info_hash, *bdecoded_data.values_at("incomplete", "complete"), peers_from_compact(bdecoded_data["peers"])
       end

data/lib/torckapi/response/error.rb

@@ -14,8 +14,6 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Error] response
       def self.from_udp info_hashes, data
-        raise ArgumentError, "info_hashes cannot be nil" if info_hashes.nil?
-        raise ArgumentError, "data cannot be nil" if data.nil?
         new info_hashes, data
       end
 

data/lib/torckapi/response/scrape.rb

@@ -11,9 +11,7 @@ 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, "info_hashes cannot be nil" if info_hashes.nil?
-        raise ArgumentError, "data cannot be nil" if data.nil?
-        raise ArgumentError, "data size invalid" if data.length != info_hashes.count * 12
+        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)] })]
       end
 

data/lib/torckapi/tracker/udp.rb

@@ -10,6 +10,15 @@ module Torckapi
     class UDP < Base
       CONNECTION_TIMEOUT = 60
 
+      # index = action (connect, announce, scrape, error)
+      # [response class, minimum response length]
+      RESPONSES = [
+        [nil, 16],
+        [Torckapi::Response::Announce, 20],
+        [Torckapi::Response::Scrape, 8],
+        [Torckapi::Response::Error, 8]
+      ].freeze
+
       # (see Base#announce)
       def announce info_hash
         super info_hash
@@ -29,19 +38,11 @@ module Torckapi
         response = communicate action, data
 
         raise CommunicationFailedError if response.nil?
+        action = response[0][0..3].unpack('L>')[0]
+        raise CommunicationFailedError if RESPONSES[action][1] > response[0].length
 
         begin
-          case response[0][0..3].unpack('L>')[0] # action
-          when 1
-            raise AnnounceFailedError if 20 > response[0].length
-            Torckapi::Response::Announce.from_udp(*args, response[0][8..-1])
-          when 2
-            raise ScrapeFailedError if 8 > response[0].length
-            Torckapi::Response::Scrape.from_udp(*args, response[0][8..-1])
-          when 3
-            raise CommunicationFailedError if 8 > response[0].length
-            Torckapi::Response::Error.from_udp(*args, response[0][8..-1])
-          end
+          RESPONSES[action][0].from_udp(*args, response[0][8..-1])
         rescue Torckapi::Response::ArgumentError => e
           $stderr.puts "Error: #{e.inspect}"
           $stderr.puts "Response: #{response.inspect}"

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/torckapi.rb

@@ -1,11 +1,11 @@
 require 'uri'
 require 'torckapi/version'
 require 'torckapi/errors'
-require 'torckapi/tracker/http'
-require 'torckapi/tracker/udp'
 require 'torckapi/response/announce'
 require 'torckapi/response/error'
 require 'torckapi/response/scrape'
+require 'torckapi/tracker/http'
+require 'torckapi/tracker/udp'
 
 module Torckapi
   # Creates a tracker interface instance

metadata

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