gettyimages-api 2.0.3.pre.alpha.pre.17 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c782e1c37f927a18de740a9c9952245d7f7ef120c92692f0e7f5aec3851d78f
-  data.tar.gz: 765c164af12c03503a6ad0e699610f97703f27eb4d1d06f2fcb7b9e7cbd65498
+  metadata.gz: 482643d3ef1c6faa8ed02ff34ea5b71f291c0617564431312b2be679a93d465f
+  data.tar.gz: 4cbf5f76b5501363a82e9500a382895c49ce9044ae277a1342fe592e2364f0d4
 SHA512:
-  metadata.gz: 6bb088be5a6f8d44f3059a506502637e5721a9ff0349dc595a95563a90e882c3d57b6707e4f18c6673c6406356b4a11b0c7985331b3e3c10d41e562251a01201
-  data.tar.gz: 496cc1d06ae8082ffcbd6d86481530e3fb1eb5bc36b990849c522f3c572b951db08aa35240ba7a2cd2f658c5d17ef6b4a071a253e92c7cfd3931e6d3a35c136f
+  metadata.gz: 0d9698e689db7edfc4e72fc0ff004284215780ca39e78308459af69b4623d6b75a759b2673132ae46babad2620d0b49f743cbb77ffbf7c75d345fe6732648f35
+  data.tar.gz: b0caca61c415a12f2c3da88c42a35dcd4b08b4d94a9a9abc96b168fdffe5e8e4faede238f3da8a9d9eb902d310015210e82ee14d0620c34b11f030ee77bf1c2c

data/README.md

@@ -1,16 +1,28 @@
 # Getty Images API Ruby SDK
 [![Build Status](https://travis-ci.org/gettyimages/gettyimages-api_ruby.svg?branch=master)](https://travis-ci.org/gettyimages/gettyimages-api_ruby)  
-Seamlessly integrate Getty Images' expansive digital content, powerful search technology, and rich metadata into your publishing tools, products and services!
 
-- Search for images and videos from our extensive creative and editorial catalogs.
-- Get image and video metadata.
-- Download files using your Getty Images products (e.g., Editorial subscriptions, Easy Access, Thinkstock Subscriptions, and Image Packs).
-- Custom Request functionality that allows user to call any endpoint.
+## Introduction
+This SDK makes using the Getty Images [API](http://developers.gettyimages.com) easy. It handles credential management, makes HTTP requests and is written with a fluent style in mind. For more info about the API, see the [Documentation](https://developers.gettyimages.com/api/).
 
-## Requirements
+* Search for images and videos from our extensive creative and editorial catalogs.
+* Get image and video metadata.
+* Download files using your Getty Images products (e.g., Editorial subscriptions, Easy Access, Thinkstock Subscriptions, and Image Packs).
+* Custom Request functionality that allows user to call any endpoint.
 
-- Ruby version >= 2.4
-- [Bundler](http://bundler.io)
+## Help & Support
+
+* [Getty Images API](http://developers.gettyimages.com/)
+* [Contact Developer Support](mailto:developersupport@gettyimages.com)
+* [Issue Tracker](https://github.com/gettyimages/gettyimages-api_ruby/issues)
+
+## Getting started
+
+### Installing the ruby gem package
+
+The SDK is available as a [ruby gem](https://rubygems.org/gems/gettyimages-api) package. Install in your workspace with:
+```sh
+gem install gettyimages-api
+```
 
 ## Examples
 
@@ -135,8 +147,13 @@ result = apiClient
 
 puts result["id"]
 ```
+## Running Source Code
+_Source code is only needed if you would like to contribute to the project. Otherwise, use the [ruby gem](https://rubygems.org/gems/gettyimages-api)_
+
+### Requirements
 
-## Unit Tests
+- Ruby version >= 2.4
+- [Bundler](http://bundler.io)
 
 Install bundler and all dependencies
 
@@ -145,6 +162,8 @@ gem install bundler
 bundle install
 ```
 
+### Unit Tests
+
 To execute all unit tests:
 
 ```sh

data/gettyimages-api.gemspec

@@ -6,7 +6,6 @@ require_relative 'lib/GettyImagesApi/version'
 Gem::Specification.new do |spec|
   spec.name          = "gettyimages-api"
   spec.version       = GettyImagesApi::VERSION
-  spec.version       = "#{spec.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS']
   spec.authors       = ["Getty Images"]
   spec.email         = ["developersupport@gettyimages.com"]
   spec.summary       = "Getty Images API SDK"

data/lib/Credentials.rb

@@ -13,18 +13,31 @@ class Credentials
 	attr_accessor :client_secret
 	attr_accessor :user_name
 	attr_accessor :password
+	attr_accessor :token_details
 
 	def initialize(args)
 		args.keys.each { |name| instance_variable_set "@" + name.to_s, args[name] }	
+		@token_details = nil
 	end
 
 	def get_uri(path)
 		return URI.parse "#{Api_Host::API_BASE_URL}#{path}"
 	end
 
+	def token_has_expired()
+		if (!token_details.nil?) && (@token_details.has_key?("sdk_expire_time"))
+			return @token_details["sdk_expire_time"] < (Time.now - 300)
+		end
+		return true
+	end
+
 	# Get Access Token Using OAuth
 	def get_access_token
 		
+		if (!token_has_expired())
+			return @token_details["access_token"]
+		end
+		
 		# Determine OAuth Flow
 		case @credential_type
 			when OAuthGrantType::PASSWORD
@@ -62,6 +75,11 @@ class Credentials
 		if !res.is_a?(Net::HTTPSuccess)
 			raise res.code + ": " + result['error_description']	
 		end
+
+		@token_details = result
+		expiry = token_details["expires_in"].to_i
+		@token_details["sdk_expire_time"] = Time.now + expiry
+
 		return result['access_token']
 	end
 

data/lib/GettyImagesApi/version.rb

@@ -1,3 +1,3 @@
 module GettyImagesApi
-	VERSION = "2.0.3"
+	VERSION = "2.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettyimages-api
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre.alpha.pre.17
+  version: 2.0.4
 platform: ruby
 authors:
 - Getty Images
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,6 @@ files:
 - lib/CustomRequest/CustomRequest.rb
 - lib/Downloads/DownloadImages.rb
 - lib/Downloads/DownloadVideos.rb
-- lib/Example.rb
 - lib/GettyImagesApi/version.rb
 - lib/HttpHelper.rb
 - lib/Images/Images.rb
@@ -87,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/Example.rb

@@ -1,21 +0,0 @@
-require "pp"
-require_relative "GettyImagesApi"
-
-api_key = "api key"
-api_secret = "api secret"
-
-apiClient 		= GettyImagesApi.new(api_key, api_secret)
-search_results	= apiClient.search().images().creative()
-					.with_phrase("gorilla")
-					.with_response_fields(["id","title"])
-					.with_graphical_styles("illustration")
-					.with_graphical_styles(["fine_art","photography"])
-					.with_page(2)
-					.with_page_size(5)
-					.execute()
-
-search_results["images"].each do | image |
-	puts "Id: #{image["id"]} Title: #{image["title"]}" 
-end
-
-