chiketto 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c7ae750d116ab1df0463f0674fb1444b57371c6
-  data.tar.gz: 24ee0e3f5ea28e4f5d124d0b136cc559aa351ff0
+  metadata.gz: 2d3c982cc44a739bfced986438e2c622e3ea8fa8
+  data.tar.gz: c82350ae60fe519bbe9aa6839ac1933a9e454176
 SHA512:
-  metadata.gz: 5a01a2ecacc729b7c779447d74d031353852a2f79e2b31d3bdeaa07e78b5c6dbeb5692b182f7c3f62b309b881ab884d21aec4b62cadcbd06d21067008f457c8a
-  data.tar.gz: 8a889152c916171eae8eab2afe5012bde446e8e5c1f2dc2f7cf41fd45cce2fe77f3b5c6a54c0c99b7c41682aa0155cad3eadda02d268a40d654acf02477fa4a9
+  metadata.gz: ee1253d5e183e441d3d664e62c3897dfb345e0f2c1351a650795bece8d569fc5970c2c61dde2d012750fed4035974ccfe2edeac7eeea0e60ab20418f885568d0
+  data.tar.gz: 28c12c5b26dc440daff2d703bed88a1d2a59307935f0c89d1161caf1fded0523149d522944b5a34ad192315ce9f6469678dc027cadacbdea0ece5b0813d6ef06

data/lib/chiketto/event.rb

@@ -88,18 +88,16 @@ module Chiketto
       get "events/#{id}/attendees", params
     end
 
-    def self.paginated_attendees(id, params, page = 1, attendees = [])
-      response = Event.find_attendees id, params.merge(page: page.to_s)
-      attendees.concat response['attendees']
-      if should_paginate(response['pagination'])
-        Event.paginated_attendees id, params, page + 1, attendees
-      else
-        attendees
+    def self.paginated_attendees(id, params)
+      page = 0
+      attendees = []
+      loop do
+        page += 1
+        response = Event.find_attendees id, params.merge(page: page.to_s)
+        attendees.concat response['attendees']
+        break unless should_paginate(response['pagination'])
       end
-    end
-
-    def self.should_paginate(pagination)
-      pagination['page_count'] > pagination['page_number']
+      attendees
     end
   end
 end

data/lib/chiketto/resource.rb

@@ -49,5 +49,9 @@ module Chiketto
     def self.token
       "/?token=#{Chiketto.api_key}"
     end
+
+    def self.should_paginate(pagination)
+      pagination['page_count'] > pagination['page_number']
+    end
   end
 end

data/lib/chiketto/user.rb

@@ -18,8 +18,8 @@ module Chiketto
     end
 
     def events(params = {})
-      events = User.find_events @id, params
-      events['events'].map { |e| Event.new e }
+      events = User.paginated_events @id, params
+      events.map { |e| Event.new e }
     end
 
     def organizers
@@ -36,5 +36,17 @@ module Chiketto
     def self.find_organizers(id)
       get "users/#{id}/organizers"
     end
+
+    def self.paginated_events(id, params)
+      page = 0
+      events = []
+      loop do
+        page += 1
+        response = User.find_events id, params.merge(page: page.to_s)
+        events.concat response['events']
+        break unless should_paginate(response['pagination'])
+      end
+      events
+    end
   end
 end

data/lib/chiketto/version.rb

@@ -1,3 +1,3 @@
 module Chiketto
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chiketto
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Chris Radford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler