send_with_us 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f559ce008e420040ec7b495e4f47f7a3ae76b2
-  data.tar.gz: 73d4a26a72a2b0d072d6398b5377d63fef7370e6
+  metadata.gz: adf0511f6d96b06f896efdfa2ba12f100fbcb2d0
+  data.tar.gz: c22959469932e596740afb531066956c746914a5
 SHA512:
-  metadata.gz: 202796e78c60bdf82ecb6c624b5f0148a10f9c46f8e9a83f81e56df709ea97f5fe3b846e585de4dc7134487e14e2532e274b61cca00c93663926363ea9e66fbd
-  data.tar.gz: c19407602ab50efa1600d97580baccd97101af0fdb1bee19c0898149e58390aae5ad2e40dc5118bb76c06f1dc3ba47fd492f26e919be897e1b8d9d7e5541ad6f
+  metadata.gz: fd6ad175bbbcc9a9b7c3260389a9bb2b95bf6aeaf0bc33dd0bfd831678481f376447487d1acacfef1d8f7954fe519caa732663513fe411a67e30f5cd48a6db83
+  data.tar.gz: 72c0733ab2c816a5e5dd5e58466b8488460015634dd2878b634ffc503fedd2a8c836efd18fcea2dce34017a3f3ce9cd53cc7e5e61febc03cd19059299f1ca274

data/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Auto tag Sendwithus employees on new Issues/Pull Requests
+*	@demoore @FlipCodes @Bean0B

data/.github/SUPPORT.md

@@ -0,0 +1,3 @@
+Please only file issues that you believe represent actual bugs or feature requests for this API client.
+
+If you are having issues with your Sendwithus integration, have questions about email, or have found a bug with Sendwithus’ API please reach out to support@sendwithus.com and our support team will be happy to help.

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+4.1.0 - `send_email` now supports already encoded files
 4.0.1 - Remove unused methods
 4.0.0 - Deprecate Logs List API endpoint
 3.1.0 - Add `strict` option to the render call

data/README.md

@@ -108,7 +108,8 @@ begin
           'path/to/file.txt',
           { filename: 'customfilename.txt', attachment: 'path/to/file.txt' },
           { filename: 'anotherfile.txt', attachment: File.open('path/to/file.txt') },
-          { filename: 'unpersistedattachment.txt', attachment: StringIO.new("raw data") }
+          { filename: 'unpersistedattachment.txt', attachment: StringIO.new("raw data") },
+          { id: "alreadyBase64EncodedFile", data: "aG9sYQ==\n" }
         ]
     )
     puts result

data/lib/send_with_us.rb

@@ -8,6 +8,7 @@ require 'uri'
 require 'json'
 
 require 'send_with_us/attachment'
+require 'send_with_us/file'
 require 'send_with_us/api'
 require 'send_with_us/api_request'
 require 'send_with_us/config'

data/lib/send_with_us/api.rb

@@ -119,15 +119,8 @@ module SendWithUs
       end
 
       if options[:files] && options[:files].any?
-        payload[:files] = []
-
-        options[:files].each do |file_data|
-          if file_data.is_a?(String)
-            attachment = SendWithUs::Attachment.new(file_data)
-          else
-            attachment = SendWithUs::Attachment.new(file_data[:attachment], file_data[:filename])
-          end
-          payload[:files] << { id: attachment.filename, data: attachment.encoded_data }
+        payload[:files] = options[:files].map do |file_data|
+          SendWithUs::File.new(file_data).to_h
         end
       end
 

data/lib/send_with_us/attachment.rb

@@ -5,12 +5,17 @@ module SendWithUs
     end
 
     def filename
-      @filename ||= @attachment.is_a?(String) ? File.basename(@attachment) : nil
+      @filename ||= @attachment.is_a?(String) ? ::File.basename(@attachment) : nil
     end
 
     def encoded_data
       file_data = @attachment.respond_to?(:read) ? @attachment : open(@attachment)
       Base64.encode64(file_data.read)
     end
+
+    def to_h
+      { id: filename,
+        data: encoded_data }
+    end
   end
 end

data/lib/send_with_us/file.rb

@@ -0,0 +1,21 @@
+module SendWithUs
+  class File
+    attr_accessor :attachment
+
+    def initialize(file_data, opts = {})
+      @attachment = if file_data.is_a?(String)
+                      SendWithUs::Attachment.new(file_data)
+                    else
+                      if file_data[:data] and file_data[:id]
+                        file_data
+                      else
+                        SendWithUs::Attachment.new(file_data[:attachment], file_data[:filename])
+                      end
+                    end
+    end
+
+    def to_h
+      attachment.to_h
+    end
+  end
+end

data/lib/send_with_us/version.rb

@@ -1,3 +1,3 @@
 module SendWithUs
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

data/test/lib/send_with_us/api_request_test.rb

@@ -86,6 +86,21 @@ class TestApiRequest < Minitest::Test
     assert_instance_of( Net::HTTPOK, result )
   end
 
+  def test_send_email_with_file
+    build_objects
+    result = @api.send_email(
+      @template[:id],
+      {name: 'Ruby Unit Test', address: 'matt@example.com'},
+      data: {data: 'I AM DATA'},
+      from: {name: 'sendwithus', address: 'matt@example.com'},
+      cc: [],
+      bcc: [],
+      files: [{data: Base64.encode64(open('README.md').read),
+               id: 'README.md'}]
+    )
+    assert_instance_of( Net::HTTPOK, result )
+  end
+
   def test_send_with_with_version
     build_objects
     email_id = 'tem_9YvYsaLW2Mw4tmPiLcVvpC'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: send_with_us
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Matt Harris
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,8 +63,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .github/CODEOWNERS
 - .github/ISSUE_TEMPLATE
 - .github/PULL_REQUEST_TEMPLATE
+- .github/SUPPORT.md
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -79,6 +81,7 @@ files:
 - lib/send_with_us/attachment.rb
 - lib/send_with_us/config.rb
 - lib/send_with_us/error.rb
+- lib/send_with_us/file.rb
 - lib/send_with_us/version.rb
 - send_with_us.gemspec
 - test/lib/send_with_us/api_request_test.rb