4me-sdk 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e79341f006b8b4c2b7298c9d5e571acfaaa0c405e4b19b33357385935f805d
-  data.tar.gz: 1560ad1534d1b0a57d57de3f980be7e2d3c6892cb98950e9ad597eee70da68d5
+  metadata.gz: da996ddd9ef66ae1e2b296bcf8ae34406163bbcbe157c1dc9ce8809e253468c4
+  data.tar.gz: 9c4aa5c40c50d5dc9365cb27c89851914d9a3361e6c1df113aa241d00599d522
 SHA512:
-  metadata.gz: 3ae58f939ad53857fc35676818476bfefdc57ca687f70958a792bb15297e2e18068ed320347f9c80d506a49bcb3a307459c2b1338e1afc75d76694609c180db5
-  data.tar.gz: 3becf25a73045be2c246ac1903443e6418d4c8ac196e4f537e6bba4863dccd903478728d6438901263a529565fdba4ecbea781e5e083ca31df1ba3cf34445152
+  metadata.gz: d338d9c4069d1a6d643f04dae0f6e98afe6059f2fa9f5c61f77cdb8869096a468cb369c47d702bec1caf2fff9c7e7d454dd67bc80b89c66dc4ebce8fcaf9b543
+  data.tar.gz: 7262b78d780457b9569c7143e39e8fbc2e1d13e5fa9d971ce263a1d666327ee7517952c428d20de1e1c851a8f082a7a45508f3abd60cf556950108a1a175d570

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    4me-sdk (2.0.1)
+    4me-sdk (2.0.2)
       activesupport (>= 4.2)
       gem_config (>= 0.3)
       mime-types (>= 3.0)

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/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.2'.freeze
+    VERSION = '2.0.3'.freeze
   end
 end

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.2
+  version: 2.0.3
 platform: ruby
 authors:
 - 4me
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport