freee 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f431d4378016a7d762e5301e899e4505c9d57e
-  data.tar.gz: 66f35e5fcba0d1c25a03cf4325d57a5bf0f7128d
+  metadata.gz: d1c589c590102035d3d89a4a526279973333251c
+  data.tar.gz: d47aa633efefa7fd6432efdcde48c6d6f11b4a8f
 SHA512:
-  metadata.gz: 8304df633374b1b5ca54ff138dc0bfca9c9ba0446a89e26bc908987760ce95f2970e8c8abba2b70617d251343cc4e8f6dece621ac058eb7cf2f32cf816db2607
-  data.tar.gz: 936110616afb886ab6f28cb3e42c832d96d4dc0acc3c8ddabbbe555756a23e28f04d35a840f47a99efec5d2ab374e7dd9677cfc665671c1699786b79d0d7ac74
+  metadata.gz: 3f43e6a967186c45ad4bcd7015a430628551e211c44d67600a6c597ab81be8695fa5e1a03d1a554dffb109003f8cd5d9c76bbb6ccebe39f9e2740de29544bb6e
+  data.tar.gz: 0ae697091e7b4ce21c0198285a1da78665f70ad5e3596809bc1e9d12fdd6fd3dbaa5ebcf78bc50daa2a84f337db788c8740c16800a0f9564b4e68c08ab430f80

data/bin/freee

@@ -8,18 +8,36 @@ module Freee
     include Thor::Actions
 
     desc "token", "Get access token of application for the freee."
-    def token 
-      client_id = ask("Client ID\n")
-      secret_key = ask("Secret Key\n")
-      redirect_uri = ask("Redirect URI\n")
-      authorization_code = ask("Authorization code\n")
+    option :client_id, required: true
+    option :secret_key, required: true
+    option :redirect_uri, required: true
+    option :authorization_code
+    option :refresh_token
+    def token
+      client_id = options[:client_id]
+      secret_key = options[:secret_key]
+      redirect_uri = options[:redirect_uri]
+      authorization_code = options[:authorization_code]
+      refresh_token = options[:refresh_token]
 
-      puts 'Token: ' + Freee::Util.create_token(
-        client_id: client_id,
-        secret_key: secret_key,
-        redirect_uri: redirect_uri,
-        authorization_code: authorization_code
-      )
+      token = if refresh_token
+        Freee::Util.refresh_token(
+          client_id: client_id,
+          secret_key: secret_key,
+          redirect_uri: redirect_uri,
+          refresh_token: refresh_token
+        )
+      elsif authorization_code
+        Freee::Util.create_token(
+          client_id: client_id,
+          secret_key: secret_key,
+          redirect_uri: redirect_uri,
+          authorization_code: authorization_code
+        )
+      end
+
+      puts "Token: #{token[:token]}"
+      puts "RefreshToken: #{token[:refresh_token]}"
     end
   end
 end

data/lib/freee/util.rb

@@ -1,30 +1,51 @@
 module Freee
   module Util
-    def self.create_token(**kwarg)
 
-      client_id = kwarg[:client_id]
-      secret_key = kwarg[:secret_key]
-      client = OAuth2::Client.new(client_id, secret_key, OPTIONS) do |con|
-        con.request :url_encoded
-        con.request :json
-        con.response :json, content_type: /\bjson$/
-        con.adapter Faraday.default_adapter
-      end
+    @@client = nil
 
-      params = {
+    def self.create_params(**kwarg)
+      {
         grant_type: 'authorization_code',
         code: kwarg[:authorization_code],
         redirect_uri: kwarg[:redirect_uri],
         headers: {
           'Content-Type' => 'application/json',
           'Authorization' => HTTPAuth::Basic.pack_authorization(
-            client_id,
-            secret_key
+            kwarg[:client_id],
+            kwarg[:secret_key]
           )
         }
       }
+    end
+
+    def self.create_client(**kwarg)
+      @@client = OAuth2::Client.new(kwarg[:client_id], kwarg[:secret_key], OPTIONS) do |con|
+        con.request :url_encoded
+        con.request :json
+        con.response :json, content_type: /\bjson$/
+        con.adapter Faraday.default_adapter
+      end
+    end
+    
+    def self.create_token(**kwarg)
+      self.create_client(kwarg) if @@client.nil?
+      get_token = @@client.get_token(create_params(kwarg))
+      {
+        token: get_token.token,
+        refresh_token: get_token.refresh_token
+      }
+    end
 
-      client.get_token(params).token
+    def self.refresh_token(**kwarg)
+      self.create_client(kwarg) if @@client.nil?
+      get_token = OAuth2::AccessToken.from_hash(
+        @@client,
+        refresh_token: kwarg[:refresh_token]
+      ).refresh!
+      {
+        token: get_token.token,
+        refresh_token: get_token.refresh_token
+      }
     end
 
     extend self

data/lib/freee/version.rb

@@ -1,3 +1,3 @@
 module Freee
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freee
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Keiji Matsuzaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2