MailchimpMarketing 3.0.2 → 3.0.9

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.9
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,26 +11,14 @@ Swagger Codegen version: 2.4.12
 =end
 
 require 'json'
-require 'faraday'
+require 'excon'
 
 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,153 +27,58 @@ 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
-    end
+    def set_config(config = {})
+      @api_key = config[:api_key] || ''
+      @is_basic_auth = @api_key.to_s.strip.empty? == false
 
-    def call_api(http_method, path, opts = {})
-      header_params = @default_headers.merge(opts[:header_params] || {})
-      query_params = opts[:query_params] || {}
-      form_params = opts[:form_params] || {}
+      @access_token = config[:access_token] || ''
+      @is_oauth = @access_token.to_s.strip.empty? == false
 
-      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)
-
-      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
+      # 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 request(http_method, path, query_params = nil, header_params = nil, body = nil)
-      host = @server.length > 0 ? @host.sub('server', @server) : @host
-      url = host + path
+    def call_api(http_method, path, opts = {})
+      headers = {'Content-Type' => "application/json"}
+      headers[:Authorization] = "Basic #{@api_key}" if @is_basic_auth
+      headers[:Authorization] = "Bearer #@access_token" if @is_oauth
 
-      conn = Faraday.new(url) do |conn|
-        conn.params = query_params
-        conn.headers = header_params
-        conn.basic_auth('user', @api_key)
-      end
+      host = @server.length > 0 ? @host.sub('server', @server) : @host
+      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
-    #
-    # @param [String] filename the filename to be sanitized
-    # @return [String] the sanitized filename
-    def sanitize_filename(filename)
-      filename.gsub(/.*[\/\\]/, '')
-    end
-
-    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
-    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
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
+      if res.status == 204
+        return "success"
+      elsif res.status == 200
+        return JSON.parse(res.body)
       else
-        data = nil
+        return res.body
       end
-      data
-    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
 
     # Convert object (array, hash, object, etc) to JSON string.
-    # @param [Object] model object to be converted into JSON string
-    # @return [String] JSON string representation of the object
     def object_to_http_body(model)
       return model if model.nil? || model.is_a?(String)
       local_body = nil
@@ -198,8 +91,6 @@ module MailchimpMarketing
     end
 
     # Convert object(non-array) to hash.
-    # @param [Object] obj object to be converted into JSON string
-    # @return [String] JSON string representation of the object
     def object_to_hash(obj)
       if obj.respond_to?(:to_hash)
         obj.to_hash
@@ -209,7 +100,6 @@ module MailchimpMarketing
     end
 
     # Build parameter value according to the given collection format.
-    # @param [String] collection_format one of :csv, :ssv, :tsv, :pipes and :multi
     def build_collection_param(param, collection_format)
       case collection_format
       when :csv
@@ -221,23 +111,10 @@ module MailchimpMarketing
       when :pipes
         param.join('|')
       when :multi
-        # return the array directly as typhoeus will handle it as expected
         param
       else
         fail "unknown collection format: #{collection_format.inspect}"
       end
     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?
-    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.2
+OpenAPI spec version: 3.0.9
 Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12

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.2
+OpenAPI spec version: 3.0.9
 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.2
+OpenAPI spec version: 3.0.9
 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.2'
+  VERSION = '3.0.9'
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: MailchimpMarketing
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.9
 platform: ruby
 authors:
 - Swagger-Codegen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.76.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.76.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement