Skip to content

Commit ae08e84

Browse files
committed
Merge pull request piotrmurach#192 from jcabas/clean_out_page_iterator
Cleaned out page iterator class
2 parents fd9be66 + 911d0c5 commit ae08e84

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

lib/github_api/page_iterator.rb

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,31 @@ def has_next?
3131
end
3232

3333
def count
34-
return nil unless last_page_uri
35-
parse_query(URI(last_page_uri).query)['page']
34+
parse_query(URI(last_page_uri).query)['page'] if last_page_uri
3635
end
3736

3837
# Perform http get request for the first resource
3938
#
4039
def first
41-
return nil unless first_page_uri
42-
perform_request(first_page_uri)
40+
perform_request(first_page_uri) if first_page_uri
4341
end
4442

4543
# Perform http get request for the next resource
4644
#
4745
def next
48-
return nil unless has_next?
49-
perform_request(next_page_uri)
46+
perform_request(next_page_uri) if has_next?
5047
end
5148

5249
# Perform http get request for the previous resource
5350
#
5451
def prev
55-
return nil unless prev_page_uri
56-
perform_request(prev_page_uri)
52+
perform_request(prev_page_uri) if prev_page_uri
5753
end
5854

5955
# Perform http get request for the last resource
6056
#
6157
def last
62-
return nil unless last_page_uri
63-
perform_request(last_page_uri)
58+
perform_request(last_page_uri) if last_page_uri
6459
end
6560

6661
# Returns the result for a specific page.
@@ -101,7 +96,6 @@ def perform_request(attribute)
10196
def sha(params)
10297
return params['last_sha'] if params.keys.include?('last_sha')
10398
return DEFAULT_SHA if params.keys.include?('sha')
104-
nil
10599
end
106100

107101
def parse_per_page_number(uri) # :nodoc:

0 commit comments

Comments
 (0)