codepicnic 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe3b2bc168ccc173b5873d6ea16ff6d26d86e01
-  data.tar.gz: b30addb8f8025495d3e9a1a2d9f15fac7c666f93
+  metadata.gz: 1d61063c8c66256efcca66cf3916fa3c3d1b8150
+  data.tar.gz: 5aac244cc7cbe31d8dea7316805426d831f646cd
 SHA512:
-  metadata.gz: b3171536e65baa1883c0b15f9bdf1848668036d60a657af9b85c042905e2c73be03d37a15f22bb8a9482a0b31999173506a481329669f2627a23b9f09e72e4a0
-  data.tar.gz: 4bf872676ef99468455afddc0f459a00ea982cf20bd512b2b598d3f240f3d8d3a4296a375c83ba9280e98464284047c5d7d354559f45902f468d7dfba9ccff5a
+  metadata.gz: 144c391b95c92696f9d1eaf80d955475fb566982cf0ea409ee3abe30a7011e17e8664ce7146490c16d58dffe6558bccf9005e74ccd83703816b0286855c2db23
+  data.tar.gz: 60f8920907bed1b72f3f9dc68bbfa93584b75974fd2584c57ece7723fd1832a5285180ac8911be895180c1570a1b459a83be65e64903b57a6b5f78c6f47a79f1

data/lib/codepicnic/console.rb

@@ -4,10 +4,6 @@ module CodePicnic
 
     @api_url = "https://codepicnic.com/api/consoles"
 
-    class << self
-      attr_accessor :api_url
-    end
-
     attr_accessor :id, :name, :container_name, :container_type, :custom_image, :created_at, :permalink, :url, :is_headless
 
     def initialize(opts={})

data/lib/codepicnic/version.rb

@@ -1,3 +1,3 @@
 module CodePicnic
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/codepicnic.rb

@@ -1,19 +1,20 @@
 require 'json'
 require 'rest_client'
 require 'codepicnic/api_request'
+require 'codepicnic/token'
 require 'codepicnic/request'
 require 'codepicnic/console'
 require 'codepicnic/version'
 
 module CodePicnic
 
-  @api_url = "https://codepicnic.com/oauth/token"
-
   class << self
-    attr_accessor :api_url, :client_id, :client_secret, :token
+    attr_accessor :client_id, :client_secret, :token
 
     def token
       @token ||= get_token
+      refresh_token if @token.expired?
+      @token.access_token
     end
 
     def refresh_token
@@ -21,12 +22,7 @@ module CodePicnic
     end
 
     def get_token
-      response = RestClient.post @api_url, {
-        grant_type: "client_credentials",
-        client_id: @client_id,
-        client_secret: @client_secret
-      }
-      JSON.parse(response)["access_token"]
+      Token.new(@client_id, @client_secret)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codepicnic
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alvaro Pereyra