4me-sdk 2.0.0.pre.rc.3 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de11ee2bbe3de9d781f371555831ad8f7c6aa64037b182c38ba085ff3de6f92
-  data.tar.gz: 4e2a09d4a0933dcc2228d676b5000264df122edbe4210e07c0ffba174bd2eece
+  metadata.gz: da996ddd9ef66ae1e2b296bcf8ae34406163bbcbe157c1dc9ce8809e253468c4
+  data.tar.gz: 9c4aa5c40c50d5dc9365cb27c89851914d9a3361e6c1df113aa241d00599d522
 SHA512:
-  metadata.gz: d14140f3859fc5e3acaf2072d84963a241f85f2788dba897cef0ee1d269cdcc0e1ef7dbc42f9ea4913d5cf85c1807b11dda4721a941f2f1e3b19363c5c822f58
-  data.tar.gz: 51afb397d2fbdc8e46dbc65599080d2514425cc0764fc14828c63c7bf66800c49d85590130c0343797de76148e884dbfa2757008876bbdb63795b3a3e5bd92ca
+  metadata.gz: d338d9c4069d1a6d643f04dae0f6e98afe6059f2fa9f5c61f77cdb8869096a468cb369c47d702bec1caf2fff9c7e7d454dd67bc80b89c66dc4ebce8fcaf9b543
+  data.tar.gz: 7262b78d780457b9569c7143e39e8fbc2e1d13e5fa9d971ce263a1d666327ee7517952c428d20de1e1c851a8f082a7a45508f3abd60cf556950108a1a175d570

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.2)
+    4me-sdk (2.0.2)
       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/README.md

@@ -129,18 +129,16 @@ If you really want to [paginate](https://developer.4me.com/v1/general/pagination
 
 ```
 @client = Sdk4me::Client.new
-response = @client.get('organizations', {per_page: 10, page: 2})
+response = @client.get('organizations', { per_page: 100 })
 
 puts response.json # all data in an array
 
 puts "showing page #{response.current_page}/#{response.total_pages}, with #{response.per_page} records per page"
 puts "total number of records #{response.total_entries}"
 
-# retrieve collection for other pages directly from the response
-first_page = @client.get(response.pagination_link(:first))
-prev_page  = @client.get(response.pagination_link(:prev))
-next_page  = @client.get(response.pagination_link(:next))
-last_page  = @client.get(response.pagination_link(:last))
+# retrieve collection for previous and next pages directly from the response
+prev_page = @client.get(response.pagination_relative_link(:prev))
+next_page = @client.get(response.pagination_relative_link(:next))
 ```
 
 By default this call will return all [collection fields](https://developer.4me.com/v1/organizations/#collection-fields) for each Organization.
@@ -148,7 +146,7 @@ For more fields, check out the [field selection](https://developer.4me.com/v1/ge
 
 The fields can be accessed using *symbols* and *strings*, and it is possible chain a number of keys in one go:
 ```
-response = Sdk4me::Client.new.get('organizations', {per_page: 10, page: 2, fields: 'parent'})
+response = Sdk4me::Client.new.get('organizations', { per_page: 100, fields: 'parent' })
 puts response[:parent, :name]    # an array with the parent organization names
 puts response['parent', 'name']  # strings are also accepted as keys
 ```

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 }
     #        ],
     #        ...

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/response.rb

@@ -98,14 +98,17 @@ module Sdk4me
       @total_entries ||= @response.header['X-Pagination-Total-Entries'].to_i
     end
 
-    # pagination urls (full paths with server) - relations :first, :prev, :next, :last
+    # pagination urls (full paths with server) - relations :first, :prev
     # Link: <https://api.4me.com/v1/requests?page=1&per_page=25>; rel="first", <https://api.4me.com/v1/requests?page=2&per_page=25>; rel="prev", etc.
     def pagination_link(relation)
       # split on ',' select the [url] in '<[url]>; rel="[relation]"', compact to all url's found (at most one) and take the first
-      (@pagination_links ||= {})[relation] ||= @response.header['Link'] && @response.header['Link'].split(/,\s*<?/).map { |link| link[/^\s*<?(.*?)>?;\s*rel="#{relation}"\s*$/, 1] }.compact.first
+      (@pagination_links ||= {})[relation] ||= @response.header['Link'] &&
+        @response.header['Link']
+          .split(/,\s*(?:<|$)/)
+          .map { |link| link[/^\s*<?(.*?)>?;\s*rel="#{relation}"\s*$/, 1] }.compact.first
     end
 
-    # pagination urls (relative paths without server) - relations :first, :prev, :next, :last
+    # pagination urls (relative paths without server) - relations :first, :prev, :next
     def pagination_relative_link(relation)
       (@pagination_relative_links ||= {})[relation] ||= pagination_link(relation) && pagination_link(relation)[%r{^https?://[^/]*(.*)}, 1]
     end

data/lib/sdk4me/client/version.rb

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

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/spec/lib/sdk4me/attachments_spec.rb

@@ -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
 

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

data/spec/lib/sdk4me/response_spec.rb

@@ -214,7 +214,7 @@ describe Sdk4me::Response do
             'X-Pagination-Current-Page' => 1,
             'X-Pagination-Total-Pages' => 2,
             'X-Pagination-Total-Entries' => 5,
-            'Link' => '<https://api.4me.com/v1/people?page=1&per_page=3>; rel="first",<https://api.4me.com/v1/people?page=2&per_page=3>; rel="next", <https://api.4me.com/v1/people?page=2&per_page=3>; rel="last"'
+            'Link' => '<https://api.4me.com/v1/people?page=1&per_page=3&fields=id,name>; rel="first",<https://api.4me.com/v1/people?fields=id%2Cname&page=2&per_page=3>; rel="next", <https://api.4me.com/v1/people?page=2&per_page=3>; rel="last"'
           }
           allow(@response_array.response).to receive('header') { @pagination_header }
         end
@@ -235,16 +235,16 @@ describe Sdk4me::Response do
           expect(@response_array.total_entries).to eq(5)
         end
 
-        { first: 'https://api.4me.com/v1/people?page=1&per_page=3',
-          next: 'https://api.4me.com/v1/people?page=2&per_page=3',
+        { first: 'https://api.4me.com/v1/people?page=1&per_page=3&fields=id,name',
+          next: 'https://api.4me.com/v1/people?fields=id%2Cname&page=2&per_page=3',
           last: 'https://api.4me.com/v1/people?page=2&per_page=3' }.each do |relation, link|
           it "should define pagination link for :#{relation}" do
             expect(@response_array.pagination_link(relation)).to eq(link)
           end
         end
 
-        { first: '/v1/people?page=1&per_page=3',
-          next: '/v1/people?page=2&per_page=3',
+        { first: '/v1/people?page=1&per_page=3&fields=id,name',
+          next: '/v1/people?fields=id%2Cname&page=2&per_page=3',
           last: '/v1/people?page=2&per_page=3' }.each do |relation, link|
           it "should define pagination relative link for :#{relation}" do
             expect(@response_array.pagination_relative_link(relation)).to eq(link)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 4me-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.3
+  version: 2.0.3
 platform: ruby
 authors:
 - 4me
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2021-12-01 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