fuelsdk 0.1.1 → 0.1.2

data/ChangeLog.md

@@ -1,13 +1,22 @@
 FuelSDK-Ruby
 ============
 
-2013-09-11: Version 0.1.1  
+2013-09-18: Version 0.1.2
+```
+  get properties for dataextension for retrieve and edit calls
+
+  clear soap client on refresh so the client gets re-established with header with new token
+
+  refresh tests
+```
+
+2013-09-11: Version 0.1.1
 ```
  Added ChangeLog
- 
+
  soap_configure, soap_perform with supporting tests
- 
+
  make soap_cud more rubular and easier to read and support
- 
+
  fixed some issues when trying to make requests after being passed a jwt
 ```

data/README.md

@@ -81,7 +81,7 @@ All methods on Fuel SDK objects return a generic object that follows the same st
 - code: HTTP Error Code (will always be 200 for SOAP requests)
 - message: Text values containing more details in the event of an error
 - results: Collection containing the details unique to the method called.
- - more? - Boolean value that indicates on Get requests if more data is available.
+- more? - Boolean value that indicates on Get requests if more data is available.
 
 
 ## Samples ##

data/fuelsdk.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
 
-  spec.add_dependency "savon", "~> 2.0"
+  spec.add_dependency "savon", "2.1.0"
   spec.add_dependency "json", "~> 1.7.0"
   spec.add_dependency "jwt", "~> 0.1.6"
   spec.add_dependency "activesupport", "~> 3.2.8"

data/lib/fuelsdk/client.rb

@@ -90,15 +90,20 @@ module FuelSDK
     end
 
     def request_token_options data
-      Hash.new.tap do |h|
-        h['data'] = data
-        h['content_type'] = 'application/json'
-        h['params'] = {'legacy' => 1}
-      end
+      {
+        'data' => data,
+        'content_type' => 'application/json',
+        'params' => {'legacy' => 1}
+      }
+    end
+
+    def clear_clients
+      instance_variable_set '@soap_client', nil
     end
 
     def refresh force=false
       if (self.auth_token.nil? || force)
+        clear_clients
         options =  request_token_options(request_token_data)
         response = post("https://auth.exacttargetapis.com/v1/requestToken", options)
         raise "Unable to refresh token: #{response['message']}" unless response.has_key?('accessToken')

data/lib/fuelsdk/soap.rb

@@ -139,6 +139,15 @@ module FuelSDK
       rsp
     end
 
+    def get_dataextension_properties dataextension
+      soap_get('DataExtensionField',
+        'Name',
+        'Property' => "DataExtension.CustomerKey",
+        'SimpleOperator' => 'equals',
+        'Value' => dataextension
+      ).results.collect{|f| f[:name]}
+    end
+
     def cache_properties action, object_type, properties
       raise 'Properties should be in cache as a list' unless properties.kind_of? Array
       cache[action][object_type] = properties

data/lib/fuelsdk/version.rb

@@ -1,3 +1,3 @@
 module FuelSDK
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/client_spec.rb

@@ -161,6 +161,49 @@ describe FuelSDK::Client do
 
     let(:client) { FuelSDK::Client.new }
 
+    it 'does nothing if auth_token exists' do
+      client.should_receive(:auth_token).and_return(true)
+      client.should_not_receive(:clear_clients)
+      client.refresh
+    end
+
+    describe 'requests and sets new tokens' do
+      subject {
+        client.should_receive(:request_token_data)
+        client.should_receive(:request_token_options).and_return('options')
+        client.should_receive(:post)
+          .with("https://auth.exacttargetapis.com/v1/requestToken", 'options')
+          .and_return 'accessToken' => :access,
+            'legacyToken' => :legacy,
+            'refreshToken' => :refresh
+        client
+      }
+      it 'calls #clear_clients' do
+        subject.instance_variable_set '@soap_client', 'SOAP'
+        expect(subject.instance_variable_get '@soap_client').to eq 'SOAP'
+        subject.refresh
+        expect(subject.instance_variable_get '@soap_client').to be_nil
+      end
+      it 'sets auth_token' do
+        subject.refresh
+        expect(subject.auth_token).to eq :access
+      end
+      it 'sets internal_token' do
+        subject.refresh
+        expect(subject.internal_token).to eq :legacy
+      end
+      it 'sets refresh_token' do
+        subject.refresh
+        expect(subject.refresh_token).to eq :refresh
+      end
+
+      it 'sets auth_token when forced and auth_token is present' do
+        subject.auth_token = true
+        subject.refresh(true)
+        expect(subject.auth_token).to eq :access
+      end
+    end
+
     context 'raises an exception' do
 
       it 'when client id and secret are missing' do
@@ -177,22 +220,6 @@ describe FuelSDK::Client do
         expect { client.refresh }.to raise_exception 'Require Client Id and Client Secret to refresh tokens'
       end
     end
-
-    #context 'posts' do
-    #  let(:client) { FuelSDK::Client.new 'client' => { 'id' => 123, 'secret' => 'sssh'} }
-    #  it 'accessType=offline' do
-    #  client.stub(:post)
-    #    .with({'clientId' => 123, 'secret' => 'ssh', 'accessType' => 'offline'})
-    #    .and_return()
-    #end
-
-    #context 'updates' do
-    #  let(:client) { FuelSDK::Client.new 'client' => { 'id' => 123, 'secret' => 'sssh'} }
-
-    #  it 'access_token' do
-    #    #client.stub(:post).
-    #  end
-    #end
   end
 
   describe 'includes HTTPRequest' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuelsdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,17 +97,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement