boxr 1.22.0 → 1.23.0

data/lib/boxr/client.rb

@@ -1,16 +1,16 @@
-module Boxr
+# frozen_string_literal: true
 
+module Boxr
   class Client
-
     attr_reader :access_token, :refresh_token, :client_id, :client_secret, :identifier, :as_user_id
 
-    #API_URI = "https://wcheng.inside-box.net/api/2.0"
-    #UPLOAD_URI = "https://upload.wcheng.inside-box.net/api/2.0"
+    # API_URI = "https://wcheng.inside-box.net/api/2.0"
+    # UPLOAD_URI = "https://upload.wcheng.inside-box.net/api/2.0"
 
-    API_URI = "https://api.box.com/2.0"
-    AUTH_URI = "https://api.box.com/oauth2/token"
-    REVOKE_AUTH_URI = "https://api.box.com/oauth2/revoke"
-    UPLOAD_URI = "https://upload.box.com/api/2.0"
+    API_URI = 'https://api.box.com/2.0'
+    AUTH_URI = 'https://api.box.com/oauth2/token'
+    REVOKE_AUTH_URI = 'https://api.box.com/oauth2/revoke'
+    UPLOAD_URI = 'https://upload.box.com/api/2.0'
     FILES_URI = "#{API_URI}/files"
     FILES_UPLOAD_URI = "#{UPLOAD_URI}/files/content"
     FOLDERS_URI = "#{API_URI}/folders"
@@ -35,52 +35,55 @@ module Boxr
     DEFAULT_LIMIT = 100
     FOLDER_ITEMS_LIMIT = 1000
 
-    FOLDER_AND_FILE_FIELDS = [:type,:id,:sequence_id,:etag,:name,:created_at,:modified_at,:description,
-                              :size,:path_collection,:created_by,:modified_by,:trashed_at,:purged_at,
-                              :content_created_at,:content_modified_at,:owned_by,:shared_link,:folder_upload_email,
-                              :parent,:item_status,:item_collection,:sync_state,:has_collaborations,:permissions,:tags,
-                              :sha1,:shared_link,:version_number,:comment_count,:lock,:extension,:is_package,:can_non_owners_invite]
+    FOLDER_AND_FILE_FIELDS = %i[type id sequence_id etag name created_at modified_at description
+                                size path_collection created_by modified_by trashed_at purged_at
+                                content_created_at content_modified_at owned_by shared_link folder_upload_email
+                                parent item_status item_collection sync_state has_collaborations permissions tags
+                                sha1 shared_link version_number comment_count lock extension is_package can_non_owners_invite].freeze
     FOLDER_AND_FILE_FIELDS_QUERY = FOLDER_AND_FILE_FIELDS.join(',')
 
-    COMMENT_FIELDS = [:type,:id,:is_reply_comment,:message,:tagged_message,:created_by,:created_at,:item,:modified_at]
+    COMMENT_FIELDS = %i[type id is_reply_comment message tagged_message created_by created_at
+                        item modified_at].freeze
     COMMENT_FIELDS_QUERY = COMMENT_FIELDS.join(',')
 
-    TASK_FIELDS = [:type,:id,:item,:due_at,:action,:message,:task_assignment_collection,:is_completed,:created_by,:created_at]
+    TASK_FIELDS = %i[type id item due_at action message task_assignment_collection
+                     is_completed created_by created_at].freeze
     TASK_FIELDS_QUERY = TASK_FIELDS.join(',')
 
-    COLLABORATION_FIELDS = [:type,:id,:created_by,:created_at,:modified_at,:expires_at,:status,:accessible_by,:role,:acknowledged_at,:item]
+    COLLABORATION_FIELDS = %i[type id created_by created_at modified_at expires_at status
+                              accessible_by role acknowledged_at item].freeze
     COLLABORATION_FIELDS_QUERY = COLLABORATION_FIELDS.join(',')
 
-    USER_FIELDS = [:type,:id,:name,:login,:created_at,:modified_at,:role,:language,:timezone,:space_amount,:space_used,
-                   :max_upload_size,:tracking_codes,:can_see_managed_users,:is_sync_enabled,:is_external_collab_restricted,
-                   :status,:job_title,:phone,:address,:avatar_uri,:is_exempt_from_device_limits,:is_exempt_from_login_verification,
-                   :enterprise,:my_tags]
+    USER_FIELDS = %i[type id name login created_at modified_at role language timezone space_amount space_used
+                     max_upload_size tracking_codes can_see_managed_users is_sync_enabled is_external_collab_restricted
+                     status job_title phone address avatar_uri is_exempt_from_device_limits is_exempt_from_login_verification
+                     enterprise my_tags].freeze
     USER_FIELDS_QUERY = USER_FIELDS.join(',')
 
-    GROUP_FIELDS = [:type, :id, :name, :created_at, :modified_at]
+    GROUP_FIELDS = %i[type id name created_at modified_at].freeze
     GROUP_FIELDS_QUERY = GROUP_FIELDS.join(',')
 
-    WEB_LINK_FIELDS = [:type, :id, :created_at, :created_by, :description, :etag, :item_status, :modified_at, :modified_by,
-                       :name, :owned_by, :parent, :path_collection, :purged_at, :sequence_id, :shared_link, :trashed_at, :url]
+    WEB_LINK_FIELDS = %i[type id created_at created_by description etag item_status modified_at modified_by
+                         name owned_by parent path_collection purged_at sequence_id shared_link trashed_at url].freeze
     WEB_LINK_FIELDS_QUERY = WEB_LINK_FIELDS.join(',')
 
-    VALID_COLLABORATION_ROLES = ['editor','viewer','previewer','uploader','previewer uploader','viewer uploader','co-owner','owner']
-
-
-    def initialize( access_token=ENV['BOX_DEVELOPER_TOKEN'],
-                    refresh_token: nil,
-                    client_id: ENV['BOX_CLIENT_ID'],
-                    client_secret: ENV['BOX_CLIENT_SECRET'],
-                    enterprise_id: ENV['BOX_ENTERPRISE_ID'],
-                    jwt_private_key: ENV['JWT_PRIVATE_KEY'],
-                    jwt_private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
-                    jwt_public_key_id: ENV['JWT_PUBLIC_KEY_ID'],
-                    identifier: nil,
-                    as_user: nil,
-                    &token_refresh_listener)
-
+    VALID_COLLABORATION_ROLES = ['editor', 'viewer', 'previewer', 'uploader', 'previewer uploader',
+                                 'viewer uploader', 'co-owner', 'owner'].freeze
+
+    def initialize(access_token = ENV['BOX_DEVELOPER_TOKEN'],
+                   refresh_token: nil,
+                   client_id: ENV['BOX_CLIENT_ID'],
+                   client_secret: ENV['BOX_CLIENT_SECRET'],
+                   enterprise_id: ENV['BOX_ENTERPRISE_ID'],
+                   jwt_private_key: ENV['JWT_PRIVATE_KEY'],
+                   jwt_private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
+                   jwt_public_key_id: ENV['JWT_PUBLIC_KEY_ID'],
+                   identifier: nil,
+                   as_user: nil,
+                   proxy: nil,
+                   &token_refresh_listener)
       @access_token = access_token
-      raise BoxrError.new(boxr_message: "Access token cannot be nil") if @access_token.nil?
+      raise BoxrError.new(boxr_message: 'Access token cannot be nil') if @access_token.nil?
 
       @refresh_token = refresh_token
       @client_id = client_id
@@ -92,12 +95,13 @@ module Boxr
       @identifier = identifier
       @as_user_id = ensure_id(as_user)
       @token_refresh_listener = token_refresh_listener
+      BOX_CLIENT.proxy = proxy unless proxy.nil?
     end
 
-
     private
 
-    def get(uri, query: nil, success_codes: [200], process_response: true, if_match: nil, box_api_header: nil, follow_redirect: true)
+    def get(uri, query: nil, success_codes: [200], process_response: true, if_match: nil,
+            box_api_header: nil, follow_redirect: true)
       uri = Addressable::URI.encode(uri)
 
       res = with_auto_token_refresh do
@@ -111,17 +115,18 @@ module Boxr
       check_response_status(res, success_codes)
 
       if process_response
-        return processed_response(res)
+        processed_response(res)
       else
-        return res.body, res
+        [res.body, res]
       end
     end
 
-    def get_all_with_pagination(uri, query: {}, offset: 0, limit: DEFAULT_LIMIT, follow_redirect: true)
+    def get_all_with_pagination(uri, query: {}, offset: 0, limit: DEFAULT_LIMIT,
+                                follow_redirect: true)
       uri = Addressable::URI.encode(uri)
       entries = []
 
-      begin
+      loop do
         query[:limit] = limit
         query[:offset] = offset
         res = with_auto_token_refresh do
@@ -129,21 +134,24 @@ module Boxr
           BOX_CLIENT.get(uri, query: query, header: headers, follow_redirect: follow_redirect)
         end
 
-        if (res.status==200)
-          body_json = JSON.load(res.body)
-          total_count = body_json["total_count"]
-          offset = offset + limit
-
-          entries << body_json["entries"]
-        else
+        unless res.status == 200
           raise BoxrError.new(status: res.status, body: res.body, header: res.header)
         end
-      end until offset - total_count >= 0
 
-      BoxrCollection.new(entries.flatten.map{ |i| BoxrMash.new(i) })
+        body_json = JSON.parse(res.body)
+        total_count = body_json['total_count']
+        offset += limit
+
+        entries << body_json['entries']
+
+        break if offset - total_count >= 0
+      end
+
+      BoxrCollection.new(entries.flatten.map { |i| BoxrMash.new(i) })
     end
 
-    def post(uri, body, query: nil, success_codes: [201], process_body: true, digest: nil, content_md5: nil, content_type: nil, if_match: nil, if_non_match: nil)
+    def post(uri, body, query: nil, success_codes: [201], process_body: true, digest: nil,
+             content_md5: nil, content_type: nil, if_match: nil, if_non_match: nil)
       uri = Addressable::URI.encode(uri)
       body = JSON.dump(body) if process_body
 
@@ -151,9 +159,9 @@ module Boxr
         headers = standard_headers
         headers['If-Match'] = if_match unless if_match.nil?
         headers['If-Non-Match'] = if_non_match unless if_non_match.nil?
-        headers["Content-MD5"] = content_md5 unless content_md5.nil?
-        headers["Content-Type"] = content_type unless content_type.nil?
-        headers["Digest"] = digest unless digest.nil?
+        headers['Content-MD5'] = content_md5 unless content_md5.nil?
+        headers['Content-Type'] = content_type unless content_type.nil?
+        headers['Digest'] = digest unless digest.nil?
 
         BOX_CLIENT.post(uri, body: body, query: query, header: headers)
       end
@@ -163,16 +171,17 @@ module Boxr
       processed_response(res)
     end
 
-    def put(uri, body, query: nil, success_codes: [200, 201], process_body: true, content_type: nil, content_range: nil, digest: nil, if_match: nil)
+    def put(uri, body, query: nil, success_codes: [200, 201], process_body: true,
+            content_type: nil, content_range: nil, digest: nil, if_match: nil)
       uri = Addressable::URI.encode(uri)
       body = JSON.dump(body) if process_body
 
       res = with_auto_token_refresh do
         headers = standard_headers
         headers['If-Match'] = if_match unless if_match.nil?
-        headers["Content-Type"] = content_type unless content_type.nil?
-        headers["Content-Range"] = content_range unless content_range.nil?
-        headers["Digest"] = digest unless digest.nil?
+        headers['Content-Type'] = content_type unless content_type.nil?
+        headers['Content-Range'] = content_range unless content_range.nil?
+        headers['Digest'] = digest unless digest.nil?
 
         BOX_CLIENT.put(uri, body: body, query: query, header: headers)
       end
@@ -210,34 +219,35 @@ module Boxr
       processed_response(res)
     end
 
-    def standard_headers()
-      headers = {"Authorization" => "Bearer #{@access_token}"}
-      if @jwt_private_key.nil?
-        headers['As-User'] = "#{@as_user_id}" unless @as_user_id.nil?
-      end
+    def standard_headers
+      headers = { 'Authorization' => "Bearer #{@access_token}" }
+      headers['As-User'] = @as_user_id.to_s if @jwt_private_key.nil? && !@as_user_id.nil?
       headers
     end
 
     def with_auto_token_refresh
-      return yield unless @refresh_token or @jwt_private_key
+      return yield unless @refresh_token || @jwt_private_key
 
       res = yield
       if res.status == 401
         auth_header = res.header['WWW-Authenticate'][0]
-        if auth_header && auth_header.include?('invalid_token')
+        if auth_header&.include?('invalid_token')
           if @refresh_token
-            new_tokens = Boxr::refresh_tokens(@refresh_token, client_id: client_id, client_secret: client_secret)
+            new_tokens = Boxr.refresh_tokens(@refresh_token, client_id: client_id,
+                                                             client_secret: client_secret)
             @access_token = new_tokens.access_token
             @refresh_token = new_tokens.refresh_token
-            @token_refresh_listener.call(@access_token, @refresh_token, @identifier) if @token_refresh_listener
+            @token_refresh_listener&.call(@access_token, @refresh_token,
+                                          @identifier)
           else
             if @as_user_id
-              new_token = Boxr::get_user_token(@as_user_id, private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, client_id: @client_id, client_secret: @client_secret)
-              @access_token = new_token.access_token
+              new_token = Boxr.get_user_token(@as_user_id, private_key: @jwt_private_key,
+                                                           private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, client_id: @client_id, client_secret: @client_secret)
             else
-              new_token = Boxr::get_enterprise_token(private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, enterprise_id: @enterprise_id, client_id: @client_id, client_secret: @client_secret)
-              @access_token = new_token.access_token
+              new_token = Boxr.get_enterprise_token(private_key: @jwt_private_key,
+                                                    private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, enterprise_id: @enterprise_id, client_id: @client_id, client_secret: @client_secret)
             end
+            @access_token = new_token.access_token
           end
 
           res = yield
@@ -248,19 +258,22 @@ module Boxr
     end
 
     def check_response_status(res, success_codes)
-      raise BoxrError.new(status: res.status, body: res.body, header: res.header) unless success_codes.include?(res.status)
+      return if success_codes.include?(res.status)
+
+      raise BoxrError.new(status: res.status, body: res.body,
+                          header: res.header)
     end
 
     def processed_response(res)
-      body_json = JSON.load(res.body)
-      return BoxrMash.new(body_json), res
+      body_json = JSON.parse(res.body)
+      [BoxrMash.new(body_json), res]
     end
 
     def build_fields_query(fields, all_fields_query)
       if fields == :all
-        {:fields => all_fields_query}
-      elsif fields.is_a?(Array) && fields.length > 0
-        {:fields => fields.join(',')}
+        { fields: all_fields_query }
+      elsif fields.is_a?(Array) && fields.length.positive?
+        { fields: fields.join(',') }
       else
         {}
       end
@@ -269,29 +282,30 @@ module Boxr
     def to_comma_separated_string(values)
       return values if values.is_a?(String) || values.is_a?(Symbol)
 
-      if values.is_a?(Array) && values.length > 0
-        values.join(',')
-      else
-        nil
-      end
+      return unless values.is_a?(Array) && values.length.positive?
+
+      values.join(',')
     end
 
     def build_range_string(from, to)
       range_string = "#{from},#{to}"
-      range_string = nil if range_string == ","
+      range_string = nil if range_string == ','
       range_string
     end
 
     def ensure_id(item)
       # Ruby 2.4 unified Fixnum and Bignum into Integer.  This tests for Ruby 2.4
-      if 1.class == Integer
-        return item if item.class == String || item.class == Integer || item.nil?
-      else
-        return item if item.class == String || item.class == Fixnum || item.class == Bignum || item.nil?
+      if 1.instance_of?(Integer)
+        return item if item.instance_of?(String) || item.instance_of?(Integer) || item.nil?
+      elsif item.instance_of?(String) || item.instance_of?(Integer) || item.instance_of?(Integer) || item.nil?
+        if item.instance_of?(String) || item.instance_of?(Integer) || item.instance_of?(Integer) || item.nil?
+          return item
+        end
       end
 
       return item.id if item.respond_to?(:id)
-      raise BoxrError.new(boxr_message: "Expecting an id of class String or Fixnum, or object that responds to :id")
+
+      raise BoxrError.new(boxr_message: 'Expecting an id of class String or Fixnum, or object that responds to :id')
     end
 
     def restore_trashed_item(uri, name, parent)
@@ -299,31 +313,32 @@ module Boxr
 
       attributes = {}
       attributes[:name] = name unless name.nil?
-      attributes[:parent] = {id: parent_id} unless parent_id.nil?
+      attributes[:parent] = { id: parent_id } unless parent_id.nil?
 
-      restored_item, response = post(uri, attributes)
+      restored_item, = post(uri, attributes)
       restored_item
     end
 
-    def create_shared_link(uri, item_id, access, unshared_at, can_download, can_preview, password)
-      attributes = {shared_link: {access: access}}
-      attributes[:shared_link][:unshared_at] = unshared_at.to_datetime.rfc3339 unless unshared_at.nil?
+    def create_shared_link(uri, _item_id, access, unshared_at, can_download, can_preview, password)
+      attributes = { shared_link: { access: access } }
+      unless unshared_at.nil?
+        attributes[:shared_link][:unshared_at] =
+          unshared_at.to_datetime.rfc3339
+      end
       attributes[:shared_link][:password] = password unless password.nil?
       attributes[:shared_link][:permissions] = {} unless can_download.nil? && can_preview.nil?
       attributes[:shared_link][:permissions][:can_download] = can_download unless can_download.nil?
       attributes[:shared_link][:permissions][:can_preview] = can_preview unless can_preview.nil?
 
-      updated_item, response = put(uri, attributes)
+      updated_item, = put(uri, attributes)
       updated_item
     end
 
     def disable_shared_link(uri)
-      attributes = {shared_link: nil}
+      attributes = { shared_link: nil }
 
-      updated_item, response = put(uri, attributes)
+      updated_item, = put(uri, attributes)
       updated_item
     end
-
   end
-
 end

data/lib/boxr/collaborations.rb

@@ -1,11 +1,15 @@
 module Boxr
   class Client
-
-    def folder_collaborations(folder, fields: [], offset: 0, limit: DEFAULT_LIMIT)
+    def folder_collaborations(folder, fields: [], limit: DEFAULT_LIMIT, marker: nil)
       folder_id = ensure_id(folder)
       query = build_fields_query(fields, COLLABORATION_FIELDS_QUERY)
+      query[:limit] = limit
+      query[:marker] = marker unless marker.nil?
+
       uri = "#{FOLDERS_URI}/#{folder_id}/collaborations"
-      collaborations = get_all_with_pagination(uri, query: query, offset: offset, limit: limit)
+
+      folder_collaborations, = get(uri, query: query)
+      folder_collaborations['entries']
     end
 
     def file_collaborations(file, fields: [], limit: DEFAULT_LIMIT, marker: nil)
@@ -16,15 +20,15 @@ module Boxr
 
       uri = "#{FILES_URI}/#{file_id}/collaborations"
 
-      collaborations, response = get(uri, query: query)
-      collaborations['entries']
+      file_collaborations, = get(uri, query: query)
+      file_collaborations['entries']
     end
 
     def group_collaborations(group, offset: 0, limit: DEFAULT_LIMIT)
       group_id = ensure_id(group)
       uri = "#{GROUPS_URI}/#{group_id}/collaborations"
 
-      collaborations = get_all_with_pagination(uri, offset: offset, limit: limit)
+      get_all_with_pagination(uri, offset: offset, limit: limit)
     end
 
     def add_collaboration(item, accessible_by, role, fields: [], notify: nil, type: :folder)
@@ -32,11 +36,11 @@ module Boxr
       query = build_fields_query(fields, COLLABORATION_FIELDS_QUERY)
       query[:notify] = notify unless notify.nil?
 
-      attributes = {item: {id: item_id, type: type}}
+      attributes = { item: { id: item_id, type: type } }
       attributes[:accessible_by] = accessible_by
       attributes[:role] = validate_role(role)
 
-      collaboration, response = post(COLLABORATIONS_URI, attributes, query: query)
+      collaboration, = post(COLLABORATIONS_URI, attributes, query: query)
       collaboration
     end
 
@@ -47,14 +51,14 @@ module Boxr
       attributes[:role] = validate_role(role) unless role.nil?
       attributes[:status] = status unless status.nil?
 
-      updated_collaboration, response = put(uri, attributes)
+      updated_collaboration, = put(uri, attributes)
       updated_collaboration
     end
 
     def remove_collaboration(collaboration)
       collaboration_id = ensure_id(collaboration)
       uri = "#{COLLABORATIONS_URI}/#{collaboration_id}"
-      result, response = delete(uri)
+      result, = delete(uri)
       result
     end
 
@@ -65,15 +69,16 @@ module Boxr
       query = build_fields_query(fields, COLLABORATION_FIELDS_QUERY)
       query[:status] = status unless status.nil?
 
-      collaboration, response = get(uri, query: query)
+      collaboration, = get(uri, query: query)
       collaboration
     end
 
-    #these are pending collaborations for the current user; use the As-User Header to request for different users
+    # These are pending collaborations for the current user
+    # Use the As-User Header to request for different users
     def pending_collaborations(fields: [])
       query = build_fields_query(fields, COLLABORATION_FIELDS_QUERY)
       query[:status] = :pending
-      pending_collaborations, response = get(COLLABORATIONS_URI, query: query)
+      pending_collaborations, = get(COLLABORATIONS_URI, query: query)
       pending_collaborations['entries']
     end
 
@@ -90,7 +95,9 @@ module Boxr
       end
 
       role = role.to_s
-      raise BoxrError.new(boxr_message: "Invalid collaboration role: '#{role}'") unless VALID_COLLABORATION_ROLES.include?(role)
+      unless VALID_COLLABORATION_ROLES.include?(role)
+        raise BoxrError.new(boxr_message: "Invalid collaboration role: '#{role}'")
+      end
 
       role
     end

data/lib/boxr/collections.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 module Boxr
   class Client
-
     def collections
-      collections = get_all_with_pagination(COLLECTIONS_URI, offset: 0, limit: DEFAULT_LIMIT)
+      get_all_with_pagination(COLLECTIONS_URI, offset: 0, limit: DEFAULT_LIMIT)
     end
 
     def collection_items(collection, fields: [])
       collection_id = ensure_id(collection)
       uri = "#{COLLECTIONS_URI}/#{collection_id}/items"
       query = build_fields_query(fields, FOLDER_AND_FILE_FIELDS_QUERY)
-      items = get_all_with_pagination(uri, query: query, offset: 0, limit: DEFAULT_LIMIT)
+      get_all_with_pagination(uri, query: query, offset: 0, limit: DEFAULT_LIMIT)
     end
-
   end
-end
+end

data/lib/boxr/comments.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 module Boxr
   class Client
-
     def file_comments(file, fields: [])
       file_id = ensure_id(file)
       uri = "#{FILES_URI}/#{file_id}/comments"
       query = build_fields_query(fields, COMMENT_FIELDS_QUERY)
 
-      comments = get_all_with_pagination(uri, query: query, offset: 0, limit: DEFAULT_LIMIT)
+      get_all_with_pagination(uri, query: query, offset: 0, limit: DEFAULT_LIMIT)
     end
 
     def add_comment_to_file(file, message: nil, tagged_message: nil)
@@ -22,38 +23,37 @@ module Boxr
     def change_comment(comment, message)
       comment_id = ensure_id(comment)
       uri = "#{COMMENTS_URI}/#{comment_id}"
-      attributes = {message: message}
-      updated_comment, response = put(uri, attributes)
+      attributes = { message: message }
+      updated_comment, = put(uri, attributes)
       updated_comment
     end
 
     def comment_from_id(comment_id, fields: [])
       comment_id = ensure_id(comment_id)
-      uri ="#{COMMENTS_URI}/#{comment_id}"
-      comment, response = get(uri)
+      uri = "#{COMMENTS_URI}/#{comment_id}"
+      query = build_fields_query(fields, COMMENT_FIELDS_QUERY)
+      comment, _response = get(uri, query: query)
       comment
     end
-    alias :comment :comment_from_id
+    alias comment comment_from_id
 
     def delete_comment(comment)
       comment_id = ensure_id(comment)
       uri = "#{COMMENTS_URI}/#{comment_id}"
-      result, response = delete(uri)
+      result, = delete(uri)
       result
     end
 
-
     private
 
     def add_comment(type, id, message, tagged_message)
       uri = COMMENTS_URI
-      attributes = {item: {type: type, id: id}}
+      attributes = { item: { type: type, id: id } }
       attributes[:message] = message unless message.nil?
       attributes[:tagged_message] = tagged_message unless tagged_message.nil?
 
-      new_comment, response = post(uri, attributes)
+      new_comment, = post(uri, attributes)
       new_comment
     end
-
   end
-end
+end

data/lib/boxr/errors.rb

@@ -1,39 +1,44 @@
-module Boxr
+# frozen_string_literal: true
 
+module Boxr
   class BoxrError < StandardError
-
-    attr_reader :response_body, :type, :status, :code, :help_uri, :box_message, :boxr_message, :request_id
+    attr_reader :response_body, :type, :status, :code, :help_uri, :box_message, :boxr_message,
+                :request_id
 
     def initialize(status: nil, body: nil, header: nil, boxr_message: nil)
+      super()
       @status = status
       @response_body = body
       @header = header
       @boxr_message = boxr_message
 
-      if(body)
-        begin
-          body_json = JSON.load(body)
+      return unless body
 
-          if body_json
-            @type = body_json["type"]
-            @box_status = body_json["status"]
-            @code = body_json["code"]
-            @help_uri = body_json["help_uri"]
-            @box_message = body_json["message"]
-            @request_id = body_json["request_id"]
-          end
-        rescue
+      begin
+        body_json = JSON.parse(body)
+
+        if body_json
+          @type = body_json['type']
+          @box_status = body_json['status']
+          @code = body_json['code']
+          @help_uri = body_json['help_uri']
+          @box_message = body_json['message']
+          @request_id = body_json['request_id']
         end
+      rescue JSON::ParserError
+        # Ignore JSON parsing errors
       end
     end
 
     def message
-      auth_header = @header['WWW-Authenticate'][0] unless @header.nil?
-      if(auth_header && auth_header != [])
+      unless @header.nil? || @header['WWW-Authenticate'].nil?
+        auth_header = @header['WWW-Authenticate'][0]
+      end
+      if auth_header && auth_header != []
         "#{@status}: #{auth_header}"
-      elsif(@box_message)
+      elsif @box_message
         "#{@status}: #{@box_message}"
-      elsif(@boxr_message)
+      elsif @boxr_message
         @boxr_message
       else
         "#{@status}: #{@response_body}"
@@ -44,5 +49,4 @@ module Boxr
       message
     end
   end
-
-end
+end