MailchimpTransactional 1.0.9 → 1.0.15

data/lib/MailchimpTransactional/api/webhooks_api.rb

@@ -3,8 +3,8 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.9
-Contact: apihelp@mandrill.com
+OpenAPI spec version: 1.0.15
+Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
 
@@ -16,45 +16,17 @@ module MailchimpTransactional
   class WebhooksApi
     attr_accessor :api_client
 
-    attr_accessor :api_key
-
-    def initialize(api_key = '', api_client = ApiClient.default)
-      @api_key = api_key
+    def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Add webhook
-    # Add a new webhook.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20072]
-    def add(body = {}, opts = {})
-      data = add_with_http_info(body, opts)
-      data
-    end
 
     # Add webhook
     # Add a new webhook.
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20072, Fixnum, Hash)>] InlineResponse20072 data, response status code and response headers
-    def add_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/webhooks/add'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # Delete webhook
-    # Delete an existing webhook.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20075]
-    def delete(body = {}, opts = {})
-      data = delete_with_http_info(body, opts)
+    def add(body = {})
+      data = @api_client.call_api(:POST, '/webhooks/add', body)
       data
     end
 
@@ -63,24 +35,8 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20075, Fixnum, Hash)>] InlineResponse20075 data, response status code and response headers
-    def delete_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/webhooks/delete'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # Get webhook info
-    # Given the ID of an existing webhook, return the data about it.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20073]
-    def info(body = {}, opts = {})
-      data = info_with_http_info(body, opts)
+    def delete(body = {})
+      data = @api_client.call_api(:POST, '/webhooks/delete', body)
       data
     end
 
@@ -89,24 +45,8 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20073, Fixnum, Hash)>] InlineResponse20073 data, response status code and response headers
-    def info_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/webhooks/info'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # List webhooks
-    # Get the list of all webhooks defined on the account.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [Array<InlineResponse20071>]
-    def list(body = {}, opts = {})
-      data = list_with_http_info(body, opts)
+    def info(body = {})
+      data = @api_client.call_api(:POST, '/webhooks/info', body)
       data
     end
 
@@ -115,24 +55,8 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(Array<InlineResponse20071>, Fixnum, Hash)>] Array<InlineResponse20071> data, response status code and response headers
-    def list_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/webhooks/list'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # Update webhook
-    # Update an existing webhook.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20074]
-    def update(body = {}, opts = {})
-      data = update_with_http_info(body, opts)
+    def list(body = {})
+      data = @api_client.call_api(:POST, '/webhooks/list', body)
       data
     end
 
@@ -141,16 +65,9 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20074, Fixnum, Hash)>] InlineResponse20074 data, response status code and response headers
-    def update_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/webhooks/update'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
+    def update(body = {})
+      data = @api_client.call_api(:POST, '/webhooks/update', body)
+      data
     end
   end
 end

data/lib/MailchimpTransactional/api/whitelists_api.rb

@@ -3,8 +3,8 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.9
-Contact: apihelp@mandrill.com
+OpenAPI spec version: 1.0.15
+Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
 
@@ -16,45 +16,17 @@ module MailchimpTransactional
   class WhitelistsApi
     attr_accessor :api_client
 
-    attr_accessor :api_key
-
-    def initialize(api_key = '', api_client = ApiClient.default)
-      @api_key = api_key
+    def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Add email to whitelist
-    # Adds an email to your email rejection whitelist. If the address is currently on your blacklist, that blacklist entry will be removed automatically.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20076]
-    def add(body = {}, opts = {})
-      data = add_with_http_info(body, opts)
-      data
-    end
 
     # Add email to whitelist
     # Adds an email to your email rejection whitelist. If the address is currently on your blacklist, that blacklist entry will be removed automatically.
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20076, Fixnum, Hash)>] InlineResponse20076 data, response status code and response headers
-    def add_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/whitelists/add'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # Remove email from whitelist
-    # Removes an email address from the whitelist.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20078]
-    def delete(body = {}, opts = {})
-      data = delete_with_http_info(body, opts)
+    def add(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/add', body)
       data
     end
 
@@ -63,24 +35,8 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(InlineResponse20078, Fixnum, Hash)>] InlineResponse20078 data, response status code and response headers
-    def delete_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/whitelists/delete'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
-    end
-    # List whitelisted emails
-    # Retrieves your email rejection whitelist. You can provide an email address or search prefix to limit the results. Returns up to 1000 results.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [Array<InlineResponse20077>]
-    def list(body = {}, opts = {})
-      data = list_with_http_info(body, opts)
+    def delete(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/delete', body)
       data
     end
 
@@ -89,16 +45,9 @@ module MailchimpTransactional
     # @param body 
     # @param [Hash] opts the optional parameters
     # @return [Array<(Array<InlineResponse20077>, Fixnum, Hash)>] Array<InlineResponse20077> data, response status code and response headers
-    def list_with_http_info(body, opts = {})
-      # add api key to request body
-      body[:key] = @api_key
-
-      # resource path
-      local_var_path = '/whitelists/list'
-
-      # http body (model)
-      data = @api_client.call_api(:POST, local_var_path, :body => body)
-      return data
+    def list(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/list', body)
+      data
     end
   end
 end

data/lib/MailchimpTransactional/api_client.rb

@@ -3,170 +3,85 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.9
-Contact: apihelp@mandrill.com
+OpenAPI spec version: 1.0.15
+Contact: apihelp@mailchimp.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
 
 =end
 
 require 'json'
-require 'faraday'
+require 'excon'
 
 module MailchimpTransactional
   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()
+    def initialize(api_key = '')
       @host = "https://mandrillapp.com/api/1.0"
-      @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
-      @default_headers = {
-        'Content-Type' => 'application/json',
-        'User-Agent' => @user_agent
-      }
       @format_list = ['json', 'xml', 'php', 'yaml']
-      @content_type = 'application/json'
       @default_output_format = 'json'
       @accepts = ['application/json', 'application/xml', 'application/x-php', 'application/x-yaml; charset=utf-8']
+      set_api_key(api_key)
     end
 
     def self.default
       @@default ||= ApiClient.new
     end
 
+    def set_api_key(api_key = '')
+      @api_key = api_key
+    end
+
     def set_default_output_format(output_format)
       if @format_list.include? output_format
         @default_output_format = output_format
       end
     end
 
-    def call_api(http_method, path, opts = {})
-      header_params = @default_headers.merge(opts[:header_params] || {})
-      url = @host + path
-
+    def call_api(http_method, path, body = {})
       use_default_output_format = true
+      active_output_format = @default_output_format
+      url = @host + path
 
-      body = opts[:body]
-
-      if body && body[:outputFormat]
+      # format body
+      if body[:outputFormat]
         format = body[:outputFormat].downcase
         if @format_list.include? format
           url += ".#{format}"
           body.delete(:outputFormat)
           use_default_output_format = false
+          active_output_format = format
         end
       end
 
+      # apply output format
       if use_default_output_format && @format_list.include?(@default_output_format)
         url += '.%s' % @default_output_format
+        active_output_format = @default_output_format
       end
 
-      res = request(http_method, url, body, header_params)
+      # apply api key
+      body[:key] = @api_key
+
+      # send request
+      conn = Excon.new(url, :headers => {'Content-Type' => 'application/json'}, :read_timeout => 300, :write_timeout => 300)
+      res = conn.post(:body => body.to_json)
 
+      # handle response
       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
+      if res.status == 200
+        if active_output_format == 'json'
+          data = JSON.parse(res.body)
         else
-          fail ApiError.new(res.body)
+          data = res.body
         end
       end
-    end
-
-    def request(http_method, url, body = nil, headers = nil)
-      if http_method.to_sym.downcase == :post
-        Faraday.post(url, body.to_json, headers)
-      else
-        fail ApiError.new('http_method must be :post')
-      end
-    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
-      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.
-    # @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
-      else
-        obj
-      end
-    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
-        param.join(',')
-      when :ssv
-        param.join(' ')
-      when :tsv
-        param.join("\t")
-      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}"
+      if (!data)
+        fail ApiError.new(:status => res.status, :response_body => res.body)
       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?
+      return data
     end
   end
 end