Merge pull request #16 from coincovemx/general-fixes

General fixes

Author: genaromadrid

README.md

@@ -1,6 +1,8 @@
+[![Gem Version](https://badge.fury.io/rb/volabit.svg)](http://badge.fury.io/rb/volabit)
+
 # Volabit
 
-Volabit's API library. Integrate the Volabit services in your apps with ease.
+Volabit's API Ruby library. Integrate the Volabit services in your apps with ease.
 
 You can see the available methods on the [project wiki][wiki]. Details of the API use can be found on the [official page][api-docs].
 
@@ -36,7 +38,7 @@ callback    = 'The registered callback URL for your APP'
 volabit_client = Volabit::Client.new(app_id, secret, callback)
 ```
 
-Note that the by default the Volabit client uses the **production** environment. If you want to use the **test** environment, set the sandbox flag to `true` before requesting the authorization code.
+Note that by default the Volabit client uses the **production** environment. If you want to use the **test** environment, set the sandbox flag to `true` before requesting the authorization code.
 
 ```ruby
 volabit_client.sandbox true
@@ -54,11 +56,16 @@ auth_url = volabit_client.authorize
 volabit_client.get_token 'The given authorization code.'
 ```
 
-4) With these tokens, you'll be ready to call the services. The methods will return a response object. The contend can be retrieved with the `body` property and will be in the JSON format.
+4) If you already have a `token` and a `refresh_token` you can use:
+
+```ruby
+volabit_client.use_token 'token', 'refresh_token'
+```
+
+5) You're ready to use our API. Just call any method listed [here][wiki].
 
 ```ruby
-response = volabit_client.tickers
-response.body
+tickers = volabit_client.tickers
 # => {
 #       "btc_usd_buy":"226.06",
 #       "btc_usd_sell":"226.56",

lib/volabit/api.rb

@@ -10,18 +10,28 @@ module API
 
     # Request a resource using the GET method.
     def get_resource(resource, params = nil)
+      raise no_token_error unless @token
       @token.refresh if @token.expired?
-      @token.get(resource, params: params)
+      response = @token.get(resource, params: params)
+      JSON.parse response.body, :symbolize_names => true
     end
 
     def post_to_resource(resource, params)
+      raise no_token_error unless @token
       @token.refresh if @token.expired?
-      @token.post(resource, params: params)
+      response = @token.post(resource, params: params)
+      JSON.parse response.body, :symbolize_names => true
     end
 
     def delete_resource(resource)
+      raise no_token_error unless @token
       @token.refresh if @token.expired?
-      @token.delete(resource)
+      response = @token.delete(resource)
+      JSON.parse response.body, :symbolize_names => true
+    end
+
+    def no_token_error
+      'Error: you have to run get_token or set_token before use this method.'
     end
   end
 end

lib/volabit/auth.rb

@@ -27,6 +27,26 @@ def authorize
     #         access the API and the methods to renew itself.
     def get_token(auth_code)
       @token = @oauth_client.auth_code.get_token auth_code, redirect_uri: @url
+      {
+        :token          => @token.token,
+        :refresh_token  => @token.refresh_token,
+        :expires_in     => @token.expires_in,
+        :expires_at     => @token.expires_at,
+        :options        => @token.options
+      }
+    end
+
+    def use_token(token, refresh_token)
+      token = OAuth2::AccessToken.new @oauth_client, token, { :refresh_token  => refresh_token }
+      token_info = JSON.parse token.get('/oauth/token/info').body
+      expires_in = token_info['expires_in_seconds']
+      @token = OAuth2::AccessToken.new @oauth_client, token, {
+        :refresh_token  => refresh_token,
+        :expires_in     => expires_in,
+        :mode           => :header,
+        :header_format  => 'Bearer %s',
+        :param_name     => 'access_token'
+      }
     end
 
     # Toggles the test environment with a boolean value.

lib/volabit/version.rb

@@ -1,3 +1,3 @@
 module Volabit
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end