exact_target_rest 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c619daa30b70dc6807b0e57e95de854633bc4328
-  data.tar.gz: 70f5940d63176afbc6550e3fef3983f081af6913
+  metadata.gz: e1aae8d038af8c94d376bd83c559e0ea98a0a611
+  data.tar.gz: e160cf3bca7bde14c48272865a3daaacc3b05ee8
 SHA512:
-  metadata.gz: c9b75e3fa94e08c19ce0f7d673e35fb9ada526ab47069e7286345a68ecaeada3d7ccdc27956855f047e7bbdaf6b78897efa189de35f614cb301cba9f0c3c2864
-  data.tar.gz: a6a468e7313dc448b20888e8f15250fff7a9936947b45a10f2db1b9921d61af277112b827b4219f0551e4d0fbba99d51ece0854b99f606e166d89fbec2928881
+  metadata.gz: 9943d608b41c9f1a21abb3fce489a37cd9651a4671d2a532d2dd8f0dfdaca27f51653b6579f6694ca8b6ff811e6391a42728908030c0a509b968444fe93840f8
+  data.tar.gz: 89e6c8baae62e3daed7a914d6465de164d91d9f43d8d9dc81da7821cb1dfa3e232fa5274ca7330e66deb591a68ccc3338db5c6205530f2b1cb0ffe323d726de1

data/.gitignore

@@ -1,4 +1,6 @@
 .idea/
+.ruby-version
+.ruby-gemset
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/lib/exact_target_rest/authorization.rb

@@ -5,6 +5,7 @@ module ExactTargetRest
   # App Center (https://appcenter-auth.exacttargetapps.com).
   class Authorization
     attr_reader :access_token
+    attr_reader :expires_in
 
     # New authorization (it does not trigger REST yet).
     #
@@ -21,7 +22,6 @@ module ExactTargetRest
     #
     # @yield [access_token] Block to be executed
     # @yieldparam access_token [String] Access token used to authorize a request
-    # @yieldparam expires_in [String] Time to token's expire
     def with_authorization
       authorize! unless authorized?
       yield @access_token
@@ -35,8 +35,8 @@ module ExactTargetRest
       end
       if resp.success?
         @access_token = resp.body['accessToken']
-        @expires_in = Time.now + resp.body['expiresIn']
-        { access_token: @access_token, expires_in: @expires_in }
+        @expires_in = resp.body['expiresIn']
+        self
       else
         fail NotAuthorizedError
       end
@@ -44,13 +44,13 @@ module ExactTargetRest
 
     # Already authorized and NOT expired?
     def authorized?
-      @access_token && @expires_in > Time.now
+      @access_token && (Time.now + @expires_in) > Time.now
     end
 
     protected
 
     def endpoint
-      @endpoint ||= Faraday.new(url: AUTH_URL) do |f|
+      Faraday.new(url: AUTH_URL) do |f|
         f.request :json
         f.response :json, content_type: /\bjson$/
         f.adapter FARADAY_ADAPTER

data/lib/exact_target_rest/triggered_send.rb

@@ -59,6 +59,7 @@ module ExactTargetRest
     # TriggeredSend with loaded attributes.
     def deliver
       tries ||= 1
+
       @authorization.with_authorization do |access_token|
         resp = endpoint.post do |p|
           p.url(format(TRIGGERED_SEND_PATH, URI.encode(@external_key)))
@@ -92,7 +93,7 @@ module ExactTargetRest
     protected
 
     def endpoint
-      @endpoint ||= Faraday.new(url: TRIGGERED_SEND_URL) do |f|
+      Faraday.new(url: TRIGGERED_SEND_URL) do |f|
         f.request :json
         f.response :json, content_type: /\bjson$/
         f.adapter FARADAY_ADAPTER

data/lib/exact_target_rest/version.rb

@@ -1,3 +1,3 @@
 module ExactTargetRest
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/spec/lib/exact_target_rest/authorization_spec.rb

@@ -34,8 +34,8 @@ describe Authorization do
     it "returns a valid authorization" do
       auth = subject.new(client_id, client_secret).authorize!
 
-      expect(auth[:access_token]).to eq access_token
-      expect(auth[:expires_in]).not_to be_nil
+      expect(auth.access_token).to eq access_token
+      expect(auth.expires_in).not_to be_nil
     end
 
     it "returns Unauthorized" do
@@ -45,12 +45,20 @@ describe Authorization do
     end
   end
 
+  describe '#to_yaml' do
+    it "serializes and deserializes Authorization" do
+      auth = subject.new(client_id, client_secret).authorize!
+
+      expect(YAML::load(auth.to_yaml)).to be_instance_of(ExactTargetRest::Authorization)
+    end
+  end
+
   private
 
   def stub_requests
-    stub_request(:post, "https://auth.exacttargetapis.com/v1/requestToken").
+    stub_request(:post, ExactTargetRest::AUTH_URL).
       with(
-        :body => "{\"clientId\":\"12345\",\"clientSecret\":\"Y9axRxR9bcvSW2cc0IwoWeq7\"}",
+        :body => "{\"clientId\":\"#{client_id}\",\"clientSecret\":\"#{client_secret}\"}",
         :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}
         ).
       to_return(
@@ -61,7 +69,7 @@ describe Authorization do
 
     stub_request(:any, ExactTargetRest::AUTH_URL).
       with(
-        :body => "{\"clientId\":\"invalid\",\"clientSecret\":\"Y9axRxR9bcvSW2cc0IwoWeq7\"}",
+        :body => "{\"clientId\":\"invalid\",\"clientSecret\":\"#{client_secret}\"}",
         :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}
         ).
       to_return(

data/spec/lib/exact_target_rest/triggered_send_spec.rb

@@ -56,6 +56,20 @@ describe TriggeredSend do
 
   end
 
+  describe '#to_yaml' do
+    it "serializes and deserializes TriggeredSend" do
+      authorization = ExactTargetRest::Authorization.new("client_id", "client_secret").authorize!
+
+      ts = ExactTargetRest::TriggeredSend.new(authorization, "external_key").
+        with_options(
+          email_address: "jake@oo.com",
+          subscriber_attributes: { "City" => "São Paulo", "Profile ID" => "42" }
+          )
+
+      expect(YAML::load(ts.to_yaml)).to be_instance_of(ExactTargetRest::TriggeredSend)
+    end
+  end
+
   private
 
   def stub_requests

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exact_target_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -131,7 +131,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
 - Gemfile
 - Guardfile
 - LICENSE.txt

data/.ruby-gemset

@@ -1 +0,0 @@
-exact_target_rest