gitlab 3.5.0 → 3.6.0

data/spec/gitlab/help_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Gitlab::Help do
-
   describe ".ri_cmd" do
     context "ri command found" do
       it "should return the path to RI" do
@@ -13,10 +12,9 @@ describe Gitlab::Help do
     context "ri command NOT found" do
       it "should raise" do
         allow(Gitlab::Help).to receive(:`).with(/which ri/).and_return('')
-        expect{Gitlab::Help.ri_cmd}.to raise_error RuntimeError
+        expect { Gitlab::Help.ri_cmd }.to raise_error RuntimeError
       end
     end
-
   end
 
   describe ".change_help_output!" do
@@ -40,5 +38,4 @@ describe Gitlab::Help do
       expect(@namespace).to eq("Gitlab::Client::Repositories.#{@cmd}")
     end
   end
-
 end

data/spec/gitlab/objectified_hash_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::ObjectifiedHash do
   before do
-    @hash = {a: 1, b: 2, 'string' => 'string', symbol: :symbol}
+    @hash = { a: 1, b: 2, 'string' => 'string', symbol: :symbol }
     @oh = Gitlab::ObjectifiedHash.new @hash
   end
 
@@ -23,7 +23,7 @@ describe Gitlab::ObjectifiedHash do
 
   describe "#inspect" do
     it "should return a formatted string" do
-      pretty_string = "#<#{@oh.class.name}:#{@oh.object_id} {hash: #{@hash.to_s}}"
+      pretty_string = "#<#{@oh.class.name}:#{@oh.object_id} {hash: #{@hash}}"
       expect(@oh.inspect).to eq(pretty_string)
     end
   end

data/spec/gitlab/page_links_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Gitlab::PageLinks do
+  before do
+    @page_links = Gitlab::PageLinks.new('Link' => "<http://example.com/api/v3/projects?page=1&per_page=5>; rel=\"first\", <http://example.com/api/v3/projects?page=20&per_page=5>; rel=\"last\", <http://example.com/api/v3/projects?page=7&per_page=5>; rel=\"prev\", <http://example.com/api/v3/projects?page=9&per_page=5>; rel=\"next\"")
+  end
+
+  context '.extract_links' do
+    it 'should extract link header appropriately' do
+      expect(@page_links.last).to eql 'http://example.com/api/v3/projects?page=20&per_page=5'
+      expect(@page_links.first).to eql 'http://example.com/api/v3/projects?page=1&per_page=5'
+      expect(@page_links.next).to eql 'http://example.com/api/v3/projects?page=9&per_page=5'
+      expect(@page_links.prev).to eql 'http://example.com/api/v3/projects?page=7&per_page=5'
+    end
+  end
+end

data/spec/gitlab/paginated_response_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Gitlab::PaginatedResponse do
+  before do
+    array = [1, 2, 3, 4]
+    @paginated_response = Gitlab::PaginatedResponse.new array
+  end
+
+  it "should respond to *_page and has_*_page methods" do
+    expect(@paginated_response).to respond_to :first_page
+    expect(@paginated_response).to respond_to :last_page
+    expect(@paginated_response).to respond_to :next_page
+    expect(@paginated_response).to respond_to :prev_page
+    expect(@paginated_response).to respond_to :has_first_page?
+    expect(@paginated_response).to respond_to :has_last_page?
+    expect(@paginated_response).to respond_to :has_next_page?
+    expect(@paginated_response).to respond_to :has_prev_page?
+  end
+
+  context '.parse_headers!' do
+    it "should parse headers" do
+      @paginated_response.parse_headers!('Link' => "<http://example.com/api/v3/projects?page=1&per_page=5>; rel=\"first\", <http://example.com/api/v3/projects?page=20&per_page=5>; rel=\"last\"")
+      client = @paginated_response.client = double('client')
+      first_page_response = double('first_page_response')
+      last_page_response = double('last_page_response')
+      allow(client).to receive(:endpoint).and_return("http://example.com/api/v3")
+      allow(client).to receive(:get).with("/projects?page=1&per_page=5").and_return(first_page_response)
+      allow(client).to receive(:get).with("/projects?page=20&per_page=5").and_return(last_page_response)
+      expect(@paginated_response.has_first_page?).to be true
+      expect(@paginated_response.has_last_page?).to be true
+      expect(@paginated_response.has_next_page?).to be false
+      expect(@paginated_response.has_prev_page?).to be false
+      expect(@paginated_response.first_page).to be first_page_response
+      expect(@paginated_response.last_page).to be last_page_response
+      expect(@paginated_response.next_page).to be_nil
+      expect(@paginated_response.prev_page).to be_nil
+    end
+  end
+
+  context '.each_page' do
+    it "should iterate pages" do
+      next_page = double('next_page')
+      allow(@paginated_response).to receive(:has_next_page?).and_return(true)
+      allow(@paginated_response).to receive(:next_page).and_return(next_page)
+      allow(next_page).to receive(:has_next_page?).and_return(false)
+      expect { |b| @paginated_response.each_page(&b) }.to yield_successive_args(@paginated_response, next_page)
+    end
+  end
+
+  context '.auto_paginate' do
+    it "should returns an array if block is not given" do
+      next_page = double('next_page')
+      allow(@paginated_response).to receive(:has_next_page?).and_return(true)
+      allow(@paginated_response).to receive(:next_page).and_return(next_page)
+      allow(next_page).to receive(:has_next_page?).and_return(false)
+      allow(next_page).to receive(:to_ary).and_return([5, 6, 7, 8])
+      expect(@paginated_response.auto_paginate).to contain_exactly(1, 2, 3, 4, 5, 6, 7, 8)
+    end
+  end
+end

data/spec/gitlab/request_spec.rb

@@ -15,14 +15,14 @@ describe Gitlab::Request do
       expect(default_options).to be_a Hash
       expect(default_options[:parser]).to be_a Proc
       expect(default_options[:format]).to eq(:json)
-      expect(default_options[:headers]).to eq({'Accept' => 'application/json'})
+      expect(default_options[:headers]).to eq('Accept' => 'application/json')
       expect(default_options[:default_params]).to be_nil
     end
   end
 
   describe ".parse" do
     it "should return ObjectifiedHash" do
-      body = JSON.unparse({a: 1, b: 2})
+      body = JSON.unparse(a: 1, b: 2)
       expect(Gitlab::Request.parse(body)).to be_an Gitlab::ObjectifiedHash
       expect(Gitlab::Request.parse("true")).to be true
       expect(Gitlab::Request.parse("false")).to be false
@@ -35,9 +35,9 @@ describe Gitlab::Request do
     context "when endpoint is not set" do
       it "should raise Error::MissingCredentials" do
         @request.endpoint = nil
-        expect {
+        expect do
           @request.set_request_defaults
-        }.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
+        end.to raise_error(Gitlab::Error::MissingCredentials, 'Please set an endpoint to API')
       end
     end
 
@@ -48,35 +48,35 @@ describe Gitlab::Request do
 
       it "should set default_params" do
         @request.set_request_defaults('sudoer')
-        expect(Gitlab::Request.default_params).to eq({:sudo => 'sudoer'})
+        expect(Gitlab::Request.default_params).to eq(sudo: 'sudoer')
       end
     end
   end
 
   describe "#set_authorization_header" do
     it "should raise MissingCredentials when auth_token and private_token are not set" do
-      expect {
+      expect do
         @request.send(:set_authorization_header, {})
-      }.to raise_error(Gitlab::Error::MissingCredentials)
+      end.to raise_error(Gitlab::Error::MissingCredentials)
     end
 
     it "should set the correct header when given a private_token" do
       @request.private_token = 'ys9BtunN3rDKbaJCYXaN'
-      expect(@request.send(:set_authorization_header, {})).to eq({"PRIVATE-TOKEN"=>'ys9BtunN3rDKbaJCYXaN'})
+      expect(@request.send(:set_authorization_header, {})).to eq("PRIVATE-TOKEN" => 'ys9BtunN3rDKbaJCYXaN')
     end
 
     it "should set the correct header when setting an auth_token via the private_token config option" do
       @request.private_token = '3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603'
-      expect(@request.send(:set_authorization_header, {})).to eq({"Authorization"=>"Bearer 3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603"})
+      expect(@request.send(:set_authorization_header, {})).to eq("Authorization" => "Bearer 3225e2804d31fea13fc41fc83bffef00cfaedc463118646b154acc6f94747603")
     end
   end
 
   describe "#handle_error" do
     before do
       @array = Array.new(['First message.', 'Second message.'])
-      @obj_h = Gitlab::ObjectifiedHash.new({user: ['not set'],
-                                            password: ['too short'],
-                                            embed_entity: { foo: ['bar'], sna: ['fu'] }})
+      @obj_h = Gitlab::ObjectifiedHash.new(user: ['not set'],
+                                           password: ['too short'],
+                                           embed_entity: { foo: ['bar'], sna: ['fu'] })
     end
     context "when passed an ObjectifiedHash" do
       it "should return a joined string of error messages sorted by key" do
@@ -97,5 +97,4 @@ describe Gitlab::Request do
       end
     end
   end
-
 end

data/spec/gitlab/shell_history_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::Shell::History do
       @history = Gitlab::Shell::History.new(file_path: @file.path)
     end
 
-    after do @file.close(true) end
+    after { @file.close(true) }
 
     it 'saves the lines' do
       @history << 'party on, dudes'

data/spec/gitlab/shell_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::Shell do
   describe ".execute" do
     context "invalid command" do
       it "should raise" do
-        expect{Gitlab::Shell.execute 'foobar', []}.to raise_error(RuntimeError)
+        expect { Gitlab::Shell.execute 'foobar', [] }.to raise_error(RuntimeError)
       end
     end
   end
@@ -55,7 +55,7 @@ describe Gitlab::Shell do
       it "should return an Array of matching commands" do
         completed_cmds = @comp.call 'group'
         expect(completed_cmds).to be_a Array
-        expect(completed_cmds.sort).to eq(['group', 'group_members', 'group_search', 'groups'])
+        expect(completed_cmds.sort).to eq(%w(group group_members group_search groups))
       end
     end
   end
@@ -63,15 +63,15 @@ describe Gitlab::Shell do
   describe ".parse_input" do
     context "with arguments" do
       it "should set command & arguments" do
-        Gitlab::Shell.parse_input('create_branch 1 "api" "master"') 
+        Gitlab::Shell.parse_input('create_branch 1 "api" "master"')
         expect(Gitlab::Shell.command).to eq('create_branch')
-        expect(Gitlab::Shell.arguments).to eq(['1', 'api', 'master'])
+        expect(Gitlab::Shell.arguments).to eq(%w(1 api master))
       end
     end
-      
+
     context "without arguments" do
       it 'should set command & empty arguments' do
-        Gitlab::Shell.parse_input('exit') 
+        Gitlab::Shell.parse_input('exit')
         expect(Gitlab::Shell.command).to eq('exit')
         expect(Gitlab::Shell.arguments).to be_empty
       end

data/spec/spec_helper.rb

@@ -28,47 +28,47 @@ end
 # GET
 def stub_get(path, fixture)
   stub_request(:get, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
-    to_return(:body => load_fixture(fixture))
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
+    to_return(body: load_fixture(fixture))
 end
 
 def a_get(path)
   a_request(:get, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token })
 end
 
 # POST
 def stub_post(path, fixture, status_code=200)
   stub_request(:post, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
-    to_return(:body => load_fixture(fixture), :status => status_code)
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
+    to_return(body: load_fixture(fixture), status: status_code)
 end
 
 def a_post(path)
   a_request(:post, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token })
 end
 
 # PUT
 def stub_put(path, fixture)
   stub_request(:put, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
-    to_return(:body => load_fixture(fixture))
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
+    to_return(body: load_fixture(fixture))
 end
 
 def a_put(path)
   a_request(:put, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token })
 end
 
 # DELETE
 def stub_delete(path, fixture)
   stub_request(:delete, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token}).
-    to_return(:body => load_fixture(fixture))
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }).
+    to_return(body: load_fixture(fixture))
 end
 
 def a_delete(path)
   a_request(:delete, "#{Gitlab.endpoint}#{path}").
-    with(:headers => {'PRIVATE-TOKEN' => Gitlab.private_token})
+    with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token })
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -138,6 +138,8 @@ files:
 - lib/gitlab/error.rb
 - lib/gitlab/help.rb
 - lib/gitlab/objectified_hash.rb
+- lib/gitlab/page_links.rb
+- lib/gitlab/paginated_response.rb
 - lib/gitlab/request.rb
 - lib/gitlab/shell.rb
 - lib/gitlab/shell_history.rb
@@ -231,6 +233,8 @@ files:
 - spec/gitlab/client/users_spec.rb
 - spec/gitlab/help_spec.rb
 - spec/gitlab/objectified_hash_spec.rb
+- spec/gitlab/page_links_spec.rb
+- spec/gitlab/paginated_response_spec.rb
 - spec/gitlab/request_spec.rb
 - spec/gitlab/shell_history_spec.rb
 - spec/gitlab/shell_spec.rb
@@ -350,6 +354,8 @@ test_files:
 - spec/gitlab/client/users_spec.rb
 - spec/gitlab/help_spec.rb
 - spec/gitlab/objectified_hash_spec.rb
+- spec/gitlab/page_links_spec.rb
+- spec/gitlab/paginated_response_spec.rb
 - spec/gitlab/request_spec.rb
 - spec/gitlab/shell_history_spec.rb
 - spec/gitlab/shell_spec.rb