tinplate 2.0.2 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e646b162936b034d5e402b3c47957942019644a844c40ce643ce8606355b366
-  data.tar.gz: fb30461669218584c80330b21b1de6f0abb88686d687c2fef151a3bcbe573e66
+  metadata.gz: 6c74f1bc36e6e016c34542b3ec3b489566d8f72a176945428ab7976cd9043524
+  data.tar.gz: 7b3c0d39b2332801d355b4b38ddc2c5cbdd96c5c99430e38700253d5c743f8fd
 SHA512:
-  metadata.gz: 20a758012a6f63ad26b536f5f8fe3b9efd96bf43febc8f9ee11dec11c2f66245ec6280e6989549fca37521a8ac69087cebb4b10dad6198018d27e6f9143a93ac
-  data.tar.gz: da05c621d15de702343f62173df7f96e874b0ca3dfc0fa951403ec30648cf0d8d3f976335aa8b4f39a90ba63c95fa561f799f4a764b0e8c11d2af4a0bfdc67b4
+  metadata.gz: '03899e5fbb07db090225c108c9c6a5db00ba4801819d405a174069e4a9a2dcfccc00ac344c42db806050dca3e124fbf9b29f9db57a8a741ef63700ed81fd72d2'
+  data.tar.gz: ac14fe344b6c537f8daacc3a9afe0d581e34c4a21bdd9188b02681c317126d233c4b33e6b06f7bb9186c18fd7d26cbcaf340f9cd83045532b03864cf70d8e442

data/Gemfile

@@ -1,5 +1,5 @@
-source 'https://rubygems.org'
-ruby '2.1.6'
+source "https://rubygems.org"
+ruby "2.7.2"
 
 # Specify your gem's dependencies in tinplate.gemspec
 gemspec

data/README.md

@@ -12,11 +12,15 @@ gem 'tinplate'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install tinplate
+```bash
+$ gem install tinplate
+```
 
 ## Configuration
 
@@ -24,7 +28,6 @@ First you've got to let Tinplate know what your TinEye API keys are. In a Rails
 
 ```ruby
 Tinplate.configure do |config|
-  config.public_key  = "YOUR PUBLIC API KEY"
   config.private_key = "YOUR PRIVATE API KEY"
   config.test        = false
 end

data/lib/tinplate/configuration.rb

@@ -2,10 +2,8 @@ module Tinplate # :nodoc:
   class Configuration # :nodoc:
 
     # https://services.tineye.com/developers/tineyeapi/sandbox.html
-    SANDBOX_PUBLIC_KEY  = "LCkn,2K7osVwkX95K4Oy"
     SANDBOX_PRIVATE_KEY = "6mm60lsCNIB,FwOWjJqA80QZHh9BMwc-ber4u=t^"
 
-    attr_writer :public_key
     attr_writer :private_key
     attr_writer :test
 
@@ -17,13 +15,9 @@ module Tinplate # :nodoc:
       !!@test
     end
 
-    def public_key
-      test? ? SANDBOX_PUBLIC_KEY : @public_key
-    end
-
     def private_key
       test? ? SANDBOX_PRIVATE_KEY : @private_key
     end
 
   end
-end
+end

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

@@ -47,15 +47,15 @@ module Tinplate
         Faraday::UploadIO.new(params.delete(:image_path), "image/jpeg")
       end
 
-      auth = Tinplate::RequestAuthenticator.new(action, params, upload && upload.original_filename)
-      params.merge!(auth.params)
-
       params.merge!(image_upload: upload) if upload
 
-      response = ::JSON.parse(connection.send(http_verb, "#{action}/", params).body)
+      headers = { "x-api-key" => Tinplate.configuration.private_key }
+
+      response = connection.send(http_verb, "#{action}/", params, headers)
+      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
@@ -63,9 +63,9 @@ module Tinplate
 
     def connection
       @conn ||= Faraday.new(url: "https://api.tineye.com/rest/") do |faraday|
-        faraday.request  :multipart
-        faraday.request  :url_encoded
-        faraday.adapter  Faraday.default_adapter
+        faraday.request :multipart
+        faraday.request :url_encoded
+        faraday.adapter Faraday.default_adapter
       end
     end
 

data/lib/tinplate/version.rb

@@ -1,3 +1,3 @@
 module Tinplate
-  VERSION = "2.0.2"
+  VERSION = "2.1.2"
 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"
 

data/tinplate.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", [">= 0.9.2", "< 2.0.0"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake",    "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake",    ">= 12.3.3"
   spec.add_development_dependency "rspec",   "~> 3.4.0"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinplate
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.2
 platform: ruby
 authors:
 - Aaron Klaassen
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,30 +34,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - aaron@unsplash.com
 executables: []
@@ -105,7 +105,6 @@ files:
 - lib/tinplate.rb
 - lib/tinplate/configuration.rb
 - lib/tinplate/errors.rb
-- lib/tinplate/request_authenticator.rb
 - lib/tinplate/search_results.rb
 - lib/tinplate/tineye.rb
 - lib/tinplate/version.rb
@@ -114,7 +113,7 @@ homepage: https://github.com/unsplash/tinplate
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: A wrapper around the TinEye API.
 test_files: []

data/lib/tinplate/request_authenticator.rb

@@ -1,60 +0,0 @@
-# https://services.tineye.com/developers/tineyeapi/authentication.html
-
-require "securerandom"
-require "uri"
-require "openssl"
-
-module Tinplate
-  class RequestAuthenticator
-
-    def initialize(action, params = {}, image_name = "")
-      @action = action
-      @params = params
-      @image_name = image_name || ""
-      @nonce = SecureRandom.hex
-      @date  = Time.now.to_i
-    end
-
-    def params
-      {
-        api_key: Tinplate.configuration.public_key,
-        api_sig: signature,
-        nonce:   @nonce,
-        date:    @date
-      }
-    end
-
-    def verb
-      @image_name.empty? ? "GET" : "POST"
-    end
-
-    def content_type
-      verb == "GET" ? "" : "multipart/form-data; boundary=-----------RubyMultipartPost"
-    end
-
-    def signature_components
-      [
-        Tinplate.configuration.private_key,
-        verb,
-        content_type,
-        URI.encode_www_form_component(@image_name).downcase,
-        @date.to_i,
-        @nonce,
-        "https://api.tineye.com/rest/#{@action}/",
-        hash_to_sorted_query_string(@params),
-      ]
-    end
-
-    def signature
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("sha256"),
-                              Tinplate.configuration.private_key,
-                              signature_components.join)
-    end
-
-    def hash_to_sorted_query_string(params)
-      Hash[params.sort].map do |key, value|
-        "#{key}=#{URI.encode_www_form_component(value)}"
-      end.join("&")
-    end
-  end
-end