tinplate 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd4d09eedc78227f59705e1178ce27d024270fe2
-  data.tar.gz: ac0c1b55d669aad4ca94b24cfec7802aae73ed33
+SHA256:
+  metadata.gz: c1ace4f94bd8263a1891dfb2f30e01a43562e3f1e9bf62cc9ea5bb470d6c05c9
+  data.tar.gz: 245d673949dee9932b2b41f35251c781576398cccf8b89b067278b8e6530346b
 SHA512:
-  metadata.gz: 87de49e77f7b78d21a613390a47443e1b6b44602b64f0faf2fb6dd8dacb184e91b0dc5319f9e47eb4c2dd0f4ce1c76ddf13f08a3927a82652a2684830abf5184
-  data.tar.gz: e1496130dcde0c1484a2adba0f989fe6a6cf087be4c915aaa59ca81d474d7ca3c07bb67c938a9a3773f86b87ee32d5b55056735b5c6a17e927288359ebf82d37
+  metadata.gz: eb5c81720a9d1809323ccb83a4a93c245a2bfb9bccca3b905e1c73748d1292a9afaa1fcd31dd0453aa2bc92fc11dc50ed7e61ae19ac86563337134660fb8f261
+  data.tar.gz: 2b4ab575b33057c1b4342ea633bd6931494d25ff3e662eba751036bab315d6b277dd1df6aff126875e44bc50e750dbabaf590f9b953c27991b532139da6a2946

data/lib/tinplate/errors.rb

@@ -1,20 +1,36 @@
 module Tinplate
   class Error < StandardError
-    def self.from_response(code, type, message)
-      klass = case message
-              when /503 Service Unavailable/          then Tinplate::ServiceUnavailableError
-              when /service is busy due to high load/ then Tinplate::ServiceUnavailableError
-              when /Image too simple/                 then Tinplate::NoSignatureError
-              when /purchase another bundle/          then Tinplate::NoCreditsRemainingError
-              else
-                Tinplate::Error
-              end
+    def self.from_response(code, messages)
+      return UnauthorizedError.new(messages.first) if code == 403
 
-      klass.new(message)
+      messages.each do |message|
+        klass = class_from_message(message)
+        return klass.new(messages.join("\n")) if klass
+      end
+
+      Tinplate::Error.new(messages.join("\n"))
+    end
+
+    def self.class_from_message(message)
+      case message
+        when /503 Service Unavailable/          then Tinplate::ServiceUnavailableError
+        when /service is busy due to high load/ then Tinplate::ServiceUnavailableError
+        when /Image too simple/                 then Tinplate::NoSignatureError
+        when /purchase another bundle/          then Tinplate::NoCreditsRemainingError
+        when /Could not download/               then Tinplate::InaccessibleURLError
+        when /Please supply an image/           then Tinplate::InvalidSearchError
+        when /Error reading image data/         then Tinplate::InvalidImageDataError
+        when /Too many concurrent requests/     then Tinplate::TooManyRequestsError
+      end
     end
   end
 
   class ServiceUnavailableError < Error; end
   class NoSignatureError < Error; end
   class NoCreditsRemainingError < Error; end
-end
+  class UnauthorizedError < Error; end
+  class InaccessibleURLError < Error; end
+  class InvalidSearchError < Error; end
+  class InvalidImageDataError < Error; end
+  class TooManyRequestsError < Error; end
+end

data/lib/tinplate/tineye.rb

@@ -55,7 +55,7 @@ module Tinplate
       response = ::JSON.parse(response.body)
 
       if response["code"] != 200
-        raise Tinplate::Error.from_response(response["code"], response["messages"][0], response["messages"][1])
+        raise Tinplate::Error.from_response(response["code"], response["messages"])
       end
 
       response

data/lib/tinplate/version.rb

@@ -1,3 +1,3 @@
 module Tinplate
-  VERSION = "2.1.0"
+  VERSION = "2.1.3"
 end

data/lib/tinplate.rb

@@ -4,7 +4,6 @@ require "json"
 require "tinplate/version"
 require "tinplate/configuration"
 require "tinplate/tineye"
-require "tinplate/request_authenticator"
 require "tinplate/search_results"
 require "tinplate/errors"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinplate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Aaron Klaassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -128,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A wrapper around the TinEye API.