tinplate 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e93f8f4d2f05ea8d7ae8cdfa3e002a49d6cf84c2bdb91dfcaa1a8daaa64bc4
-  data.tar.gz: 84ef0144e226efb3bf0ec58ce3727651e6a165de6a0b29dc69e508c830e3bd24
+  metadata.gz: 6c74f1bc36e6e016c34542b3ec3b489566d8f72a176945428ab7976cd9043524
+  data.tar.gz: 7b3c0d39b2332801d355b4b38ddc2c5cbdd96c5c99430e38700253d5c743f8fd
 SHA512:
-  metadata.gz: d6c9ebfcedf2ad635f866db6425e8501eb07a9f2ece2051b8ebe31d5752f31def2ac0c91343d4c89a225e93c6cc76a610946fec88758fda17ce1704f20e78d9c
-  data.tar.gz: abfddee5e25022fb25129e24a288a236b9c77aeeb09a978f1d7d02a4faa4abe1d7f6524f4794aa6d2521f151c35819710ae0248f7195aad86cdf712d134f3a2e
+  metadata.gz: '03899e5fbb07db090225c108c9c6a5db00ba4801819d405a174069e4a9a2dcfccc00ac344c42db806050dca3e124fbf9b29f9db57a8a741ef63700ed81fd72d2'
+  data.tar.gz: ac14fe344b6c537f8daacc3a9afe0d581e34c4a21bdd9188b02681c317126d233c4b33e6b06f7bb9186c18fd7d26cbcaf340f9cd83045532b03864cf70d8e442

data/lib/tinplate/errors.rb

@@ -1,20 +1,34 @@
 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
+      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
+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.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinplate
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Aaron Klaassen
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - aaron@unsplash.com
 executables: []
@@ -113,7 +113,7 @@ homepage: https://github.com/unsplash/tinplate
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A wrapper around the TinEye API.
 test_files: []