maas-client 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5e1e49b5860c2dd08f3f54f50e4bb2e0ec0159d55f151351d382e997e3372f
-  data.tar.gz: 4bcf35e1650fda5b9fbb618623c63b2a2a424380bdc23bcc4c70c74385a73098
+  metadata.gz: 471f5ee6442b4722061249e081b46b9ac8e1536ffaa8211d5288b8f924b3b52f
+  data.tar.gz: 9d8e5af1e3d0150acc0002ee5701f15ab2a49252a3cd27f93ba50e49bb3ab722
 SHA512:
-  metadata.gz: ec4cc750290fdada55ef41f463d3daf2ff3d2d42b220ad6caaf0c425f57cc4f9c8f381204657b6706877de8429fc456ff917d10a7ac307d9b647897d06883a0c
-  data.tar.gz: 9d51ba8ad6e5c0326ee3cec8035afcb1ac31440fc9c1e4cfec1592ab282dfffa226dd103fbfd34f6faf93776649427164be925b9f6906ecaf1421d684962b9ef
+  metadata.gz: 77db95ae809a57ecb501b7e3b6283840c16d3a5ac2cb3e86c95b4d2bb51c9a84497937a45ba7a7405a78726bc01d3450a90bbe638ce600a62327622beeec49f3
+  data.tar.gz: 007f067feddda6a797bf0475509ce7a01fafd0d03a8244afea9058e19c03fc3d5e6b091a17799be9f8512b8cebab363a2a65e1a23791e83c3f5aa3c5522ed870

data/README.md

@@ -180,8 +180,12 @@ Pushed maas-client x.x.xx to rubygems.org.
 ** Execute release
 
 ```
+## Reference
+https://docs.maas.io/2.4/en/api-authentication
+https://github.com/oauth-xx/oauth-ruby
+https://github.com/typhoeus/typhoeus
+https://docs.maas.io/2.4/en/api
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/maas/client/version.rb

@@ -2,6 +2,6 @@
 
 module Maas
   module Client
-    VERSION = '0.2.4'
+    VERSION = '0.3.0'
   end
 end

data/lib/maas/client.rb

@@ -1,7 +1,10 @@
 require 'maas/client/config'
 require 'oauth'
 require 'oauth/signature/plaintext'
+require 'oauth/request_proxy/typhoeus_request'
 require 'json'
+require 'hashie'
+require 'typhoeus'
 
 module Maas
   module Client
@@ -10,6 +13,7 @@ module Maas
       attr_reader :access_token
 
       def initialize(api_key = nil, endpoint = nil)
+
         if api_key and endpoint
           @api_key = api_key
           @endpoint = endpoint
@@ -20,17 +24,20 @@ module Maas
         else
           abort("There is no server Info provided.")
         end
+
         @consumer_key = @api_key.split(/:/)[0]
         @key = @api_key.split(/:/)[1]
         @secret = @api_key.split(/:/)[2]
+
         consumer = OAuth::Consumer.new(
-          @consumer_key,
-          '',
-          realm: '',
-          site: @endpoint,
-          scheme: :header,
-          signature_method: 'PLAINTEXT'
+          @consumer_key, '',
+          {
+            :site => @endpoint,
+            :scheme => :header,
+            :signature_method => "PLAINTEXT"
+          }
         )
+
         @access_token = OAuth::AccessToken.new(
           consumer,
           @key,
@@ -39,21 +46,67 @@ module Maas
       end
 
       def request(method, subject, param = nil)
-        default_param = {
-          'Accept' => 'application/json',
-          'Content-Type' => 'multipart/form-data'
+
+        headers = {Accept: 'application/json'}
+
+        uri = access_token.consumer.options[:site] + 
+          '/' + 
+          subject.join('/') + 
+          '/'
+
+
+        oauth_params = {
+          :consumer => access_token.consumer, 
+          :token => access_token
+        }
+
+        hydra = Typhoeus::Hydra.new
+
+        Hashie.symbolize_keys! param if param
+
+        options = {
+          method: method,
+          headers: headers
         }
-        uri = '/' + subject.join('/') + '/'
-        arguments = [method, uri, param, default_param].compact
-        response = access_token.request(*arguments)
 
-        return JSON.parse(response.body) if response.code == '200'
+# https://github.com/typhoeus/typhoeus#sending-params-in-the-body-with-put
+        if method == :get
+          options.merge!({params: param})
+        elsif method == :post
+          options.merge!({body: param})
+          headers.merge!(
+            {'Content-Type'=> "application/x-www-form-urlencoded"}
+          )
+        end
+
+        req = Typhoeus::Request.new(uri, options)
+
+        oauth_helper = OAuth::Client::Helper.new(
+          req,
+          oauth_params.merge(
+            {
+              request_uri: uri,
+              signature_method: access_token
+              .consumer
+              .options[:signature_method]
+            }
+          )
+        )
+
+        req.options[:headers].merge!(
+          { "Authorization" => oauth_helper.header }
+        )
+
+        hydra.queue(req); hydra.run
+        response = req.response
+
+        return JSON.parse(response.body) if response.code == 200
 
-        if response.code == '204'
+        if response.code == 204
           puts 'No Content'
         else
           raise "#{response.class} #{response.code} \
-            #{response.message} #{response.body}"
+            #{response.status_message} #{response.body}"
         end
       end
     end

data/maas-client.gemspec

@@ -32,4 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'hashie'
+  spec.add_runtime_dependency 'typhoeus'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maas-client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A client library that can be used to call MAAS API.
 email:
 - donoldfashioned@gmail.com