gerry 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e200dab14c89753f41cfb890952e8cb061b7c5a8
-  data.tar.gz: ace3546df83782b1c5d0216950b169e7c122a2be
+  metadata.gz: 54504c142edb7bfbe2b9bcc7ad1c4e0d8e288ec0
+  data.tar.gz: 52bb964e310b1d57507e2443d6eb5170939ba2f7
 SHA512:
-  metadata.gz: b4a79250d3610b37ab47590eda2f3b624c34b4ec2f490fb12df8229dfd818afc3f2473eddd9cad6ef60cc2257088b6e6686dcb8bcf66d380230daa47d2f49e95
-  data.tar.gz: 0e03a33a5d0bb547e08588e2ca22dcbf94b50e79501264dd13d6842b8316db69a29de2109b784de844fd87a1b08c98a024db67c124c1cf946893fbace444fd39
+  metadata.gz: a9edca037aead6cf979a3f331de2a7122fba12de1fd171517bbf439912223cf4c375bfe3d510ed9724acb5820745a15de91900ffba09130f7d6c02fd827e0cea
+  data.tar.gz: 01c5ca61b668906666d7599184aefeebfc7779192f172ecddd47eb51f5f08631a55831ca01264f84fbfc848fee2d68468469e172ac431f4bab581bb80c1dea62

data/lib/gerry/client/request.rb

@@ -33,14 +33,13 @@ module Gerry
           end
 
           result = parse(response)
-          unless result.is_a?(Array) && result.last.is_a?(Hash) && result.last.delete('_more_changes')
-            return result
-          end
+          return result unless result.is_a?(Array) && result.last.is_a?(Hash)
 
           all_results.concat(result)
+          return all_results unless result.last.delete('_more_changes')
 
           # Append the start parameter to the URL, overriding any previous start parameter.
-          url = orig_url + "&S=#{start + all_results.size}"
+          url = orig_url + "#{query ? '&' : '?'}S=#{start + all_results.size}"
         end
 
         all_results

data/lib/gerry/version.rb

@@ -1,5 +1,5 @@
 module Gerry
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
 end

data/spec/changes_spec.rb

@@ -1,32 +1,49 @@
 require 'spec_helper'
 
-describe '.changes' do    
+describe '.changes' do
   it 'should fetch all changes' do
-    stub = stub_get('/changes/', 'changes.json')                     
-    
+    stub = stub_get('/changes/', 'changes.json')
+
     client = MockGerry.new
     changes = client.changes
-    
+
     expect(stub).to have_been_requested
-    
+
     expect(changes[0]['project']).to eq('awesome')
     expect(changes[0]['branch']).to eq('master')
-    
+
     expect(changes[1]['project']).to eq('clean')
     expect(changes[1]['subject']).to eq('Refactor code')
     expect(changes[1]['owner']['name']).to eq('Batman')
   end
-  
+
+  it 'should fetch all changes in batches' do
+    stub_batch_0 = stub_get('/changes/', 'changes_batch_0.json')
+    stub_batch_1 = stub_get('/changes/?S=1', 'changes_batch_1.json')
+
+    client = MockGerry.new
+    changes = client.changes
+
+    expect(stub_batch_0).to have_been_requested
+    expect(stub_batch_1).to have_been_requested
+
+    expect(changes[0]['project']).to eq('awesome')
+    expect(changes[0]['branch']).to eq('master')
+
+    expect(changes[1]['project']).to eq('clean')
+    expect(changes[1]['subject']).to eq('Refactor code')
+    expect(changes[1]['owner']['name']).to eq('Batman')
+  end
+
   it 'should fetch all open changes' do
-    
-    stub = stub_get('/changes/?q=is:open+owner:self', 'open_changes.json')                     
-    
+    stub = stub_get('/changes/?q=is:open+owner:self', 'open_changes.json')
+
     client = MockGerry.new
     changes = client.changes(['q=is:open+owner:self'])
-    
+
     expect(stub).to have_been_requested
-    
+
     expect(changes[0]['status']).to eq('OPEN')
     expect(changes[0]['owner']['name']).to eq('The Duke')
   end
-end
+end

data/spec/fixtures/changes_batch_0.json

@@ -0,0 +1,18 @@
+)]}'
+[
+  {
+    "project": "awesome",
+    "branch": "master",
+    "id": "Idd8747a5ea93bb9bddf7695bab25670be135f777",
+    "subject": "Add an awesome feature",
+    "status": "NEW",
+    "created": "2012-09-12 15:54:21.531000000",
+    "updated": "2012-10-13 01:34:40.511000000",
+    "_sortkey": "00115dfe00009334",
+    "_number": 3,
+    "owner": {
+      "name": "The Duke"
+    },
+    "_more_changes": true
+  }
+]

data/spec/fixtures/changes_batch_1.json

@@ -0,0 +1,17 @@
+)]}'
+[
+  {
+    "project": "clean",
+    "branch": "master",
+    "id": "Idac803deea68faa1294b3fa5bf814277e899f075",
+    "subject": "Refactor code",
+    "status": "NEW",
+    "created": "2012-09-12 15:51:30.605000000",
+    "updated": "2012-10-13 00:45:26.431000000",
+    "_sortkey": "00205dcddd00937d",
+    "_number": 42,
+    "owner": {
+      "name": "Batman"
+    }
+  }
+]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gerry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Fabian Mettler
@@ -150,6 +150,8 @@ files:
 - spec/fixtures/account_groups.json
 - spec/fixtures/capabilities.json
 - spec/fixtures/changes.json
+- spec/fixtures/changes_batch_0.json
+- spec/fixtures/changes_batch_1.json
 - spec/fixtures/group_members.json
 - spec/fixtures/groups.json
 - spec/fixtures/open_changes.json
@@ -191,6 +193,8 @@ test_files:
 - spec/fixtures/account_groups.json
 - spec/fixtures/capabilities.json
 - spec/fixtures/changes.json
+- spec/fixtures/changes_batch_0.json
+- spec/fixtures/changes_batch_1.json
 - spec/fixtures/group_members.json
 - spec/fixtures/groups.json
 - spec/fixtures/open_changes.json