dit3-api 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9512452c3c4666305ec0081df7d0d0728a2080
-  data.tar.gz: c01ced71326660ffec3769a9d033f70de5d624a1
+  metadata.gz: 464a19d6b859063bcfec22625531469467d5b79c
+  data.tar.gz: be8adfd93e7c59e045f55bee94b0ad8882c5b69a
 SHA512:
-  metadata.gz: 8864513cb70cf7a324abdca9081e60787fd911b8880f209e0722a5c7e5e67da4e38f6e81b49bb34ea43ed502c9c6cca56285269e188202b2de3a08d88265ecc8
-  data.tar.gz: 8ac0b5f7fb2bb4e66d0b5b79ecb8d3c9b8c81de65782d561a464302f4d50fc76af94758361edd8882349ba7cf6043e9f03453f3834295c9374b125c1bcbf4cbb
+  metadata.gz: 212b4cae7264d9ad9505edc02d9591809913dd3852b9206ff57a87f347abf10946701299456722ff9a0aac847b3f77778773c4d9c7e76df8997c633b9710efd8
+  data.tar.gz: 7d78dcc84ddf672dc7a3eb7ee2d60161d960298561a6e58dfee14ad4b7e922d897e77562f63c22aa09099b2660aed3b1b1c832038856ce7ad4efa03e2f0863f0

data/lib/dit3/api/api_error.rb

@@ -1,6 +1,11 @@
 module DIT3
     module Api
         class ApiError < StandardError
+            attr_reader :response
+            
+            def initialize(response)
+                @response = response
+            end
         end
     end
 end

data/lib/dit3/api/client.rb

@@ -12,20 +12,27 @@ module DIT3::Api
             @api = host + "/api"
             @oauth_client = OAuthClient.new(host, client_id, client_secret)
             @token = get_token @oauth_client
+            @request_factory = {
+                "GET" => method(:get_request),
+                "POST" => method(:post_request),
+                "DELETE" => method(:delete_request)
+            }
         end
 
         def tenants
             Wrappers::Tenants.new(self)
         end
 
-        def get endpoint
+        def exec_request method, endpoint
             uri = URI(@api + endpoint)
-            request = get_request uri
+            request = @request_factory[method].call(uri)
             http = get_http uri
 
+            yield(request) if block_given?
+
             response = http.request request
             if (!response.kind_of? Net::HTTPSuccess)
-                raise ApiError, "Failed to execute GET #{endpoint} request - #{response.code}"
+                raise ApiError.new(response), "Failed to execute #{method} #{endpoint} request - #{response.code}"
             end
             if !response.body.nil?
                 JSON.parse response.body
@@ -34,29 +41,25 @@ module DIT3::Api
             end
         end
 
-        def post endpoint, data
-            uri = URI(@api + endpoint)
-            request = post_request uri
-            http = get_http uri
-
-            request['Content-Type'] = 'application/json'
-            request.body = data.to_json
+        def get endpoint
+            exec_request("GET", endpoint)
+        end
 
-            response = http.request request
-            if (!response.kind_of? Net::HTTPSuccess)
-                raise ApiError, "Failed to execute POST #{endpoint} request - #{response.code}"
-            end
-            if !response.body.nil?
-                JSON.parse response.body
-            else
-                nil
+        def post endpoint, data
+            exec_request("POST", endpoint) do |request|
+                request['Content-Type'] = 'application/json'
+                request.body = data.to_json
             end
         end
 
+        def delete endpoint
+            exec_request("DELETE", endpoint)
+        end
+
         private
 
         def get_token oauth_client
-            opts = { :params => { :scope => oauth_client.normalize_scope(['platform.tenants.read', 'platform.tenants.write']) }}
+            opts = { :params => { :scope => oauth_client.normalize_scope(['platform.tenants.read', 'platform.tenants.write', 'platform.tenants.delete']) }}
             response = oauth_client.client_credentials.get_token(opts)
             if (!response.kind_of? Net::HTTPSuccess)
                 raise ApiError, "Failed to get access token: #{response.body}"
@@ -73,6 +76,10 @@ module DIT3::Api
             Net::HTTP::Post.new(endpoint_uri.request_uri, 'Authorization' => "Bearer #{@token}")
         end
 
+        def delete_request endpoint_uri
+            Net::HTTP::Delete.new(endpoint_uri.request_uri, 'Authorization' => "Bearer #{@token}")
+        end
+
         def get_http endpoint_uri
             http = Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
             if (endpoint_uri.scheme == 'https')

data/lib/dit3/api/wrappers/tenants.rb

@@ -10,6 +10,10 @@ module DIT3::Api::Wrappers
             @client.post("/tenants", {'name' => name})
         end
 
+        def delete name
+            @client.delete("/tenants/#{name}")
+        end
+
         def get name
             begin
                 DIT3::Api::Model::Tenant.new(@client.get("/tenants/#{name}"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dit3-api
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrew Maraev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2-client