gerry 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54504c142edb7bfbe2b9bcc7ad1c4e0d8e288ec0
-  data.tar.gz: 52bb964e310b1d57507e2443d6eb5170939ba2f7
+  metadata.gz: 50cbfe20d0fa8c4f9a179cb5e74fc4ed0bdf346c
+  data.tar.gz: e865e925bda4a23be8df637f48278174fd3ae048
 SHA512:
-  metadata.gz: a9edca037aead6cf979a3f331de2a7122fba12de1fd171517bbf439912223cf4c375bfe3d510ed9724acb5820745a15de91900ffba09130f7d6c02fd827e0cea
-  data.tar.gz: 01c5ca61b668906666d7599184aefeebfc7779192f172ecddd47eb51f5f08631a55831ca01264f84fbfc848fee2d68468469e172ac431f4bab581bb80c1dea62
+  metadata.gz: a0f656b7564de7d4f0a68bbd3a90323f3392e1fca2724d22ba7847a3063f81337531194eb5129b269f47a126efbef728673d1a25dc77cff79923b5ffcceb5760
+  data.tar.gz: 9cd7d00b43322b5dbc68fe116d80e16a5d26d594be79778b4cebee17bb813e7dacd40dcdb1bcdbe484a73d1b92e0f0d9bfcd8d2710e684cebb1315f8fd86548e

data/lib/gerry/client/accounts.rb

@@ -1,17 +1,26 @@
 module Gerry
   class Client
     module Accounts
+      # Get the account info for the specified account ID.
+      #
+      # @param [String] account_id the account.
+      # @return [Hash] the account info.
+      def account_info(account_id)
+        url = "/accounts/#{account_id}"
+        get(url)
+      end
+
       # Get the global capabilities that are enabled for the calling user.
       #
       # @param [Array] options the query parameters.
       # @return [Hash] the account capabilities.
       def account_capabilities(options = [])
         url = '/accounts/self/capabilities'
-        
+
         if options.empty?
           return get(url)
         end
-        
+
         options = map_options(options)
         get("#{url}?#{options}")
       end
@@ -26,4 +35,4 @@ module Gerry
       end
     end
   end
-end
+end

data/lib/gerry/client/changes.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Gerry
   class Client
     module Changes
@@ -6,14 +8,30 @@ module Gerry
       # @param [Array] options the query parameters.
       # @return [Hash] the changes.
       def changes(options = [])
-        url = '/changes/'
+        endpoint = '/changes/'
+        url = endpoint
 
-        if options.empty?
-          return get(url)
+        if !options.empty?
+          url += '?' + map_options(options)
         end
 
-        options = map_options(options)
-        get("#{url}?#{options}")
+        response = get(url)
+        return response unless response.last.delete('_more_changes')
+
+        # Get the original start parameter, if any, else start from 0.
+        query = URI.parse(url).query
+        query = query ? CGI.parse(query) : { 'S' => ['0'] }
+        start = query['S'].join.to_i
+
+        # Keep getting data until there are no more changes.
+        loop do
+          # Replace the start parameter, using the original start as an offset.
+          query['S'] = ["#{start + response.size}"]
+          url = endpoint + '?' + map_options(query)
+
+          response.concat(get(url))
+          return response unless response.last.delete('_more_changes')
+        end
       end
     end
   end

data/lib/gerry/client/request.rb

@@ -1,14 +1,16 @@
-require 'cgi'
-
 module Gerry
   class Client
     module Request
       # Get the mapped options.
       #
-      # @param [Array] options the query parameters.
+      # @param [Array] or [Hash] options the query parameters.
       # @return [String] the mapped options.
       def map_options(options)
-        options.map{|v| "#{v}"}.join('&')
+        if options.is_a?(Array)
+          options.map { |v| "#{v}" }.join('&')
+        elsif options.is_a?(Hash)
+          options.map { |k,v| "#{k}=#{v.join(',')}" }.join('&')
+        end
       end
 
       private
@@ -16,33 +18,13 @@ module Gerry
       end
 
       def get(url)
-        orig_url = url
-
-        # Get the original start parameter, if any.
-        query = URI.parse(orig_url).query
-        start = query ? CGI.parse(query)['S'].join.to_i : 0
-
-        # Keep requesting data until there are no more changes.
-        all_results = []
-        loop do
-          response = if @username && @password
-            auth = { username: @username, password: @password }
-            self.class.get("/a#{url}", digest_auth: auth)
-          else
-            self.class.get(url)
-          end
-
-          result = parse(response)
-          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 + "#{query ? '&' : '?'}S=#{start + all_results.size}"
+        response = if @username && @password
+          auth = { username: @username, password: @password }
+          self.class.get("/a#{url}", digest_auth: auth)
+        else
+          self.class.get(url)
         end
-
-        all_results
+        parse(response)
       end
 
       def put(url, body)

data/lib/gerry/version.rb

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

data/spec/changes_spec.rb

@@ -20,6 +20,7 @@ describe '.changes' do
   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')
+    stub_batch_2 = stub_get('/changes/?S=2', 'changes_batch_2.json')
 
     client = MockGerry.new
     changes = client.changes
@@ -29,10 +30,15 @@ describe '.changes' do
 
     expect(changes[0]['project']).to eq('awesome')
     expect(changes[0]['branch']).to eq('master')
+    expect(changes[0]['owner']['name']).to eq('The Duke')
 
     expect(changes[1]['project']).to eq('clean')
     expect(changes[1]['subject']).to eq('Refactor code')
     expect(changes[1]['owner']['name']).to eq('Batman')
+
+    expect(changes[2]['project']).to eq('X')
+    expect(changes[2]['subject']).to eq('Remove unused imports')
+    expect(changes[2]['owner']['name']).to eq('Bill')
   end
 
   it 'should fetch all open changes' do

data/spec/fixtures/changes_batch_1.json

@@ -12,6 +12,7 @@
     "_number": 42,
     "owner": {
       "name": "Batman"
-    }
+    },
+    "_more_changes": true
   }
 ]

data/spec/fixtures/changes_batch_2.json

@@ -0,0 +1,17 @@
+)]}'
+[
+  {
+    "project": "X",
+    "branch": "default",
+    "id": "Ieb185f4da8725ae35e9f940e614c6eaa7b88eff5",
+    "subject": "Remove unused imports",
+    "status": "NEW",
+    "created": "2016-01-11 15:51:30.605000000",
+    "updated": "2016-02-12 00:45:26.431000000",
+    "_sortkey": "002e4203000187d5",
+    "_number": 4711,
+    "owner": {
+      "name": "Bill"
+    }
+  }
+]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gerry
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Fabian Mettler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -152,6 +152,7 @@ files:
 - spec/fixtures/changes.json
 - spec/fixtures/changes_batch_0.json
 - spec/fixtures/changes_batch_1.json
+- spec/fixtures/changes_batch_2.json
 - spec/fixtures/group_members.json
 - spec/fixtures/groups.json
 - spec/fixtures/open_changes.json
@@ -195,6 +196,7 @@ test_files:
 - spec/fixtures/changes.json
 - spec/fixtures/changes_batch_0.json
 - spec/fixtures/changes_batch_1.json
+- spec/fixtures/changes_batch_2.json
 - spec/fixtures/group_members.json
 - spec/fixtures/groups.json
 - spec/fixtures/open_changes.json