constantcontact 1.3.2 → 2.0.0

data/lib/constantcontact/services/library_service.rb

@@ -10,18 +10,16 @@ module ConstantContact
       class << self
 
         # Retrieve MyLibrary usage information
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @return [LibrarySummary]
-        def get_library_info(access_token)
+        def get_library_info()
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_info')
 
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           Components::LibrarySummary.create(JSON.parse(response.body).first)
         end
 
 
         # Retrieve a list of MyLibrary folders
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Hash] params - hash of query parameters and values to append to the request.
         #     Allowed parameters include:
         #     sort_by - The method to sort by, valid values are :
@@ -33,10 +31,10 @@ module ConstantContact
         #         NAME_DESC - sorts alphabetically by folder name, z to a
         #     limit -  Specifies the number of results displayed per page of output, from 1 - 50, default = 50.
         # @return [ResultSet<LibraryFolder>]
-        def get_library_folders(access_token, params)
+        def get_library_folders(params)
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_folders')
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           folders = []
           body = JSON.parse(response.body)
           body['results'].each do |folder|
@@ -47,58 +45,53 @@ module ConstantContact
 
 
         # Create a new MyLibrary folder
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [LibraryFolder] folder - MyLibrary folder to be created
         # @return [LibraryFolder]
-        def add_library_folder(access_token, folder)
+        def add_library_folder(folder)
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_folders')
           url = build_url(url)
           payload = folder.to_json
-          response = RestClient.post(url, payload, get_headers(access_token))
+          response = RestClient.post(url, payload, get_headers())
           Components::LibraryFolder.create(JSON.parse(response.body))
         end
 
 
         # Retrieve a specific MyLibrary folder using the folder_id path parameter
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] folder_id - The ID for the folder to return
         # @return [LibraryFolder]
-        def get_library_folder(access_token, folder_id)
+        def get_library_folder(folder_id)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.library_folder'), folder_id)
           url = build_url(url)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           Components::LibraryFolder.create(JSON.parse(response.body))
         end
 
 
         # Update a specific MyLibrary folder
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [LibraryFolder] folder - MyLibrary folder to be updated
         # @return [LibraryFolder]
-        def update_library_folder(access_token, folder)
+        def update_library_folder(folder)
           url = Util::Config.get('endpoints.base_url') + 
                 sprintf(Util::Config.get('endpoints.library_folder'), folder.id)
           url = build_url(url)
           payload = folder.to_json
-          response = RestClient.put(url, payload, get_headers(access_token))
+          response = RestClient.put(url, payload, get_headers())
           Components::LibraryFolder.create(JSON.parse(response.body))
         end
 
 
         # Delete a MyLibrary folder
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] folder_id - The ID for the MyLibrary folder to delete
         # @return [Boolean]
-        def delete_library_folder(access_token, folder_id)
+        def delete_library_folder(folder_id)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.library_folder'), folder_id)
           url = build_url(url)
-          response = RestClient.delete(url, get_headers(access_token))
+          response = RestClient.delete(url, get_headers())
           response.code == 204
         end
 
 
         # Retrieve all files in the Trash folder
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Hash] params - hash of query parameters and values to append to the request.
         #     Allowed parameters include:
         #     type - Specifies the type of files to retrieve, valid values are : ALL, IMAGES, or DOCUMENTS
@@ -115,10 +108,10 @@ module ConstantContact
         #         DIMENSION_DESC - sorts by file dimensions (hxw), largest to smallest
         #     limit -  Specifies the number of results displayed per page of output, from 1 - 50, default = 50.
         # @return [ResultSet<LibraryFile>]
-        def get_library_trash(access_token, params)
+        def get_library_trash(params)
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_folder_trash')
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           files = []
           body = JSON.parse(response.body)
           body['results'].each do |file|
@@ -129,18 +122,16 @@ module ConstantContact
 
 
         # Permanently deletes all files in the Trash folder
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @return [Boolean]
-        def delete_library_trash(access_token)
+        def delete_library_trash()
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_folder_trash')
           url = build_url(url)
-          response = RestClient.delete(url, get_headers(access_token))
+          response = RestClient.delete(url, get_headers())
           response.code == 204
         end
 
 
         # Retrieve a collection of MyLibrary files in the Constant Contact account
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Hash] params - hash of query parameters and values to append to the request.
         #     Allowed parameters include:
         #     type - Specifies the type of files to retrieve, valid values are : ALL, IMAGES, or DOCUMENTS
@@ -154,10 +145,10 @@ module ConstantContact
         #         Mobile
         #     limit -  Specifies the number of results displayed per page of output, from 1 - 1000, default = 50.
         # @return [ResultSet<LibraryFile>]
-        def get_library_files(access_token, params = {})
+        def get_library_files(params = {})
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_files')
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           files = []
           body = JSON.parse(response.body)
           body['results'].each do |file|
@@ -168,17 +159,16 @@ module ConstantContact
 
 
         # Retrieves all files from a MyLibrary folder specified by the folder_id path parameter
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] folder_id  - Specifies the folder from which to retrieve files
         # @param [Hash] params - hash of query parameters and values to append to the request.
         #     Allowed parameters include:
         #     limit - Specifies the number of results displayed per page of output, from 1 - 50, default = 50.
         # @return [ResultSet<LibraryFile>]
-        def get_library_files_by_folder(access_token, folder_id, params = {})
+        def get_library_files_by_folder(folder_id, params = {})
           url = Util::Config.get('endpoints.base_url') + 
                 sprintf(Util::Config.get('endpoints.library_files_by_folder'), folder_id)
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           files = []
           body = JSON.parse(response.body)
           body['results'].each do |file|
@@ -189,19 +179,17 @@ module ConstantContact
 
 
         # Retrieve a MyLibrary file using the file_id path parameter
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] file_id - Specifies the MyLibrary file for which to retrieve information
         # @return [LibraryFile]
-        def get_library_file(access_token, file_id)
+        def get_library_file(file_id)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.library_file'), file_id)
           url = build_url(url)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           Components::LibraryFile.create(JSON.parse(response.body))
         end
 
 
         # Adds a new MyLibrary file using the multipart content-type
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] file_name - The name of the file (ie: dinnerplate-special.jpg)
         # @param [String] folder_id - Folder id to add the file to
         # @param [String] description - The description of the file provided by user 
@@ -212,7 +200,7 @@ module ConstantContact
         # @param [String] file_type - Specifies the file type, valid values are: JPEG, JPG, GIF, PDF, PNG 
         # @param [String] contents - The content of the file
         # @return [LibraryFile]
-        def add_library_file(access_token, file_name, folder_id, description, source, file_type, contents)
+        def add_library_file(file_name, folder_id, description, source, file_type, contents)
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.library_files')
           url = build_url(url)
 
@@ -220,21 +208,20 @@ module ConstantContact
                       :description => description, :source => source, :file_type => file_type, 
                       :data => contents, :multipart => true }
 
-          response = RestClient.post(url, payload, get_headers(access_token))
+          response = RestClient.post(url, payload, get_headers())
           location = response.headers[:location] || ''
           location.split('/').last
         end
 
 
         # Update information for a specific MyLibrary file
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [LibraryFile] file - Library File to be updated
         # @return [LibraryFile]
-        def update_library_file(access_token, file)
+        def update_library_file(file)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.library_file'), file.id)
           url = build_url(url)
           payload = file.to_json
-          response = RestClient.put(url, payload, get_headers(access_token))
+          response = RestClient.put(url, payload, get_headers())
           Components::LibraryFile.create(JSON.parse(response.body))
         end
 
@@ -242,27 +229,25 @@ module ConstantContact
         # Delete one or more MyLibrary files specified by the fileId path parameter; 
         # separate multiple file IDs with a comma. 
         # Deleted files are moved from their current folder into the system Trash folder, and its status is set to Deleted.
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] file_id - Specifies the MyLibrary file to delete
         # @return [Boolean]
-        def delete_library_file(access_token, file_id)
+        def delete_library_file(file_id)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.library_file'), file_id)
           url = build_url(url)
-          response = RestClient.delete(url, get_headers(access_token))
+          response = RestClient.delete(url, get_headers())
           response.code == 204
         end
 
 
         # Retrieve the upload status for one or more MyLibrary files using the file_id path parameter; 
         # separate multiple file IDs with a comma
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] file_id - Specifies the files for which to retrieve upload status information
         # @return [Array<UploadStatus>]
-        def get_library_files_upload_status(access_token, file_id)
+        def get_library_files_upload_status(file_id)
           url = Util::Config.get('endpoints.base_url') + 
                 sprintf(Util::Config.get('endpoints.library_file_upload_status'), file_id)
           url = build_url(url)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           statuses = []
           JSON.parse(response.body).each do |status|
             statuses << Components::UploadStatus.create(status)
@@ -273,17 +258,16 @@ module ConstantContact
 
         # Move one or more MyLibrary files to a different folder in the user's account
         # specify the destination folder using the folder_id path parameter. 
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [String] folder_id - Specifies the destination MyLibrary folder to which the files will be moved
         # @param [String] file_id - Specifies the files to move, in a string of comma separated file ids (e.g. 8,9)
         # @return [Array<MoveResults>]
-        def move_library_files(access_token, folder_id, file_id)
+        def move_library_files(folder_id, file_id)
           url = Util::Config.get('endpoints.base_url') + 
                 sprintf(Util::Config.get('endpoints.library_file_move'), folder_id)
           url = build_url(url)
  
           payload = file_id.split(',').map {|id| id.strip}.to_json
-          response = RestClient.put(url, payload, get_headers(access_token))
+          response = RestClient.put(url, payload, get_headers())
           results = []
           JSON.parse(response.body).each do |result|
             results << Components::MoveResults.create(result)

data/lib/constantcontact/services/list_service.rb

@@ -10,13 +10,12 @@ module ConstantContact
       class << self
 
         # Get lists within an account
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Hash] params - query parameters to be appended to the request
         # @return [Array<ContactList>]
-        def get_lists(access_token, params = {})
+        def get_lists(params = {})
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.lists')
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           lists = []
           JSON.parse(response.body).each do |contact|
             lists << Components::ContactList.create(contact)
@@ -26,52 +25,48 @@ module ConstantContact
 
 
         # Add a new list to the Constant Contact account
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [ContactList] list
         # @return [ContactList]
-        def add_list(access_token, list)
+        def add_list(list)
           url = Util::Config.get('endpoints.base_url') + Util::Config.get('endpoints.lists')
           url = build_url(url)
           payload = list.to_json
-          response = RestClient.post(url, payload, get_headers(access_token))
+          response = RestClient.post(url, payload, get_headers())
           Components::ContactList.create(JSON.parse(response.body))
         end
 
 
         # Update a Contact List
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [ContactList] list - ContactList to be updated
         # @return [ContactList]
-        def update_list(access_token, list)
+        def update_list(list)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.list'), list.id)
           url = build_url(url)
           payload = list.to_json
-          response = RestClient.put(url, payload, get_headers(access_token))
+          response = RestClient.put(url, payload, get_headers())
           Components::ContactList.create(JSON.parse(response.body))
         end
 
 
         # Get an individual contact list
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Integer] list_id - list id
         # @return [ContactList]
-        def get_list(access_token, list_id)
+        def get_list(list_id)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.list'), list_id)
           url = build_url(url)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           Components::ContactList.create(JSON.parse(response.body))
         end
 
 
         # Get all contacts from an individual list
-        # @param [String] access_token - Constant Contact OAuth2 access token
         # @param [Integer] list_id - list id to retrieve contacts for
         # @param [Hash] params - query parameters to attach to request
         # @return [Array<Contact>]
-        def get_contacts_from_list(access_token, list_id, params = nil)
+        def get_contacts_from_list(list_id, params = nil)
           url = Util::Config.get('endpoints.base_url') + sprintf(Util::Config.get('endpoints.list_contacts'), list_id)
           url = build_url(url, params)
-          response = RestClient.get(url, get_headers(access_token))
+          response = RestClient.get(url, get_headers())
           contacts = []
           body = JSON.parse(response.body)
           body['results'].each do |contact|

data/lib/constantcontact/util/config.rb

@@ -132,9 +132,11 @@ module ConstantContact
 
         # Errors to be returned for various exceptions
         :errors => {
-          :id_or_object => 'Only an id or %s object are allowed for this method.',
-          :invalid_webhook => 'Invalid Webhook. The x-ctct-hmac-sha256 does not correspond to message encryption.',
-          :api_secret_missing => 'The api_secret is missing in explicit call or configuration.'
+          :api_key_missing      => 'api_key required either explicitly or in configuration.',
+          :access_token_missing => 'access_token required explicitly.',
+          :id_or_object         => 'Only an id or %s object are allowed for this method.',
+          :invalid_webhook      => 'Invalid Webhook. The x-ctct-hmac-sha256 does not correspond to message encryption.',
+          :api_secret_missing   => 'The api_secret is missing in explicit call or configuration.'
         }
       }
 

data/lib/constantcontact/version.rb

@@ -2,11 +2,11 @@
 # version.rb
 # ConstantContact
 #
-# Copyright (c) 2013 Constant Contact. All rights reserved.
+# Copyright (c) 2015 Constant Contact. All rights reserved.
 
 module ConstantContact
   module SDK
     # Gem version
-    VERSION = "1.3.2"
+    VERSION = "2.0.0"
   end
-end
+end

data/spec/constantcontact/api_spec.rb

@@ -7,7 +7,7 @@
 require 'spec_helper'
 
 describe ConstantContact::Api do
-  
+
   before(:all) {
     ConstantContact::Util::Config.configure do |config|
       config[:auth].delete :api_key
@@ -15,13 +15,19 @@ describe ConstantContact::Api do
       config[:auth].delete :redirect_uri
     end
   }
-  
+
   it "without api_key defined" do
     lambda { 
       ConstantContact::Api.new
-    }.should raise_error(ArgumentError)
+    }.should raise_error(ArgumentError, ConstantContact::Util::Config.get('errors.api_key_missing'))
+  end
+
+  it "without access_token defined" do
+    lambda { 
+      ConstantContact::Api.new('api_key')
+    }.should raise_error(ArgumentError, ConstantContact::Util::Config.get('errors.access_token_missing'))
   end
-  
+
   context "with middle-ware configuration" do
     before(:all) do
       ConstantContact::Services::BaseService.api_key = nil
@@ -33,13 +39,13 @@ describe ConstantContact::Api do
     end
     let(:proc) { lambda { ConstantContact::Api.new } }
     it "use implicit config" do
-      proc.should_not raise_error
+      proc.should raise_error(ArgumentError, ConstantContact::Util::Config.get('errors.access_token_missing'))
     end
-    it "has the correct client_id" do
+    it "has the correct implicit api key" do
       ConstantContact::Services::BaseService.api_key.should == "config_api_key"
     end
   end
-    
+
   context "with middle-ware configuration" do
     before(:all) do
       ConstantContact::Services::BaseService.api_key = nil
@@ -48,16 +54,30 @@ describe ConstantContact::Api do
         config[:auth][:api_secret] = "config_api_secret"
         config[:auth][:redirect_uri] = "config_redirect_uri"
       end
-      ConstantContact::Api.new 'explicit_api_key'
+      ConstantContact::Api.new('explicit_api_key', 'access_token')
     end
     it "has the correct explicit api key" do
       ConstantContact::Services::BaseService.api_key.should == "explicit_api_key"
     end
   end
-  
+
   describe "test methods" do
     before(:each) do
-      @api = ConstantContact::Api.new('api key')
+      @api = ConstantContact::Api.new('api key', 'access token')
+    end
+
+    describe "#get_account_info" do
+      it "gets a summary of account information" do
+        json_response = load_file('account_info_response.json')
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, 'OK')
+
+        response = RestClient::Response.create(json_response, net_http_resp, {})
+        RestClient.stub(:get).and_return(response)
+
+        result = @api.get_account_info()
+        result.should be_kind_of(ConstantContact::Components::AccountInfo)
+        result.website.should eq('http://www.example.com')
+      end
     end
 
     describe "#get_verified_email_addresses" do
@@ -68,7 +88,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        email_addresses = @api.get_verified_email_addresses('token')
+        email_addresses = @api.get_verified_email_addresses()
 
         email_addresses.should be_kind_of(Array)
         email_addresses.first.should be_kind_of(ConstantContact::Components::VerifiedEmailAddress)
@@ -83,7 +103,7 @@ describe ConstantContact::Api do
 
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
-        contacts = @api.get_contacts('token', {:limit => 60})
+        contacts = @api.get_contacts({:limit => 60})
 
         contacts.should be_kind_of(ConstantContact::Components::ResultSet)
         contacts.results.first.should be_kind_of(ConstantContact::Components::Contact)
@@ -98,7 +118,7 @@ describe ConstantContact::Api do
 
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
-        contact = @api.get_contact('token', 1)
+        contact = @api.get_contact(1)
 
         contact.should be_kind_of(ConstantContact::Components::Contact)
       end
@@ -111,7 +131,7 @@ describe ConstantContact::Api do
 
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
-        contacts = @api.get_contact_by_email('token', 'rmartone@systems.com')
+        contacts = @api.get_contact_by_email('rmartone@systems.com')
 
         contacts.results.first.should be_kind_of(ConstantContact::Components::Contact)
       end
@@ -126,7 +146,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         new_contact = ConstantContact::Components::Contact.create(JSON.parse(json_response))
 
-        contact = @api.add_contact('token', new_contact)
+        contact = @api.add_contact(new_contact)
         contact.should be_kind_of(ConstantContact::Components::Contact)
         contact.status.should eq('ACTIVE')
       end
@@ -140,7 +160,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_contact('token', contact_id)
+        result = @api.delete_contact(contact_id)
         result.should be_true
       end
     end
@@ -153,7 +173,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_contact_from_lists('token', contact_id)
+        result = @api.delete_contact_from_lists(contact_id)
         result.should be_true
       end
     end
@@ -167,7 +187,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_contact_from_list('token', contact_id, list_id)
+        result = @api.delete_contact_from_list(contact_id, list_id)
         result.should be_true
       end
     end
@@ -180,7 +200,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:put).and_return(response)
         contact = ConstantContact::Components::Contact.create(JSON.parse(json))
-        result = @api.update_contact('token', contact)
+        result = @api.update_contact(contact)
 
         result.should be_kind_of(ConstantContact::Components::Contact)
         result.status.should eq('ACTIVE')
@@ -194,7 +214,7 @@ describe ConstantContact::Api do
 
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
-        lists = @api.get_lists('token')
+        lists = @api.get_lists()
 
         lists.should be_kind_of(Array)
         lists.first.should be_kind_of(ConstantContact::Components::ContactList)
@@ -210,7 +230,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        list = @api.get_list('token', 1)
+        list = @api.get_list(1)
         list.should be_kind_of(ConstantContact::Components::ContactList)
         list.name.should eq('Monthly Specials')
       end
@@ -225,7 +245,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         new_list = ConstantContact::Components::ContactList.create(JSON.parse(json))
 
-        list = @api.add_list('token', new_list)
+        list = @api.add_list(new_list)
         list.should be_kind_of(ConstantContact::Components::ContactList)
         list.status.should eq('ACTIVE')
       end
@@ -240,7 +260,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         list = ConstantContact::Components::ContactList.create(JSON.parse(json))
 
-        result = @api.update_list('token', list)
+        result = @api.update_list(list)
         result.should be_kind_of(ConstantContact::Components::ContactList)
         result.status.should eq('ACTIVE')
       end
@@ -256,12 +276,12 @@ describe ConstantContact::Api do
         RestClient.stub(:get).and_return(response)
         list = ConstantContact::Components::ContactList.create(JSON.parse(json_list))
 
-        contacts = @api.get_contacts_from_list('token', list, "?limit=4&next=true")
+        contacts = @api.get_contacts_from_list(list, "?limit=4&next=true")
         contacts.should be_kind_of(ConstantContact::Components::ResultSet)
         contacts.results.first.should be_kind_of(ConstantContact::Components::Contact)
         contacts.results.first.fax.should eq('318-978-7575')
 
-        contacts = @api.get_contacts_from_list('token', list, 4)
+        contacts = @api.get_contacts_from_list(list, 4)
         contacts.should be_kind_of(ConstantContact::Components::ResultSet)
         contacts.results.first.should be_kind_of(ConstantContact::Components::Contact)
         contacts.results.first.fax.should eq('318-978-7575')
@@ -276,7 +296,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
         
-        events = @api.get_events('token')
+        events = @api.get_events()
         events.should be_kind_of(ConstantContact::Components::ResultSet)
         events.results.collect{|e| e.should be_kind_of(ConstantContact::Components::Event) }
       end
@@ -289,7 +309,7 @@ describe ConstantContact::Api do
 
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
-        event = @api.get_event('token', 1)
+        event = @api.get_event(1)
 
         event.should be_kind_of(ConstantContact::Components::Event)
       end
@@ -304,7 +324,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
 
         event = ConstantContact::Components::Event.create(JSON.parse(json))
-        added = @api.add_event('token', event)
+        added = @api.add_event(event)
 
         added.should respond_to(:id)
         added.id.should_not be_empty
@@ -322,7 +342,7 @@ describe ConstantContact::Api do
         RestClient.stub(:patch).and_return(response)
 
         event = ConstantContact::Components::Event.create(JSON.parse(json))
-        updated = @api.publish_event('token', event)
+        updated = @api.publish_event(event)
         updated.should be_kind_of(ConstantContact::Components::Event)
         updated.should respond_to(:status)
         updated.status.should eq("ACTIVE")
@@ -340,7 +360,7 @@ describe ConstantContact::Api do
         RestClient.stub(:patch).and_return(response)
 
         event = ConstantContact::Components::Event.create(JSON.parse(json))
-        updated = @api.cancel_event('token', event)
+        updated = @api.cancel_event(event)
         updated.should be_kind_of(ConstantContact::Components::Event)
         updated.should respond_to(:status)
         updated.status.should eq("CANCELLED")
@@ -356,7 +376,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(fees_json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
-        fees = @api.get_event_fees('token', event)
+        fees = @api.get_event_fees(event)
         #fees.should be_kind_of(ConstantContact::Components::ResultSet)
         #fees.results.collect{|f| f.should be_kind_of(ConstantContact::Components::Fee) }
 
@@ -376,7 +396,7 @@ describe ConstantContact::Api do
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
         fee   = ConstantContact::Components::EventFee.create(JSON.parse(fee_json))
-        retrieved = @api.get_event_fee('token', event, fee)
+        retrieved = @api.get_event_fee(event, fee)
         retrieved.should be_kind_of(ConstantContact::Components::EventFee)
       end
     end
@@ -392,7 +412,7 @@ describe ConstantContact::Api do
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
         fee   = ConstantContact::Components::EventFee.create(JSON.parse(fee_json))
-        added = @api.add_event_fee('token', event, fee)
+        added = @api.add_event_fee(event, fee)
         added.should be_kind_of(ConstantContact::Components::EventFee)
         added.id.should_not be_empty
       end
@@ -411,7 +431,7 @@ describe ConstantContact::Api do
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
         fee   = ConstantContact::Components::EventFee.create(JSON.parse(fee_json))
-        updated = @api.update_event_fee('token', event, fee)
+        updated = @api.update_event_fee(event, fee)
         updated.should be_kind_of(ConstantContact::Components::EventFee)
         updated.fee.should_not eq(fee.fee)
         updated.fee.should eq(fee.fee + 1)
@@ -429,7 +449,7 @@ describe ConstantContact::Api do
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
         fee   = ConstantContact::Components::EventFee.create(JSON.parse(fee_json))
-        @api.delete_event_fee('token', event, fee).should be_true
+        @api.delete_event_fee(event, fee).should be_true
       end
     end
 
@@ -443,7 +463,7 @@ describe ConstantContact::Api do
         RestClient.stub(:get).and_return(response)
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
-        registrants = @api.get_event_registrants('token', event)
+        registrants = @api.get_event_registrants(event)
         registrants.should be_kind_of(ConstantContact::Components::ResultSet)
         registrants.results.collect{|r| r .should be_kind_of(ConstantContact::Components::Registrant) }
       end
@@ -460,7 +480,7 @@ describe ConstantContact::Api do
 
         event = ConstantContact::Components::Event.create(JSON.parse(event_json))
         registrant = ConstantContact::Components::Registrant.create(JSON.parse(registrant_json))
-        retrieved = @api.get_event_registrant('token', event, registrant)
+        retrieved = @api.get_event_registrant(event, registrant)
         retrieved.should be_kind_of(ConstantContact::Components::Registrant)
         retrieved.id.should_not be_empty
       end
@@ -474,7 +494,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        results = @api.get_event_items('token', 1)
+        results = @api.get_event_items(1)
         results.should be_kind_of(Array)
         results.first.should be_kind_of(ConstantContact::Components::EventItem)
         results.first.name.should eq('Running Belt')
@@ -489,7 +509,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        result = @api.get_event_item('token', 1, 1)
+        result = @api.get_event_item(1, 1)
         result.should be_kind_of(ConstantContact::Components::EventItem)
         result.name.should eq('Running Belt')
       end
@@ -504,7 +524,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         event_item = ConstantContact::Components::EventItem.create(JSON.parse(json))
 
-        result = @api.add_event_item('token', 1, event_item)
+        result = @api.add_event_item(1, event_item)
         result.should be_kind_of(ConstantContact::Components::EventItem)
         result.name.should eq('Running Belt')
       end
@@ -517,7 +537,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_event_item('token', 1, 1)
+        result = @api.delete_event_item(1, 1)
         result.should be_true
       end
     end
@@ -531,7 +551,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         event_item = ConstantContact::Components::EventItem.create(JSON.parse(json))
 
-        result = @api.update_event_item('token', 1, event_item)
+        result = @api.update_event_item(1, event_item)
         result.should be_kind_of(ConstantContact::Components::EventItem)
         result.name.should eq('Running Belt')
       end
@@ -545,7 +565,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        results = @api.get_event_item_attributes('token', 1, 1)
+        results = @api.get_event_item_attributes(1, 1)
         results.should be_kind_of(Array)
         results.first.should be_kind_of(ConstantContact::Components::EventItemAttribute)
         results.first.name.should eq('Royal Blue')
@@ -560,7 +580,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        result = @api.get_event_item_attribute('token', 1, 1, 1)
+        result = @api.get_event_item_attribute(1, 1, 1)
         result.should be_kind_of(ConstantContact::Components::EventItemAttribute)
         result.name.should eq('Hi-Vis Green')
       end
@@ -575,7 +595,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         event_item_attribute = ConstantContact::Components::EventItemAttribute.create(JSON.parse(json))
 
-        result = @api.add_event_item_attribute('token', 1, 1, event_item_attribute)
+        result = @api.add_event_item_attribute(1, 1, event_item_attribute)
         result.should be_kind_of(ConstantContact::Components::EventItemAttribute)
         result.name.should eq('Hi-Vis Green')
       end
@@ -588,7 +608,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_event_item_attribute('token', 1, 1, 1)
+        result = @api.delete_event_item_attribute(1, 1, 1)
         result.should be_true
       end
     end
@@ -602,7 +622,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         event_item_attribute = ConstantContact::Components::EventItemAttribute.create(JSON.parse(json))
 
-        result = @api.update_event_item_attribute('token', 1, 1, event_item_attribute)
+        result = @api.update_event_item_attribute(1, 1, event_item_attribute)
         result.should be_kind_of(ConstantContact::Components::EventItemAttribute)
         result.name.should eq('Hi-Vis Green')
       end
@@ -616,7 +636,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        results = @api.get_promocodes('token', 1)
+        results = @api.get_promocodes(1)
         results.should be_kind_of(Array)
         results.first.should be_kind_of(ConstantContact::Components::Promocode)
         results.first.code_name.should eq('REDUCED_FEE')
@@ -631,7 +651,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        result = @api.get_promocode('token', 1, 1)
+        result = @api.get_promocode(1, 1)
         result.should be_kind_of(ConstantContact::Components::Promocode)
         result.code_name.should eq('TOTAL_FEE')
       end
@@ -646,7 +666,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         promocode = ConstantContact::Components::Promocode.create(JSON.parse(json))
 
-        result = @api.add_promocode('token', 1, promocode)
+        result = @api.add_promocode(1, promocode)
         result.should be_kind_of(ConstantContact::Components::Promocode)
         result.code_name.should eq('TOTAL_FEE')
       end
@@ -659,7 +679,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_promocode('token', 1, 1)
+        result = @api.delete_promocode(1, 1)
         result.should be_true
       end
     end
@@ -673,7 +693,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         promocode = ConstantContact::Components::Promocode.create(JSON.parse(json))
 
-        result = @api.update_promocode('token', 1, promocode)
+        result = @api.update_promocode(1, promocode)
         result.should be_kind_of(ConstantContact::Components::Promocode)
         result.code_name.should eq('TOTAL_FEE')
       end
@@ -687,7 +707,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        campaigns = @api.get_email_campaigns('token', {:limit => 2})
+        campaigns = @api.get_email_campaigns({:limit => 2})
         campaigns.should be_kind_of(ConstantContact::Components::ResultSet)
         campaigns.results.first.should be_kind_of(ConstantContact::Components::Campaign)
         campaigns.results.first.name.should eq('1357157252225')
@@ -702,7 +722,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        campaign = @api.get_email_campaign('token', 1)
+        campaign = @api.get_email_campaign(1)
         campaign.should be_kind_of(ConstantContact::Components::Campaign)
         campaign.name.should eq('Campaign Name')
       end
@@ -717,7 +737,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         new_campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 
-        campaign = @api.add_email_campaign('token', new_campaign)
+        campaign = @api.add_email_campaign(new_campaign)
         campaign.should be_kind_of(ConstantContact::Components::Campaign)
         campaign.name.should eq('Campaign Name')
       end
@@ -732,7 +752,7 @@ describe ConstantContact::Api do
         RestClient.stub(:delete).and_return(response)
         campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 
-        result = @api.delete_email_campaign('token', campaign)
+        result = @api.delete_email_campaign(campaign)
         result.should be_true
       end
     end
@@ -746,7 +766,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         campaign = ConstantContact::Components::Campaign.create(JSON.parse(json))
 
-        result = @api.update_email_campaign('token', campaign)
+        result = @api.update_email_campaign(campaign)
         result.should be_kind_of(ConstantContact::Components::Campaign)
         result.name.should eq('Campaign Name')
       end
@@ -762,7 +782,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         new_schedule = ConstantContact::Components::Schedule.create(JSON.parse(json))
 
-        schedule = @api.add_email_campaign_schedule('token', campaign_id, new_schedule)
+        schedule = @api.add_email_campaign_schedule(campaign_id, new_schedule)
         schedule.should be_kind_of(ConstantContact::Components::Schedule)
         schedule.scheduled_date.should eq('2013-05-10T11:07:43.626Z')
       end
@@ -777,7 +797,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        schedules = @api.get_email_campaign_schedules('token', campaign_id)
+        schedules = @api.get_email_campaign_schedules(campaign_id)
         schedules.first.should be_kind_of(ConstantContact::Components::Schedule)
         schedules.first.scheduled_date.should eq('2012-12-16T11:07:43.626Z')
       end
@@ -794,7 +814,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        schedule = @api.get_email_campaign_schedule('token', campaign_id, schedule_id)
+        schedule = @api.get_email_campaign_schedule(campaign_id, schedule_id)
         schedule.should be_kind_of(ConstantContact::Components::Schedule)
         schedule.scheduled_date.should eq('2013-05-10T11:07:43.626Z')
       end
@@ -809,7 +829,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_email_campaign_schedule('token', campaign_id, schedule_id)
+        result = @api.delete_email_campaign_schedule(campaign_id, schedule_id)
         result.should be_true
       end
     end
@@ -824,7 +844,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         schedule = ConstantContact::Components::Schedule.create(JSON.parse(json))
 
-        result = @api.update_email_campaign_schedule('token', campaign_id, schedule)
+        result = @api.update_email_campaign_schedule(campaign_id, schedule)
         result.should be_kind_of(ConstantContact::Components::Schedule)
         result.scheduled_date.should eq('2013-05-10T11:07:43.626Z')
       end
@@ -841,7 +861,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         test_send = ConstantContact::Components::TestSend.create(JSON.parse(json_request))
 
-        result = @api.send_email_campaign_test('token', campaign_id, test_send)
+        result = @api.send_email_campaign_test(campaign_id, test_send)
         result.should be_kind_of(ConstantContact::Components::TestSend)
         result.personal_message.should eq('This is a test send of the email campaign message.')
       end
@@ -857,7 +877,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_bounces('token', campaign_id, params)
+        set = @api.get_email_campaign_bounces(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::BounceActivity)
         set.results.first.activity_type.should eq('EMAIL_BOUNCE')
@@ -874,7 +894,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_clicks('token', campaign_id, params)
+        set = @api.get_email_campaign_clicks(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::ClickActivity)
         set.results.first.activity_type.should eq('EMAIL_CLICK')
@@ -891,7 +911,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_forwards('token', campaign_id, params)
+        set = @api.get_email_campaign_forwards(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::ForwardActivity)
         set.results.first.activity_type.should eq('EMAIL_FORWARD')
@@ -908,7 +928,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_opens('token', campaign_id, params)
+        set = @api.get_email_campaign_opens(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::OpenActivity)
         set.results.first.activity_type.should eq('EMAIL_OPEN')
@@ -925,7 +945,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_sends('token', campaign_id, params)
+        set = @api.get_email_campaign_sends(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::SendActivity)
         set.results.first.activity_type.should eq('EMAIL_SEND')
@@ -942,7 +962,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_email_campaign_unsubscribes('token', campaign_id, params)
+        set = @api.get_email_campaign_unsubscribes(campaign_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::UnsubscribeActivity)
         set.results.first.activity_type.should eq('EMAIL_UNSUBSCRIBE')
@@ -958,7 +978,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        summary = @api.get_email_campaign_summary_report('token', campaign_id)
+        summary = @api.get_email_campaign_summary_report(campaign_id)
         summary.should be_kind_of(ConstantContact::Components::TrackingSummary)
         summary.sends.should eq(15)
       end
@@ -974,7 +994,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_bounces('token', contact_id, params)
+        set = @api.get_contact_bounces(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::BounceActivity)
         set.results.first.activity_type.should eq('EMAIL_BOUNCE')
@@ -991,7 +1011,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_clicks('token', contact_id, params)
+        set = @api.get_contact_clicks(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::ClickActivity)
         set.results.first.activity_type.should eq('EMAIL_CLICK')
@@ -1008,7 +1028,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_forwards('token', contact_id, params)
+        set = @api.get_contact_forwards(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::ForwardActivity)
         set.results.first.activity_type.should eq('EMAIL_FORWARD')
@@ -1025,7 +1045,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_opens('token', contact_id, params)
+        set = @api.get_contact_opens(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::OpenActivity)
         set.results.first.activity_type.should eq('EMAIL_OPEN')
@@ -1042,7 +1062,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_sends('token', contact_id, params)
+        set = @api.get_contact_sends(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::SendActivity)
         set.results.first.activity_type.should eq('EMAIL_SEND')
@@ -1059,7 +1079,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        set = @api.get_contact_unsubscribes('token', contact_id, params)
+        set = @api.get_contact_unsubscribes(contact_id, params)
         set.should be_kind_of(ConstantContact::Components::ResultSet)
         set.results.first.should be_kind_of(ConstantContact::Components::UnsubscribeActivity)
         set.results.first.activity_type.should eq('EMAIL_UNSUBSCRIBE')
@@ -1075,7 +1095,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        summary = @api.get_contact_summary_report('token', contact_id)
+        summary = @api.get_contact_summary_report(contact_id)
         summary.should be_kind_of(ConstantContact::Components::TrackingSummary)
         summary.sends.should eq(15)
       end
@@ -1089,7 +1109,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        activities = @api.get_activities('token')
+        activities = @api.get_activities()
         activities.first.should be_kind_of(ConstantContact::Components::Activity)
         activities.first.type.should eq('REMOVE_CONTACTS_FROM_LISTS')
       end
@@ -1103,7 +1123,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        activity = @api.get_activity('token', 'a07e1ilbm7shdg6ikeo')
+        activity = @api.get_activity('a07e1ilbm7shdg6ikeo')
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('REMOVE_CONTACTS_FROM_LISTS')
       end
@@ -1149,7 +1169,7 @@ describe ConstantContact::Api do
 
         add_contact = ConstantContact::Components::AddContacts.new(contacts, lists)
 
-        activity = @api.add_create_contacts_activity('token', add_contact)
+        activity = @api.add_create_contacts_activity(add_contact)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('ADD_CONTACTS')
       end
@@ -1165,7 +1185,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:post).and_return(response)
 
-        activity = @api.add_create_contacts_activity_from_file('token', 'contacts.txt', content, lists)
+        activity = @api.add_create_contacts_activity_from_file('contacts.txt', content, lists)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('ADD_CONTACTS')
       end
@@ -1184,7 +1204,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_clear_lists, net_http_resp, {})
         RestClient.stub(:post).and_return(response)
 
-        activity = @api.add_clear_lists_activity('token', lists)
+        activity = @api.add_clear_lists_activity(lists)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('CLEAR_CONTACTS_FROM_LISTS')
       end
@@ -1201,7 +1221,7 @@ describe ConstantContact::Api do
         email_addresses = ["djellesma@constantcontact.com"]
 
         activity = @api.add_remove_contacts_from_lists_activity(
-          'token', email_addresses, lists)
+          email_addresses, lists)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('REMOVE_CONTACTS_FROM_LISTS')
       end
@@ -1217,8 +1237,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:post).and_return(response)
 
-        activity = @api.add_remove_contacts_from_lists_activity_from_file(
-          'token', 'contacts.txt', content, lists)
+        activity = @api.add_remove_contacts_from_lists_activity_from_file('contacts.txt', content, lists)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('REMOVE_CONTACTS_FROM_LISTS')
       end
@@ -1234,8 +1253,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         export_contacts = ConstantContact::Components::ExportContacts.new(JSON.parse(json_request))
 
-        activity = @api.add_export_contacts_activity(
-          'token', export_contacts)
+        activity = @api.add_export_contacts_activity(export_contacts)
         activity.should be_kind_of(ConstantContact::Components::Activity)
         activity.type.should eq('EXPORT_CONTACTS')
       end
@@ -1249,7 +1267,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        info = @api.get_library_info('token')
+        info = @api.get_library_info()
         info.should be_kind_of(ConstantContact::Components::LibrarySummary)
         info.usage_summary['folder_count'].should eq(6)
       end
@@ -1263,7 +1281,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        folders = @api.get_library_folders('token', {:limit => 2})
+        folders = @api.get_library_folders({:limit => 2})
         folders.should be_kind_of(ConstantContact::Components::ResultSet)
         folders.results.first.should be_kind_of(ConstantContact::Components::LibraryFolder)
         folders.results.first.name.should eq('backgrounds')
@@ -1279,7 +1297,7 @@ describe ConstantContact::Api do
         RestClient.stub(:post).and_return(response)
         new_folder = ConstantContact::Components::LibraryFolder.create(JSON.parse(json))
 
-        folder = @api.add_library_folder('token', new_folder)
+        folder = @api.add_library_folder(new_folder)
         folder.should be_kind_of(ConstantContact::Components::LibraryFolder)
         folder.name.should eq('wildflowers')
       end
@@ -1293,7 +1311,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        folder = @api.get_library_folder('token', 6)
+        folder = @api.get_library_folder(6)
         folder.should be_kind_of(ConstantContact::Components::LibraryFolder)
         folder.name.should eq('wildflowers')
       end
@@ -1308,7 +1326,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         folder = ConstantContact::Components::LibraryFolder.create(JSON.parse(json))
 
-        response = @api.update_library_folder('token', folder)
+        response = @api.update_library_folder(folder)
         response.should be_kind_of(ConstantContact::Components::LibraryFolder)
         response.name.should eq('wildflowers')
       end
@@ -1322,7 +1340,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_library_folder('token', folder_id)
+        result = @api.delete_library_folder(folder_id)
         result.should be_true
       end
     end
@@ -1335,7 +1353,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        files = @api.get_library_trash('token', {:sort_by => 'SIZE_DESC'})
+        files = @api.get_library_trash({:sort_by => 'SIZE_DESC'})
         files.should be_kind_of(ConstantContact::Components::ResultSet)
         files.results.first.should be_kind_of(ConstantContact::Components::LibraryFile)
         files.results.first.name.should eq('menu_form.pdf')
@@ -1349,7 +1367,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_library_trash('token')
+        result = @api.delete_library_trash()
         result.should be_true
       end
     end
@@ -1362,7 +1380,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        files = @api.get_library_files('token', {:type => 'ALL'})
+        files = @api.get_library_files({:type => 'ALL'})
         files.should be_kind_of(ConstantContact::Components::ResultSet)
         files.results.first.should be_kind_of(ConstantContact::Components::LibraryFile)
         files.results.first.name.should eq('IMG_0341.JPG')
@@ -1378,7 +1396,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json_response, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        files = @api.get_library_files_by_folder('token', folder_id, {:limit => 10})
+        files = @api.get_library_files_by_folder(folder_id, {:limit => 10})
         files.should be_kind_of(ConstantContact::Components::ResultSet)
         files.results.first.should be_kind_of(ConstantContact::Components::LibraryFile)
         files.results.first.name.should eq('IMG_0341.JPG')
@@ -1393,7 +1411,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        file = @api.get_library_file('token', 6)
+        file = @api.get_library_file(6)
         file.should be_kind_of(ConstantContact::Components::LibraryFile)
         file.name.should eq('IMG_0261.JPG')
       end
@@ -1413,7 +1431,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create("", net_http_resp, {})
         RestClient.stub(:post).and_return(response)
 
-        response = @api.add_library_file('token', file_name, folder_id, description, source, file_type, contents)
+        response = @api.add_library_file(file_name, folder_id, description, source, file_type, contents)
         response.should be_kind_of(String)
         response.should eq('123456789')
       end
@@ -1428,7 +1446,7 @@ describe ConstantContact::Api do
         RestClient.stub(:put).and_return(response)
         file = ConstantContact::Components::LibraryFile.create(JSON.parse(json))
 
-        response = @api.update_library_file('token', file)
+        response = @api.update_library_file(file)
         response.should be_kind_of(ConstantContact::Components::LibraryFile)
         response.name.should eq('IMG_0261.JPG')
       end
@@ -1442,7 +1460,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create('', net_http_resp, {})
         RestClient.stub(:delete).and_return(response)
 
-        result = @api.delete_library_file('token', file_id)
+        result = @api.delete_library_file(file_id)
         result.should be_true
       end
     end
@@ -1456,7 +1474,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:get).and_return(response)
 
-        statuses = @api.get_library_files_upload_status('token', file_id)
+        statuses = @api.get_library_files_upload_status(file_id)
         statuses.should be_kind_of(Array)
         statuses.first.should be_kind_of(ConstantContact::Components::UploadStatus)
         statuses.first.status.should eq('Active')
@@ -1473,7 +1491,7 @@ describe ConstantContact::Api do
         response = RestClient::Response.create(json, net_http_resp, {})
         RestClient.stub(:put).and_return(response)
 
-        results = @api.move_library_files('token', folder_id, file_id)
+        results = @api.move_library_files(folder_id, file_id)
         results.should be_kind_of(Array)
         results.first.should be_kind_of(ConstantContact::Components::MoveResults)
         results.first.uri.should eq('https://api.d1.constantcontact.com/v2/library/files/9')