Merge pull request piotrmurach#185 from jcabas/page_iterator_refactor

piotrmurach · piotrmurach · commit c71f4fb8f162 · 2014-08-23T12:37:44.000-04:00
Refactoring page iterator class
diff --git a/lib/github_api/page_iterator.rb b/lib/github_api/page_iterator.rb
@@ -12,6 +12,8 @@ class PageIterator
     # Setup attribute accesor for all the link types
     ATTRIBUTES = [ META_FIRST, META_NEXT, META_PREV, META_LAST ]
 
+    DEFAULT_SHA = 'master'
+
     ATTRIBUTES.each do |attr|
       attr_accessor :"#{attr}_page_uri", :"#{attr}_page"
     end
@@ -37,66 +39,28 @@ def count
     #
     def first
       return nil unless first_page_uri
-      page_uri = URI(first_page_uri)
-      params = parse_query(page_uri.query)
-      if next_page < 1
-        params['sha'] = 'master' if params.keys.include?('sha')
-        params['per_page'] = parse_per_page_number(first_page_uri)
-      else
-        params['page']     = parse_page_number(first_page_uri)
-        params['per_page'] = parse_per_page_number(first_page_uri)
-      end
-
-      response = page_request(page_uri.path, params)
-      update_page_links response.links
-      response
+      perform_request(first_page_uri)
     end
 
     # Perform http get request for the next resource
     #
     def next
       return nil unless has_next?
-      page_uri = URI(next_page_uri)
-      params   = parse_query(page_uri.query)
-      if next_page < 1
-        params['sha'] = params['last_sha'] if params.keys.include?('last_sha')
-        params['per_page'] = parse_per_page_number(next_page_uri)
-      else
-        params['page']     = parse_page_number(next_page_uri)
-        params['per_page'] = parse_per_page_number(next_page_uri)
-      end
-
-      response = page_request(page_uri.path, params)
-      update_page_links response.links
-      response
+      perform_request(next_page_uri)
     end
 
     # Perform http get request for the previous resource
     #
     def prev
       return nil unless prev_page_uri
-      page_uri = URI(prev_page_uri)
-      params = parse_query(page_uri.query)
-      params['page']     = parse_page_number(prev_page_uri)
-      params['per_page'] = parse_per_page_number(prev_page_uri)
-
-      response = page_request(page_uri.path, params)
-      update_page_links response.links
-      response
+      perform_request(prev_page_uri)
     end
 
     # Perform http get request for the last resource
     #
     def last
       return nil unless last_page_uri
-      page_uri = URI(last_page_uri)
-      params = parse_query(page_uri.query)
-      params['page']     = parse_page_number(last_page_uri)
-      params['per_page'] = parse_per_page_number(last_page_uri)
-
-      response = page_request(page_uri.path, params)
-      update_page_links response.links
-      response
+      perform_request(last_page_uri)
     end
 
     # Returns the result for a specific page.
@@ -117,6 +81,29 @@ def get_page(page_number)
 
   private
 
+    def perform_request(attribute)
+      page_uri = URI(attribute)
+      params = parse_query(page_uri.query)
+
+      if next_page < 1
+        sha = sha(params)
+        params['sha'] = sha if sha
+      else
+        params['page'] = parse_page_number(attribute)
+      end
+      params['per_page'] = parse_per_page_number(attribute)
+
+      response = page_request(page_uri.path, params)
+      update_page_links response.links
+      response
+    end
+
+    def sha(params)
+      return params['last_sha'] if params.keys.include?('last_sha')
+      return DEFAULT_SHA if params.keys.include?('sha')
+      nil
+    end
+
     def parse_per_page_number(uri) # :nodoc:
       parse_page_params(uri, PARAM_PER_PAGE)
     end
