intercom 3.5.23 → 3.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e68aeb1127d2cf823cc5dd0ddd659dcd3c87b21
-  data.tar.gz: 47726ed9aaa657973655766fbde7562aa106f9bd
+  metadata.gz: ec8a7ce6c9363737310afd46f571c394f4e324ec
+  data.tar.gz: aa4056bdf51ad0423f38b89694c333548450aacb
 SHA512:
-  metadata.gz: 22c0957deab7de22f497ace8c4b5e2c51a36719cd12abae4dc83c89525b795b665c04fb62b1a85e537c4e9e9a5ee6a84beef9aad4920e8a3f281bcdd1300f189
-  data.tar.gz: 579157330addc830b0c64bf48f0721d94f956e30a1248d59380c6284ca32bd2ff43e7b49f6f67db94ac3e75e5074c3020eeb50d2c39741d8ef327c2002472d34
+  metadata.gz: 8a05546c944b5c41dc6725244c7c7fd8c7502218c7ac320b70782d47b65d075bc1671547ce610c8eeb972f0bbe8ec30e41fcc0c7c77368e0ec45e24bf13327c9
+  data.tar.gz: 106162c9952d8d1bb7f752bae45d53036788d792bffcd7d01248bc724bfa68f94ba48c187c7f357011bfbee60a29bce86890e1466531eab3ee59c7e5e1ae7df2

data/.circleci/config.yml

@@ -0,0 +1,12 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.3.7
+
+    working_directory: ~/intercom-ruby
+
+    steps:
+      - checkout
+      - run: bundle install
+      - run: bundle exec rake

data/Gemfile

@@ -8,7 +8,4 @@ group :development, :test do
     gem 'json-jruby'
     gem 'jruby-openssl'
   end
-  platforms :ruby_18 do
-    gem 'json_pure'
-  end
 end

data/README.md

@@ -22,13 +22,13 @@ This version of the gem is compatible with `Ruby 2.1` and above.
 
 Using bundler:
 
-    gem 'intercom', '~> 3.5.23'
+    gem 'intercom', '~> 3.5.24'
 
 ## Basic Usage
 
 ### Configure your client
 
-> If you already have a personal access token you can find it [here](https://app.intercom.io/a/apps/_/settings/personal-access-token). If you want to create or learn more about personal access tokens then you can find more info [here](https://developers.intercom.io/docs/personal-access-tokens).
+> If you already have a personal access token you can find it [here](https://app.intercom.io/developers/_/access-token). If you want to create or learn more about personal access tokens then you can find more info [here](https://developers.intercom.io/docs/personal-access-tokens).
 
 ```ruby
 # With an OAuth or Personal Access token:

data/lib/intercom/errors.rb

@@ -27,6 +27,15 @@ module Intercom
   # Check that you have set Intercom.token correctly.
   class AuthenticationError < IntercomError; end
 
+  # Raised when the token provided is linked to a deleted application.
+  class AppSuspendedError < AuthenticationError; end
+
+  # Raised when the token provided has been revoked.
+  class TokenRevokedError < AuthenticationError; end
+
+  # Raised when the token provided can't be decoded, and is most likely invalid.
+  class TokenUnauthorizedError < AuthenticationError; end
+
   # Raised when something goes wrong on within the Intercom API service.
   class ServerError < IntercomError; end
 

data/lib/intercom/request.rb

@@ -74,7 +74,8 @@ module Intercom
             parsed_body
           rescue Intercom::RateLimitExceeded => e
             if @handle_rate_limit
-              sleep (@rate_limit_details[:reset_at] - Time.now.utc).ceil
+              seconds_to_retry = (@rate_limit_details[:reset_at] - Time.now.utc).ceil
+              sleep seconds_to_retry unless seconds_to_retry < 0
               retry unless (retries -=1).zero?
             else
               raise e
@@ -109,7 +110,7 @@ module Intercom
       rate_limit_details = {}
       rate_limit_details[:limit] = response['X-RateLimit-Limit'].to_i if response['X-RateLimit-Limit']
       rate_limit_details[:remaining] = response['X-RateLimit-Remaining'].to_i if response['X-RateLimit-Remaining']
-      rate_limit_details[:reset_at] = Time.at(response['X-RateLimit-Reset'].to_i) if response['X-RateLimit-Reset']
+      rate_limit_details[:reset_at] = Time.parse(response['X-RateLimit-Reset']) if response['X-RateLimit-Reset']
       @rate_limit_details = rate_limit_details
     end
 
@@ -151,6 +152,12 @@ module Intercom
       case error_code
       when 'unauthorized', 'forbidden', 'token_not_found'
         raise Intercom::AuthenticationError.new(error_details['message'], error_context)
+      when 'token_suspended'
+        raise Intercom::AppSuspendedError.new(error_details['message'], error_context)
+      when 'token_revoked'
+        raise Intercom::TokenRevokedError.new(error_details['message'], error_context)
+      when 'token_unauthorized'
+        raise Intercom::TokenUnauthorizedError.new(error_details['message'], error_context)
       when "bad_request", "missing_parameter", 'parameter_invalid', 'parameter_not_found'
         raise Intercom::BadRequestError.new(error_details['message'], error_context)
       when "not_restorable"

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "3.5.23"
+  VERSION = "3.5.24"
 end

data/spec/spec_helper.rb

@@ -235,7 +235,7 @@ def users_scroll(include_users= false)
   }
 end
 
-def users_pagination(include_next_link=false, per_page=0, page=0, total_pages=0, total_count=0, user_list=[])
+def users_pagination(include_next_link:, per_page:, page:, total_pages:, total_count:, user_list:)
   {
       "type"=>"user.list",
       "pages"=>

data/spec/unit/intercom/client_collection_proxy_spec.rb

@@ -38,21 +38,21 @@ describe Intercom::ClientCollectionProxy do
      test_user("user4@example.com"), test_user("user5@example.com"), test_user("user6@example.com"),
      test_user("user7@example.com"), test_user("user8@example.com"), test_user("user9@example.com"),
      test_user("user10@example.com")]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 10, :page => 1}).returns(users_pagination(false, per_page=10, page=1, total_pages=1, total_count=10, user_list=users))
+    client.expects(:get).with("/users", {:type=>'users', :per_page => 10, :page => 1}).returns(users_pagination(include_next_link: false, per_page: 10, page: 1, total_pages: 1, total_count: 10, user_list: users))
     result = client.users.find_all(:type=>'users', :per_page => 10, :page => 1).map {|user| user.email }
     result.must_equal %W(user1@example.com user2@example.com user3@example.com user4@example.com user5@example.com user6@example.com user7@example.com user8@example.com user9@example.com user10@example.com)
   end
 
   it "supports multi page pagination" do
     users = [test_user("user3@example.com"), test_user("user4@example.com")]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 3}).returns(users_pagination(true, per_page=2, page=3, total_pages=5, total_count=10, user_list=users))
+    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 3}).returns(users_pagination(include_next_link: true, per_page: 2, page: 3, total_pages: 5, total_count: 10, user_list: users))
     result = client.users.find_all(:type=>'users', :per_page => 2, :page => 3).map {|user| user.email }
     result.must_equal %W(user3@example.com user4@example.com)
   end
 
   it "works with page out of range request" do
     users = []
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 30}).returns(users_pagination(true, per_page=2, page=30, total_pages=2, total_count=3, user_list=users))
+    client.expects(:get).with("/users", {:type=>'users', :per_page => 2, :page => 30}).returns(users_pagination(include_next_link: true, per_page: 2, page: 30, total_pages: 2, total_count: 3, user_list: users))
     result = client.users.find_all(:type=>'users', :per_page => 2, :page => 30).map {|user| user.email }
     result.must_equal %W()
   end
@@ -62,7 +62,7 @@ describe Intercom::ClientCollectionProxy do
     time_increment=1000
     users = [test_user_dates(email="user1@example.com", created_at=test_date), test_user_dates(email="user2@example.com", created_at=test_date-time_increment),
              test_user_dates(email="user3@example.com", created_at=test_date-2*time_increment), test_user_dates(email="user4@example.com", created_at=test_date-3*time_increment)]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at"}).returns(users_pagination(true, per_page=4, page=5, total_pages=6, total_count=30, user_list=users))
+    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at"}).returns(users_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, user_list: users))
     result = client.users.find_all(:type=>'users', :per_page => 4, :page => 5, :order => "asc", :sort => "created_at").map(&:email)
     result.must_equal %W(user1@example.com user2@example.com user3@example.com user4@example.com)
   end
@@ -72,7 +72,7 @@ describe Intercom::ClientCollectionProxy do
     time_increment=1000
     users = [test_user_dates(email="user4@example.com", created_at=3*test_date), test_user_dates(email="user3@example.com", created_at=test_date-2*time_increment),
              test_user_dates(email="user2@example.com", created_at=test_date-time_increment), test_user_dates(email="user1@example.com", created_at=test_date)]
-    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at"}).returns(users_pagination(true, per_page=4, page=5, total_pages=6, total_count=30, user_list=users))
+    client.expects(:get).with("/users", {:type=>'users', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at"}).returns(users_pagination(include_next_link: true, per_page: 4, page: 5, total_pages: 6, total_count: 30, user_list: users))
     result = client.users.find_all(:type=>'users', :per_page => 4, :page => 5, :order => "desc", :sort => "created_at").map {|user| user.email }
     result.must_equal %W(user4@example.com user3@example.com user2@example.com user1@example.com)
   end

data/spec/unit/intercom/request_spec.rb

@@ -61,6 +61,17 @@ describe 'Intercom::Request' do
       req.execute(target_base_url=uri, username: "ted", secret: "")
     end
 
+    it 'should not sleep if rate limit reset time has passed' do
+      # Use webmock to mock the HTTP request
+      stub_request(:any, uri).\
+      to_return(status: [429, "Too Many Requests"], headers: { 'X-RateLimit-Reset' => Time.parse("February 25 2010").utc }).\
+      then.to_return(status: [200, "OK"])
+      req = Intercom::Request.get(uri, "")
+      req.handle_rate_limit=true
+      req.expects(:sleep).never.with(any_parameters)
+      req.execute(target_base_url=uri, username: "ted", secret: "")
+    end
+
   end
 
 

data/spec/unit/intercom/user_spec.rb

@@ -239,7 +239,7 @@ describe "Intercom::User" do
   it "allows setting dates to nil without converting them to 0" do
     client.expects(:post).with("/users", {"email" => "jo@example.com", 'custom_attributes' => {}, "remote_created_at" => nil}).returns({"email" => "jo@example.com"})
     user = client.users.create("email" => "jo@example.com", "remote_created_at" => nil)
-    user.remote_created_at.must_equal nil
+    assert_nil user.remote_created_at
   end
 
   it "sets/gets rw keys" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 3.5.23
+  version: 3.5.24
 platform: ruby
 authors:
 - Ben McRedmond
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -131,6 +131,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
@@ -140,7 +141,6 @@ files:
 - RELEASING.md
 - Rakefile
 - changes.txt
-- circle.yml
 - intercom.gemspec
 - lib/data/cacert.pem
 - lib/ext/sliceable_hash.rb

data/circle.yml

@@ -1,6 +0,0 @@
-machine:
-  ruby:
-    version: 2.1.0
-test:
-  post:
-  - bundle exec rake