zendesk_api 1.13.4 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 929e97f4f95119eb52613dd21e7bcdfdf812d880
-  data.tar.gz: f6befca8e106dc2946d431ec7dbefafaca698db6
+SHA256:
+  metadata.gz: 592ae735c6f79aa698f4edcd7328c5774dcffc06c00e2f28b85027586f98a48c
+  data.tar.gz: a86e4f2d88eb2b6a05082ba5bd343942dc645af19dcfbd75d00c1ccf1e8d08fe
 SHA512:
-  metadata.gz: 03043ac68eb0208d90dbf7757200270e29ea7e8e5341fc0dac9a1ca5b739c662ebff110ebd2a2bfbce0dad79e2b11aab0a0b6559e16105b41d7ca65733a9902d
-  data.tar.gz: 462327e6ac915c8bc83f7e921d4198366ea2484c1b9d8e3958870c56e0fc97adf9ca9162537f2a1bf84c9fddc0b1c1fc0aa37cce1938d9f774dff89bd7e98def
+  metadata.gz: b4563b95cd57c46662876c012fcabcee71b35d39d77d93f7e36fe629f46187c001e8c817c06004fb7617c5c1c9191f0c0c8bc40662e15d550cc7721c89341822
+  data.tar.gz: 21ebc067a097717124234eae951a8f7d8e003076e6af8958404b2e26dc0b5b08acdb3c26f1792380441802aee21f23632850338e81bb6657948990d4ddfe5aba

data/LICENSE

@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/lib/zendesk_api/actions.rb

@@ -72,7 +72,7 @@ module ZendeskAPI
         changed = association.is_a?(Collection) || association.changed?
 
         if association.respond_to?(:save) && changed && !inline_creation && association.save
-          self.send("#{association_name}=", association) # set id/ids columns
+          send("#{association_name}=", association) # set id/ids columns
         end
 
         if (association_data[:inline] == true || inline_creation) && changed
@@ -129,7 +129,7 @@ module ZendeskAPI
       # @param [Hash] options Any additional GET parameters to be added
       def find(client, options = {}, &block)
         find!(client, options, &block)
-      rescue ZendeskAPI::Error::ClientError => e
+      rescue ZendeskAPI::Error::ClientError
         nil
       end
     end
@@ -181,6 +181,41 @@ module ZendeskAPI
     end
   end
 
+  module CreateOrUpdate
+    # Creates or updates resource using the create_or_update endpoint.
+    # @param [Client] client The {Client} object to be used
+    # @param [Hash] attributes The attributes to create.
+    def create_or_update!(client, attributes, association = Association.new(:class => self))
+      response = client.connection.post("#{association.generate_path}/create_or_update") do |req|
+        req.body = { singular_resource_name => attributes }
+
+        yield req if block_given?
+      end
+
+      new_from_response(client, response, Array(association.options[:include]))
+    end
+  end
+
+  module CreateOrUpdateMany
+    # Creates or updates multiple resources using the create_or_update_many endpoint.
+    #
+    # @param [Client] client The {Client} object to be used
+    # @param [Array<Hash>] attributes The attributes to update resources with
+    #
+    # @return [JobStatus] the {JobStatus} instance for this destroy job
+    def create_or_update_many!(client, attributes)
+      association = Association.new(:class => self)
+
+      response = client.connection.post("#{association.generate_path}/create_or_update_many") do |req|
+        req.body = { resource_name => attributes }
+
+        yield req if block_given?
+      end
+
+      JobStatus.new_from_response(client, response)
+    end
+  end
+
   module Destroy
     def self.included(klass)
       klass.extend(ClassMethod)
@@ -276,15 +311,19 @@ module ZendeskAPI
   module UpdateMany
     # Updates multiple resources using the update_many endpoint.
     # @param [Client] client The {Client} object to be used
-    # @param [Array] ids An array of ids to update
+    # @param [Array] ids_or_attributes An array of ids or arributes including ids to update
     # @param [Hash] attributes The attributes to update resources with
     # @return [JobStatus] the {JobStatus} instance for this destroy job
-    def update_many!(client, ids, attributes)
+    def update_many!(client, ids_or_attributes, attributes = {})
       association = attributes.delete(:association) || Association.new(:class => self)
 
       response = client.connection.put("#{association.generate_path}/update_many") do |req|
-        req.params = { :ids => ids.join(',') }
-        req.body = { singular_resource_name => attributes }
+        if attributes == {}
+          req.body = { resource_name => ids_or_attributes }
+        else
+          req.params = { :ids => ids_or_attributes.join(',') }
+          req.body = { singular_resource_name => attributes }
+        end
 
         yield req if block_given?
       end

data/lib/zendesk_api/association.rb

@@ -37,7 +37,7 @@ module ZendeskAPI
     # * parent - Parent instance
     # * path - Optional path instead of resource name
     def initialize(options = {})
-      @options = Hashie::Mash.new(options)
+      @options = SilentMash.new(options)
     end
 
     # Generate a path to the resource.
@@ -48,7 +48,7 @@ module ZendeskAPI
     # * with_parent - Include the parent path (false by default)
     # * with_id - Include the instance id, if possible (true)
     def generate_path(*args)
-      options = Hashie::Mash.new(:with_id => true)
+      options = SilentMash.new(:with_id => true)
       if args.last.is_a?(Hash)
         original_options = args.pop
         options.merge!(original_options)
@@ -150,7 +150,7 @@ module ZendeskAPI
     def build_parent_namespace(parent_class, instance, options, original_options)
       path = @options.path
 
-      association_on_parent = parent_class.associations.detect {|a| a[:name] == @options[:name]}
+      association_on_parent = parent_class.associations.detect { |a| a[:name] == @options[:name] }
       association_on_parent ||= parent_class.associations.detect do |a|
         !a[:inline] && a[:class] == @options[:class]
       end

data/lib/zendesk_api/associations.rb

@@ -20,7 +20,7 @@ module ZendeskAPI
       case resource
       when Hash
         klass.new(@client, resource.merge(:association => instance_association))
-      when String, Fixnum
+      when String, Integer
         klass.new(@client, (options[:include_key] || :id) => resource, :association => instance_association)
       else
         resource.association = instance_association
@@ -172,7 +172,7 @@ module ZendeskAPI
                 klass.find(@client, :id => id, :association => instance_association)
               end.compact
             elsif (resources = method_missing(association[:name].to_sym)) && resources.any?
-              resources.map {|res| wrap_resource(res, association)}
+              resources.map { |res| wrap_resource(res, association) }
             else
               []
             end

data/lib/zendesk_api/client.rb

@@ -5,8 +5,10 @@ require 'zendesk_api/sideloading'
 require 'zendesk_api/configuration'
 require 'zendesk_api/collection'
 require 'zendesk_api/lru_cache'
+require 'zendesk_api/silent_mash'
 require 'zendesk_api/middleware/request/etag_cache'
 require 'zendesk_api/middleware/request/retry'
+require 'zendesk_api/middleware/request/raise_rate_limited'
 require 'zendesk_api/middleware/request/upload'
 require 'zendesk_api/middleware/request/encode_json'
 require 'zendesk_api/middleware/request/url_based_access_token'
@@ -63,7 +65,7 @@ module ZendeskAPI
     # @return [Hash] The attributes of the current account or nil
     def current_account(reload = false)
       return @current_account if @current_account && !reload
-      @current_account = Hashie::Mash.new(connection.get('account/resolve').body)
+      @current_account = SilentMash.new(connection.get('account/resolve').body)
     end
 
     # Returns the current locale
@@ -92,6 +94,8 @@ module ZendeskAPI
 
       config.retry = !!config.retry # nil -> false
 
+      set_raise_error_when_rated_limited
+
       set_token_auth
 
       set_default_logger
@@ -170,9 +174,14 @@ module ZendeskAPI
         builder.use ZendeskAPI::Middleware::Request::Upload
         builder.request :multipart
         builder.use ZendeskAPI::Middleware::Request::EncodeJson
-        builder.use ZendeskAPI::Middleware::Request::Retry, :logger => config.logger if config.retry # Should always be first in the stack
 
-        builder.adapter *adapter
+        # Should always be first in the stack
+        builder.use ZendeskAPI::Middleware::Request::Retry, :logger => config.logger if config.retry
+        if config.raise_error_when_rate_limited
+          builder.use ZendeskAPI::Middleware::Request::RaiseRateLimited, :logger => config.logger
+        end
+
+        builder.adapter(*adapter)
       end
     end
 
@@ -189,8 +198,20 @@ module ZendeskAPI
       end
     end
 
+    def set_raise_error_when_rated_limited
+      config.raise_error_when_rate_limited = if config.retry
+        false
+      else
+        !!config.raise_error_when_rate_limited
+      end
+    end
+
     def set_token_auth
-      if config.token && !config.password
+      return if config.password || config.token.nil?
+
+      if config.username.nil?
+        raise ArgumentError, "you need to provide a username when using API token auth"
+      else
         config.password = config.token
         config.username += "/token" unless config.username.end_with?("/token")
       end

data/lib/zendesk_api/collection.rb

@@ -29,7 +29,7 @@ module ZendeskAPI
     # @param [Hash] options Any additional options to be passed in.
     def initialize(client, resource, options = {})
       @client, @resource_class, @resource = client, resource, resource.resource_name
-      @options = Hashie::Mash.new(options)
+      @options = SilentMash.new(options)
 
       set_association_from_options
       join_special_params
@@ -48,7 +48,7 @@ module ZendeskAPI
 
     # Methods that take a Hash argument
     methods = %w{create find update update_many destroy}
-    methods += methods.map {|method| method + "!"}
+    methods += methods.map { |method| method + "!" }
     methods.each do |deferrable|
       # Passes arguments and the proper path to the resource class method.
       # @param [Hash] options Options or attributes to pass
@@ -152,7 +152,7 @@ module ZendeskAPI
     # Adds an item (or items) to the list of side-loaded resources to request
     # @option sideloads [Symbol or String] The item(s) to sideload
     def include(*sideloads)
-      self.tap { @includes.concat(sideloads.map(&:to_s)) }
+      tap { @includes.concat(sideloads.map(&:to_s)) }
     end
 
     # Adds an item to this collection
@@ -186,7 +186,7 @@ module ZendeskAPI
         return (@resources = [])
       end
 
-      @response = get_response(@query || self.path)
+      @response = get_response(@query || path)
       handle_response(@response.body)
 
       @resources
@@ -194,7 +194,7 @@ module ZendeskAPI
 
     def fetch(*args)
       fetch!(*args)
-    rescue Faraday::Error::ClientError => e
+    rescue Faraday::ClientError => e
       @error = e
 
       []
@@ -236,7 +236,7 @@ module ZendeskAPI
     # @option collection [Array] The collection to replace this one with
     # @raise [ArgumentError] if any resources passed in don't belong in this collection
     def replace(collection)
-      raise "this collection is for #{@resource_class}" if collection.any?{|r| !r.is_a?(@resource_class) }
+      raise "this collection is for #{@resource_class}" if collection.any? { |r| !r.is_a?(@resource_class) }
       @resources = collection
     end
 
@@ -309,7 +309,7 @@ module ZendeskAPI
         inspect = []
         inspect << "options=#{@options.inspect}" if @options.any?
         inspect << "path=#{path}"
-        "#{Inflection.singular(@resource)} collection [#{inspect.join(",")}]"
+        "#{Inflection.singular(@resource)} collection [#{inspect.join(',')}]"
       end
     end
 
@@ -398,7 +398,7 @@ module ZendeskAPI
     def get_response(path)
       @error = nil
       @response = @client.connection.send(@verb || "get", path) do |req|
-        opts = @options.delete_if {|_, v| v.nil?}
+        opts = @options.delete_if { |_, v| v.nil? }
 
         req.params.merge!(:include => @includes.join(",")) if @includes.any?
 

data/lib/zendesk_api/configuration.rb

@@ -16,6 +16,9 @@ module ZendeskAPI
     # @return [Boolean] Whether to attempt to retry when rate-limited (http status: 429).
     attr_accessor :retry
 
+    # @return [Boolean] Whether to raise error when rate-limited (http status: 429).
+    attr_accessor :raise_error_when_rate_limited
+
     # @return [Logger] Logger to use when logging requests.
     attr_accessor :logger
 
@@ -56,7 +59,8 @@ module ZendeskAPI
           :user_agent => "ZendeskAPI Ruby #{ZendeskAPI::VERSION}"
         },
         :request => {
-          :open_timeout => 10
+          :open_timeout => 10,
+          :timeout => 60
         },
         :url => @url
       }.merge(client_options)

data/lib/zendesk_api/error.rb

@@ -1,14 +1,23 @@
+# tested via spec/core/middleware/response/raise_error_spec.rb
 module ZendeskAPI
   module Error
-    class ClientError < Faraday::Error::ClientError
+    class ClientError < Faraday::ClientError
       attr_reader :wrapped_exception
+
+      def to_s
+        if response
+          "#{super} -- #{response.method} #{response.url}"
+        else
+          super
+        end
+      end
     end
 
     class RecordInvalid < ClientError
-      attr_accessor :response, :errors
+      attr_accessor :errors
 
-      def initialize(response)
-        @response = response
+      def initialize(*)
+        super
 
         if response[:body].is_a?(Hash)
           @errors = response[:body]["details"] || response[:body]["description"]
@@ -18,11 +27,12 @@ module ZendeskAPI
       end
 
       def to_s
-        "#{self.class.name}: #{@errors.to_s}"
+        "#{self.class.name}: #{@errors}"
       end
     end
 
     class NetworkError < ClientError; end
     class RecordNotFound < ClientError; end
+    class RateLimited < ClientError; end
   end
 end

data/lib/zendesk_api/helpers.rb

@@ -3,18 +3,18 @@ module ZendeskAPI
   module Helpers
     # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/modulize.rb
     def self.modulize_string(string)
-      #gsub('__','/').  # why was this ever here?
-      string.gsub(/__(.?)/){ "::#{$1.upcase}" }.
-        gsub(/\/(.?)/){ "::#{$1.upcase}" }.
-        gsub(/(?:_+|-+)([a-z])/){ $1.upcase }.
-        gsub(/(\A|\s)([a-z])/){ $1 + $2.upcase }
+      # gsub('__','/').  # why was this ever here?
+      string.gsub(/__(.?)/) { "::#{$1.upcase}" }.
+        gsub(/\/(.?)/) { "::#{$1.upcase}" }.
+        gsub(/(?:_+|-+)([a-z])/) { $1.upcase }.
+        gsub(/(\A|\s)([a-z])/) { $1 + $2.upcase }
     end
 
     # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/snakecase.rb
     def self.snakecase_string(string)
-      #gsub(/::/, '/').
-      string.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      # gsub(/::/, '/').
+      string.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
         tr('-', '_').
         gsub(/\s/, '_').
         gsub(/__+/, '_').

data/lib/zendesk_api/middleware/request/etag_cache.rb

@@ -30,7 +30,11 @@ module ZendeskAPI
 
           @app.call(environment).on_complete do |env|
             if cached && env[:status] == 304 # not modified
+              # Handle differences in serialized env keys in Faraday < 1.0 and 1.0
+              # See https://github.com/lostisland/faraday/pull/847
               env[:body] = cached[:body]
+              env[:response_body] = cached[:response_body]
+
               env[:response_headers].merge!(
                 :etag => cached[:response_headers][:etag],
                 :content_type => cached[:response_headers][:content_type],

data/lib/zendesk_api/middleware/request/raise_rate_limited.rb

@@ -0,0 +1,31 @@
+require 'faraday/middleware'
+require 'zendesk_api/error'
+
+module ZendeskAPI
+  module Middleware
+    # @private
+    module Request
+      # Faraday middleware to handle HTTP Status 429 (rate limiting) / 503 (maintenance)
+      # @private
+      class RaiseRateLimited < Faraday::Middleware
+        ERROR_CODES = [429, 503].freeze
+
+        def initialize(app, options = {})
+          super(app)
+          @logger = options[:logger]
+        end
+
+        def call(env)
+          response = @app.call(env)
+
+          if ERROR_CODES.include?(response.env[:status])
+            @logger&.warn 'You have been rate limited. Raising error...'
+            raise Error::RateLimited, env
+          else
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zendesk_api/middleware/request/retry.rb

@@ -10,7 +10,7 @@ module ZendeskAPI
         DEFAULT_RETRY_AFTER = 10
         ERROR_CODES = [429, 503]
 
-        def initialize(app, options={})
+        def initialize(app, options = {})
           super(app)
           @logger = options[:logger]
         end

data/lib/zendesk_api/middleware/request/upload.rb

@@ -1,5 +1,5 @@
 require "faraday/middleware"
-require "mime/types"
+require "mini_mime"
 require 'tempfile'
 
 module ZendeskAPI
@@ -50,7 +50,10 @@ module ZendeskAPI
               hash = hash[key]
             end
 
-            mime_type ||= MIME::Types.type_for(path).first || "application/octet-stream"
+            unless defined?(mime_type) && !mime_type.nil?
+              mime_type = MiniMime.lookup_by_filename(path)
+              mime_type = mime_type ? mime_type.content_type : "application/octet-stream"
+            end
 
             hash[:filename] ||= if file.respond_to?(:original_filename)
               file.original_filename

data/lib/zendesk_api/middleware/response/callback.rb

@@ -12,7 +12,7 @@ module ZendeskAPI
 
         def call(env)
           @app.call(env).on_complete do |env|
-            @client.callbacks.each {|c| c.call(env)}
+            @client.callbacks.each { |c| c.call(env) }
           end
         end
       end

data/lib/zendesk_api/middleware/response/logger.rb

@@ -4,6 +4,8 @@ module ZendeskAPI
       # Faraday middleware to handle logging
       # @private
       class Logger < Faraday::Middleware
+        LOG_LENGTH = 1000
+
         def initialize(app, logger = nil)
           super(app)
 
@@ -18,7 +20,10 @@ module ZendeskAPI
           @logger.debug dump_debug(env, :request_headers)
 
           @app.call(env).on_complete do |env|
-            @logger.info("Status #{env[:status].to_s}")
+            info = "Status #{env[:status]}"
+            info.concat(" #{env[:body].to_s[0, LOG_LENGTH]}") if (400..499).cover?(env[:status].to_i)
+
+            @logger.info info
             @logger.debug dump_debug(env, :response_headers)
           end
         end

data/lib/zendesk_api/middleware/response/parse_iso_dates.rb

@@ -17,7 +17,7 @@ module ZendeskAPI
 
         def parse_dates!(value)
           case value
-          when Hash then value.each { |key,element| value[key] = parse_dates!(element) }
+          when Hash then value.each { |key, element| value[key] = parse_dates!(element) }
           when Array then value.each_with_index { |element, index| value[index] = parse_dates!(element) }
           when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\Z/m then Time.parse(value)
           else