MailchimpMarketing 3.0.1 → 3.0.8

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.1
+OpenAPI spec version: 3.0.8
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -15,22 +15,10 @@ require 'faraday'
 
 module MailchimpMarketing
   class ApiClient
-    # Defines the headers to be used in HTTP requests of all API calls by default.
-    #
-    # @return [Hash]
-    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 = {
-        'Content-Type' => 'application/json',
-        '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,27 +27,41 @@ 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 = {})
+      @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
+
+      # 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 = {})
-      header_params = @default_headers.merge(opts[:header_params] || {})
+      header_params = {
+        'Content-Type' => 'application/json',
+        'User-Agent' => @user_agent
+      }
       query_params = opts[:query_params] || {}
       form_params = opts[:form_params] || {}
 
-      body = nil
-      if [:post, :patch, :put, :delete].include?(http_method)
+      body = {}
+      if [:post, :patch, :put, :delete].include?(http_method.to_sym.downcase)
         body = build_request_body(header_params, form_params, opts[:body])
       end
 
@@ -85,60 +87,66 @@ module MailchimpMarketing
       host = @server.length > 0 ? @host.sub('server', @server) : @host
       url = host + path
 
-      conn = Faraday.new(url, params: query_params, headers: header_params) do |conn|
-        conn.basic_auth('user', @api_key)
+      # 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
 
       case http_method.to_sym.downcase
       when :delete
-        conn.delete(body: body.to_json)
+        conn.delete do |req|
+          req.body = body.to_json
+        end
       when :get
-        conn.get()
+        conn.get
       when :head
-        conn.head()
+        conn.head
       when :options
-        conn.options()
+        conn.options
       when :post
-        conn.post(body: body.to_json)
+        conn.post do |req|
+          req.body = body.to_json
+        end
       when :put
-        conn.put(body: body.to_json)
+        conn.put do |req|
+          req.body = body.to_json
+        end
       when :patch
-        conn.patch(body: body.to_json)
+        conn.patch do |req|
+          req.body = body.to_json
+        end
       else
-        fail ApiError.new('http_method must be :post')
+        fail ApiError.new('Invalid http_method')
       end
     end
 
     # Sanitize filename by removing path.
     # e.g. ../../sun.gif becomes sun.gif
-    #
-    # @param [String] filename the filename to be sanitized
-    # @return [String] the sanitized filename
     def sanitize_filename(filename)
       filename.gsub(/.*[\/\\]/, '')
     end
 
+    # Add leading and trailing slashes to path
     def build_request_url(path)
-      # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
       URI.encode(@config.base_url + path)
     end
 
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @return [String] HTTP body data in the form of string
+    # Format HTTP request body as string
     def build_request_body(header_params, form_params, body)
-      # http form
       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
-            # let typhoeus handle File, Array and nil parameters
             data[key] = value
           else
             data[key] = value.to_s
@@ -153,40 +161,62 @@ module MailchimpMarketing
     end
 
     # Return Accept header based on an array of accepts provided.
-    # @param [Array] accepts array for Accept
-    # @return [String] the Accept header (e.g. application/json)
     def select_header_accept(accepts)
       return nil if accepts.nil? || accepts.empty?
-      # use JSON when present, otherwise use all of the provided
       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.
-    # @param [Array] content_types array for Content-Type
-    # @return [String] the Content-Type header  (e.g. application/json)
     def select_header_content_type(content_types)
-      # use application/json by default
       return 'application/json' if content_types.nil? || content_types.empty?
-      # use JSON when present, otherwise use the first one
+
       json_content_type = content_types.find { |s| json_mime?(s) }
       json_content_type || content_types.first
     end
 
-    # Check if the given MIME is a JSON MIME.
-    # JSON MIME examples:
-    #   application/json
-    #   application/json; charset=UTF8
-    #   APPLICATION/JSON
-    #   */*
-    # @param [String] mime MIME
-    # @return [Boolean] True if the MIME is application/json
-    def json_mime?(mime)
-      (mime == '*/*') || !(mime =~ /Application\/.*json(?!p)(;.*)?/i).nil?
+    # Convert object (array, hash, object, etc) to JSON string.
+    def object_to_http_body(model)
+      return model if model.nil? || model.is_a?(String)
+      local_body = nil
+      if model.is_a?(Array)
+        local_body = model.map { |m| object_to_hash(m) }
+      else
+        local_body = object_to_hash(model)
+      end
+      local_body.to_json
     end
 
+    # Convert object(non-array) to hash.
+    def object_to_hash(obj)
+      if obj.respond_to?(:to_hash)
+        obj.to_hash
+      else
+        obj
+      end
+    end
 
+    # Build parameter value according to the given collection format.
+    def build_collection_param(param, collection_format)
+      case collection_format
+      when :csv
+        param.join(',')
+      when :ssv
+        param.join(' ')
+      when :tsv
+        param.join("\t")
+      when :pipes
+        param.join('|')
+      when :multi
+        param
+      else
+        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

data/lib/MailchimpMarketing/api_error.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.1
+OpenAPI spec version: 3.0.8
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -12,13 +12,13 @@ Swagger Codegen version: 2.4.12
 
 module MailchimpMarketing
   class ApiError < StandardError
-    attr_reader :code, :response_headers, :response_body
+    attr_reader :status, :type, :title, :detail, :instance, :errors
 
     # Usage examples:
     #   ApiError.new
     #   ApiError.new("message")
-    #   ApiError.new(:code => 500, :response_headers => {}, :response_body => "")
-    #   ApiError.new(:code => 404, :message => "Not Found")
+    #   ApiError.new(:status => 500, :response_headers => {}, :response_body => "")
+    #   ApiError.new(:status => 404, :message => "Not Found")
     def initialize(arg = nil)
       if arg.is_a? Hash
         if arg.key?(:message) || arg.key?('message')

data/lib/MailchimpMarketing/configuration.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.1
+OpenAPI spec version: 3.0.8
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12

data/lib/MailchimpMarketing/version.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 3.0.1
+OpenAPI spec version: 3.0.8
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,5 +11,5 @@ Swagger Codegen version: 2.4.12
 =end
 
 module MailchimpMarketing
-  VERSION = '3.0.1'
+  VERSION = '3.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MailchimpMarketing
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.8
 platform: ruby
 authors:
 - Swagger-Codegen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday