torckapi 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146de8f36529a36d19b6c31bf0cc3db2e4df945b
-  data.tar.gz: 632d8cbb3b34f871a593caf454044cc45d913417
+  metadata.gz: dba9414160066c19b9561d9b2e9b2740164b4ccd
+  data.tar.gz: 5b9a310aa5397565fa4fcf88024f218d7b83aebc
 SHA512:
-  metadata.gz: df12478369270ec572cc28e5faa599aa2f1adcfce84d89830d562dfced6d391af7529e62db2f953521d6e612f188a9f3c8ff3dd53d24440dd7c6a5540c217107
-  data.tar.gz: f507f6057952a51ed1e6858e51d9fe32ff0ba8ad7238f8e9febe42be5be12e0e92f80bda239e2d35e98767a7c95cf8468fab4dff6f21dc518489554b930a99f1
+  metadata.gz: 8dc4126661eca699ff3f6d1a8aa54eb6bade43abd7d1513a2811ee5d3bd11f5655fb736246e67b3791d90a513bdd282686bef951cf505a97243a6ad3c207224a
+  data.tar.gz: 92905271cfba39a8e38927f7eceb9ae7c42d48018c044e61ea6fde597dbf0360b8bcce1f7357aa5cecac6c1522c1be4cdae9011b185469a1cd70fad8544ab5dd

data/lib/torckapi/errors.rb

@@ -1,7 +1,6 @@
 module Torckapi
   class Error < StandardError; end
   class InvalidInfohashError < Error; end
-  class ArgumentError < Error; end
 
   module Tracker
     class Error < Torckapi::Error; end

data/lib/torckapi/response/announce.rb

@@ -29,7 +29,8 @@ module Torckapi
       # @return [Torckapi::Response::Announce] response
       def self.from_http info_hash, data, compact=true
         bdecoded_data = BEncode.load(data)
-        new info_hash, *bdecoded_data.values_at("incomplete", "complete"), peers_from_compact(bdecoded_data["peers"])
+        raise Torckapi::MalformedResponseError unless bdecoded_data.is_a? Hash and bdecoded_data.has_key? 'peers'
+        new info_hash, *bdecoded_data.values_at("incomplete", "complete"), peers_from_compact(bdecoded_data['peers'])
       end
 
       private

data/lib/torckapi/response/scrape.rb

@@ -13,13 +13,13 @@ 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 Torckapi::ArgumentError, "data does not match info_hashes" if data.length != info_hashes.count * 12
+        raise Torckapi::MalformedResponseError 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'
+        raise Torckapi::MalformedResponseError 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
 

data/lib/torckapi/version.rb

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

metadata

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