exact-target-api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cfa8a6154a2844221f392f18b3bd279c04926dc
-  data.tar.gz: eaedaa8b1f741d0a6492028726b06848fd772fd9
+  metadata.gz: e3b6bd3ed15cda28cfe2f05f7e89c35a03bbc472
+  data.tar.gz: 636380464fa77643163b5a54f422683e6bfa84c4
 SHA512:
-  metadata.gz: 432df1a25e5e09a33fe0409d7864108f9dda8f465f0ae175b3bbdd1a6b42b7f22fcde7a9e3f8709979a9a1870ba714a5c6ca0459526a8428bbcaeb616653b9b2
-  data.tar.gz: 27a26d976407d8c93bab879bc6b383efc0ac1a5cb4dc8db1286ec246f2459523de569c136768e7242a729f7384c108d2884c5cbb48ed950d63470e885b7e9bdf
+  metadata.gz: 7b2a89d7eb6d1262eee81b4f018cf2bfc954f2fc9fd2ba61e337ad2421c08e1a5d4c6ce671528d402cd59f93a304fcdbfbe1758cf5460678ec6b2ca39b9541c0
+  data.tar.gz: bf9efa06eac1b73196e8d910623ad662029f5db016f300844cb00d3f5ae547f9ba164ff82e41f2d649a7193e55189a2b319e1df28f87136c176ce72f3d982e2e

data/lib/exact-target-api/client.rb

@@ -27,7 +27,7 @@ module ET
           @internalAuthToken = jwt['request']['user']['internalOauthToken']
           @refreshKey = jwt['request']['user']['refreshToken']
 
-          self.determineStack
+          self.determine_stack
 
           @authObj = {'oAuth' => {'oAuthToken' => @internalAuthToken}}
           @authObj[:attributes!] = { 'oAuth' => { 'xmlns' => 'http://exacttarget.com' }}
@@ -41,7 +41,7 @@ module ET
                                open_timeout: 180,
                                read_timeout: 180)
         end
-        refreshToken
+        refresh_token
       rescue
         raise
       end
@@ -49,7 +49,7 @@ module ET
       @ready = @auth.operations.length > 0 && @status >= 200 && @status <= 400
     end
 
-    def refreshToken(force = nil)
+    def refresh_token(force = nil)
       #If we don't already have a token or the token expires within 5 min(300 seconds), get one
       if force || @authToken.nil? || Time.now + 300 > @authTokenExpiration
         begin
@@ -58,10 +58,12 @@ module ET
           http.use_ssl = true
           request = Net::HTTP::Post.new(uri.request_uri)
 
-          jsonPayload = {clientId: @clientId, clientSecret: @clientSecret}#, accessType: 'offline'}
+          jsonPayload = {clientId: @clientId, clientSecret: @clientSecret, accessType: 'offline'}
           # Pass in the refreshKey if we have it
-          jsonPayload[:refreshToken] = @refreshKey if @refreshKey
-
+          if @refreshKey
+            jsonPayload[:refreshToken] = @refreshKey
+            jsonPayload[:scope] = "cas:#{@internalAuthToken}"
+          end
           request.body = jsonPayload.to_json
           request.add_field "Content-Type", "application/json"
           tokenResponse = JSON.parse(http.request(request).body)
@@ -78,7 +80,7 @@ module ET
           end
 
 
-          self.determineStack if @endpoint.nil?
+          self.determine_stack if @endpoint.nil?
 
           @authObj = {'oAuth' => {'oAuthToken' => @internalAuthToken}}
           @authObj[:attributes!] = {'oAuth' => {'xmlns' => 'http://exacttarget.com' }}
@@ -155,7 +157,7 @@ module ET
       @wsdl = config[:defaultwsdl] || 'https://webservice.exacttarget.com/etframework.wsdl'
     end
 
-    def determineStack
+    def determine_stack
       begin
         uri = URI.parse("https://www.exacttargetapis.com/platform/v1/endpoints/soap?access_token=" + @authToken)
         http = Net::HTTP.new(uri.host, uri.port)
@@ -171,5 +173,7 @@ module ET
         raise 'Unable to determine stack using /platform/v1/tokenContext: ' + e.message
       end
     end
+
+    alias_method :refreshToken, :refresh_token
   end
-end
+end

data/lib/exact-target-api/subscriber.rb

@@ -24,7 +24,11 @@ module ET
       end
 
       props = {'EmailAddress' => email}
-      props['SubscriberKey'] = params.delete('SubscriberKey') if params['SubscriberKey']
+      props['SubscriberKey'] = if params['SubscriberKey']
+                                 params.delete('SubscriberKey')
+                               else
+                                 email
+                               end
 
       props['Lists'] =  [{'ID' => list_id.to_s}] if list_id
 

data/lib/exact-target-api/version.rb

@@ -1,3 +1,3 @@
 module ET
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exact-target-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Shapiotko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon