shutterstock-ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d09af3d27a5e5c465d6943b85c75fd0329b6e8a
-  data.tar.gz: cabd32f37b51ffd889868ada64ebbfbca0a14d34
+  metadata.gz: a16a3aea51b0797b15acdf0b796a4b1f318e5333
+  data.tar.gz: 6c60678b9f218c9f4c0129d8db4846b9ee238e9d
 SHA512:
-  metadata.gz: 9c85a28f7bbbbeced0e23fdce5d45567f1f0bb494aca52b7e5e9b9ab76785651f388d104200ddeaee268eba40a0e0b4ec1cd05cc083a09ac9d06cb47bedcbcd8
-  data.tar.gz: 5075271cad9a20cd0a0ea528988eeaa2fdb4d1bce9eb1b5bfb0e617faee356a716c843c61e58c592dbda73a7441d0145107fa7d4fbc748e3687a9d001f950a3b
+  metadata.gz: 9a868e0f76dcacb6b56b30858b588924596077ab071dd4be3e36851b55d86c220e97d3758cb650305df640174158473a2365736799e9d93d7c9734ddae67fdcd
+  data.tar.gz: 7c867d2f9b4f0c32ef84e723150edf76ba037bcf26988fba2ba03b198e506ab312488fcd037ecc324731a13986dfca4a54ebc94679a7746c692be2d790af20cd

data/README.md

@@ -4,7 +4,7 @@ The Shutterstock Ruby API Wrapper
 A Ruby API wrapper for [Shutterstock](http://www.shutterstock.com/) [API's](http://developers.shutterstock.com)
 
 [![Gem Version](https://badge.fury.io/rb/shutterstock-ruby.svg)](http://badge.fury.io/rb/shutterstock-ruby)[![Dependency Status](https://gemnasium.com/TailorBrands/shutterstock-ruby.svg)](https://gemnasium.com/TailorBrands/shutterstock-ruby)
-[![Circle CI](https://circleci.com/gh/TailorBrands/shutterstock-ruby/tree/master.svg?style=svg)](https://circleci.com/gh/TailorBrands/shutterstock-ruby/tree/master)  [![Code Climate](https://codeclimate.com/github/TailorBrands/shutterstock-ruby/badges/gpa.svg)](https://codeclimate.com/github/TailorBrands/shutterstock-ruby)  [![Test Coverage](https://codeclimate.com/github/TailorBrands/shutterstock-ruby/badges/coverage.svg)](https://codeclimate.com/github/TailorBrands/shutterstock-ruby)
+[![Circle CI](https://circleci.com/gh/TailorBrands/shutterstock-ruby/tree/master.svg?style=svg)](https://circleci.com/gh/TailorBrands/shutterstock-ruby/tree/master)  [![Code Climate](https://codeclimate.com/github/TailorBrands/shutterstock-ruby/badges/gpa.svg)](https://codeclimate.com/github/TailorBrands/shutterstock-ruby) 
 
 ```rb
 gem "shutterstock-ruby"

data/lib/shutterstock-ruby.rb

@@ -19,10 +19,12 @@ module ShutterstockRuby
 
   # Main configuration class.
   class Configuration
+    attr_accessor :access_token
     attr_accessor :api_client
     attr_accessor :api_secret
 
     def initialize
+      @access_token = nil
       @api_client = nil
       @api_secret = nil
     end

data/lib/shutterstock-ruby/connections.rb

@@ -6,24 +6,36 @@ module ShutterstockRuby
       options = { accept: :json }.merge(options)
       options[:params] = params unless params.nil?
 
-      RestClient.get(build_url(path), options)
+      RestClient.get(build_url(path), add_bearer(options))
     end
 
-    def post(path, body, options = {})
+    def post(path, body, params = nil, options = {})
       ensure_credentials!
 
-      RestClient.post(build_url(path), body, options)
+      options[:params] = params unless params.nil?
+      options[:content_type] = "application/json"
+
+      RestClient.post(build_url(path), body, add_bearer(options))
     end
 
     private
 
     def build_url(path)
-      "https://#{ShutterstockRuby.configuration.api_client}:#{ShutterstockRuby.configuration.api_secret}@#{ShutterstockRuby::API_BASE}#{path}"
+      if ShutterstockRuby.configuration.access_token
+        "https://#{ShutterstockRuby::API_BASE}#{path}"
+      else
+        "https://#{ShutterstockRuby.configuration.api_client}:#{ShutterstockRuby.configuration.api_secret}@#{ShutterstockRuby::API_BASE}#{path}"
+      end
+    end
+
+    def add_bearer(options)
+      options[:authorization] = "Bearer #{ShutterstockRuby.configuration.access_token}" if ShutterstockRuby.configuration.access_token
+      options
     end
 
     def ensure_credentials!
       config = ShutterstockRuby.configuration
-      fail(Exception, 'Missing credentials') if config.api_client.nil? || config.api_secret.nil?
+      fail(Exception, 'Missing credentials') if (config.api_client.nil? || config.api_secret.nil?) && config.access_token.nil?
     end
   end
 end

data/lib/shutterstock-ruby/videos.rb

@@ -6,5 +6,15 @@ module ShutterstockRuby
     def self.search(query, options = {})
       JSON.parse(self.get('/videos/search', { query: query }.merge(options)))
     end
+
+    def self.details(id, options = {})
+      JSON.parse(self.get('/videos', { id: id }.merge(options)))
+    end
+
+    def self.purchase(id, subscription_id, size, options = {})
+      params = { subscription_id: subscription_id, size: size }
+      body = { videos: [ video_id: id ] }.to_json
+      JSON.parse(self.post("/videos/licenses", body, params, options))
+    end
   end
 end

data/spec/lib/shutterstock_ruby_spec.rb

@@ -2,26 +2,32 @@ require 'spec_helper'
 
 RSpec.describe ShutterstockRuby do
   after :each do
+    ShutterstockRuby.configuration.access_token = nil
     ShutterstockRuby.configuration.api_client = nil
     ShutterstockRuby.configuration.api_secret = nil
   end
 
   it 'has the correct default' do
+    expect(ShutterstockRuby.configuration.access_token).to be nil
     expect(ShutterstockRuby.configuration.api_client).to be nil
     expect(ShutterstockRuby.configuration.api_secret).to be nil
   end
 
   it 'sets the correct configuration' do
+    expect(ShutterstockRuby.configuration.access_token).to be nil
     expect(ShutterstockRuby.configuration.api_client).to be nil
     expect(ShutterstockRuby.configuration.api_secret).to be nil
 
+    token = SecureRandom.uuid
     key = SecureRandom.uuid
     secret = SecureRandom.uuid
     ShutterstockRuby.configure do |config|
+      config.access_token = token
       config.api_client = key
       config.api_secret = secret
     end
 
+    expect(ShutterstockRuby.configuration.access_token).to equal(token)
     expect(ShutterstockRuby.configuration.api_client).to equal(key)
     expect(ShutterstockRuby.configuration.api_secret).to equal(secret)
   end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 require 'bundler/setup'
 require 'shutterstock-ruby'
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shutterstock-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nadav Shatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An API wrapper for the Shutterstock API's