fuelsdk 0.0.3 → 0.0.4

data/lib/fuelsdk/version.rb

@@ -1,3 +1,3 @@
 module FuelSDK
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/samples/sample-bounceevent.rb

@@ -2,14 +2,14 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	## Modify the date below to reduce the number of results returned from the request
 	## Setting this too far in the past could result in a very large response size
 	retrieveDate = '2011-01-15T13:00:00.000'
 
 	p '>>> Retrieve Filtered BounceEvents with GetMoreResults'
-	getBounceEvent = FuelSDK::ET_BounceEvent.new()
+	getBounceEvent = FuelSDK::BounceEvent.new()
 	getBounceEvent.authStub = stubObj
 	getBounceEvent.props = ["SendID","SubscriberKey","EventDate","Client.ID","EventType","BatchID","TriggeredSendDefinitionObjectID","PartnerKey"]
 	getBounceEvent.filter = {'Property' => 'EventDate','SimpleOperator' => 'greaterThan','DateValue' => retrieveDate}
@@ -38,7 +38,7 @@ begin
 	#  The following request could potentially bring back large amounts of data if run against a production account
 =begin
 	p '>>> Retrieve All BounceEvents with GetMoreResults'
-	getBounceEvent = FuelSDK::ET_BounceEvent.new()
+	getBounceEvent = FuelSDK::BounceEvent.new()
 	getBounceEvent.authStub = stubObj
 	getBounceEvent.props = ["SendID","SubscriberKey","EventDate","Client.ID","EventType","BatchID","TriggeredSendDefinitionObjectID","PartnerKey"]
 	getResponse = getBounceEvent.get

data/samples/sample-campaign.rb

@@ -3,11 +3,11 @@ require_relative 'sample_helper'
 
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	# Create List
 	p '>>> Create List'
-	postList = FuelSDK::ET_List.new
+	postList = FuelSDK::List.new
 	postList.authStub = stubObj
 	postList.props = {"ListName" => 'RubyAssetList', "Description" => "This list was created with the RubySDK", "Type" => "Private" }
 	postResponse = postList.post
@@ -25,7 +25,7 @@ begin
 
 	# Retrieve all Campaigns
 	p '>>> Retrieve all Campaigns'
-	getCamp = FuelSDK::ET_Campaign.new
+	getCamp = FuelSDK::Campaign.new
 	getCamp.authStub = stubObj
 	getResponse = getCamp.get
 	p 'Retrieve Status: ' + getResponse.status.to_s
@@ -50,7 +50,7 @@ begin
 
 	# Create a new Campaign
 	p '>>> Create a new Campaign'
-	postCamp = FuelSDK::ET_Campaign.new
+	postCamp = FuelSDK::Campaign.new
 	postCamp.authStub = stubObj
 	postCamp.props = {"name" => "RubySDKCreatedForTest1", "description"=> "RubySDKCreatedForTest", "color"=>"FF9933", "favorite"=>"false"}
 	postResponse = postCamp.post
@@ -66,7 +66,7 @@ begin
 
 		# Retrieve the new Campaign
 		p '>>> Retrieve the new Campaign'
-		getCamp =  FuelSDK::ET_Campaign.new
+		getCamp =  FuelSDK::Campaign.new
 		getCamp.authStub = stubObj
 		getCamp.props = {"id" => IDOfpostCampaign}
 		getResponse = getCamp.get
@@ -80,7 +80,7 @@ begin
 
 		# Update the new Campaign
 		p '>>> Update the new Campaign'
-		patchCamp = FuelSDK::ET_Campaign.new
+		patchCamp = FuelSDK::Campaign.new
 		patchCamp.authStub = stubObj
 		patchCamp.props = {"id"=> IDOfpostCampaign, "name" => "RubySDKCreated-Updated!"}
 		patchResponse = patchCamp.patch
@@ -94,7 +94,7 @@ begin
 
 		# Retrieve the updated Campaign
 		p '>>> Retrieve the updated Campaign'
-		getCamp = FuelSDK::ET_Campaign.new
+		getCamp = FuelSDK::Campaign.new
 		getCamp.authStub = stubObj
 		getCamp.props = {"id" => IDOfpostCampaign}
 		getResponse = getCamp.get
@@ -108,7 +108,7 @@ begin
 
 		# Create a new Campaign Asset
 		p '>>> Create a new Campaign Asset'
-		postCampAsset = FuelSDK::ET_Campaign::Asset.new
+		postCampAsset = FuelSDK::Campaign::Asset.new
 		postCampAsset.authStub = stubObj
 		postCampAsset.props = {"id" => IDOfpostCampaign, "ids"=> [ExampleAssetItemID], "type"=> ExampleAssetType}
 		postResponse = postCampAsset.post
@@ -124,7 +124,7 @@ begin
 
 		# Retrieve all Campaign Asset for a campaign
 		p '>>> Retrieve all Campaign Asset for a Campaign'
-		getCampAsset = FuelSDK::ET_Campaign::Asset.new
+		getCampAsset = FuelSDK::Campaign::Asset.new
 		getCampAsset.authStub = stubObj
 		getCampAsset.props = {"id" => IDOfpostCampaign}
 		getResponse = getCampAsset.get
@@ -138,7 +138,7 @@ begin
 
 		# Retrieve a single new Campaign Asset
 		p '>>> Retrieve a single new Campaign Asset'
-		getCampAsset = FuelSDK::ET_Campaign::Asset.new
+		getCampAsset = FuelSDK::Campaign::Asset.new
 		getCampAsset.authStub = stubObj
 		getCampAsset.props = {"id" => IDOfpostCampaign, "assetId" => IDOfpostCampaignAsset}
 		getResponse = getCampAsset.get
@@ -152,7 +152,7 @@ begin
 
 		# Delete the new Campaign Asset
 		p '>>> Delete the new Campaign Asset'
-		deleteCampAsset = FuelSDK::ET_Campaign::Asset.new
+		deleteCampAsset = FuelSDK::Campaign::Asset.new
 		deleteCampAsset.authStub = stubObj
 		deleteCampAsset.props = {"id" => IDOfpostCampaign, "assetId"=> IDOfpostCampaignAsset}
 		deleteResponse = deleteCampAsset.delete
@@ -166,7 +166,7 @@ begin
 
 		# Get a single a new Campaign Asset to confirm deletion
 		p '>>> Get a single a new Campaign Asset to confirm deletion'
-		getCampAsset = FuelSDK::ET_Campaign::Asset.new
+		getCampAsset = FuelSDK::Campaign::Asset.new
 		getCampAsset.authStub = stubObj
 		getCampAsset.props = {"id" => IDOfpostCampaign}
 		getResponse = getCampAsset.get
@@ -186,7 +186,7 @@ rescue => e
 ensure
 		# Delete the new Campaign
 		p '>>> Delete the new Campaign'
-		deleteCamp = FuelSDK::ET_Campaign.new
+		deleteCamp = FuelSDK::Campaign.new
 		deleteCamp.authStub = stubObj
 		deleteCamp.props = {"id"=> IDOfpostCampaign}
 		deleteResponse = deleteCamp.delete
@@ -199,7 +199,7 @@ ensure
   raise 'Failure deleting campaign asset' unless deleteResponse.success?
 
 		p '>>> Delete List'
-		deleteSub = FuelSDK::ET_List.new()
+		deleteSub = FuelSDK::List.new()
 		deleteSub.authStub = stubObj
 		deleteSub.props = {"ID" => ExampleAssetItemID}
 		deleteResponse = deleteSub.delete

data/samples/sample-clickevent.rb

@@ -2,14 +2,14 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	## Modify the date below to reduce the number of results returned from the request
 	## Setting this too far in the past could result in a very large response size
 	retrieveDate = '2013-01-15T13:00:00.000'
 
 	p '>>> Retrieve Filtered ClickEvents with GetMoreResults'
-	getClickEvent = FuelSDK::ET_ClickEvent.new()
+	getClickEvent = FuelSDK::ClickEvent.new()
 	getClickEvent.authStub = stubObj
 	getClickEvent.props = ["SendID","SubscriberKey","EventDate","Client.ID","EventType","BatchID","TriggeredSendDefinitionObjectID","PartnerKey"]
 	getClickEvent.filter = {'Property' => 'EventDate','SimpleOperator' => 'greaterThan','DateValue' => retrieveDate}
@@ -39,7 +39,7 @@ begin
 	#  The following request could potentially bring back large amounts of data if run against a production account
 =begin
 	p '>>> Retrieve All ClickEvents with GetMoreResults'
-	getClickEvent = FuelSDK::ET_ClickEvent.new()
+	getClickEvent = FuelSDK::ClickEvent.new()
 	getClickEvent.authStub = stubObj
 	getClickEvent.props = ["SendID","SubscriberKey","EventDate","Client.ID","EventType","BatchID","TriggeredSendDefinitionObjectID","PartnerKey"]
 	getResponse = getClickEvent.get

data/samples/sample-contentarea.rb

@@ -2,11 +2,11 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	# Retrieve All ContentArea with GetMoreResults
 	p '>>> Retrieve All ContentArea with GetMoreResults'
-	getContent = FuelSDK::ET_ContentArea.new()
+	getContent = FuelSDK::ContentArea.new()
 	getContent.authStub = stubObj
 	getContent.props = ["RowObjectID","ObjectID","ID","CustomerKey","Client.ID","ModifiedDate","CreatedDate","CategoryID","Name","Layout","IsDynamicContent","Content","IsSurvey","IsBlank","Key"]
 	getResponse = getContent.get
@@ -33,7 +33,7 @@ begin
 
 	# Create ContentArea
 	p '>>> Create ContentArea'
-	postContent = FuelSDK::ET_ContentArea.new
+	postContent = FuelSDK::ContentArea.new
 	postContent.authStub = stubObj
 	postContent.props = {"CustomerKey" => NameOfTestContentArea, "Name"=>NameOfTestContentArea, "Content"=> "<b>Some HTML Content Goes here</b>"}
 	postResponse = postContent.post
@@ -46,7 +46,7 @@ begin
 
 	# Retrieve newly created ContentArea
 	p '>>> Retrieve newly created ContentArea'
-	getContent = FuelSDK::ET_ContentArea.new()
+	getContent = FuelSDK::ContentArea.new()
 	getContent.authStub = stubObj
 	getContent.props = ["RowObjectID","ObjectID","ID","CustomerKey","Client.ID","ModifiedDate","CreatedDate","CategoryID","Name","Layout","IsDynamicContent","Content","IsSurvey","IsBlank","Key"]
 	getContent.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestContentArea}
@@ -61,7 +61,7 @@ begin
 
 	# Update ContentArea
 	p '>>> Update ContentArea'
-	patchContent = FuelSDK::ET_ContentArea.new
+	patchContent = FuelSDK::ContentArea.new
 	patchContent.authStub = stubObj
 	patchContent.props = {"CustomerKey" => NameOfTestContentArea, "Name"=>NameOfTestContentArea, "Content"=> "<b>Some HTML Content Goes here. NOW WITH NEW CONTENT</b>"}
 	patchResponse = patchContent.patch
@@ -74,7 +74,7 @@ begin
 
 	# Retrieve updated ContentArea
 	p '>>> Retrieve updated ContentArea'
-	getContent = FuelSDK::ET_ContentArea.new()
+	getContent = FuelSDK::ContentArea.new()
 	getContent.authStub = stubObj
 	getContent.props = ["RowObjectID","ObjectID","ID","CustomerKey","Client.ID","ModifiedDate","CreatedDate","CategoryID","Name","Layout","IsDynamicContent","Content","IsSurvey","IsBlank","Key"]
 	getContent.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestContentArea}
@@ -89,7 +89,7 @@ begin
 
 	# Delete ContentArea
 	p '>>> Delete ContentArea'
-	deleteContent = FuelSDK::ET_ContentArea.new
+	deleteContent = FuelSDK::ContentArea.new
 	deleteContent.authStub = stubObj
 	deleteContent.props = {"CustomerKey" => NameOfTestContentArea, "Name"=>NameOfTestContentArea, "Content"=> "<b>Some HTML Content Goes here. NOW WITH NEW CONTENT</b>"}
 	deleteResponse = deleteContent.delete
@@ -102,7 +102,7 @@ begin
 
 	# Retrieve ContentArea to confirm deletion
 	p '>>> Retrieve ContentArea to confirm deletion'
-	getContent = ET_ContentArea.new()
+	getContent = FuelSDK::ContentArea.new()
 	getContent.authStub = stubObj
 	getContent.props = ["RowObjectID","ObjectID","ID","CustomerKey","Client.ID","ModifiedDate","CreatedDate","CategoryID","Name","Layout","IsDynamicContent","Content","IsSurvey","IsBlank","Key"]
 	getContent.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestContentArea}

data/samples/sample-email.rb

@@ -2,11 +2,11 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	# Retrieve All Email with GetMoreResults
 	p '>>> Retrieve All Email with GetMoreResults'
-	getHTMLBody = FuelSDK::ET_Email.new()
+	getHTMLBody = FuelSDK::Email.new()
 	getHTMLBody.authStub = stubObj
 	getHTMLBody.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Name","Folder","CategoryID","HTMLBody","TextBody","Subject","IsActive","IsHTMLPaste","ClonedFromID","Status","EmailType","CharacterSet","HasDynamicSubjectLine","ContentCheckStatus","Client.PartnerClientKey","ContentAreas","CustomerKey"]
 	getResponse = getHTMLBody.get
@@ -33,7 +33,7 @@ begin
 
 	# Create Email
 	p '>>> Create Email'
-	postHTMLBody = FuelSDK::ET_Email.new
+	postHTMLBody = FuelSDK::Email.new
 	postHTMLBody.authStub = stubObj
 	postHTMLBody.props = {"CustomerKey" => NameOfTestEmail, "Name"=>NameOfTestEmail, "Subject" => "Created Using the RubySDK", "HTMLBody"=> "<b>Some HTML Goes here</b>"}
 	postResponse = postHTMLBody.post
@@ -46,7 +46,7 @@ begin
 
 	# Retrieve newly created Email
 	p '>>> Retrieve newly created Email'
-	getHTMLBody = FuelSDK::ET_Email.new()
+	getHTMLBody = FuelSDK::Email.new()
 	getHTMLBody.authStub = stubObj
 	getHTMLBody.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Name","Folder","CategoryID","HTMLBody","TextBody","Subject","IsActive","IsHTMLPaste","ClonedFromID","Status","EmailType","CharacterSet","HasDynamicSubjectLine","ContentCheckStatus","Client.PartnerClientKey","ContentAreas","CustomerKey"]
 	getHTMLBody.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestEmail}
@@ -61,7 +61,7 @@ begin
 
 	# Update Email
 	p '>>> Update Email'
-	patchHTMLBody = FuelSDK::ET_Email.new
+	patchHTMLBody = FuelSDK::Email.new
 	patchHTMLBody.authStub = stubObj
 	patchHTMLBody.props = {"CustomerKey" => NameOfTestEmail, "Name"=>NameOfTestEmail,  "HTMLBody"=> "<b>Some HTML HTMLBody Goes here. NOW WITH NEW HTMLBody</b>"}
 	patchResponse = patchHTMLBody.patch
@@ -74,7 +74,7 @@ begin
 
 	# Retrieve updated Email
 	p '>>> Retrieve updated Email'
-	getHTMLBody = FuelSDK::ET_Email.new()
+	getHTMLBody = FuelSDK::Email.new()
 	getHTMLBody.authStub = stubObj
 	getHTMLBody.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Name","Folder","CategoryID","HTMLBody","TextBody","Subject","IsActive","IsHTMLPaste","ClonedFromID","Status","EmailType","CharacterSet","HasDynamicSubjectLine","ContentCheckStatus","Client.PartnerClientKey","ContentAreas","CustomerKey"]
 	getHTMLBody.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestEmail}
@@ -89,7 +89,7 @@ begin
 
 	# Delete Email
 	p '>>> Delete Email'
-	deleteHTMLBody = FuelSDK::ET_Email.new
+	deleteHTMLBody = FuelSDK::Email.new
 	deleteHTMLBody.authStub = stubObj
 	deleteHTMLBody.props = {"CustomerKey" => NameOfTestEmail, "Name"=>NameOfTestEmail, "HTMLBody"=> "<b>Some HTML HTMLBody Goes here. NOW WITH NEW HTMLBody</b>"}
 	deleteResponse = deleteHTMLBody.delete
@@ -102,7 +102,7 @@ begin
 
 	# Retrieve Email to confirm deletion
 	p '>>> Retrieve Email to confirm deletion'
-	getHTMLBody = FuelSDK::ET_Email.new()
+	getHTMLBody = FuelSDK::Email.new()
 	getHTMLBody.authStub = stubObj
 	getHTMLBody.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Name","Folder","CategoryID","HTMLBody","TextBody","Subject","IsActive","IsHTMLPaste","ClonedFromID","Status","EmailType","CharacterSet","HasDynamicSubjectLine","ContentCheckStatus","Client.PartnerClientKey","ContentAreas","CustomerKey"]
 	getHTMLBody.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestEmail}

data/samples/sample-folder.rb

@@ -2,11 +2,11 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	# Retrieve All Folder with GetMoreResults
 	p '>>> Retrieve All Folder with GetMoreResults'
-	getFolder = FuelSDK::ET_Folder.new()
+	getFolder = FuelSDK::Folder.new()
 	getFolder.authStub = stubObj
 	getFolder.props = ["ID", "Client.ID", "ParentFolder.ID", "ParentFolder.CustomerKey", "ParentFolder.ObjectID", "ParentFolder.Name", "ParentFolder.Description", "ParentFolder.ContentType", "ParentFolder.IsActive", "ParentFolder.IsEditable", "ParentFolder.AllowChildren", "Name", "Description", "ContentType", "IsActive", "IsEditable", "AllowChildren", "CreatedDate", "ModifiedDate", "Client.ModifiedBy", "ObjectID", "CustomerKey", "Client.EnterpriseID", "Client.CreatedBy"]
 	getResponse = getFolder.get
@@ -33,7 +33,7 @@ begin
 
 	# Retrieve Specific Folder for Email Folder ParentID
 	p '>>> Retrieve Specific Folder for Email Folder ParentID'
-	getFolder = FuelSDK::ET_Folder.new()
+	getFolder = FuelSDK::Folder.new()
 	getFolder.authStub = stubObj
 	getFolder.props = ["ID"]
 	getFolder.filter = {'LeftOperand' => {'Property' => 'ParentFolder.ID','SimpleOperator' => 'equals','Value' => '0'}, 'LogicalOperator' => 'AND', 'RightOperand' => {'Property' => 'ContentType','SimpleOperator' => 'equals','Value' => 'EMAIL'}}
@@ -52,7 +52,7 @@ begin
 
 		# Create Folder
 		p '>>> Create Folder'
-		postFolder = FuelSDK::ET_Folder.new
+		postFolder = FuelSDK::Folder.new
 		postFolder.authStub = stubObj
 		postFolder.props = {"CustomerKey" => NameOfTestFolder, "Name" => NameOfTestFolder, "Description" => NameOfTestFolder, "ContentType"=> "EMAIL", "ParentFolder" => {"ID" => ParentIDForEmail}}
 		postResponse = postFolder.post
@@ -65,7 +65,7 @@ begin
 
 		# Retrieve newly created Folder
 		p '>>> Retrieve newly created Folder'
-		getFolder = FuelSDK::ET_Folder.new()
+		getFolder = FuelSDK::Folder.new()
 		getFolder.authStub = stubObj
 		getFolder.props = ["ID", "Client.ID", "ParentFolder.ID", "ParentFolder.CustomerKey", "ParentFolder.ObjectID", "ParentFolder.Name", "ParentFolder.Description", "ParentFolder.ContentType", "ParentFolder.IsActive", "ParentFolder.IsEditable", "ParentFolder.AllowChildren", "Name", "Description", "ContentType", "IsActive", "IsEditable", "AllowChildren", "CreatedDate", "ModifiedDate", "Client.ModifiedBy", "ObjectID", "CustomerKey", "Client.EnterpriseID", "Client.CreatedBy"]
 		getFolder.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestFolder}
@@ -81,7 +81,7 @@ begin
 
 		# Update Folder
 		p '>>> Update Folder'
-		patchFolder = FuelSDK::ET_Folder.new
+		patchFolder = FuelSDK::Folder.new
 		patchFolder.authStub = stubObj
 		patchFolder.props = {"CustomerKey" => NameOfTestFolder, "Description" => "New Description"}
 		patchResponse = patchFolder.patch
@@ -94,7 +94,7 @@ begin
 
 		# Retrieve updated Folder
 		p '>>> Retrieve updated Folder'
-		getFolder = FuelSDK::ET_Folder.new()
+		getFolder = FuelSDK::Folder.new()
 		getFolder.authStub = stubObj
 		getFolder.props = ["ID", "Client.ID", "ParentFolder.ID", "ParentFolder.CustomerKey", "ParentFolder.ObjectID", "ParentFolder.Name", "ParentFolder.Description", "ParentFolder.ContentType", "ParentFolder.IsActive", "ParentFolder.IsEditable", "ParentFolder.AllowChildren", "Name", "Description", "ContentType", "IsActive", "IsEditable", "AllowChildren", "CreatedDate", "ModifiedDate", "Client.ModifiedBy", "ObjectID", "CustomerKey", "Client.EnterpriseID", "Client.CreatedBy"]
 		getFolder.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestFolder}
@@ -109,7 +109,7 @@ begin
 
 		# Delete Folder
 		p '>>> Delete Folder'
-		deleteFolder = FuelSDK::ET_Folder.new
+		deleteFolder = FuelSDK::Folder.new
 		deleteFolder.authStub = stubObj
 		deleteFolder.props = {"CustomerKey" => NameOfTestFolder, "Name"=>NameOfTestFolder, "Content"=> "<b>Some HTML Content Goes here. NOW WITH NEW CONTENT</b>"}
 		deleteResponse = deleteFolder.delete
@@ -122,7 +122,7 @@ begin
 
 		# Retrieve Folder to confirm deletion
 		p '>>> Retrieve Folder to confirm deletion'
-		getFolder = FuelSDK::ET_Folder.new()
+		getFolder = FuelSDK::Folder.new()
 		getFolder.authStub = stubObj
 		getFolder.props = ["ID"]
 		getFolder.filter = {'Property' => 'CustomerKey','SimpleOperator' => 'equals','Value' => NameOfTestFolder}

data/samples/sample-list.rb

@@ -2,13 +2,13 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	NewListName = "RubySDKList"
 
 	# Create List
 	p '>>> Create List'
-	postList = FuelSDK::ET_List.new
+	postList = FuelSDK::List.new
 	postList.authStub = stubObj
 	postList.props = {"ListName" => NewListName, "Description" => "This list was created with the RubySDK", "Type" => "Private" }
 	postResponse = postList.post
@@ -27,7 +27,7 @@ begin
 
 		# Retrieve newly created List by ID
 		p '>>> Retrieve newly created List'
-		getList = FuelSDK::ET_List.new()
+		getList = FuelSDK::List.new()
 		getList.authStub = stubObj
 		getList.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Client.PartnerClientKey","ListName","Description","Category","Type","CustomerKey","ListClassification","AutomatedEmail.ID"]
 		getList.filter = {'Property' =>  'ID','SimpleOperator' => 'equals','Value' => newListID}
@@ -42,7 +42,7 @@ begin
 
 		# Update List
 		p '>>> Update List'
-		patchSub = FuelSDK::ET_List.new
+		patchSub = FuelSDK::List.new
 		patchSub.authStub = stubObj
 		patchSub.props = {"ID" => newListID, "Description" => "I updated the description"}
 		patchResponse = patchSub.patch
@@ -56,7 +56,7 @@ begin
 
 		# Retrieve List that should have description updated
 		p '>>> Retrieve List that should have description updated '
-		getList = FuelSDK::ET_List.new()
+		getList = FuelSDK::List.new()
 		getList.authStub = stubObj
 		getList.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Client.PartnerClientKey","ListName","Description","Category","Type","CustomerKey","ListClassification","AutomatedEmail.ID"]
 		getList.filter = {'Property' => 'ID','SimpleOperator' => 'equals','Value' => newListID}
@@ -71,7 +71,7 @@ begin
 
 		# Delete List
 		p '>>> Delete List'
-		deleteSub = FuelSDK::ET_List.new()
+		deleteSub = FuelSDK::List.new()
 		deleteSub.authStub = stubObj
 		deleteSub.props = {"ID" => newListID}
 		deleteResponse = deleteSub.delete
@@ -84,7 +84,7 @@ begin
 
 		# Retrieve List to confirm deletion
 		p '>>> Retrieve List to confirm deletion'
-		getList = FuelSDK::ET_List.new()
+		getList = FuelSDK::List.new()
 		getList.authStub = stubObj
 		getList.props = ["ID","PartnerKey","CreatedDate","ModifiedDate","Client.ID","Client.PartnerClientKey","ListName","Description","Category","Type","CustomerKey","ListClassification","AutomatedEmail.ID"]
 		getList.filter = {'Property' => 'ID','SimpleOperator' => 'equals','Value' => newListID}

data/samples/sample-list.subscriber.rb

@@ -2,7 +2,7 @@ require 'fuelsdk'
 require_relative 'sample_helper'
 
 begin
-	stubObj = FuelSDK::ET_Client.new auth
+	stubObj = FuelSDK::Client.new auth
 
 	# NOTE: These examples only work in accounts where the SubscriberKey functionality is not enabled
 	#       SubscriberKey will need to be included in the props if that feature is enabled
@@ -12,7 +12,7 @@ begin
 
 	# Create List
 	p '>>> Create List'
-	postList = FuelSDK::ET_List.new
+	postList = FuelSDK::List.new
 	postList.authStub = stubObj
 	postList.props = {"ListName" => NewListName, "Description" => "This list was created with the RubySDK", "Type" => "Private" }
 	postResponse = postList.post
@@ -32,7 +32,7 @@ begin
 
 		# Create Subscriber On List
 		p '>>> Create Subscriber On List'
-		postSub = FuelSDK::ET_Subscriber.new
+		postSub = FuelSDK::Subscriber.new
 		postSub.authStub = stubObj
 		postSub.props = {"EmailAddress" => SubscriberTestEmail, "Lists" =>[{"ID" => newListID}]}
 		postResponse = postSub.post
@@ -48,7 +48,7 @@ begin
 			if postResponse.results[0][:error_code] == "12014" then
 				# Update Subscriber to add to List
 				p '>>> Update Subscriber to add to List'
-				patchSub = FuelSDK::ET_Subscriber.new
+				patchSub = FuelSDK::Subscriber.new
 				patchSub.authStub = stubObj
 				patchSub.props = {"EmailAddress" => SubscriberTestEmail, "Lists" =>[{"ID" => newListID}]}
 				patchResponse = patchSub.patch
@@ -64,7 +64,7 @@ begin
 
 		# Retrieve all Subscribers on the List
 		p '>>> Retrieve all Subscribers on the List'
-		getListSubs = FuelSDK::ET_List::Subscriber.new
+		getListSubs = FuelSDK::List::Subscriber.new
 		getListSubs.authStub = stubObj
 		getListSubs.props = ["ObjectID","SubscriberKey","CreatedDate","Client.ID","Client.PartnerClientKey","ListID","Status"]
 		getListSubs.filter = {'Property' => 'ListID','SimpleOperator' => 'equals','Value' => newListID}
@@ -79,7 +79,7 @@ begin
 
 		# Delete List
 		p '>>> Delete List'
-		deleteSub = FuelSDK::ET_List.new()
+		deleteSub = FuelSDK::List.new()
 		deleteSub.authStub = stubObj
 		deleteSub.props = {"ID" => newListID}
 		deleteResponse = deleteSub.delete