zaikio-client-helpers 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5231d366ba2c15a4a7adebee682f240828b9c09eef27ca41f0d9420c54dbf53d
-  data.tar.gz: a918501a0c65b22ca0a22afe632859fb89b954dc6cdda9af965f2b93e2bd8277
+  metadata.gz: d00d304ca27fb927748ae92d163e44c1254a6a9b6c7cd2616fdc32e8cd08dc38
+  data.tar.gz: cbbe9e8df3357f9e1bfdb7defc4e14d20808add68608138d60684e2af78b2e08
 SHA512:
-  metadata.gz: 122e12335f91bcb223a8ea83bc4c889c8ffa57c3348dd1a91a5ef1a9acffde537d0d260061b89b9bec9616242a608788fcb53f85daf20465ee32e594725b76fc
-  data.tar.gz: 56690603e8d4e2b4f88c0ec6a7ac27659dd78210de2b64b19497758dd31505e9f036d9b112f7c694c38a138ea58c21090f59a2cb6d97988592b8a9aada6f2570
+  metadata.gz: 24eebf4cafa1afd04326db5f23b2d8518e2c1633607e5d8c54bcdf768b576ac5e7b3a266ac495c85ab73e6f167dfca7b545d41d802f3fd6777e8df417af35590
+  data.tar.gz: 51c4e0d201584c3d0701bffb3942a219d2d40312f946f4b75b11e43ccf00acc06369553b8ee6bdef182766f07137b38e52ef6520e4319c8e33ee55f44d008753

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.2.4] - 2022-03-29
+
+- Add support for Faraday 2.x
+
+## [0.2.3] - 2021-11-12
+
+- Handle "uncountable" responses (i.e. those without a Total-Count or Total-Pages header)
+
+## [0.2.2] - 2021-08-12
+
+- Attempt to fix `NoMethodError` when looking for pagination headers
+
 ## [0.2.1] - 2021-08-05
 
 - Fixed `with_fallback` from spyke by aliasing the correct error classes

data/lib/zaikio/client/helpers/json_parser.rb

@@ -2,7 +2,13 @@ require "faraday"
 require "multi_json"
 
 module Zaikio::Client::Helpers
-  class JSONParser < Faraday::Response::Middleware
+  superclass = if Gem.loaded_specs["faraday"].version >= Gem::Version.new("2.0")
+    Faraday::Middleware
+  else
+    Faraday::Response::Middleware
+  end
+
+  JSONParser = Class.new(superclass) do
     def on_complete(env)
       case env.status
       when 404 then raise Spyke::ResourceNotFound.new(nil, url: env.url)

data/lib/zaikio/client/helpers/pagination.rb

@@ -11,6 +11,12 @@ module Zaikio::Client::Helpers
 
     METADATA_KEY = :pagination
 
+    superclass = if Gem.loaded_specs["faraday"].version >= Gem::Version.new("2.0")
+      Faraday::Middleware
+    else
+      Faraday::Response::Middleware
+    end
+
     # Faraday Middleware for extracting any pagination headers into the a top-level
     # :metadata hash, or the env hash for non-JSON responses.
     #
@@ -22,7 +28,7 @@ module Zaikio::Client::Helpers
     #   response = conn.get("/")
     #   response.env[METADATA_KEY]
     #   #=> {total_count: 4, total_pages: 1, current_page: 1}
-    class FaradayMiddleware < Faraday::Response::Middleware
+    FaradayMiddleware = Class.new(superclass) do
       def on_complete(env)
         @env = env
 
@@ -63,7 +69,7 @@ module Zaikio::Client::Helpers
     class Relation < Spyke::Relation
       HEADERS.each_key do |symbol|
         define_method(symbol) do
-          find_some.metadata[METADATA_KEY][symbol]
+          find_some.metadata.dig(METADATA_KEY, symbol)
         end
       end
 
@@ -76,7 +82,11 @@ module Zaikio::Client::Helpers
       end
 
       def last_page?
-        current_page >= total_pages
+        if total_pages.nil?
+          find_some.empty?
+        else
+          current_page >= total_pages
+        end
       end
 
       def supports_pagination?

data/lib/zaikio/client/helpers/version.rb

@@ -3,7 +3,7 @@
 module Zaikio
   module Client
     module Helpers
-      VERSION = "0.2.1"
+      VERSION = "0.2.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-client-helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Zaikio GMBH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +48,16 @@ dependencies:
   name: spyke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="