asana 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2da63e8aadca7da78829e16acbf420934d8c39c63eaf2b761c931a84ba84c75
-  data.tar.gz: 5abf90728ebbd012b700bce472dd29e00307218062c6faa8865c151949e7b3db
+  metadata.gz: 0a4e97c4ca97737835acf2af6cc261b767770ee3a16743e88aabe1bd86e81173
+  data.tar.gz: 5794d53e835b7c06820d0c0487820486c8a88338c4037302159560e4ea1c0cce
 SHA512:
-  metadata.gz: 2bddb470b53a632fe92412e174c958abfcafa75565b771991864567d3627bdde4560c9082fe46793a3926e32c75a3d913306e2979733a730f2018b424a797298
-  data.tar.gz: 6db94c479e44de7fa283a76fd41db46db547bf30d743fbc1b842a715226fa544bea0fef7498c396b2fbbbeefaea06d17ec55433d511c507ce0bfb989413e63cb
+  metadata.gz: 37629874aeb92b99355aa0074aa010f8d7d98ebe208530c7d02e875676f291f733a915e7c972e0780e4f6f535d438c59f08f5df7b5bcc5296d5ead283ffff4d1
+  data.tar.gz: bbdbf4440eb4b10214e97a0db1e88ae8ac7eaa930d8c634efe4e7d63e71a66f0588f1fa4c3ce439b7647bae9d8eba61d17314a3dde2579005b5c7b2e125ddc17

data/.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Run 
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.7, 3.0]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/.github/workflows/pubilsh-to-rubygem.yml

@@ -0,0 +1,18 @@
+name: Publish 📦 to RubyGems.org
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  publish-to-rubygems:
+    name: Publish 📦 to RubyGems.org
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Release
+        uses: dawidd6/action-publish-gem@v1
+        with:
+          api_key: ${{secrets.RUBYGEMS_API_KEY}}

data/.github/workflows/publish-to-github-releases.yml

@@ -0,0 +1,16 @@
+name: Publish to GitHub Releases
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  publish-to-github:
+    name: Publish to GitHub Releases
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Release
+        uses: softprops/action-gh-release@v1

data/.gitignore

@@ -1,7 +1,6 @@
 .idea
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.5.0

data/.swagger-codegen-ignore

@@ -1,4 +1,3 @@
 # Swagger Codegen Ignore
 
-docs/*
 test/*

data/Appraisals

@@ -1,37 +1,4 @@
 
-  appraise "faraday-0.9.0" do
-    gem "faraday", "0.9.0"
+  appraise "faraday-1.0.0" do
+    gem "faraday", "1.0.0"
   end
-
-  appraise "faraday-0.9.1" do
-    gem "faraday", "0.9.1"
-  end
-
-  appraise "faraday-0.9.2" do
-    gem "faraday", "0.9.2"
-  end
-
-  appraise "faraday-0.10.0" do
-    gem "faraday", "0.10.0"
-  end
-  appraise "faraday-0.10.1" do
-    gem "faraday", "0.10.1"
-  end
-
-  appraise "faraday-0.11.0" do
-    gem "faraday", "0.11.0"
-  end
-
- # Oauth2 does not yet support 0.12
-
-  # appraise "faraday-0.12.0" do
-  #   gem "faraday", "0.12.0"
-  # end
-  #
-  # appraise "faraday-0.12.0.1" do
-  #   gem "faraday", "0.12.0.1"
-  # end
-  #
-  # appraise "faraday-0.12.1" do
-  #   gem "faraday", "0.12.1"
-  # end

data/Gemfile

@@ -23,4 +23,6 @@ group :tools do
   gem 'byebug'
 
   gem 'simplecov', require: false
+
+  gem "rack-protection", "1.5.5"
 end

data/Gemfile.lock

@@ -0,0 +1,174 @@
+PATH
+  remote: .
+  specs:
+    asana (1.0.0)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (>= 1.4, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.5.0)
+      guard (~> 2.0)
+      rubocop (< 2.0)
+    guard-yard (2.2.1)
+      guard (>= 1.1.0)
+      yard (>= 0.7.0)
+    hashie (5.0.0)
+    jwt (2.4.1)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.2.3)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    oauth2 (2.0.3)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+      rash_alt (>= 0.4, < 1)
+      version_gem (~> 1.0)
+    parallel (1.22.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3.1)
+    rack-protection (1.5.5)
+      rack
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.22.2)
+      rubocop (>= 0.52.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    shellany (0.0.1)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    thor (1.2.1)
+    tomparse (0.4.2)
+    unicode-display_width (1.8.0)
+    version_gem (1.1.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    yard-tomdoc (0.7.1)
+      tomparse (>= 0.4.0)
+      yard
+
+PLATFORMS
+  universal-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal (~> 2.1, >= 2.1)
+  asana!
+  byebug
+  guard
+  guard-rspec
+  guard-rubocop
+  guard-yard
+  rack-protection (= 1.5.5)
+  rake (~> 13.0)
+  rspec (~> 3.2)
+  rubocop (~> 0.52.1)
+  rubocop-rspec (~> 1.22.2)
+  simplecov
+  yard
+  yard-tomdoc
+
+BUNDLED WITH
+   2.3.13

data/README.md

@@ -1,7 +1,7 @@
 # Asana
 
 [![Gem Version](https://badge.fury.io/rb/asana.svg)](http://badge.fury.io/rb/asana)
-[![Build Status](https://travis-ci.org/Asana/ruby-asana.svg?branch=master)](https://travis-ci.org/Asana/ruby-asana)
+[![Build Status](https://github.com/Asana/ruby-asana/workflows/Build/badge.svg)](https://github.com/Asana/ruby-asana/actions)
 [![Code Climate](https://codeclimate.com/github/Asana/ruby-asana/badges/gpa.svg)](https://codeclimate.com/github/Asana/ruby-asana)
 
 
@@ -11,53 +11,6 @@ Supported rubies:
 
 * MRI 2.0.0 up to 2.2.x stable
 
-## Required: Security procedures for outdated OpenSSL versions
-
-Older versions of OpenSSL can cause a problem when using `ruby-asana` In particular, at the time of this writing, at least **MacOS X 10.11 and below** ship with a very old version of OpenSSL:
-    
-    $ openssl version
-    OpenSSL 0.9.8zh 14 Jan 2016
-
-OpenSSL 0.9.8 was first released in 2005, and therefore only supports TLS (Transport Layer Security) version 1.0. Asana has deprecated and stopped accepting requests for clients which do not suport [TLS 1.0 and above](https://asa.na/tls), which unfortunately includes any software linked against this version of the library - this includes both the MacOS X provided Ruby interpreter and any homebrew installed Ruby that is not specifically configured to link against a newer version.
-
-To see if your Ruby version is affected, run
-   
-    $ ruby -ropenssl -e 'puts OpenSSL::OPENSSL_VERSION'
-
-If the version printed at the command line is older than `1.0.1`, when, in 2012, OpenSSL first supported TLS 1.1 and 1.2, you will not be able to use `ruby-asana` to connect to Asana. Specifically, you will recieve `400 Bad Request` responses with an error message in the response body about the lack of support for TLS 1.1 and above.
-
-Asana highly recommends using a Ruby installation manager, either RVM or `rbenv`. Instructions on how to install an up-to-date `ruby` for each of these are below.
-
-### Solution when using RVM
-
-RVM makes it easy to install both an updated OpenSSL and a Ruby interpreter that links to it. If you are using MacPorts or Homebrew, you're probably fine out of the box; RVM favors package management using either one of these to satisfy dependencies, and so can keep your ruby up to date automatically. If you are not using these, consider using them, as they're very simple to install and use.
-
-If you don't use your package manager, you can use RVM's [package manager](https://rvm.io/packages) to install from source.
-
-If you want to build OpenSSL from source yourself, you have to specify how to link to this OpenSSL installation:
-
-    $ rvm install ruby-{version} --with-openssl-dir={ssl_dir}
-          # Specify your openssl path prefix, wherever openssl dirs 
-          # "bin", "include", and "lib" are installed; usually
-          # "/usr" for system installs, or $PREFIX for configure/make locally.
-    $ ruby -ropenssl -e 'puts OpenSSL::OPENSSL_VERSION' # Verify inside Ruby
-    OpenSSL 1.0.2h  3 May 2016
-
-If you see the version of OpenSSL greater than OpenSSL 1.0.1, then you're all set to start using `ruby-asana`
-
-### Solution when using rbenv
-
-Similar to RVM, rbenv compiles rubies with knowledge of MacPorts and Homebrew libraries. When a newer version of OpenSSL is installed via the method above, all rubies built (after that time of course) will link to the newer version of OpenSSL.
-
-If you don't use a package manager, as above, you can build by explicitly supplying the directory in which to find OpenSSL:
-
-    $ RUBY_CONFIGURE_OPTS=--with-openssl-dir=/opt/local rbenv install ruby-{version}
-          # Specify your openssl path prefix, wherever openssl dirs 
-          # "bin", "include", and "lib" are installed; usually
-          # "/usr" for system installs, or $PREFIX for configure/make locally.
-    $ ruby -ropenssl -e 'puts OpenSSL::OPENSSL_VERSION' # Verify inside Ruby
-    OpenSSL 1.0.2h  3 May 2016
-
 ## Gem Installation
 Add this line to your application's Gemfile:
 
@@ -179,7 +132,7 @@ get '/auth/:name/callback' do
   $client = Asana::Client.new do |c|
     c.authentication :oauth2, access_token
   end
- 
+
   redirect '/'
 end
 ```
@@ -261,8 +214,10 @@ In any request against the Asana API, there a number of errors that could
 arise. Those are well documented in the [Asana API Documentation][apidocs], and
 are represented as exceptions under the namespace `Asana::Errors`.
 
-All errors are subclasses of `Asana::Errors::APIError`, so make sure to rescue
-instances of this class if you want to handle them yourself.
+The Asana client automatically handles and retries requests upon receipt of
+500 (Internal Server Error) responses from the Asana API. If you want to handle
+any 4xx errors, you will have to do that yourself; you can do this by rescuing
+`Asana::Errors::APIError`, the parent class of all Asana API errors.
 
 ### I/O options
 
@@ -352,7 +307,7 @@ If you receive one of these warnings, you should:
 You can add global headers, by setting default_headers
 
     c.default_headers "asana-enable" => "string_ids"
-    
+
 Or you can add a header field to the options of each request.
 
 If you would rather suppress these warnings, you can set
@@ -361,7 +316,7 @@ If you would rather suppress these warnings, you can set
 
 ## Development
 
-You'll need Ruby 2.1+ and Node v0.10.26+ / NPM 1.4.3+ installed.
+You'll need Ruby 2.5+ and Node v0.10.26+ / NPM 1.4.3+ installed.
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run
 `bin/console` for an interactive prompt that will allow you to experiment.
@@ -380,11 +335,22 @@ To release a new version, run either of these commands:
     rake bump:minor
     rake bump:major
 
-This will: update `lib/asana/version.rb`, commit and tag the commit. Then you
-just need to `push --tags` to let Travis build and release the new version to
+This will: update `lib/asana/version.rb` and `VERSION`, commit and tag the commit. Then you
+just need to `push --tags` to let GitHub Actions build and release the new version to
 Rubygems:
 
-    git push --tags
+    git push --tags origin master:master
+
+### Manual Deployment
+
+  1. Merge in the desired changes into the `master` branch and commit them.
+  2. Clone the repo, work on master.
+  3. Edit package version in `lib/asana/version.rb` and `VERSION` to indicate the [semantic version](http://semver.org/) change.
+  4. Commit the change
+  5. Tag the commit with `v` plus the same version number you set in the file.
+     `git tag v1.2.3`
+  6. Push changes to origin, including tags:
+     `git push --tags origin master:master`
 
 ### Code generation
 
@@ -402,8 +368,7 @@ If you wish to make changes on the code generation script:
    spec/templates/unicorn_spec.rb`
 
 Once you're sure your code works, submit a pull request and ask the maintainer
-to make a release, as they'll need to run a release script from the
-[asana-api-meta][meta] repository.
+to make a release, as they'll need to run a release script.
 
 ## Contributing
 

data/Rakefile

@@ -29,6 +29,11 @@ namespace :bump do
 
   # rubocop:disable Metrics/MethodLength
   def write_version(major, minor, patch)
+
+    File.open('VERSION', 'w') do |f|
+      f.write "#{major}.#{minor}.#{patch}"
+    end
+
     str = <<-EOS
 #:nodoc:
 module Asana
@@ -41,10 +46,13 @@ EOS
     end
 
     new_version = "#{major}.#{minor}.#{patch}"
+    system('bundle lock --update')
+    system('git add Gemfile.lock')
+    system('git add VERSION')
     system('git add lib/asana/version.rb')
     system(%(git commit -m "Bumped to #{new_version}" && ) +
            %(git tag -a v#{new_version} -m "Version #{new_version}"))
-    puts "\nRun git push --tags to release."
+    puts "\nRun git push --tags origin master:master to release."
   end
 
   desc 'Bumps a patch version'
@@ -72,17 +80,5 @@ task default: [:all, :rubocop, :yard]
 
 desc 'Test the plugin under all supported Rails versions.'
 task :all do |_t|
-  if ENV['TRAVIS']
-    # require 'json'
-    # puts JSON.pretty_generate(ENV.to_hash)
-    if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
-      appraisal_name = ENV['BUNDLE_GEMFILE'].scan(/faraday\_(.*)\.gemfile/).flatten.first
-      command_prefix = "appraisal faraday-#{appraisal_name}"
-      exec("#{command_prefix} bundle install && #{command_prefix} bundle exec rspec")
-    else
-      exec(' bundle exec appraisal install && bundle exec rake appraisal spec')
-    end
-  else
-    exec('bundle exec appraisal install && bundle exec rake appraisal spec')
-  end
+  exec('bundle exec appraisal install && bundle exec rake appraisal spec')
 end

data/VERSION

@@ -0,0 +1 @@
+1.0.0

data/asana.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency "oauth2", "~> 1.4"
-  spec.add_dependency "faraday", "~> 0.9"
-  spec.add_dependency "faraday_middleware", "~> 0.9"
+  spec.add_dependency "oauth2", ">= 1.4", '< 3'
+  spec.add_dependency "faraday", "~> 1.0"
+  spec.add_dependency "faraday_middleware", "~> 1.0"
   spec.add_dependency "faraday_middleware-multi_json", "~> 0.0"
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency 'appraisal', '~> 2.1', '>= 2.1'
 end

data/examples/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: ..
   specs:
-    asana (0.9.0)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9)
+    asana (0.10.5)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
     jwt (2.2.1)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    rack (2.0.7)
+    rack (2.2.3.1)
 
 PLATFORMS
   ruby

data/lib/asana/client.rb

@@ -59,8 +59,8 @@ module Asana
         @resource = resource
       end
 
-      def method_missing(m, *args, &block)
-        @resource.public_send(m, *([@client] + args), &block)
+      def method_missing(m, *args, **kwargs, &block)
+        @resource.public_send(m, *([@client] + args), **kwargs, &block)
       end
 
       def respond_to_missing?(m, *)
@@ -87,29 +87,29 @@ module Asana
     # Public: Performs a GET request against an arbitrary Asana URL. Allows for
     # the user to interact with the API in ways that haven't been
     # reflected/foreseen in this library.
-    def get(url, *args)
-      @http_client.get(url, *args)
+    def get(url, **args)
+      @http_client.get(url, **args)
     end
 
     # Public: Performs a POST request against an arbitrary Asana URL. Allows for
     # the user to interact with the API in ways that haven't been
     # reflected/foreseen in this library.
-    def post(url, *args)
-      @http_client.post(url, *args)
+    def post(url, **args)
+      @http_client.post(url, **args)
     end
 
     # Public: Performs a PUT request against an arbitrary Asana URL. Allows for
     # the user to interact with the API in ways that haven't been
     # reflected/foreseen in this library.
-    def put(url, *args)
-      @http_client.put(url, *args)
+    def put(url, **args)
+      @http_client.put(url, **args)
     end
 
     # Public: Performs a DELETE request against an arbitrary Asana URL. Allows
     # for the user to interact with the API in ways that haven't been
     # reflected/foreseen in this library.
-    def delete(url, *args)
-      @http_client.delete(url, *args)
+    def delete(url, **args)
+      @http_client.delete(url, **args)
     end
 
     # Public: Exposes queries for all top-evel endpoints.

data/lib/asana/http_client/error_handling.rb

@@ -11,7 +11,7 @@ module Asana
 
       module_function
 
-      MAX_TIMEOUTS = 5
+      MAX_RETRIES = 5
 
       # Public: Perform a request handling any API errors correspondingly.
       #
@@ -28,7 +28,7 @@ module Asana
       # Raises [Asana::Errors::APIError] when the API returns an unknown error.
       #
       # rubocop:disable all
-      def handle(num_timeouts=0, &request)
+      def handle(num_retries=0, &request)
         request.call
       rescue Faraday::ClientError => e
         raise e unless e.response
@@ -43,9 +43,16 @@ module Asana
           when 500 then raise server_error(e.response)
           else raise api_error(e.response)
         end
+      # Retry for timeouts or 500s from Asana
+      rescue Faraday::ServerError => e
+        if num_retries < MAX_RETRIES
+          handle(num_retries + 1, &request)
+        else
+          raise server_error(e.response)
+        end
       rescue Net::ReadTimeout => e
-        if num_timeouts < MAX_TIMEOUTS
-          handle(num_timeouts + 1, &request)
+        if num_retries < MAX_RETRIES
+          handle(num_retries + 1, &request)
         else
           raise e
         end