tinplate 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e991a0691cbab5444897570757a5d904e2750888
-  data.tar.gz: dc62ff9181824047d26476102ced5e09ec741048
+  metadata.gz: ba23118a45b0d10c153fc40b6b3e65c600a4854e
+  data.tar.gz: 5be87df8bd610dc667f30d81bbe2248ec881aec9
 SHA512:
-  metadata.gz: 054e7e5ee86662d5dab7aeb260afd1ad8e0712730911e276b77a6a3d4a9dc6b7e7343dd11567372ae14177a3eda7240e6a27b693463849df79fa4347bf0c6573
-  data.tar.gz: 81391a6f230a54c8be37760c821f5fa71a6085547f234d34a40231225fea33e5b593ec28374b2c35b2243864f003233713c696d6781ed60a67d1d67c5e0dd7b5
+  metadata.gz: e4e3cf73996b52331ff949cd81527dc6b337c4d0ab2a2efc5848201ad681adf34803680ef12b822fcb48e23a8bc5589ebfda4137e5406bae45fb9819b34fb31f
+  data.tar.gz: 0cec435914711cb5fba98aa01fd42682e794700faaa425970e0d104a0eb5ae531e7631199bf26563847e20e1f5d470519daed3f6f617dc6c3290d6cfa93db789

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Crew
+Copyright (c) 2016 Unsplash
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -41,9 +41,9 @@ There are only three API actions available: `search`, `remaining_searches` (to c
 
 `image_count` returns a plain old integer.
 
-### Search example
+### Search examples
 
-*Note: this gem does not (yet) support searching by image upload, only by image URL.*
+#### Search by URL
 
 ```ruby
 tineye = Tinplate::TinEye.new
@@ -58,6 +58,13 @@ results.matches.each do |match|
 end
 ```
 
+#### Search by upload
+
+```ruby
+tineye = Tinplate::TinEye.new
+results = tineye.search(image_path: "/home/alice/example.jpg")
+```
+
 #### Optional search parameters
 
 `offset`: Default 0    
@@ -78,7 +85,7 @@ format: "JPEG",
 contributor: true,
 overlay: "overlay/507bb6bf9a397284e2330be7c0671aadc7319b4b/0f1e84b7b7538e8e7de048f4d45eb8f579e3e999941b3341ed9a754eb447ebb1?m21=-9.06952e-05&m22=0.999975&m23=0.0295591&m11=0.999975&m13=-0.0171177&m12=9.06952e-05",
 backlinks:
-  # These are also an OpenStruct objects, not Hashes.
+  # These are also OpenStruct objects, not Hashes.
   [
     {
       url: "http://example-copier.com/photo.jpg",

data/lib/tinplate/request_authenticator.rb

@@ -9,7 +9,7 @@ module Tinplate
     def initialize(action, params = {}, image_name = "")
       @action = action
       @params = params
-      @image_name = image_name
+      @image_name = image_name || ""
       @nonce = SecureRandom.hex
       @date  = Time.now.to_i
     end
@@ -23,15 +23,23 @@ module Tinplate
       }
     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,
-        "GET",
-        "", # Content-Type for GET requests is blank
-        URI.encode(@image_name).downcase,
+        verb,
+        content_type,
+        URI.encode_www_form_component(@image_name).downcase,
         @date.to_i,
         @nonce,
-        "http://api.tineye.com/rest/#{@action}/",
+        "https://api.tineye.com/rest/#{@action}/",
         hash_to_sorted_query_string(@params),
       ]
     end

data/lib/tinplate/tineye.rb

@@ -3,12 +3,21 @@ module Tinplate
     SORTS  = ["score", "size", "crawl_date"]
     ORDERS = ["asc", "desc"]
 
-    def search(image_url: nil, offset: 0, limit: 100, sort: "score", order: "desc")
-      raise ArgumentError.new("You must supply an image_url") if !image_url
+    def search(image_path: nil, image_url: nil, offset: 0, limit: 100, sort: "score", order: "desc")
+      raise ArgumentError.new("You must supply an image or image_url") if !image_url && !image_path
       raise ArgumentError.new("sort must be one of #{SORTS.join(', ')}") if !SORTS.include?(sort)
       raise ArgumentError.new("order must be one of #{ORDERS.join(', ')}") if !ORDERS.include?(order)
 
-      response = request "search", image_url: image_url, offset: offset.to_s, limit: limit.to_s, sort: sort, order: order
+      options = {
+        offset: offset.to_s,
+        limit: limit.to_s,
+        sort: sort,
+        order: order
+      }
+      img = image_url ? { image_url: image_url } : { image_path: image_path }
+
+      response = request("search", options.merge(img))
+
       Tinplate::SearchResults.new(response["results"])
     end
 
@@ -23,14 +32,22 @@ module Tinplate
       request("image_count")["results"]
     end
 
-
     private
 
     def request(action, params = {})
-      auth = Tinplate::RequestAuthenticator.new(action, params)
+      http_verb = :get
+
+      upload = if params[:image_path]
+        http_verb = :post
+        Faraday::UploadIO.new(params.delete(:image_path), "image/jpeg")
+      end
+
+      auth = Tinplate::RequestAuthenticator.new(action, params, upload && upload.original_filename)
       params.merge!(auth.params)
 
-      response = ::JSON.parse(connection.get("#{action}/", params).body)
+      params.merge!(image_upload: upload) if upload
+
+      response = ::JSON.parse(connection.send(http_verb, "#{action}/", params).body)
 
       if response["code"] != 200
         raise Tinplate::Error.from_response(response["code"], response["messages"][0], response["messages"][1])
@@ -40,13 +57,13 @@ module Tinplate
     end
 
     def connection
-      @conn ||= Faraday.new(url: "http://api.tineye.com/rest/") do |faraday|
+      @conn ||= Faraday.new(url: "https://api.tineye.com/rest/") do |faraday|
+        faraday.request  :multipart
         faraday.request  :url_encoded
-        faraday.response :logger
         faraday.adapter  Faraday.default_adapter
       end
     end
 
   end
 
-end
+end

data/lib/tinplate/version.rb

@@ -1,3 +1,3 @@
 module Tinplate
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/tinplate.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "tinplate"
   spec.version       = Tinplate::VERSION
   spec.authors       = ["Aaron Klaassen"]
-  spec.email         = ["aaron@crew.co"]
+  spec.email         = ["aaron@unsplash.com"]
 
   spec.summary       = %q{A wrapper around the TinEye API.}
   spec.homepage      = "https://github.com/unsplash/tinplate"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinplate
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron Klaassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- aaron@crew.co
+- aaron@unsplash.com
 executables: []
 extensions: []
 extra_rdoc_files: []