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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4c1ac14f3525802639a4aa78223d0635533ffee6527fed0a02e9f8b41aca54
-  data.tar.gz: 5e8b18fa02b940a0883b2ed6349a619cda9048201c87c4d953f53e373e64d88f
+  metadata.gz: b1e79341f006b8b4c2b7298c9d5e571acfaaa0c405e4b19b33357385935f805d
+  data.tar.gz: 1560ad1534d1b0a57d57de3f980be7e2d3c6892cb98950e9ad597eee70da68d5
 SHA512:
-  metadata.gz: 5e0752a3cac273d81a7cafa7d43ca5a69088db6143418a9bb70b6a95f1111db422d8eb03d8f669f5d74efd1f0e05d2004f284f21e173605da0f4f3fcb601d62b
-  data.tar.gz: 41079af50a9db8a791614849197a5d5aee2049d1b2f9900c345802ff1a6439869f86f9f341309883cfe2c0233c590f352b1ef4c9f5ba81f4cf7506183d95c139
+  metadata.gz: 3ae58f939ad53857fc35676818476bfefdc57ca687f70958a792bb15297e2e18068ed320347f9c80d506a49bcb3a307459c2b1338e1afc75d76694609c180db5
+  data.tar.gz: 3becf25a73045be2c246ac1903443e6418d4c8ac196e4f537e6bba4863dccd903478728d6438901263a529565fdba4ecbea781e5e083ca31df1ba3cf34445152

data/4me-sdk.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'gem_config', '>=0.3'
   spec.add_runtime_dependency 'mime-types', '>= 3.0'
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 12'
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'rubocop', '>= 0.49.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    4me-sdk (2.0.0.pre.rc.1)
+    4me-sdk (2.0.1)
       activesupport (>= 4.2)
       gem_config (>= 0.3)
       mime-types (>= 3.0)
@@ -9,80 +9,82 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.5)
     gem_config (0.3.2)
     hashdiff (1.0.1)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    minitest (5.14.2)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    mime-types-data (3.2021.0225)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (1.8.2)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.93.1)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    simplecov (0.19.1)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    webmock (3.9.4)
+    simplecov_json_formatter (0.1.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   4me-sdk!
-  bundler (~> 1)
+  bundler
   rake (~> 12)
   rspec (~> 3.3)
   rubocop (>= 0.49.0)
@@ -90,4 +92,4 @@ DEPENDENCIES
   webmock (~> 3)
 
 BUNDLED WITH
-   1.16.6
+   2.2.14

data/lib/sdk4me/client.rb

@@ -216,9 +216,8 @@ module Sdk4me
       request
     end
 
-    URI_ESCAPE_PATTERN = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
     def uri_escape(value)
-      URI.escape(value, URI_ESCAPE_PATTERN).gsub('.', '%2E')
+      URI.encode_www_form_component(value).gsub('+', '%20').gsub('.', '%2E')
     end
 
     # Expand the given header with the default header

data/lib/sdk4me/client/attachments.rb

@@ -32,7 +32,7 @@ module Sdk4me
     #      data = {
     #        note: "Hello ![](storage/abc/adjhajdhjaadf.png) and ![](storage/abc/fskdhakjfkjdssdf.png])",
     #        note_attachments: [
-    #          { key: 'storage/abc/fskdhakjfkjdssdf.png', filesize: 12345, inline: true },
+    #          { key: 'storage/abc/adjhajdhjaadf.png', filesize: 12345, inline: true },
     #          { key: 'storage/abc/fskdhakjfkjdssdf.png'], filesize: 98765, inline: true }
     #        ],
     #        ...
@@ -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?
+
+      JSON.parse(response.body)['key']
     end
 
     def send_file(uri, params, basic_auth_header = {})

data/lib/sdk4me/client/multipart.rb

@@ -66,7 +66,8 @@ module Sdk4me
       def to_multipart
         # If we can tell the possible mime-type from the filename, use the first in the list; otherwise, use "application/octet-stream"
         mime_type = MIME::Types.type_for(filename)[0] || MIME::Types['application/octet-stream'][0]
-        %(Content-Disposition: form-data; name="#{CGI.escape(k.to_s)}"; filename="#{filename}"\r\nContent-Type: #{mime_type.simplified}\r\n\r\n#{content}\r\n)
+        %(Content-Disposition: form-data; name="#{CGI.escape(k.to_s)}"; filename="#{filename}"\r\n) +
+          %(Content-Type: #{mime_type.simplified}\r\n\r\n#{content.force_encoding('UTF-8')}\r\n)
       end
     end
   end

data/lib/sdk4me/client/version.rb

@@ -1,5 +1,5 @@
 module Sdk4me
   class Client
-    VERSION = '2.0.0-rc.1'.freeze
+    VERSION = '2.0.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
@@ -311,7 +311,7 @@ describe Sdk4me::Attachments do
         end
 
         it 'should upload a file from disk' do
-          Tempfile.create('4me_attachments_spec.txt') do |file|
+          Tempfile.create('4me_我attáchments_spec.txt') do |file|
             file << 'foobar'
             file.flush
 
@@ -328,10 +328,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: 204, body: '', headers: {})
+              .to_return(status: 200, headers: {}, body: %({"key":"attachments/5/zxxb4ot60xfd6sjg/s3test.txt"}))
 
             expect(a.send(:upload_attachment, file.path)).to eq({
-                                                                  key: "attachments/5/requests/000/000/777/abc/#{File.basename(file.path)}",
+                                                                  key: 'attachments/5/zxxb4ot60xfd6sjg/s3test.txt',
                                                                   filesize: 6
                                                                 })
           end

data/spec/lib/sdk4me/certificate_spec.rb

@@ -12,7 +12,7 @@ describe 'ca-bundle.crt' do
     expect(response.valid?).to be_falsey
 
     # expecting 401 error
-    expect(response.message).to eq('401: Bad credentials')
+    expect(response.message).to start_with('401:')
   end
 
   it 'should be able to connect to the 4me REST API (access token)' do
@@ -26,7 +26,7 @@ describe 'ca-bundle.crt' do
     expect(response.valid?).to be_falsey
 
     # expecting 401 error
-    expect(response.message).to eq('401: Bad credentials')
+    expect(response.message).to start_with('401:')
   end
 
   it 'should be able to connect to S3' do

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.2
 platform: ruby
 authors:
 - 4me
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,12 +180,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: The official 4me SDK for Ruby. Provides easy access to the REST APIs found