4me-sdk 2.0.0.pre.rc.1 → 2.0.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4c1ac14f3525802639a4aa78223d0635533ffee6527fed0a02e9f8b41aca54
-  data.tar.gz: 5e8b18fa02b940a0883b2ed6349a619cda9048201c87c4d953f53e373e64d88f
+  metadata.gz: 4a47412fa979f19c6133c5fb05a9e3c5979ce8e26b70ab7e970c161bc1650792
+  data.tar.gz: a7caae4a8ccd168b3284506a63405321186cf2d50989e6f08a6910b0f916578a
 SHA512:
-  metadata.gz: 5e0752a3cac273d81a7cafa7d43ca5a69088db6143418a9bb70b6a95f1111db422d8eb03d8f669f5d74efd1f0e05d2004f284f21e173605da0f4f3fcb601d62b
-  data.tar.gz: 41079af50a9db8a791614849197a5d5aee2049d1b2f9900c345802ff1a6439869f86f9f341309883cfe2c0233c590f352b1ef4c9f5ba81f4cf7506183d95c139
+  metadata.gz: 752300c464dfa9d493218aa5f3672ff4fae68f23f131631d057c8e0d073b6f18a0a526dc7fce8f03490d82594e7a2d54aafb4b52b72be0c5cb6a9f6cfde97f13
+  data.tar.gz: cd40c5966800ca2e52b790e7d2f57e4fe3f92c2145c472048a3ce6f8c5c83717648cb6805445d5a983f57397807a96f0e08f55a66c264492df81e61479caa3c8

data/lib/sdk4me/client/attachments.rb

@@ -97,11 +97,11 @@ module Sdk4me
       key_template = storage[provider][:key]
       key = key_template.sub(FILENAME_TEMPLATE, File.basename(attachment.path))
 
-      if provider == S3_PROVIDER
-        upload_to_s3(key, attachment)
-      else
-        upload_to_4me_local(key, attachment)
-      end
+      key = if provider == S3_PROVIDER
+              upload_to_s3(key, attachment)
+            else
+              upload_to_4me_local(key, attachment)
+            end
 
       # return the values for the attachments param
       { key: key, filesize: File.size(attachment.path) }
@@ -118,6 +118,8 @@ module Sdk4me
       xml = response.body || ''
       error = xml[%r{<Error>.*<Message>(.*)</Message>.*</Error>}, 1]
       raise "AWS S3 upload to #{uri} for #{key} failed: #{error}" if error
+
+      xml[%r{<Key>(.*)</Key>}, 1]
     end
 
     # Upload the file directly to 4me local storage
@@ -125,6 +127,8 @@ module Sdk4me
       uri = storage[:upload_uri]
       response = send_file(uri, storage[:local].merge({ file: attachment }), @client.send(:expand_header))
       raise "4me upload to #{uri} for #{key} failed: #{response.message}" unless response.valid?
+
+      key
     end
 
     def send_file(uri, params, basic_auth_header = {})

data/lib/sdk4me/client/version.rb

@@ -1,5 +1,5 @@
 module Sdk4me
   class Client
-    VERSION = '2.0.0-rc.1'.freeze
+    VERSION = '2.0.0-rc.2'.freeze
   end
 end

data/spec/lib/sdk4me/attachments_spec.rb

@@ -260,10 +260,10 @@ describe Sdk4me::Attachments do
                   'User-Agent' => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6 4me/#{Sdk4me::Client::VERSION}"
                 }
               )
-              .to_return(status: 200, body: '', headers: {})
+              .to_return(status: 200, headers: {}, body: %(<?xml version="1.0" encoding="UTF-8"?>\n<PostResponse><Location>foo</Location><Bucket>example</Bucket><Key>attachments/5/zxxb4ot60xfd6sjg/s3test.txt</Key><ETag>"bar"</ETag></PostResponse>))
 
             expect(a.send(:upload_attachment, file.path)).to eq({
-                                                                  key: "attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/#{File.basename(file.path)}",
+                                                                  key: 'attachments/5/zxxb4ot60xfd6sjg/s3test.txt',
                                                                   filesize: 6
                                                                 })
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 4me-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.1
+  version: 2.0.0.pre.rc.2
 platform: ruby
 authors:
 - 4me
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport