MailchimpMarketing 3.0.8 → 3.0.13

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class RootApi
@@ -27,15 +26,13 @@ module MailchimpMarketing
       query_params = {}
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class SearchCampaignsApi
@@ -29,15 +28,13 @@ module MailchimpMarketing
       query_params[:'query'] = query
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/search-campaigns'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class SearchMembersApi
@@ -30,15 +29,13 @@ module MailchimpMarketing
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
       query_params[:'list_id'] = opts[:'list_id'] if !opts[:'list_id'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/search-members'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class TemplateFoldersApi
@@ -26,15 +25,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'folder_id'" if folder_id.nil?
 
       query_params = {}
-      form_params = {}
       post_body = nil
 
       local_var_path = '/template-folders/{folder_id}'.sub('{' + 'folder_id' + '}', folder_id.to_s)
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      data = @api_client.call_api(:DELETE, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # List template folders
@@ -46,15 +43,13 @@ module MailchimpMarketing
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
       query_params[:'count'] = opts[:'count'] if !opts[:'count'].nil?
       query_params[:'offset'] = opts[:'offset'] if !opts[:'offset'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/template-folders'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Get template folder
@@ -64,15 +59,13 @@ module MailchimpMarketing
       query_params = {}
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/template-folders/{folder_id}'.sub('{' + 'folder_id' + '}', folder_id.to_s)
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Update template folder
@@ -81,15 +74,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/template-folders/{folder_id}'.sub('{' + 'folder_id' + '}', folder_id.to_s)
-      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path,
+      data = @api_client.call_api(:PATCH, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Add template folder
@@ -97,15 +88,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/template-folders'
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      data = @api_client.call_api(:POST, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class TemplatesApi
@@ -26,15 +25,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'template_id'" if template_id.nil?
 
       query_params = {}
-      form_params = {}
       post_body = nil
 
       local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', template_id.to_s)
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      data = @api_client.call_api(:DELETE, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # List templates
@@ -54,15 +51,13 @@ module MailchimpMarketing
       query_params[:'category'] = opts[:'category'] if !opts[:'category'].nil?
       query_params[:'folder_id'] = opts[:'folder_id'] if !opts[:'folder_id'].nil?
       query_params[:'sort_field'] = opts[:'sort_field'] if !opts[:'sort_field'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/templates'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Get template info
@@ -72,15 +67,13 @@ module MailchimpMarketing
       query_params = {}
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', template_id.to_s)
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # View default content
@@ -90,15 +83,13 @@ module MailchimpMarketing
       query_params = {}
       query_params[:'fields'] = @api_client.build_collection_param(opts[:'fields'], :csv) if !opts[:'fields'].nil?
       query_params[:'exclude_fields'] = @api_client.build_collection_param(opts[:'exclude_fields'], :csv) if !opts[:'exclude_fields'].nil?
-      form_params = {}
       post_body = nil
 
       local_var_path = '/templates/{template_id}/default-content'.sub('{' + 'template_id' + '}', template_id.to_s)
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Update template
@@ -107,15 +98,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/templates/{template_id}'.sub('{' + 'template_id' + '}', template_id.to_s)
-      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path,
+      data = @api_client.call_api(:PATCH, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Add template
@@ -123,15 +112,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/templates'
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      data = @api_client.call_api(:POST, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,6 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'uri'
-require 'json'
 
 module MailchimpMarketing
   class VerifiedDomainsApi
@@ -26,15 +25,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/verified-domains'
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      data = @api_client.call_api(:POST, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Delete domain
@@ -42,15 +39,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'domain_name'" if domain_name.nil?
 
       query_params = {}
-      form_params = {}
       post_body = nil
 
       local_var_path = '/verified-domains/{domain_name}'.sub('{' + 'domain_name' + '}', domain_name.to_s)
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      data = @api_client.call_api(:DELETE, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Get domain info
@@ -58,30 +53,26 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'domain_name'" if domain_name.nil?
 
       query_params = {}
-      form_params = {}
       post_body = nil
 
       local_var_path = '/verified-domains/{domain_name}'.sub('{' + 'domain_name' + '}', domain_name.to_s)
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # List sending domains
     def get_verified_domains_all(opts = {})
 
       query_params = {}
-      form_params = {}
       post_body = nil
 
       local_var_path = '/verified-domains'
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      data = @api_client.call_api(:GET, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
 
     # Verify domain
@@ -90,15 +81,13 @@ module MailchimpMarketing
       fail ArgumentError, "Missing required param: 'body'" if body.nil?
 
       query_params = {}
-      form_params = {}
       post_body = @api_client.object_to_http_body(body)
 
       local_var_path = '/verified-domains/{domain_name}/actions/verify'.sub('{' + 'domain_name' + '}', domain_name.to_s)
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      data = @api_client.call_api(:POST, local_var_path,
         :query_params => query_params,
-        :form_params => form_params,
         :body => post_body)
-      return data, status_code, headers
+      return data
     end
   end
 end

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.8
+OpenAPI spec version: 3.0.13
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,7 +11,7 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'json'
-require 'faraday'
+require 'excon'
 
 module MailchimpMarketing
   class ApiClient
@@ -41,6 +41,7 @@ module MailchimpMarketing
     def set_config(config = {})
       @api_key = config[:api_key] || ''
       @is_basic_auth = @api_key.to_s.strip.empty? == false
+
       @access_token = config[:access_token] || ''
       @is_oauth = @access_token.to_s.strip.empty? == false
 
@@ -53,126 +54,30 @@ module MailchimpMarketing
     end
 
     def call_api(http_method, path, opts = {})
-      header_params = {
-        'Content-Type' => 'application/json',
-        'User-Agent' => @user_agent
-      }
-      query_params = opts[:query_params] || {}
-      form_params = opts[:form_params] || {}
-
-      body = {}
-      if [:post, :patch, :put, :delete].include?(http_method.to_sym.downcase)
-        body = build_request_body(header_params, form_params, opts[:body])
-      end
-
-      res = request(http_method, path, query_params, header_params, body)
+      headers = {'Content-Type' => "application/json"}
+      headers[:Authorization] = "Basic #{@api_key}" if @is_basic_auth
+      headers[:Authorization] = "Bearer #@access_token" if @is_oauth
 
-      data = nil
-      if res.headers['content-type'] && res.headers['content-type'].include?('application/json')
-        data = JSON.parse(res.body)
-      else
-        data = res.body
-      end
-
-      if data
-        if res.status <= 200
-          data
-        else
-          fail ApiError.new(res.body)
-        end
-      end
-    end
-
-    def request(http_method, path, query_params = nil, header_params = nil, body = nil)
       host = @server.length > 0 ? @host.sub('server', @server) : @host
-      url = host + path
-
-      # Apply Authentication
-      conn = Faraday.new(url) do |conn|
-        conn.headers = header_params
-        conn.params = query_params
-
-        if @is_basic_auth
-          conn.basic_auth('user', @api_key)
-        elsif @is_oauth
-          conn.headers["Authorization"] = "Bearer #{@access_token}"
-        end
-      end
+      conn = Excon.new(host + path, :headers => headers)
 
+      res = nil
       case http_method.to_sym.downcase
-      when :delete
-        conn.delete do |req|
-          req.body = body.to_json
-        end
+      when :post, :put, :delete
+        res = conn.request(:method => http_method, :body => opts[:body])
       when :get
-        conn.get
-      when :head
-        conn.head
-      when :options
-        conn.options
-      when :post
-        conn.post do |req|
-          req.body = body.to_json
-        end
-      when :put
-        conn.put do |req|
-          req.body = body.to_json
-        end
-      when :patch
-        conn.patch do |req|
-          req.body = body.to_json
-        end
-      else
-        fail ApiError.new('Invalid http_method')
+        res = conn.get(:query => opts[:query_params])
       end
-    end
 
-    # Sanitize filename by removing path.
-    # e.g. ../../sun.gif becomes sun.gif
-    def sanitize_filename(filename)
-      filename.gsub(/.*[\/\\]/, '')
-    end
-
-    # Add leading and trailing slashes to path
-    def build_request_url(path)
-      path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
+      data = nil
+      data = JSON.parse(res.body) if res.status == 200
+      data = "success" if res.status == 204
 
-    # Format HTTP request body as string
-    def build_request_body(header_params, form_params, body)
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
+      if (!data)
+        fail ApiError.new(:status => res.status, :response_body => res.body)
       end
-      data
-    end
-
-    # Return Accept header based on an array of accepts provided.
-    def select_header_accept(accepts)
-      return nil if accepts.nil? || accepts.empty?
-      json_accept = accepts.find { |s| json_mime?(s) }
-      json_accept || accepts.join(',')
-    end
-
-    # Return Content-Type header based on an array of content types provided.
-    def select_header_content_type(content_types)
-      return 'application/json' if content_types.nil? || content_types.empty?
 
-      json_content_type = content_types.find { |s| json_mime?(s) }
-      json_content_type || content_types.first
+      return data
     end
 
     # Convert object (array, hash, object, etc) to JSON string.
@@ -213,10 +118,5 @@ module MailchimpMarketing
         fail "unknown collection format: #{collection_format.inspect}"
       end
     end
-
-    # Check if the given MIME is a JSON MIME.
-    def json_mime?(mime)
-      (mime == '*/*') || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
-    end
   end
 end