abiquo-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8836f606285a63c433d784569b4d5f0847641aa5
-  data.tar.gz: 7a063fd1c4b2be4ad830f3b5b51e7d276715b955
+  metadata.gz: fcced71f2e3f6782763643d062ada792dabc6023
+  data.tar.gz: 862f2f8b982f93e35de263aecf45b1b513842f05
 SHA512:
-  metadata.gz: 5d11dbf20d34e360fdcf740203b5e7d12e51a851a197282a82bbb71b9db461584f4c41e475b0127d47c3c117fd46e8b26d1c7a28867d8a1c27df93dc82d55fc8
-  data.tar.gz: b8af64523e3ed132e14596040224792bc9f748b973bf2205c2b8cbca13bbb6f4203017825931909880973134ce81c4afc702ab2500a9f54e6a3d74096d54c266
+  metadata.gz: e6b149388d3bf38f6417f0a57667deb6022bfdda8cb597063d6f3dd9c45949b83b84467ae968a65b530d8911573c9e1767c851b00df239abf691f0f84dcec6fc
+  data.tar.gz: 0dbd1de15111dfa23fbdd04a65b47481e347bdcd86fd7773c0ab786867cbeb1e3788272721cb2878c0d0f4d63b7d40265cd48719f3b3154d82725679aac4f386

data/lib/abiquo-api.rb

@@ -56,13 +56,14 @@ class AbiquoAPI
     api_password = options[:abiquo_password]
     api_key = options[:abiquo_api_key]
     api_secret = options[:abiquo_api_secret]
+    access_token = options[:abiquo_access_token]
     token_key = options[:abiquo_token_key]
     token_secret = options[:abiquo_token_secret]
     connection_options = options[:connection_options] || {}
 
     raise "You need to set :abiquo_api_url" if api_url.nil?
-    raise "You need to provide either basic auth or oauth credentials!!" if (api_username.nil? or api_password.nil?) and 
-          (api_key.nil? or api_secret.nil? or token_key.nil? or token_secret.nil?)
+    raise "You need to provide either basic auth, oauth credentials or OpenID access token!!" if (api_username.nil? or api_password.nil?) and 
+          (api_key.nil? or api_secret.nil? or token_key.nil? or token_secret.nil?) and (access_token.nil?)
 
     unless api_key.nil?
       credentials = {
@@ -72,10 +73,16 @@ class AbiquoAPI
         :token_secret => token_secret
       }
     else
-      credentials = {
-        :api_username => api_username,
-        :api_password => api_password
-      }
+      if access_token.nil?
+        credentials = {
+          :api_username => api_username,
+          :api_password => api_password
+        }
+      else
+        credentials = {
+          :access_token => access_token
+        }
+      end
     end
 
     @http_client = AbiquoAPIClient::HTTPClient.new(api_url,

data/lib/abiquo-api/httpclient.rb

@@ -33,7 +33,12 @@ module AbiquoAPIClient
     #                           :ssl_verify_peer => <true_or_false>, :ssl_ca_path => <path_to_ca_file> }
     #
     def initialize(api_url, creds, connection_options)
-      if creds.has_key? :consumer_key
+      if creds.has_key? :access_token
+        @connection = Faraday.new(api_url, connection_options) do |c|
+          c.authorization :Bearer, creds[:access_token]
+          c.adapter :excon
+        end
+      elsif creds.has_key? :consumer_key
         @connection = Faraday.new(api_url, connection_options) do |c|
           c.request :oauth, creds
           c.adapter :excon

data/lib/abiquo-api/version.rb

@@ -1,3 +1,3 @@
 module AbiquoAPIClient
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abiquo-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marc Cirauqui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon