cloudsight 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb35b6bfc1b3ad85f8b22fbada36405a301de3a2
-  data.tar.gz: 07ad0f0d8a70fd1e07538d75de7f200b2e523ca6
+  metadata.gz: bb8badd51b892500316434b647052103df2287be
+  data.tar.gz: 241c9348620a066bfb4d67003e82e814c45f4b91
 SHA512:
-  metadata.gz: 8ae5d760ea12f5bddaa50a7fc75f79e34d31fb5fcd87ae3146c5ebce675b31e4e32ac58cb8d528137dc0b77f988a7f7d45eca4b4ac0c92a57fba599fde0645f3
-  data.tar.gz: d00be6755a458a5ac22a47c3b6dd33770e644a1dfdbe4d75760f9da239980a3ce959818416c7de9d5313f36d29cb74afd8a27c2cd051f45b6db5bf9a86bb1306
+  metadata.gz: c7c2c691cf71ca220e3a15d1652b757d7ed7b8911ba821a80c9e83bd9d52e6f6f0141b898fa25b4792cab4045dd42c2dd4e6892efebaef69b89afc4d9ccd0fed
+  data.tar.gz: b7743e4646dc36a3684e88bf9fce2306126010ef4bde5d72c4ccc71e72d4ff08e7504e93ceebcbd5edd9127f6697a34a0284fd2aa443a33644b288d40ae0e37d

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rake'
 gem 'json'
 gem 'rest-client'
 gem 'simple_oauth'

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     json (1.8.1)
     mime-types (2.2)
+    rake (10.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     simple_oauth (0.2.0)
@@ -12,5 +13,6 @@ PLATFORMS
 
 DEPENDENCIES
   json
+  rake
   rest-client
   simple_oauth

data/README.md

@@ -3,6 +3,12 @@ cloudsight-ruby
 
 A simple CloudSight API Client
 
+| Project                 |  Gem Release      |
+|------------------------ | ----------------- |
+| gem name                |  gem-release      |
+| version                 |  [![Gem Version](https://badge.fury.io/rb/gem-release.png)](http://badge.fury.io/rb/gem-release) |
+| continuous integration  |  [![Build Status](https://secure.travis-ci.org/cloudsight/cloudsight-ruby.png?branch=master)](https://travis-ci.org/cloudsight/cloudsight-ruby) |
+
 Installation
 ============
 
@@ -10,11 +16,18 @@ Installation
 $ gem install cloudsight
 ```
 
+Install the `simple_oauth` gem to use with oauth options.
+
+```
+$ gem install simple_oauth
+```
+
 Configuration
 =============
 
 ```ruby
 require 'rubygems'
+require 'simple_oauth'
 require 'cloudsight'
 
 Cloudsight.oauth_options = {
@@ -23,6 +36,15 @@ Cloudsight.oauth_options = {
 }
 ```
 
+or, using a single API key:
+
+```ruby
+require 'rubygems'
+require 'cloudsight'
+
+Cloudsight.api_key = 'REPLACE WITH YOUR KEY'
+```
+
 Usage
 =====
 

data/cloudsight.gemspec

@@ -6,7 +6,7 @@ require 'cloudsight/version'
 Gem::Specification.new do |s|
   s.name        = 'cloudsight'
   s.version     = Cloudsight::VERSION
-  s.date        = '2014-11-14'
+  s.date        = '2015-11-05'
   s.summary     = "CloudSight API Client"
   s.description = "A simple CloudSight API Client for Image Recognition"
   s.authors     = ['Brad Folkens']

data/lib/cloudsight.rb

@@ -1,6 +1,10 @@
 require 'rubygems'
 require 'rest-client'
-require 'simple_oauth'
+begin
+	require 'simple_oauth'
+rescue LoadError => err
+	# Tolerate not having this unless it's actually configured
+end
 require 'json'
 
 module Cloudsight
@@ -8,21 +12,25 @@ module Cloudsight
 
 	class << self
 		def oauth_options=(val)
+			raise RuntimeError.new("Could not load the simple_oauth gem. Install it with `gem install simple_oauth`.") unless defined?(SimpleOAuth::Header)
+
+			val = val.inject({}) {|memo, (k, v)| memo[k.to_sym] = v; memo }
 			@@oauth_options = val
+		end
 
+		def api_key=(val)
+			@@api_key = val
 			RestClient.add_before_execution_proc do |req, params|
-				if params[:payload]
-					filtered_payload = params[:payload].dup
-					filtered_payload.delete('image_request[image]')
-				end
-
-				oauth = SimpleOAuth::Header.new(params[:method], params[:url], filtered_payload, oauth_options)
-			  req.add_field 'Authorization', oauth.to_s
+				req.add_field 'Authorization', "CloudSight #{val}"
 			end
 		end
 
+		def api_key
+			@@api_key if defined?(@@api_key)
+		end
+
 		def oauth_options
-			@@oauth_options
+			@@oauth_options if defined?(@@oauth_options)
 		end
 
 		def base_url=(val)
@@ -34,8 +42,30 @@ module Cloudsight
 		end
 	end
 
+	class Util
+		def self.wrap_request &block
+			RestClient.reset_before_execution_procs
+			RestClient.add_before_execution_proc do |req, params|
+				if params[:payload]
+					filtered_payload = params[:payload].dup
+					filtered_payload.delete('image_request[image]')
+				end
+
+				oauth = SimpleOAuth::Header.new(params[:method], params[:url], filtered_payload, Cloudsight.oauth_options)
+			  req.add_field 'Authorization', oauth.to_s
+			end
+
+			retval = yield
+
+			RestClient.reset_before_execution_procs
+
+			return retval
+		end
+	end
+
 	class Request
 		def self.send(options = {})
+			raise RuntimeError.new("Need to define either oauth_options or api_key") unless Cloudsight.api_key || Cloudsight.oauth_options
 			url = "#{Cloudsight::base_url}/image_requests"
 
 			params = {}
@@ -51,7 +81,7 @@ module Cloudsight
 			params['image_request[remote_image_url]'] = options[:url] if options.has_key?(:url)
 			params['image_request[image]'] = options[:file] if options.has_key?(:file)
 
-			response = RestClient.post(url, params)
+			response = Util.wrap_request { RestClient.post(url, params) }
 			data = JSON.parse(response.body)
 			raise ResponseException.new(data['error']) if data['error']
 			raise UnexpectedResponseException.new(response.body) unless data['token']
@@ -64,7 +94,7 @@ module Cloudsight
 		def self.get(token, options = {})
 			url = "#{Cloudsight::base_url}/image_responses/#{token}"
 
-			response = RestClient.get(url)
+			response = Util.wrap_request { RestClient.get(url) }
 			data = JSON.parse(response.body)
 			raise ResponseException.new(data['error']) if data['error']
 			raise UnexpectedResponseException.new(response.body) unless data['status']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudsight
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brad Folkens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: CloudSight API Client
 test_files: []
+has_rdoc: