nylas 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02d4ddf22b4a6d57beca4b1f0d9fe0628c3d118e62dcee6e7c8ec38695035b5b
-  data.tar.gz: 6393d443a2c9d4f45ffff8d8094929ba767bec0f27414aa5f47eb3914dab16f5
+  metadata.gz: 66046a0bdf3cda4d6c782bba25fba8459223c97930d3bf0d15f46e000f04546a
+  data.tar.gz: cf1e2a07df881e98a6087255c654078ceefcc2dca4b47a0cc79506edbbca63c1
 SHA512:
-  metadata.gz: d815d22e5bf051d16465ea4985ac231ac99f61f8de9e728cb73750ca7ed325e2bbebf7d03ac3e7465d2a0abf42be31925df52f48db2a5fff2a4572d4c537498f
-  data.tar.gz: 6cb20979b66c86fad147bba710cd10cb1a1323712eb8986863f603c98f5c9fe11f11b3cc85384733fcd5193bce0c622e2df1ac41a2388bb7b7bf59bb4baa7d4e
+  metadata.gz: fd94c45db1d031e7e431f7c6f09f2b6f0f8263787fd4a94c1c5978b14a8e57032febfdc5476705eb55f26c33ef3781554dcf3df9c2e4ea21b57764447cc4d7ed
+  data.tar.gz: a2aa5c353495efbdf033131569c12f5166297c760ee10ef50911bb55a4aec98f4823c5779660ba57904eb65b06751021d51a579046938e2a445b382cfa188a19

data/lib/nylas/resources/drafts.rb

@@ -40,19 +40,11 @@ module Nylas
     # @param identifier [String] Grant ID or email account in which to create the draft.
     # @param request_body [Hash] The values to create the message with.
     #   If you're attaching files, you must pass an array of [File] objects, or
-    #   you can use {FileUtils::attach_file_request_builder} to build each object attach.
+    #   you can pass in base64 encoded strings if the total attachment size is less than 3mb.
+    #   You can also use {FileUtils::attach_file_request_builder} to build each object attach.
     # @return [Array(Hash, String)] The created draft and API Request ID.
     def create(identifier:, request_body:)
-      payload = request_body
-      opened_files = []
-
-      # Use form data only if the attachment size is greater than 3mb
-      attachments = request_body[:attachments] || request_body["attachments"] || []
-      attachment_size = attachments&.sum { |attachment| attachment[:size] || 0 } || 0
-
-      if attachment_size >= FileUtils::FORM_DATA_ATTACHMENT_SIZE
-        payload, opened_files = FileUtils.build_form_request(request_body)
-      end
+      payload, opened_files = FileUtils.handle_message_payload(request_body)
 
       response = post(
         path: "#{api_uri}/v3/grants/#{identifier}/drafts",
@@ -70,19 +62,11 @@ module Nylas
     # @param draft_id [String] The id of the draft to update.
     # @param request_body [Hash] The values to create the message with.
     #   If you're attaching files, you must pass an array of [File] objects, or
-    #   you can use {FileUtils::attach_file_request_builder} to build each object attach.
+    #   you can pass in base64 encoded strings if the total attachment size is less than 3mb.
+    #   You can also use {FileUtils::attach_file_request_builder} to build each object attach.
     # @return [Array(Hash, String)] The updated draft and API Request ID.
     def update(identifier:, draft_id:, request_body:)
-      payload = request_body
-      opened_files = []
-
-      # Use form data only if the attachment size is greater than 3mb
-      attachments = request_body[:attachments] || request_body["attachments"] || []
-      attachment_size = attachments&.sum { |attachment| attachment[:size] || 0 } || 0
-
-      if attachment_size >= FileUtils::FORM_DATA_ATTACHMENT_SIZE
-        payload, opened_files = FileUtils.build_form_request(request_body)
-      end
+      payload, opened_files = FileUtils.handle_message_payload(request_body)
 
       response = put(
         path: "#{api_uri}/v3/grants/#{identifier}/drafts/#{draft_id}",

data/lib/nylas/resources/folders.rb

@@ -14,10 +14,12 @@ module Nylas
     # Return all folders.
     #
     # @param identifier [String] Grant ID or email account to query.
+    # @param query_params [Hash, nil] Query params to pass to the request.
     # @return [Array(Array(Hash), String, String)] The list of folders, API Request ID, and next cursor.
-    def list(identifier:)
+    def list(identifier:, query_params: nil)
       get_list(
-        path: "#{api_uri}/v3/grants/#{identifier}/folders"
+        path: "#{api_uri}/v3/grants/#{identifier}/folders",
+        query_params: query_params
       )
     end
 

data/lib/nylas/resources/messages.rb

@@ -92,19 +92,11 @@ module Nylas
     # @param identifier [String] Grant ID or email account from which to delete an object.
     # @param request_body [Hash] The values to create the message with.
     #   If you're attaching files, you must pass an array of [File] objects, or
-    #   you can use {FileUtils::attach_file_request_builder} to build each object attach.
+    #   you can pass in base64 encoded strings if the total attachment size is less than 3mb.
+    #   You can also use {FileUtils::attach_file_request_builder} to build each object attach.
     # @return [Array(Hash, String)] The sent message and the API Request ID.
     def send(identifier:, request_body:)
-      payload = request_body
-      opened_files = []
-
-      # Use form data only if the attachment size is greater than 3mb
-      attachments = request_body[:attachments] || request_body["attachments"] || []
-      attachment_size = attachments&.sum { |attachment| attachment[:size] || 0 } || 0
-
-      if attachment_size >= FileUtils::FORM_DATA_ATTACHMENT_SIZE
-        payload, opened_files = FileUtils.build_form_request(request_body)
-      end
+      payload, opened_files = FileUtils.handle_message_payload(request_body)
 
       response = post(
         path: "#{api_uri}/v3/grants/#{identifier}/messages/send",

data/lib/nylas/test.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'nylas'
+
+nylas = Nylas::Client.new(
+  api_key: "nyk_v0_tRgvnXpqESPGVaaf5QTDzoSYet94natpftScKTT8auH6Www49RJUQ1WJ5VAWplqu"
+)
+
+# file = Nylas::FileUtils.attach_file_request_builder("/Users/mostafa.r@nylas.com/Downloads/05i7gc9wvgv51.jpg")
+file = Nylas::FileUtils.attach_file_request_builder("/Users/mostafa.r@nylas.com/Downloads/zara_reciept.pdf")
+
+request_body = {
+  subject: "Ruby SDK attachment test - 8.30.24 x1",
+  to: [{email: "mostafa.r@nylas.com"}],
+  attachments: [file],
+}
+
+puts "Before request"
+puts request_body
+
+begin
+  email, _ = nylas.messages.send(identifier: "mostafa.r@nylas.com", request_body: request_body)
+  puts "Email sent successfully: #{email}"
+rescue StandardError => e
+  puts "An error occurred: #{e.message}"
+end
+
+puts "After request"
+puts request_body
+
+# begin
+#   email, _ = nylas.messages.send(identifier: "mostafa.r@nylas.com", request_body: request_body)
+#   puts "Email sent successfully: #{email}"
+# rescue StandardError => e1
+#   puts "An error occurred: #{e1.message}"
+# end

data/lib/nylas/utils/file_utils.rb

@@ -13,20 +13,29 @@ module Nylas
     # @return The form data to send to the API and the opened files.
     # @!visibility private
     def self.build_form_request(request_body)
-      attachments = request_body.delete(:attachments) || request_body.delete("attachments") || []
+      attachments = request_body[:attachments] || request_body["attachments"] || []
+      serializable_body = request_body.reject { |key, _| [:attachments, "attachments"].include?(key) }
+      request_body_copy = Marshal.load(Marshal.dump(serializable_body))
 
       # RestClient will not send a multipart request if there are no attachments
-      # so we need to return the message payload to be used as a json payload
-      return [request_body, []] if attachments.empty?
+      return [request_body_copy, []] if attachments.empty?
 
       # Prepare the data to return
-      message_payload = request_body.to_json
+      message_payload = request_body_copy.to_json
 
       form_data = {}
       opened_files = []
 
       attachments.each_with_index do |attachment, index|
         file = attachment[:content] || attachment["content"]
+        if file.respond_to?(:closed?) && file.closed?
+          unless attachment[:file_path]
+            raise ArgumentError, "The file at index #{index} is closed and no file_path was provided."
+          end
+
+          file = File.open(attachment[:file_path], "rb")
+        end
+
         form_data.merge!({ "file#{index}" => file })
         opened_files << file
       end
@@ -36,6 +45,50 @@ module Nylas
       [form_data, opened_files]
     end
 
+    # Build a json attachment request for the API.
+    # @param attachments The attachments to send with the message. Can be a file object or a base64 string.
+    # @return The properly-formatted json data to send to the API and the opened files.
+    # @!visibility private
+    def self.build_json_request(attachments)
+      opened_files = []
+
+      attachments.each_with_index do |attachment, _index|
+        current_attachment = attachment[:content]
+        next unless current_attachment
+
+        if current_attachment.respond_to?(:read)
+          attachment[:content] = Base64.strict_encode64(current_attachment.read)
+          opened_files << current_attachment
+        else
+          attachment[:content] = current_attachment
+        end
+      end
+
+      [attachments, opened_files]
+    end
+
+    # Handle encoding the message payload.
+    # @param request_body The values to create the message with.
+    # @return The encoded message payload and any opened files.
+    # @!visibility private
+    def self.handle_message_payload(request_body)
+      payload = request_body.transform_keys(&:to_sym)
+      opened_files = []
+
+      # Use form data only if the attachment size is greater than 3mb
+      attachments = payload[:attachments]
+      attachment_size = attachments&.sum { |attachment| attachment[:size] || 0 } || 0
+
+      # Handle the attachment encoding depending on the size
+      if attachment_size >= FORM_DATA_ATTACHMENT_SIZE
+        payload, opened_files = build_form_request(request_body)
+      else
+        payload[:attachments], opened_files = build_json_request(attachments) unless attachments.nil?
+      end
+
+      [payload, opened_files]
+    end
+
     # Build the request to attach a file to a message/draft object.
     # @param file_path [String] The path to the file to attach.
     # @return [Hash] The request that will attach the file to the message/draft
@@ -54,7 +107,8 @@ module Nylas
         filename: filename,
         content_type: content_type,
         size: size,
-        content: content
+        content: content,
+        file_path: file_path
       }
     end
   end

data/lib/nylas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nylas
-  VERSION = "6.1.0"
+  VERSION = "6.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nylas
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Nylas, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -31,12 +31,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.1
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -44,9 +58,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -251,6 +265,7 @@ files:
 - lib/nylas/resources/smart_compose.rb
 - lib/nylas/resources/threads.rb
 - lib/nylas/resources/webhooks.rb
+- lib/nylas/test.rb
 - lib/nylas/utils/file_utils.rb
 - lib/nylas/version.rb
 homepage: