rally-wsapi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8fcd6dfc98a371448591ac323e980f16b38220b
-  data.tar.gz: 16fde94fe2cd3776b90ca3150f92cbc147634e65
+  metadata.gz: e5ce53a2efe584ea08f87c687cb53e1262c11b64
+  data.tar.gz: 1ee68746295ff7558b5a411681e6928b11cd892e
 SHA512:
-  metadata.gz: df67aba1e91f9e1e650ca5d5304d6d9c16da733471df6e0f4bebc26d4637502a84da570f1cb754c7c67befdeb52ff277a690cf9c2034b336df8c5439fcc27d0a
-  data.tar.gz: 51a297733c01698f72bb1aacd44f7385f7577683b304f0b7fca522e19870e364e039dbe3397ebacb237aee610fbc50e356e7a0a51526ad574670a51a42f09ffd
+  metadata.gz: d76be63543d5156c41896db4b30b6058428da8bf509e38e2fac8dbbad2a8a6261bbeaef71f9d14899d74322c0e9a6380c6df9bea5441807ac5f5df7c8cd4afa1
+  data.tar.gz: eaf84111aa0d65afc4e5069a6ebb48d9a40b969d436ea4b421af3bd86ec5565866ca7c5a48fda5229e5af7bfbc2631652873c90be08ce2aa457faba99f86cef9

data/Gemfile.lock

@@ -35,7 +35,7 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.2.0)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -47,7 +47,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
+    rack (1.6.0)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)

data/README.md

@@ -14,6 +14,7 @@ s = Wsapi::Session.new("deadbeefdeadbeef")
 The constructor also accepts the following options:
   * `:workspace_id`, if not given, user's default workspace is used for queries
   * `:version`, WSAPI version, default is `3.0`
+  * `:timeout`, request time out in seconds
   * `oauth2`, see: (using WSAPI with OAuth2)[https://github.com/flowdock/rally-wsapi#using-wsapi-with-oauth2]
 
 ### Using WSAPI with OAuth2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/wsapi/session.rb

@@ -16,6 +16,7 @@ module Wsapi
   class ApiError < StandardErrorWithResponse; end
   class ObjectNotFoundError < StandardErrorWithResponse; end
   class IpAddressLimited < StandardErrorWithResponse; end
+  class TimeoutError < StandardError; end
 
   WSAPI_URL = ENV['WSAPI_URL'] || 'https://rally1.rallydev.com/slm/webservice/'
   AUTH_URL = ENV['RALLY_AUTHENTICATION_URL'] || "https://rally1.rallydev.com/login/oauth2/token"
@@ -38,6 +39,7 @@ module Wsapi
     def initialize(session_id, opts = {})
       @api_version = opts[:version] || "3.0"
       @workspace_id = opts[:workspace_id]
+      @timeout = opts[:timeout]
       @conn = connection(session_id)
     end
 
@@ -148,16 +150,18 @@ module Wsapi
     end
 
     def wsapi_request_with_refresh_token(method, url, opts = {})
-      response = @conn.send(method, url, opts)
+      response = @conn.send(method, url, opts) { |req| req.options.timeout = @timeout }
       if defined?(@oauth2) && response.status == 401
         refresh_token_response = refresh_token!
 
         access_token = MultiJson.load(refresh_token_response.body)["access_token"]
         @conn = connection(access_token)
-        response = @conn.send(method, url, opts) # Try again with fresh token
+        response = @conn.send(method, url, opts) { |req| req.options.timeout = @timeout } # Try again with fresh token
       end
 
       response
+    rescue Faraday::TimeoutError
+      raise TimeoutError.new("Request timed out")
     end
 
     def refresh_token!
@@ -173,7 +177,7 @@ module Wsapi
         client_secret: @oauth2[:client_secret]
       }
 
-      response = client.post AUTH_URL, refresh_params
+      response = client.post(AUTH_URL, refresh_params) { |req| req.options.timeout = @timeout }
 
       check_response_for_errors!(response)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rally-wsapi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Antti Pitkänen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple client for Rally WSAPI