typetalk 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode

data/README.md

@@ -1,7 +1,13 @@
-# Typetalk
+# Typetalk [![Build Status](https://secure.travis-ci.org/umakoz/typetalk.png)](http://travis-ci.org/umakoz/typetalk)
 
 A Ruby wrapper for [Typetalk API](http://developers.typetalk.in/api.html). The Typetalk gem provides an easy-to-use wrapper for Typetalk's REST APIs.
 
+## Requirements
+
+* Ruby 1.9.3 or higher
+* Typetalk account
+
+
 
 
 

data/lib/typetalk/api.rb

@@ -5,7 +5,7 @@ module Typetalk
   class Api
     include Connection
 
-    Dir[File.join(__dir__, 'api/*.rb')].each{|f| require f}
+    Dir[File.join(File.dirname(__FILE__), 'api/*.rb')].each{|f| require f}
     include Auth
     include User
     include Topic
@@ -15,8 +15,14 @@ module Typetalk
 
 
     def access_token
-      @access_token ||= get_access_token
-      @access_token['access_token']
+      if @access_token.nil?
+        @access_token = get_access_token
+        @access_token.expire_time = Time.now.to_i + @access_token.expires_in.to_i
+      elsif Time.now.to_i >= @access_token.expire_time
+        @access_token = update_access_token(@access_token.refresh_token)
+        @access_token.expire_time = Time.now.to_i + @access_token.expires_in.to_i
+      end
+      @access_token.access_token
     end
 
 

data/lib/typetalk/api/auth.rb

@@ -4,32 +4,54 @@ module Typetalk
     module Auth
       attr_accessor :authorization_code
 
-      def get_access_token(client_id:nil, client_secret:nil, grant_type:nil, scope:nil, code:nil, redirect_uri:nil)
+      def get_access_token(options={})
+        options = {client_id:nil, client_secret:nil, grant_type:nil, scope:nil, code:nil, redirect_uri:nil}.merge(options)
+
         body = {
-          client_id: client_id || Typetalk.config.client_id,
-          client_secret: client_secret || Typetalk.config.client_secret,
-          grant_type: grant_type || Typetalk.config.grant_type,
-          scope: scope || Typetalk.config.scope,
+          client_id: options[:client_id] || Typetalk.config.client_id,
+          client_secret: options[:client_secret] || Typetalk.config.client_secret,
+          grant_type: options[:grant_type] || Typetalk.config.grant_type,
+          scope: options[:scope] || Typetalk.config.scope,
         }
 
         if body[:grant_type] == 'authorization_code'
-          body[:code] = code || @authorization_code
-          body[:redirect_uri] = redirect_uri || Typetalk.config.redirect_uri
+          body[:code] = options[:code] || @authorization_code
+          body[:redirect_uri] = options[:redirect_uri] || Typetalk.config.redirect_uri
+        end
+
+        response = connection.post do |req|
+          req.url 'https://typetalk.in/oauth2/access_token'
+          req.body = body
         end
+        parse_response(response)
+      end
+
+
+      def update_access_token(refresh_token, options={})
+        options = {client_id:nil, client_secret:nil}.merge(options)
+
+        body = {
+          client_id: options[:client_id] || Typetalk.config.client_id,
+          client_secret: options[:client_secret] || Typetalk.config.client_secret,
+          grant_type: 'refresh_token',
+          refresh_token: refresh_token
+        }
 
         response = connection.post do |req|
-         req.url 'https://typetalk.in/oauth2/access_token'
-         req.body = body
+          req.url 'https://typetalk.in/oauth2/access_token'
+          req.body = body
         end
         parse_response(response)
       end
 
 
-      def self.authorize_url(client_id:nil, redirect_uri:nil, scope:nil)
+      def self.authorize_url(options={})
+        options = {client_id:nil, redirect_uri:nil, scope:nil}.merge(options)
+
         params = {
-          client_id: client_id || Typetalk.config.client_id,
-          redirect_uri: redirect_uri || Typetalk.config.redirect_uri,
-          scope: scope || Typetalk.config.scope,
+          client_id: options[:client_id] || Typetalk.config.client_id,
+          redirect_uri: options[:redirect_uri] || Typetalk.config.redirect_uri,
+          scope: options[:scope] || Typetalk.config.scope,
           response_type: 'code',
         }
         url = URI.parse('https://typetalk.in/oauth2/authorize')

data/lib/typetalk/api/mention.rb

@@ -3,21 +3,25 @@ module Typetalk
 
     module Mention
 
-      def get_mentions(token:nil, from:nil, unread:nil)
+      def get_mentions(options={})
+        options = {token:nil, from:nil, unread:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/mentions"
-          req.params[:access_token] = token || access_token
-          req.params[:from] = from unless from.nil?
-          req.params[:unread] = unread unless unread.nil?
+          req.params[:access_token] = options[:token] || access_token
+          req.params[:from] = options[:from] unless options[:from].nil?
+          req.params[:unread] = options[:unread] unless options[:unread].nil?
         end
         parse_response(response)
       end
 
 
-      def read_mention(mention_id, token:nil)
+      def read_mention(mention_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.put do |req|
           req.url "#{endpoint}/mentions/#{mention_id}"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end

data/lib/typetalk/api/message.rb

@@ -5,74 +5,88 @@ module Typetalk
 
     module Message
 
-      def post_message(topic_id, message, token:nil, reply_to:nil, file_keys:nil, talk_ids:nil)
+      def post_message(topic_id, message, options={})
+        options = {token:nil, reply_to:nil, file_keys:nil, talk_ids:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/topics/#{topic_id}"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
           body = {}
           body[:message] = message
-          body[:replyTo] = reply_to unless reply_to.nil?
-          body.merge! to_request_params('fileKeys', file_keys)
-          body.merge! to_request_params('talkIds', talk_ids)
+          body[:replyTo] = options[:reply_to] unless options[:reply_to].nil?
+          body.merge! to_request_params(:fileKeys, options[:file_keys])
+          body.merge! to_request_params(:talkIds, options[:talk_ids])
           req.body = body
         end
         parse_response(response)
       end
 
 
-      def upload_attachment(topic_id, file, token:nil)
+      def upload_attachment(topic_id, file, options={})
+        options = {token:nil}.merge(options)
+
         raise InvalidFileSize if File.size(file) > 10485760 # > 10MB
 
         response = connection(multipart:true).post do |req|
           req.url "#{endpoint}/topics/#{topic_id}/attachments"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
           req.body = { file: Faraday::UploadIO.new(file, MIME::Types.type_for(file).first.to_s) }
         end
         parse_response(response)
       end
 
 
-      def get_message(topic_id, post_id, token:nil)
+      def get_message(topic_id, post_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/topics/#{topic_id}/posts/#{post_id}"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def remove_message(topic_id, post_id, token:nil)
+      def remove_message(topic_id, post_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.delete do |req|
           req.url "#{endpoint}/topics/#{topic_id}/posts/#{post_id}"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
         response.status == 200
       end
 
 
-      def like_message(topic_id, post_id, token:nil)
+      def like_message(topic_id, post_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/topics/#{topic_id}/posts/#{post_id}/like"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def unlike_message(topic_id, post_id, token:nil)
+      def unlike_message(topic_id, post_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.delete do |req|
           req.url "#{endpoint}/topics/#{topic_id}/posts/#{post_id}/like"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def read_message(topic_id, post_id=nil, token:nil)
+      def read_message(topic_id, post_id=nil, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/bookmark/save"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
           body = {}
           body[:topicId] = topic_id
           body[:postId] = post_id unless post_id.nil?

data/lib/typetalk/api/notification.rb

@@ -3,28 +3,34 @@ module Typetalk
 
     module Notification
 
-      def get_notifications(token:nil)
+      def get_notifications(options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/notifications"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def get_notifications_status(token:nil)
+      def get_notifications_status(options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/notifications/status"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def read_notifications(token:nil)
+      def read_notifications(options={})
+        options = {token:nil}.merge(options)
+
         response = connection.put do |req|
           req.url "#{endpoint}/notifications/open"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
@@ -33,19 +39,23 @@ module Typetalk
 
 
 
-      def accept_team(team_id, invite_team_id, token:nil)
+      def accept_team(team_id, invite_team_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/teams/#{team_id}/members/invite/#{invite_team_id}/accept"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def decline_team(team_id, invite_team_id, token:nil)
+      def decline_team(team_id, invite_team_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/teams/#{team_id}/members/invite/#{invite_team_id}/decline"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
@@ -54,19 +64,23 @@ module Typetalk
 
 
 
-      def accept_topic(topic_id, invite_topic_id, token:nil)
+      def accept_topic(topic_id, invite_topic_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/topics/#{topic_id}/members/invite/#{invite_topic_id}/accept"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def decline_topic(topic_id, invite_topic_id, token:nil)
+      def decline_topic(topic_id, invite_topic_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/topics/#{topic_id}/members/invite/#{invite_topic_id}/decline"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end

data/lib/typetalk/api/topic.rb

@@ -3,49 +3,59 @@ module Typetalk
 
     module Topic
 
-      def get_topics(token:nil)
+      def get_topics(options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/topics"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def get_topic(topic_id, token:nil, count:nil, from:nil, direction:nil)
+      def get_topic(topic_id, options={})
+        options = {token:nil, count:nil, from:nil, direction:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/topics/#{topic_id}"
-          req.params[:access_token] = token || access_token
-          req.params[:count] = count unless count.nil?
-          req.params[:from] = from unless from.nil?
-          req.params[:direction] = direction unless direction.nil?
+          req.params[:access_token] = options[:token] || access_token
+          req.params[:count] = options[:count] unless options[:count].nil?
+          req.params[:from] = options[:from] unless options[:from].nil?
+          req.params[:direction] = options[:direction] unless options[:direction].nil?
         end
         parse_response(response)
       end
 
 
-      def get_topic_members(topic_id, token:nil)
+      def get_topic_members(topic_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/topics/#{topic_id}/members/status"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def favorite_topic(topic_id, token:nil)
+      def favorite_topic(topic_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.post do |req|
           req.url "#{endpoint}/topics/#{topic_id}/favorite"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end
 
 
-      def unfavorite_topic(topic_id, token:nil)
+      def unfavorite_topic(topic_id, options={})
+        options = {token:nil}.merge(options)
+
         response = connection.delete do |req|
           req.url "#{endpoint}/topics/#{topic_id}/favorite"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end

data/lib/typetalk/api/user.rb

@@ -3,10 +3,12 @@ module Typetalk
 
     module User
 
-      def get_profile(token:nil)
+      def get_profile(options={})
+        options = {token:nil}.merge(options)
+
         response = connection.get do |req|
           req.url "#{endpoint}/profile"
-          req.params[:access_token] = token || access_token
+          req.params[:access_token] = options[:token] || access_token
         end
         parse_response(response)
       end

data/lib/typetalk/connection.rb

@@ -16,9 +16,11 @@ module Typetalk
       }
     end
 
-    def connection(multipart:false)
+    def connection(options={})
+      options = {multipart:nil}.merge(options)
+
       Faraday.new(connection_options) do |conn|
-        conn.request :multipart if multipart
+        conn.request :multipart if options[:multipart]
         conn.use Faraday::Request::UrlEncoded
         conn.use Faraday::Adapter::NetHttp
         # conn.use Faraday::Response::ParseJson

data/lib/typetalk/version.rb

@@ -1,3 +1,3 @@
 module Typetalk
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/cassettes/Typetalk_Api/_access_token/should_get_access_token.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=client_credentials&scope=topic.read%2Ctopic.post%2Cmy
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 04:42:34 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 04:42:34 GMT
+recorded_with: VCR 2.9.0

data/spec/cassettes/Typetalk_Api/_access_token/should_not_update_access_token.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=client_credentials&scope=topic.read%2Ctopic.post%2Cmy
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 05:05:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 05:05:59 GMT
+recorded_with: VCR 2.9.0

data/spec/cassettes/Typetalk_Api/_access_token/should_update_access_token_when_access_token_is_expired.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=client_credentials&scope=topic.read%2Ctopic.post%2Cmy
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 05:12:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 05:12:38 GMT
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=refresh_token&refresh_token=(REFRESH_TOKEN)
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 05:12:38 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(UPDATED_ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 05:12:38 GMT
+recorded_with: VCR 2.9.0

data/spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_get_the_correct_resource_by_client_credentials.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=client_credentials&scope=topic.read%2Ctopic.post%2Cmy
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 05:11:57 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 05:11:57 GMT
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=refresh_token&refresh_token=(REFRESH_TOKEN)
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 05:11:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 05:11:58 GMT
+recorded_with: VCR 2.9.0

data/spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_raise_error_when_refresh_token_is_wrong.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=client_credentials&scope=topic.read%2Ctopic.post%2Cmy
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 04:12:51 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Strict-Transport-Security:
+      - max-age=2592000
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"(ACCESS_TOKEN)","expires_in":3600,"scope":"topic.read,topic.post,my","refresh_token":"(REFRESH_TOKEN)","token_type":"Bearer"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 04:12:51 GMT
+- request:
+    method: post
+    uri: https://typetalk.in/oauth2/access_token
+    body:
+      encoding: UTF-8
+      string: client_id=(CLIENT_ID)&client_secret=(CLIENT_SECRET)&grant_type=refresh_token&refresh_token=dummy_token
+    headers:
+      Accept:
+      - application/json; charset=utf-8
+      User-Agent:
+      - Typetalk Rubygem 0.0.1
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 29 May 2014 04:12:52 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '56'
+      Connection:
+      - keep-alive
+      Www-Authenticate:
+      - Bearer error="invalid_grant", error_description="NotFound"
+    body:
+      encoding: UTF-8
+      string: '{"error":"invalid_grant","error_description":"NotFound"}'
+    http_version: 
+  recorded_at: Thu, 29 May 2014 04:12:52 GMT
+recorded_with: VCR 2.9.0

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ VCR.configure do |c|
   c.before_record do |i|
     i.request.body.sub!(/(&?client_id=)[^&]+/, '\1(CLIENT_ID)')
     i.request.body.sub!(/(&?client_secret=)[^&]+/, '\1(CLIENT_SECRET)')
+    i.request.body.sub!(/(&?refresh_token=)[^&]+/, '\1(REFRESH_TOKEN)')
     i.request.uri.sub!(/((\?|&)?access_token=)[^&]+/, '\1(ACCESS_TOKEN)')
 
     begin

data/spec/typetalk/api/auth_spec.rb

@@ -55,6 +55,28 @@ describe Typetalk::Api::Auth do
 
 
 
+  describe '#update_access_token', :vcr do
+    it 'should get the correct resource by client_credentials' do
+      response = api.get_access_token
+
+      response = api.update_access_token(response.refresh_token)
+      expect(response).to be_a(Hashie::Mash)
+      expect(response.access_token).to eq('(ACCESS_TOKEN)')
+      expect(response.refresh_token).to eq('(REFRESH_TOKEN)')
+      expect(response.scope).to eq('topic.read,topic.post,my')
+      expect(response.token_type).to eq('Bearer')
+      expect(response.expires_in).to eq(3600)
+    end
+
+
+    it 'should raise error when refresh_token is wrong' do
+      response = api.get_access_token
+      expect{ api.update_access_token('dummy_token') }.to raise_error(Typetalk::InvalidRequest)
+    end
+  end
+
+
+
   describe '.authorize_url' do
     before do
       Typetalk.configure do |config|

data/spec/typetalk/api/message_spec.rb

@@ -33,8 +33,8 @@ describe Typetalk::Api::Message do
 
 
     it 'should get the correct resource for attachments' do
-      attachment1 = api.upload_attachment(topic_id, File.join(__dir__, '../../fixtures/attachments/logo_typetalk.jpg'))
-      attachment2 = api.upload_attachment(topic_id, File.join(__dir__, '../../fixtures/attachments/logo_cacoo.jpg'))
+      attachment1 = api.upload_attachment(topic_id, File.join(File.dirname(__FILE__), '../../fixtures/attachments/logo_typetalk.jpg'))
+      attachment2 = api.upload_attachment(topic_id, File.join(File.dirname(__FILE__), '../../fixtures/attachments/logo_cacoo.jpg'))
       response = api.post_message(topic_id, 'Test Message 2 - 4', file_keys:[attachment1.fileKey, attachment2.fileKey])
       expect(response).to be_a(Hashie::Mash)
       expect(response.post.message).to eq('Test Message 2 - 4')
@@ -71,7 +71,7 @@ describe Typetalk::Api::Message do
 
   describe '#upload_attachment', :vcr do
     it 'should get the correct resource' do
-      response = api.upload_attachment(topic_id, File.join(__dir__, '../../fixtures/attachments/logo_typetalk.jpg'))
+      response = api.upload_attachment(topic_id, File.join(File.dirname(__FILE__), '../../fixtures/attachments/logo_typetalk.jpg'))
       expect(response).to be_a(Hashie::Mash)
       expect(response.fileName).to eq('logo_typetalk.jpg')
       expect(response.fileSize).to eq(7622)
@@ -80,12 +80,12 @@ describe Typetalk::Api::Message do
 
 
     it 'should raise error when topic_id is wrong' do
-      expect{ api.upload_attachment('dummy', File.join(__dir__, '../../fixtures/attachments/logo_typetalk.jpg')) }.to raise_error(Typetalk::InvalidRequest)
+      expect{ api.upload_attachment('dummy', File.join(File.dirname(__FILE__), '../../fixtures/attachments/logo_typetalk.jpg')) }.to raise_error(Typetalk::InvalidRequest)
     end
 
 
     it 'should raise error when file size 10MB', vcr:false do
-      file = File.join(__dir__, '../../fixtures/attachments/10mb.txt')
+      file = File.join(File.dirname(__FILE__), '../../fixtures/attachments/10mb.txt')
       File.write(file, 'a' * (10485760 + 1))
       expect{ api.upload_attachment(topic_id, file) }.to raise_error(Typetalk::InvalidFileSize)
       File.unlink(file)

data/spec/typetalk/api_spec.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Typetalk::Api do
+
+  let(:api) { Typetalk::Api.new }
+
+  describe '#access_token', :vcr do
+    it 'should get access_token' do
+      expect(api.instance_variable_get(:@access_token)).to be_nil
+
+      response = api.access_token
+      expect(response).to eq('(ACCESS_TOKEN)')
+
+      expect(api.instance_variable_get(:@access_token).expire_time).to eq(Time.now.to_i + 3600)
+    end
+
+
+    it 'should not update access_token' do
+      expect(api.instance_variable_get(:@access_token)).to be_nil
+
+      response = api.access_token
+      expect(response).to eq('(ACCESS_TOKEN)')
+
+      response = api.access_token
+      expect(response).to eq('(ACCESS_TOKEN)')
+    end
+
+
+    it 'should update access_token when access_token is expired' do
+      expect(api.instance_variable_get(:@access_token)).to be_nil
+
+      response = api.access_token
+      expect(response).to eq('(ACCESS_TOKEN)')
+
+      at = api.instance_variable_get(:@access_token)
+      at.expire_time = Time.now.to_i # expired
+      api.instance_variable_set(:@access_token, at)
+
+      response = api.access_token
+      expect(response).to eq('(UPDATED_ACCESS_TOKEN)')
+    end
+  end
+
+end

data/typetalk.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["umakoz@gmail.com"]
   spec.summary       = %q{A Ruby wrapper for Typetalk}
   spec.description   = %q{A Ruby wrapper for Typetalk}
-  spec.homepage      = "https://github.com/umakoz/typetalk"
+  spec.homepage      = "https://github.com/umakoz/typetalk-rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency "hashie"
   spec.add_dependency "faraday"

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: typetalk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - umakoz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,71 +78,81 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby wrapper for Typetalk
@@ -145,6 +164,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -160,6 +180,9 @@ files:
 - lib/typetalk/connection.rb
 - lib/typetalk/error.rb
 - lib/typetalk/version.rb
+- spec/cassettes/Typetalk_Api/_access_token/should_get_access_token.yml
+- spec/cassettes/Typetalk_Api/_access_token/should_not_update_access_token.yml
+- spec/cassettes/Typetalk_Api/_access_token/should_update_access_token_when_access_token_is_expired.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_authorization_code.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_client_credentials.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_client_credentials_when_scope_changed.yml
@@ -167,6 +190,8 @@ files:
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_client_id_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_client_secret_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_redirect_uri_mismatch.yml
+- spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_get_the_correct_resource_by_client_credentials.yml
+- spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_raise_error_when_refresh_token_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_correct_resource.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_correct_resource_till_mention.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_unread_resource.yml
@@ -229,32 +254,40 @@ files:
 - spec/typetalk/api/notification_spec.rb
 - spec/typetalk/api/topic_spec.rb
 - spec/typetalk/api/user_spec.rb
+- spec/typetalk/api_spec.rb
 - typetalk.gemspec
-homepage: https://github.com/umakoz/typetalk
+homepage: https://github.com/umakoz/typetalk-rb
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 930648927955685077
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Ruby wrapper for Typetalk
 test_files:
+- spec/cassettes/Typetalk_Api/_access_token/should_get_access_token.yml
+- spec/cassettes/Typetalk_Api/_access_token/should_not_update_access_token.yml
+- spec/cassettes/Typetalk_Api/_access_token/should_update_access_token_when_access_token_is_expired.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_authorization_code.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_client_credentials.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_get_the_correct_resource_by_client_credentials_when_scope_changed.yml
@@ -262,6 +295,8 @@ test_files:
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_client_id_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_client_secret_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Auth/_get_access_token/should_raise_error_when_redirect_uri_mismatch.yml
+- spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_get_the_correct_resource_by_client_credentials.yml
+- spec/cassettes/Typetalk_Api_Auth/_update_access_token/should_raise_error_when_refresh_token_is_wrong.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_correct_resource.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_correct_resource_till_mention.yml
 - spec/cassettes/Typetalk_Api_Mention/_get_mentions/should_get_the_unread_resource.yml
@@ -324,3 +359,4 @@ test_files:
 - spec/typetalk/api/notification_spec.rb
 - spec/typetalk/api/topic_spec.rb
 - spec/typetalk/api/user_spec.rb
+- spec/typetalk/api_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c8abe69ef420d358276adc435f463c3bcdbb1d17
-  data.tar.gz: cf7b032089f7482505217065765e9b7614e37859
-SHA512:
-  metadata.gz: 286c0578f142feff79ed45b1f1757e4bc15591301feba0dc4cfe116431e1f8f73efdb52bb10538966c858d24a9f024dbeda0a5bb1ac8943a6b1e282021b13cc8
-  data.tar.gz: 6576852ef676d8745a7a9a3010040c3e5ee73f00830999f3692170275fd98caab156b902f396635a29271bc166832615e1feead36b9e11814668eacf484a0104