MailchimpMarketing 3.0.2 → 3.0.5

data/lib/MailchimpMarketing/api/root_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # API Root
+    # List api root resources
     # Get links to all other resources available in the API.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
@@ -30,7 +30,7 @@ module MailchimpMarketing
       data
     end
 
-    # API Root
+    # List api root resources
     # Get links to all other resources available in the API.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.

data/lib/MailchimpMarketing/api/search_campaigns_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # Search Campaigns
+    # Search campaigns
     # Search all campaigns for the specified query terms.
     # @param query The search query used to filter results.
     # @param [Hash] opts the optional parameters
@@ -31,7 +31,7 @@ module MailchimpMarketing
       data
     end
 
-    # Search Campaigns
+    # Search campaigns
     # Search all campaigns for the specified query terms.
     # @param query The search query used to filter results.
     # @param [Hash] opts the optional parameters

data/lib/MailchimpMarketing/api/search_members_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # Search Members
+    # Search members
     # Search for list members. This search can be restricted to a specific list, or can be used to search across all lists in an account.
     # @param query The search query used to filter results.
     # @param [Hash] opts the optional parameters
@@ -32,7 +32,7 @@ module MailchimpMarketing
       data
     end
 
-    # Search Members
+    # Search members
     # Search for list members. This search can be restricted to a specific list, or can be used to search across all lists in an account.
     # @param query The search query used to filter results.
     # @param [Hash] opts the optional parameters

data/lib/MailchimpMarketing/api/template_folders_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # Delete a template folder
+    # Delete template folder
     # Delete a specific template folder, and mark all the templates in the folder as 'unfiled'.
     # @param folder_id The unique id for the template folder.
     # @param [Hash] opts the optional parameters
@@ -29,7 +29,7 @@ module MailchimpMarketing
       nil
     end
 
-    # Delete a template folder
+    # Delete template folder
     # Delete a specific template folder, and mark all the templates in the folder as 'unfiled'.
     # @param folder_id The unique id for the template folder.
     # @param [Hash] opts the optional parameters
@@ -62,7 +62,7 @@ module MailchimpMarketing
         :auth_names => auth_names)
       return data, status_code, headers
     end
-    # Get all template folders
+    # List template folders
     # Get all folders used to organize templates.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
@@ -75,7 +75,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get all template folders
+    # List template folders
     # Get all folders used to organize templates.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
@@ -116,7 +116,7 @@ module MailchimpMarketing
         :return_type => 'TemplateFolders')
       return data, status_code, headers
     end
-    # Get a template folder
+    # Get template folder
     # Get information about a specific folder used to organize templates.
     # @param folder_id The unique id for the template folder.
     # @param [Hash] opts the optional parameters
@@ -128,7 +128,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get a template folder
+    # Get template folder
     # Get information about a specific folder used to organize templates.
     # @param folder_id The unique id for the template folder.
     # @param [Hash] opts the optional parameters
@@ -166,7 +166,7 @@ module MailchimpMarketing
         :return_type => 'TemplateFolder')
       return data, status_code, headers
     end
-    # Update a template folder
+    # Update template folder
     # Update a specific folder used to organize templates.
     # @param folder_id The unique id for the template folder.
     # @param body 
@@ -177,7 +177,7 @@ module MailchimpMarketing
       data
     end
 
-    # Update a template folder
+    # Update template folder
     # Update a specific folder used to organize templates.
     # @param folder_id The unique id for the template folder.
     # @param body 
@@ -212,7 +212,7 @@ module MailchimpMarketing
         :return_type => 'TemplateFolder')
       return data, status_code, headers
     end
-    # Create a template folder
+    # Add template folder
     # Create a new template folder.
     # @param body 
     # @param [Hash] opts the optional parameters
@@ -222,7 +222,7 @@ module MailchimpMarketing
       data
     end
 
-    # Create a template folder
+    # Add template folder
     # Create a new template folder.
     # @param body 
     # @param [Hash] opts the optional parameters

data/lib/MailchimpMarketing/api/templates_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # Delete a specific template
+    # Delete template
     # Delete a specific template.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -29,7 +29,7 @@ module MailchimpMarketing
       nil
     end
 
-    # Delete a specific template
+    # Delete template
     # Delete a specific template.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -62,7 +62,7 @@ module MailchimpMarketing
         :auth_names => auth_names)
       return data, status_code, headers
     end
-    # Get all templates
+    # List templates
     # Get a list of an account's available templates.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
@@ -82,7 +82,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get all templates
+    # List templates
     # Get a list of an account&#39;s available templates.
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :fields A comma-separated list of fields to return. Reference parameters of sub-objects with dot notation.
@@ -137,7 +137,7 @@ module MailchimpMarketing
         :return_type => 'Templates')
       return data, status_code, headers
     end
-    # Get information about a specific template
+    # Get template info
     # Get information about a specific template.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -149,7 +149,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get information about a specific template
+    # Get template info
     # Get information about a specific template.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -187,7 +187,7 @@ module MailchimpMarketing
         :return_type => 'TemplateInstance')
       return data, status_code, headers
     end
-    # Get the default content for a template
+    # View default content
     # Get the sections that you can edit in a template, including each section's default content.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -199,7 +199,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get the default content for a template
+    # View default content
     # Get the sections that you can edit in a template, including each section&#39;s default content.
     # @param template_id The unique id for the template.
     # @param [Hash] opts the optional parameters
@@ -237,7 +237,7 @@ module MailchimpMarketing
         :return_type => 'TemplateDefaultContent')
       return data, status_code, headers
     end
-    # Update an existing template
+    # Update template
     # Update the name, HTML, or `folder_id` of an existing template.
     # @param template_id The unique id for the template.
     # @param body 
@@ -248,7 +248,7 @@ module MailchimpMarketing
       data
     end
 
-    # Update an existing template
+    # Update template
     # Update the name, HTML, or &#x60;folder_id&#x60; of an existing template.
     # @param template_id The unique id for the template.
     # @param body 
@@ -283,8 +283,8 @@ module MailchimpMarketing
         :return_type => 'TemplateInstance')
       return data, status_code, headers
     end
-    # Create a new template
-    # Create a new template for the account. Only [Classic templates](https://mailchimp.com/help/types-of-templates/) are supported.
+    # Add template
+    # Create a new template for the account. Only Classic templates are supported.
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [TemplateInstance]
@@ -293,8 +293,8 @@ module MailchimpMarketing
       data
     end
 
-    # Create a new template
-    # Create a new template for the account. Only [Classic templates](https://mailchimp.com/help/types-of-templates/) are supported.
+    # Add template
+    # Create a new template for the account. Only Classic templates are supported.
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(TemplateInstance, Fixnum, Hash)>] TemplateInstance data, response status code and response headers

data/lib/MailchimpMarketing/api/verified_domains_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -19,7 +19,7 @@ module MailchimpMarketing
     def initialize(api_client)
       @api_client = api_client
     end
-    # Add a domain to the account, triggering a verification e-mail to the provided address.
+    # Add domain to account
     # Add a domain to the account.
     # @param body 
     # @param [Hash] opts the optional parameters
@@ -29,7 +29,7 @@ module MailchimpMarketing
       data
     end
 
-    # Add a domain to the account, triggering a verification e-mail to the provided address.
+    # Add domain to account
     # Add a domain to the account.
     # @param body 
     # @param [Hash] opts the optional parameters
@@ -63,7 +63,7 @@ module MailchimpMarketing
         :return_type => 'VerifiedDomains')
       return data, status_code, headers
     end
-    # Delete a verified domain
+    # Delete domain
     # Delete a verified domain from the account.
     # @param domain_name The domain to be verified.
     # @param [Hash] opts the optional parameters
@@ -73,7 +73,7 @@ module MailchimpMarketing
       nil
     end
 
-    # Delete a verified domain
+    # Delete domain
     # Delete a verified domain from the account.
     # @param domain_name The domain to be verified.
     # @param [Hash] opts the optional parameters
@@ -106,7 +106,7 @@ module MailchimpMarketing
         :auth_names => auth_names)
       return data, status_code, headers
     end
-    # Get the details for a single domain on the account.
+    # Get domain info
     # Get the details for a single domain on the account.
     # @param domain_name The domain to be verified.
     # @param [Hash] opts the optional parameters
@@ -116,7 +116,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get the details for a single domain on the account.
+    # Get domain info
     # Get the details for a single domain on the account.
     # @param domain_name The domain to be verified.
     # @param [Hash] opts the optional parameters
@@ -150,7 +150,7 @@ module MailchimpMarketing
         :return_type => 'VerifiedDomains')
       return data, status_code, headers
     end
-    # Get all of the sending domains on the account.
+    # List sending domains
     # Get all of the sending domains on the account.
     # @param [Hash] opts the optional parameters
     # @return [VerifiedDomains1]
@@ -159,7 +159,7 @@ module MailchimpMarketing
       data
     end
 
-    # Get all of the sending domains on the account.
+    # List sending domains
     # Get all of the sending domains on the account.
     # @param [Hash] opts the optional parameters
     # @return [Array<(VerifiedDomains1, Fixnum, Hash)>] VerifiedDomains1 data, response status code and response headers
@@ -192,7 +192,7 @@ module MailchimpMarketing
         :return_type => 'VerifiedDomains1')
       return data, status_code, headers
     end
-    # Submit a response to the verification challenge and verify a domain for sending.
+    # Verify domain
     # Verify a domain for sending.
     # @param domain_name The domain to be verified.
     # @param body 
@@ -203,7 +203,7 @@ module MailchimpMarketing
       data
     end
 
-    # Submit a response to the verification challenge and verify a domain for sending.
+    # Verify domain
     # Verify a domain for sending.
     # @param domain_name The domain to be verified.
     # @param body 

data/lib/MailchimpMarketing/api_client.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.2
+OpenAPI spec version: 3.0.5
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -21,7 +21,7 @@ module MailchimpMarketing
     attr_accessor :default_headers
 
     # Initializes the ApiClient
-    def initialize(api_key, server = '')
+    def initialize(config = {})
       @host = "https://server.api.mailchimp.com/3.0"
       @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
       @default_headers = {
@@ -29,8 +29,7 @@ module MailchimpMarketing
         'User-Agent' => @user_agent
       }
 
-      @api_key = api_key
-      @server = server || get_server_from_api_key(api_key)
+      set_config(config)
     end
 
     def self.default
@@ -39,18 +38,34 @@ module MailchimpMarketing
 
     def get_server_from_api_key(api_key = '')
       begin
-        split = api_key.split('-us', 1)
-        server_prefix = 'us'
-        server = server_prefix + api_key.split('-' + server_prefix, 1)[1]
+        split = api_key.split('-')
+        server = 'invalid-server'
+
+        if split.length == 2
+          server = split[1]
+        end
+
         server
       rescue
         ""
       end
     end
 
-    def set_config(api_key = '', server = '')
-      @api_key = api_key || @api_key
-      @server = server || get_server_from_api_key(api_key) || @server
+    def set_config(config = {})
+      # Basic Auth
+      @api_key = config[:api_key] || ''
+      @is_basic_auth = @api_key.to_s.strip.empty? == false
+
+      # OAuth
+      @access_token = config[:access_token] || ''
+      @is_oauth = @access_token.to_s.strip.empty? == false
+
+      # If using Basic auth and no server is provided,
+      # attempt to extract it from the api_key directy.
+      @server = config[:server] || 'invalid-server'
+      if @server == 'invalid-server' && @is_basic_auth
+        @server = get_server_from_api_key(@api_key)
+      end
     end
 
     def call_api(http_method, path, opts = {})
@@ -85,10 +100,18 @@ module MailchimpMarketing
       host = @server.length > 0 ? @host.sub('server', @server) : @host
       url = host + path
 
+      # Basic Authentication
       conn = Faraday.new(url) do |conn|
         conn.params = query_params
-        conn.headers = header_params
-        conn.basic_auth('user', @api_key)
+
+        if @is_basic_auth
+          conn.headers = header_params
+          conn.basic_auth('user', @api_key)
+        end
+
+        if @is_oauth
+          conn.headers["Authorization"] = "Bearer #{@access_token}"
+        end
       end
 
       case http_method.to_sym.downcase