peat 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fa245529382701a1bfd48b654da15cd8f3cd21
-  data.tar.gz: 6493470249ed7d19be5c0168bfded39baec7eca1
+  metadata.gz: 41c65100d648379520dc5052704759855a56fa65
+  data.tar.gz: 85cb807ffd5ec5e054e11e21337b364b34923df1
 SHA512:
-  metadata.gz: 2720755ef61407418d8503d9943987afbc3998cd21951a78e3d418e598b40f09f45dd4c399a45a0722953a021a41bd56c10f52b637bc2558a9ce14b5f894ada0
-  data.tar.gz: 6af89e948d1167dbf4fbb4f04ab19e66e4860823075795219dbb37a67f1320f4ed31113b13e860da788ba97e0d20b7b2e6ccbcd9cd7862c2a4f13cce20fab91d
+  metadata.gz: aa237a24c04a8d10f5d63afe3ab9c2d72db5f3d861b5478b8e4aa6e6e474a8d12b681daa580ff789273ee2ac70a13ae27e46fac15630f3bf1ca75fe60fd16bbf
+  data.tar.gz: 25fdde4566320c272e6f60d2cd67ebb82c01718376f853a7ef6284f54c9a318cc0ec3cafe429aa604a72e4701f8a5da141735586be5e716d79b2f02a78a8d9cb

data/lib/peat/token_manager.rb

@@ -2,21 +2,25 @@ module Peat
   module TokenManager
     module_function
 
-      def token
+      def token(fuel_client_id: nil, fuel_secret: nil)
         fetch_token do
+          client_id = fuel_client_id || ENV['FUEL_CLIENT_ID'] || $fuel_client_id
+          secret = fuel_secret || ENV['FUEL_SECRET'] || $fuel_secret
+          raise MissingConfiguration, 'You must set values for fuel client id and secret' unless client_id && secret
+
           connection.post do |req|
             req.url 'requestToken'
             req.headers['Content-Type'] = 'application/json'
             req.body = {
-              'clientId' => ENV['FUEL_CLIENT_ID'] || $fuel_client_id,
-              'clientSecret' => ENV['FUEL_SECRET'] || $fuel_secret,
+              'clientId' => client_id,
+              'clientSecret' => secret,
             }.to_json
           end.body.merge('created_at' => Time.now)
         end
       end
 
       def connection
-        @connection = Faraday.new(url: 'https://auth.exacttargetapis.com/v1/') do |conn|
+        @connection ||= Faraday.new(url: 'https://auth.exacttargetapis.com/v1/') do |conn|
           conn.request :json
 
           conn.response :logger

data/lib/peat/version.rb

@@ -1,3 +1,3 @@
 module Peat
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/peat.rb

@@ -2,6 +2,8 @@ require "peat/version"
 require 'faraday_middleware'
 
 module Peat
+  class MissingConfiguration < Exception; end
+
   autoload :TokenManager, 'peat/token_manager'
   autoload :Client, 'peat/client'
 end

data/spec/token_manager_spec.rb

@@ -4,27 +4,86 @@ require 'active_support/core_ext'
 
 module Peat
   describe TokenManager do
+    before do
+      test = Faraday.new(url: 'https://auth.exacttargetapis.com/v1/') do |builder|
+        builder.adapter :test do |stub|
+          stub.post('v1/requestToken') { |env|
+            [ 200, {},  {'accessToken' => 'foobar123' }]
+          }
+        end
+      end
+      allow(TokenManager).to receive(:connection).and_return(test)
+    end
+
+    after do
+      TokenManager.instance_variable_set('@token', nil)
+    end
+
+    context 'configuring fuel client id and secret' do
+      context 'no creds set' do
+        it 'raises MissingConfiguration if no fuel credentials set' do
+          expect { Peat::TokenManager.token }.to raise_error(MissingConfiguration, 'You must set values for fuel client id and secret')
+        end
+      end
+
+      context 'client and secret passed in' do
+        it 'uses passed in client and secret' do
+          expect { Peat::TokenManager.token(fuel_client_id: 'foo', fuel_secret: 'bar') }.not_to raise_error
+        end
+      end
+
+      context 'client and secret set in env' do
+        around(:each) do |example|
+          ENV['FUEL_CLIENT_ID'] = 'foo'
+          ENV['FUEL_SECRET'] = 'bar'
+          example.run
+          ENV['FUEL_CLIENT_ID'] = nil
+          ENV['FUEL_SECRET'] = nil
+        end
+
+        it 'uses FUEL_CLIENT_ID and FUEL_SECRET from env if not passed in values' do
+          expect { Peat::TokenManager.token }.not_to raise_error
+        end
+      end
+
+      context 'client and secret set globally' do
+        around(:each) do |example|
+          $fuel_client_id, $fuel_secret = %w(foo bar)
+          example.run
+          $fuel_client_id, $fuel_secret = %w(nil nil)
+        end
+
+        it 'uses global $fuel_client_id and $fuel_secret if no values passed in or set in env' do
+          expect { Peat::TokenManager.token }.not_to raise_error
+        end
+      end
+    end
+
     context 'token is nil' do
       it 'fetches token' do
-        expect(TokenManager).to receive(:fetch_token)
-        TokenManager.token
+        expect(TokenManager.token).to eq('foobar123')
       end
     end
 
     context 'token is expired' do
+      before do
+        TokenManager.instance_variable_set('@token', { 'accessToken' => 'expired', 'created_at' => 1.hour.ago })
+      end
+
       it 'fetches token' do
-        TokenManager.instance_variable_set('@token', { 'created_at' => 1.hour.ago })
-        expect(TokenManager).to receive(:fetch_token)
-        TokenManager.token
+        expect(TokenManager.token).to eq('foobar123')
       end
     end
 
     context 'token is present and not expired' do
-      it 'returns token' do
-        token = { 'accessToken' => 'foobar123', 'created_at' => 1.day.from_now }
-        TokenManager.instance_variable_set('@token', token)
-        expect(TokenManager.token).to eql('foobar123')
-      end
+      before
+      token = { 'accessToken' => 'valid', 'created_at' => 1.day.from_now }
+      TokenManager.instance_variable_set('@token', token)
+    end
+
+    it 'returns token' do
+      expect(TokenManager.token).to eql('valid')
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hubert Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday