shutterstock-ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16a3aea51b0797b15acdf0b796a4b1f318e5333
-  data.tar.gz: 6c60678b9f218c9f4c0129d8db4846b9ee238e9d
+  metadata.gz: ee208d1ecc3c46db667ef7bc689ab76952ccb557
+  data.tar.gz: 5b1aaec166ec632891e7715186576717b0862314
 SHA512:
-  metadata.gz: 9a868e0f76dcacb6b56b30858b588924596077ab071dd4be3e36851b55d86c220e97d3758cb650305df640174158473a2365736799e9d93d7c9734ddae67fdcd
-  data.tar.gz: 7c867d2f9b4f0c32ef84e723150edf76ba037bcf26988fba2ba03b198e506ab312488fcd037ecc324731a13986dfca4a54ebc94679a7746c692be2d790af20cd
+  metadata.gz: b99eaded4fc7b274a2867a2bbb502a2486ab478e926a2c4877e343197602d0cb957714096f54c47bef15d386ccd55abd77e12987a2c026f9f8c8a2ec4c50e57d
+  data.tar.gz: 6ef64b682f9596a7d169d2e9eee3758c822ebb1f5b41521275a2de3fbe67bdb7d22c942cd490a9182b7d98c7aabf4165c70f550a1ec440a3dfadfd0a00b5b5fb

data/lib/shutterstock-ruby.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'rest_client'
+require 'shutterstock-ruby/configuration'
 require 'shutterstock-ruby/connections'
 require 'shutterstock-ruby/images'
 require 'shutterstock-ruby/videos'
@@ -9,24 +10,22 @@ module ShutterstockRuby
   API_BASE = 'api.shutterstock.com/v2'
 
   def self.configuration
-    @configuration ||=  Configuration.new
+    @configuration ||=  Configuration.new({})
   end
 
   def self.configure
-    self.configuration ||= Configuration.new
+    self.configuration ||= Configuration.new({})
     yield(configuration) if block_given?
   end
 
-  # Main configuration class.
-  class Configuration
-    attr_accessor :access_token
-    attr_accessor :api_client
-    attr_accessor :api_secret
+  class Client
+    attr_reader :configuration, :videos, :images
 
-    def initialize
-      @access_token = nil
-      @api_client = nil
-      @api_secret = nil
+    def initialize(args = {})
+      @configuration = Configuration.new(args)
+      @videos = Videos.new(configuration)
+      @images = Images.new(configuration)
     end
+
   end
 end

data/lib/shutterstock-ruby/configuration.rb

@@ -0,0 +1,13 @@
+module ShutterstockRuby
+  class Configuration
+    attr_accessor :access_token
+    attr_accessor :api_client
+    attr_accessor :api_secret
+
+    def initialize(args)
+      @access_token = args[:access_token]
+      @api_client = args[:api_client]
+      @api_secret = args[:api_secret]
+    end
+  end
+end

data/lib/shutterstock-ruby/connections.rb

@@ -1,5 +1,11 @@
 module ShutterstockRuby
-  module Connections
+  class Connections
+    attr_reader :configuration
+
+    def initialize(configuration)
+      @configuration = configuration
+    end
+
     def get(path, params = nil, options = {})
       ensure_credentials!
 
@@ -18,24 +24,28 @@ module ShutterstockRuby
       RestClient.post(build_url(path), body, add_bearer(options))
     end
 
+    protected
+    def self.client
+      @client ||= new(ShutterstockRuby.configuration)
+    end
+
     private
 
     def build_url(path)
-      if ShutterstockRuby.configuration.access_token
+      if configuration.access_token
         "https://#{ShutterstockRuby::API_BASE}#{path}"
       else
-        "https://#{ShutterstockRuby.configuration.api_client}:#{ShutterstockRuby.configuration.api_secret}@#{ShutterstockRuby::API_BASE}#{path}"
+        "https://#{configuration.api_client}:#{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[:authorization] = "Bearer #{configuration.access_token}" if configuration.access_token
       options
     end
 
     def ensure_credentials!
-      config = ShutterstockRuby.configuration
-      fail(Exception, 'Missing credentials') if (config.api_client.nil? || config.api_secret.nil?) && config.access_token.nil?
+      fail(Exception, 'Missing credentials') if (configuration.api_client.nil? || configuration.api_secret.nil?) && configuration.access_token.nil?
     end
   end
 end

data/lib/shutterstock-ruby/images.rb

@@ -1,10 +1,15 @@
 module ShutterstockRuby
   # A class to hold all images related code.
-  class Images
-    extend Connections
+  class Images < Connections
 
-    def self.search(query, options = {})
-      JSON.parse(self.get('/images/search', { query: query }.merge(options)))
+    def search(query, options = {})
+      JSON.parse(get('/images/search', { query: query }.merge(options)))
+    end
+
+    class << self
+      def search(query, options = {})
+        client.search(query, options)
+      end
     end
   end
 end

data/lib/shutterstock-ruby/videos.rb

@@ -1,20 +1,33 @@
 module ShutterstockRuby
   # A class to hold all videos related code.
-  class Videos
-    extend Connections
+  class Videos < Connections
 
-    def self.search(query, options = {})
-      JSON.parse(self.get('/videos/search', { query: query }.merge(options)))
+    def search(query, options = {})
+      JSON.parse(get('/videos/search', { query: query }.merge(options)))
     end
 
-    def self.details(id, options = {})
-      JSON.parse(self.get('/videos', { id: id }.merge(options)))
+    def details(id, options = {})
+      JSON.parse(get('/videos', { id: id }.merge(options)))
     end
 
-    def self.purchase(id, subscription_id, size, options = {})
+    def 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))
+      JSON.parse(post("/videos/licenses", body, params, options))
+    end
+
+    class << self
+      def search(query, options = {})
+        client.search(query, options)
+      end
+
+      def details(id, options = {})
+        client.details(id, options)
+      end
+
+      def purchase(id, subscription_id, size, options = {})
+        client.purchase(id, subscription_id, size, options)
+      end
     end
   end
 end

data/spec/lib/shutterstock_ruby_spec.rb

@@ -1,6 +1,30 @@
 require 'spec_helper'
 
-RSpec.describe ShutterstockRuby do
+RSpec.describe "ShutterstockRuby instance client" do
+
+  it 'has the correct default' do
+    client = ShutterstockRuby::Client.new
+
+    expect(client.configuration.access_token).to be nil
+    expect(client.configuration.api_client).to be nil
+    expect(client.configuration.api_secret).to be nil
+  end
+
+  it 'sets the correct configuration' do
+    token = SecureRandom.uuid
+    key = SecureRandom.uuid
+    secret = SecureRandom.uuid
+
+    client = ShutterstockRuby::Client.new(access_token: token, api_client: key, api_secret: secret)
+
+    expect(client.configuration.access_token).to equal(token)
+    expect(client.configuration.api_client).to equal(key)
+    expect(client.configuration.api_secret).to equal(secret)
+  end
+end
+
+
+RSpec.describe "ShutterstockRuby static client" do
   after :each do
     ShutterstockRuby.configuration.access_token = nil
     ShutterstockRuby.configuration.api_client = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shutterstock-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nadav Shatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,6 +82,7 @@ files:
 - README.md
 - Rakefile
 - lib/shutterstock-ruby.rb
+- lib/shutterstock-ruby/configuration.rb
 - lib/shutterstock-ruby/connections.rb
 - lib/shutterstock-ruby/images.rb
 - lib/shutterstock-ruby/videos.rb