MailchimpTransactional 1.0.4 → 1.0.11

data/lib/MailchimpTransactional/api/whitelists_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.4
+OpenAPI spec version: 1.0.11
 Contact: apihelp@mandrill.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -16,101 +16,38 @@ 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
-    # /whitelists/add
-    # 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, _status_code, _headers = add_with_http_info(body, opts)
-      data
-    end
 
-    # /whitelists/add
+    # 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)
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
-        :body => body,
-        :auth_names => auth_names,
-        :return_type => 'InlineResponse20076')
-      return data, status_code, headers
-    end
-    # /whitelists/delete
-    # Removes an email address from the whitelist.
-    # @param body 
-    # @param [Hash] opts the optional parameters
-    # @return [InlineResponse20078]
-    def delete(body = {}, opts = {})
-      data, _status_code, _headers = delete_with_http_info(body, opts)
+    def add(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/add', body)
       data
     end
 
-    # /whitelists/delete
+    # Remove email from whitelist
     # Removes an email address from the whitelist.
     # @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)
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
-        :body => body,
-        :auth_names => auth_names,
-        :return_type => 'InlineResponse20078')
-      return data, status_code, headers
-    end
-    # /whitelists/list
-    # 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, _status_code, _headers = list_with_http_info(body, opts)
+    def delete(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/delete', body)
       data
     end
 
-    # /whitelists/list
+    # 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<(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)
-      auth_names = []
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
-        :body => body,
-        :auth_names => auth_names,
-        :return_type => 'Array<InlineResponse20077>')
-      return data, status_code, headers
+    def list(body = {})
+      data = @api_client.call_api(:POST, '/whitelists/list', body)
+      data
     end
   end
 end

data/lib/MailchimpTransactional/api_client.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.4
+OpenAPI spec version: 1.0.11
 Contact: apihelp@mandrill.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -11,84 +11,77 @@ 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'})
+      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
+      puts "active format: #{active_output_format}"
+
+      if res.status == 200
+        if active_output_format == 'json'
+          return JSON.parse(res.body)
         else
-          fail ApiError.new(res.body)
+          return 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')
+        fail ApiError.new(:status => res.status, :response_body => res.body)
       end
+
+      return data
     end
   end
 end

data/lib/MailchimpTransactional/api_error.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.4
+OpenAPI spec version: 1.0.11
 Contact: apihelp@mandrill.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.12
@@ -12,7 +12,7 @@ Swagger Codegen version: 2.4.12
 
 module MailchimpTransactional
   class ApiError < StandardError
-    attr_reader :code, :response_headers, :response_body
+    attr_reader :status, :type, :title, :detail, :instance, :errors,:response_headers, :response_body
 
     # Usage examples:
     #   ApiError.new

data/lib/MailchimpTransactional/configuration.rb

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

data/lib/MailchimpTransactional/version.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
-OpenAPI spec version: 1.0.4
+OpenAPI spec version: 1.0.11
 Contact: apihelp@mandrill.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 MailchimpTransactional
-  VERSION = '1.0.4'
+  VERSION = '1.0.11'
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: MailchimpTransactional
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.11
 platform: ruby
 authors:
 - Swagger-Codegen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-08-06 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
@@ -198,6 +192,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- LICENSE
 - MailchimpTransactional.gemspec
 - README.md
 - lib/MailchimpTransactional.rb