gitlab-ruby 0.1.0.pre → 0.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae0303d813deb88c096599308727f3f078b3b6c2f57de3546446f037ba1eba4
-  data.tar.gz: a4a9222fd8c8ac606ff47b082345f1f084cb8df5af0cf9ae38730b1bd17b7d7a
+  metadata.gz: 69eaed3eb91232c2aecbb26b98be4cd5a29fde24248e10a852f659516bb247d0
+  data.tar.gz: 1725f8b68db38f3f053e27ff55337401c052b88d01e84831ffd8992389b6b3bc
 SHA512:
-  metadata.gz: bfacc95fb95804577dfe04bb5c8b610278cd6dddd8eb398b8b79a47673f881dff0766118c25a93cb707a6be3b13998c1f51f627f0fab2958886f5e35ba00de23
-  data.tar.gz: ff14425d09ab5dc94ed2e77b3ff0a88869b7a312639c60dc961fbe8f9c903bae22368776791e0d1b3dc39c614aadc122948103af868f1c7353e527ad92e92fc8
+  metadata.gz: 82624e6e5b3c2ea05b39741e860b28c002ad9d1e1da63143987c7737cfed894521a65732f2feaabcf011f706fdf4edfd5746e1cfc04305ab5f0cb327229f9680
+  data.tar.gz: 86991c0381614452da9f14f7f7e1e8ff250a82bc4286060b222f069a72b2a23f3107f7f13f64ab160245284d5462dafc7460bf3642fbd3e3d5d03f09c3dad216

data/README.md

@@ -33,15 +33,11 @@ end
 
 #### Pagination
 ```ruby
-loop do
-  page = 1
-  response = client.issues.list(page: 1)
-  response.body.each do |issue|
-    # Do Something
-  end
-
-  page = response.next_page
-  break if page.zero?
+client = Gitlab::Client.new(private_token: 'secret')
+response = client.issues.list
+
+while (response = response.next_page) do
+  # Do something with next page
 end
 ```
 

data/lib/gitlab/api/base.rb

@@ -9,8 +9,18 @@ module Gitlab
 
       protected
 
-      def handle_response(response)
-        Gitlab::Response.new(response)
+      def handle_action(action)
+        response = action.call
+        Gitlab::Response.new(response, action)
+      end
+
+      private
+
+      def with_pagination(args)
+        proc do |page = nil|
+          args[:page] = page unless page.nil?
+          yield
+        end
       end
     end
   end

data/lib/gitlab/api/issues.rb

@@ -4,18 +4,18 @@ module Gitlab
       PATH = 'issues'
 
       def list(args = {})
-        response = connection.get(PATH, args)
-        handle_response(response)
+        action = with_pagination(args) { connection.get(PATH, args) }
+        handle_action(action)
       end
 
       def list_group(group, args = {})
-        response = connection.get(group_path(group), args)
-        handle_response(response)
+        action = with_pagination(args) { connection.get(group_path(group), args) }
+        handle_action(action)
       end
 
       def list_project(project, args = {})
-        response = connection.get(project_path(project), args)
-        handle_response(response)
+        action = with_pagination(args) { connection.get(project_path(project), args) }
+        handle_action(action)
       end
 
       private

data/lib/gitlab/pagination.rb

@@ -1,14 +1,14 @@
 module Gitlab
   module Pagination
-    def current_page
+    def current_page_number
       headers['x-page'].to_i
     end
 
-    def next_page
+    def next_page_number
       headers['x-next-page'].to_i
     end
 
-    def prev_page
+    def prev_page_number
       headers['x-prev-page'].to_i
     end
 
@@ -24,8 +24,11 @@ module Gitlab
       headers['x-per-page'].to_i
     end
 
-    def request_next_page
-      raise NotMethodError
+    def next_page
+      return nil if next_page_number.zero?
+
+      response = @action.call(next_page_number)
+      self.class.new(response, @action)
     end
   end
 end

data/lib/gitlab/response.rb

@@ -2,11 +2,12 @@ module Gitlab
   class Response < Faraday::Response
     include Gitlab::Pagination
 
-    attr_reader :gateway
+    attr_reader :gateway, :action
 
-    def initialize(response)
+    def initialize(response, action = proc {})
       super()
       finish(response.env)
+      @action = action
     end
   end
 end

data/lib/gitlab/version.rb

@@ -1,3 +1,3 @@
 module Gitlab
-  VERSION = "0.1.0.pre"
+  VERSION = "0.1.1.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - Taylor Scott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler