tinplate 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a74f2e93dd8ade88b665a77758c7e5b2d95bfb6
-  data.tar.gz: afb9a34fa0b1ee059d232c52dc3e2ab66818412c
+SHA256:
+  metadata.gz: 01e93f8f4d2f05ea8d7ae8cdfa3e002a49d6cf84c2bdb91dfcaa1a8daaa64bc4
+  data.tar.gz: 84ef0144e226efb3bf0ec58ce3727651e6a165de6a0b29dc69e508c830e3bd24
 SHA512:
-  metadata.gz: ec377ce0cee4b860c942e69728accaa88c3b99493415a1181a4611e86e5a5c3e6548e771c52f5e8494ff00954839d4cacffcefa8f4a018926b2238cfebfa08a6
-  data.tar.gz: 8b48f5e54f0172271f1b24e8dfd8a2c9a647efc5e0b84102bca5929c721de1c7b33f11a0201eaafabd996a836968296f1075edc6c1479b93f97912841e6f9087
+  metadata.gz: d6c9ebfcedf2ad635f866db6425e8501eb07a9f2ece2051b8ebe31d5752f31def2ac0c91343d4c89a225e93c6cc76a610946fec88758fda17ce1704f20e78d9c
+  data.tar.gz: abfddee5e25022fb25129e24a288a236b9c77aeeb09a978f1d7d02a4faa4abe1d7f6524f4794aa6d2521f151c35819710ae0248f7195aad86cdf712d134f3a2e

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/tineye.rb

@@ -26,8 +26,8 @@ module Tinplate
 
       bundles = results["bundles"].map do |bundle|
         OpenStruct.new(remaining_searches: bundle["remaining_searches"],
-                       start_date:  DateTime.parse(bundle["start_date"]),
-                       expire_date: DateTime.parse(bundle["expire_date"]))
+                       start_date:  Time.parse(bundle["start_date"]),
+                       expire_date: Time.parse(bundle["expire_date"]))
       end
 
       OpenStruct.new(total_remaining_searches: results["total_remaining_searches"], bundles: bundles)
@@ -47,12 +47,12 @@ 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])
@@ -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.0"
+  VERSION = "2.1.1"
 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

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.9.2"
+  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,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: tinplate
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Aaron Klaassen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   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
@@ -80,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - aaron@unsplash.com
 executables: []
@@ -99,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
@@ -108,7 +113,7 @@ homepage: https://github.com/unsplash/tinplate
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-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,59 +0,0 @@
-# https://services.tineye.com/developers/tineyeapi/authentication.html
-
-require "securerandom"
-require "uri"
-
-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