aladtec 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1a55b6d0b8583820796f25b094c57789988fd579440f73f480a280efc0af25
-  data.tar.gz: 429c1814e23f37a940ceeb68f2b725eee25324eeec012da717a82021b8382499
+  metadata.gz: 4bb6e0cb78ea7cc6446e1a62611ff179318d2ee0de1e94cbc1d29be51b3390d8
+  data.tar.gz: 719e483534d65051256f493bad7eb74632b735de7e2bb4985848ba1963fedc3e
 SHA512:
-  metadata.gz: f28a90e45decd38cdd6b6fbc538deb738ffaeec8c2c32364eb69c25058e1165c1f85e355e4bcc486887a81568bec172870e9dc6b18cbe506054ee544df39320d
-  data.tar.gz: 653004a2caa4814a61092dac892f6da1d36c67cb8135d83e2b0777cc90c7226f0d874139b8114bd9962abf2a5a1e9e5f8646e14d5f2eaefefb796af714780753
+  metadata.gz: ee5b6ecb37f26e1912447418e79489f5f33050705490fa3ca11061d19942ba7f593e9957fc7b18869a0a18604c20561ec757c7011b52e2ba7d64c0b3ce42c76c
+  data.tar.gz: a3dafeb15699a88737e5bd20ecc99d0d0af00b6d3baefe3d1fd6943718ea7549c5c74b9f28c7378a5487e1360a6ea8b1c205f9afbcab7f494fd5283e709cd9fb

data/lib/aladtec/client.rb

@@ -13,9 +13,7 @@ module Aladtec
   class Client
     attr_reader :config
     def initialize(args = {})
-      @config = Aladtec.config.dup.tap do |c|
-        c.update(args)
-      end
+      @config = Aladtec.config.dup.update(args)
     end
 
     def configure
@@ -52,11 +50,12 @@ module Aladtec
       events['data'].flat_map { |dates| dates['event_records'] }.map { |event| Event.new(event) }
     end
 
+    MAX = 1000
+
     # Public: Get a list of members
     #
     def members
-      res = request('members')
-      res['data'].map { |member| Member.new(member) }
+      paginated_get('members', {}, self).map { |member| Member.new(member) }
     end
 
     # Public: Get a list of schedules
@@ -89,8 +88,6 @@ module Aladtec
       scheduled_time['data'].flat_map { |date| date['time_records'] }.map { |range| Range.new(range) }
     end
 
-    private
-
     def request(path, options = {})
       if auth_expired? && !authenticate
         raise Aladtec::Error, 'authentication failed'
@@ -103,6 +100,8 @@ module Aladtec
       res.parse
     end
 
+    private
+
     def format_time(time)
       (time.is_a?(Time) ? time : Time.parse(time)).strftime('%FT%T%:z')
     end
@@ -110,5 +109,52 @@ module Aladtec
     def auth_expired?
       !@auth_token || !@auth_expiration || Time.now >= @auth_expiration
     end
+
+    def paginated_get(path, params, client)
+      Cursor.new(path, params, client)
+    end
+
+    class Cursor
+      include Enumerable
+
+      def initialize(path, options = {}, client)
+        @path       = path
+        @params     = options.dup
+        @client     = client
+
+        @collection = []
+        @offset     = @params.fetch(:offset, nil)
+        @limit      = @params.fetch(:limit, 50)
+      end
+
+      def each(start = 0, &block)
+        return to_enum(:each, start) unless block
+    
+        Array(@collection[start..]).each(&block)
+    
+        unless finished?
+          start = [@collection.size, start].max
+    
+          fetch_next_page
+    
+          each(start, &block)
+        end
+      end
+
+      private
+
+      def fetch_next_page
+        response              = @client.request(@path, @params.merge(offset: @collection.length, limit: @limit))
+        data = response['data']
+        @last_response_empty  = data.empty? || data.length < @limit
+        @collection           += data
+      end
+    
+      MAX = 1000
+
+      def finished?
+        @last_response_empty || @collection.length >= MAX
+      end
+    end
   end
 end

data/lib/aladtec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aladtec
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.0.pre2'
 end

data/spec/aladtec/client_spec.rb

@@ -23,6 +23,7 @@ describe Aladtec::Client do
     let(:members) { subject.members }
     before(:each) do
       stub_request(:get, URI.join(endpoint, 'members'))
+        .with(query: { offset: 0, limit: 50 })
         .to_return(body: fixture('members.json'),
                    headers: { 'Content-Type': 'application/json' })
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aladtec
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Travis Dahlke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-31 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler