dit3-api 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea5e5abdb6811c9a6b7a067b4c853a2de6ef00f3
-  data.tar.gz: 6933bf411feed9df5d0b769119b6b027e2c2d905
+  metadata.gz: 2c3f0c53e2a04f31971fd0f5e76900346a6a8ab7
+  data.tar.gz: f4dff5f15a57489a0b79b9dd2079217fbf725ae1
 SHA512:
-  metadata.gz: a7825763c76254523c6b340636ab9de5ccdb4466fb200315a80b090be9fafc1294789791825983a37fb84a7a5ae5ad49c8d6ca62b60633d131a0d2aa9c3bda28
-  data.tar.gz: 9bbae10dea6cc65b46cbb00691c1ee1adf7d08e53b3a2e980b0cf6ebb6900195c0d215a9855fc5563edc763f624c6f306c4e0f13dee88e397228ee55e71a4bae
+  metadata.gz: a023327c150f1b125c3753a965d4284a6d63459629afed2934e6a5f4c123ee2323cfb0a519da693daf17ab91ef77cbbd497ec8394990b12b519ee773fa053355
+  data.tar.gz: 6b93ab0fc2ce576baf3848ede1877b2722689a25bc957abd8942c83d26415304f61f68b85c4dde106d5aca4340d9ad5ce6bf702c66d44eba2d3bd90660d260a7

data/lib/dit3/api/api_error.rb

@@ -1,11 +1,6 @@
 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

@@ -4,81 +4,66 @@ require 'uri'
 
 require_relative 'api_error'
 require_relative 'oauth_client'
-require_relative 'wrappers/accounts'
 require_relative 'wrappers/tenants'
 
 module DIT3::Api
     class Client
-        def initialize(host, client_id, client_secret)
+        def initialize(host, client_id, client_secret, login, password)
             @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),
-                "PUT" => method(:put_request)
-            }
+            @token = get_token @oauth_client, login, password
         end
 
         def tenants
             Wrappers::Tenants.new(self)
         end
 
-        def accounts
-            Wrappers::Accounts.new(self)
-        end
-
-        def exec_request method, endpoint
+        def get endpoint
             uri = URI(@api + endpoint)
-            request = @request_factory[method].call(uri)
+            request = get_request uri
             http = get_http uri
 
-            yield(request) if block_given?
-
             response = http.request request
             if (!response.kind_of? Net::HTTPSuccess)
-                raise ApiError.new(response), "Failed to execute #{method} #{endpoint} request - #{response.code}"
+                raise ApiError, "Failed to execute GET #{endpoint} request - #{request.code}"
             end
-            if !response.body.nil?
-                JSON.parse response.body
+            if request.body_permitted?
+                JSON.parse request.body
             else
                 nil
             end
         end
 
-        def get endpoint
-            exec_request("GET", endpoint)
-        end
-
         def post endpoint, data
-            exec_request("POST", endpoint) do |request|
-                request['Content-Type'] = 'application/json'
-                request.body = data.to_json
-            end
-        end
+            uri = URI(@api + endpoint)
+            request = post_request uri
+            http = get_http uri
 
-        def put endpoint, data
-            exec_request("PUT", endpoint) do |request|
-                request['Content-Type'] = 'application/json'
-                request.body = data.to_json
-            end
-        end
+            request['Content-Type'] = 'application/json'
+            request.body = data.to_json
 
-        def delete endpoint
-            exec_request("DELETE", endpoint)
+            response = http.request request
+            if (!response.kind_of? Net::HTTPSuccess)
+                raise ApiError, "Failed to execute POST #{endpoint} request - #{request.code}"
+            end
+            if request.body_permitted?
+                JSON.parse request.body
+            else
+                nil
+            end
         end
 
         private
 
-        def get_token oauth_client
-            opts = { :params => { :scope => oauth_client.normalize_scope(['platform.tenants.read', 'platform.tenants.write', 'platform.tenants.delete', 'platform.accounts.read', 'platform.accounts.write']) }}
-            response = oauth_client.client_credentials.get_token(opts)
-            if (!response.kind_of? Net::HTTPSuccess)
-                raise ApiError, "Failed to get access token: #{response.body}"
-            end
-            response_body = JSON.parse(response.body)
-            response_body['access_token']
+        def get_token oauth_client, login, password
+#            opts = { :params => { :scope => oauth_client.normalize_scope(['platform.tenants.read', 'platform.tenants.write']) }}
+#            response = oauth_client.client_credentials.get_token(opts)
+#            if (!response.kind_of? Net::HTTPSuccess)
+#                raise ApiError, "Failed to get access token: #{response.body}"
+#            end
+#            response_body = JSON.parse(response.body)
+#            response_body['access_token']
+			client.password.get_token(login, password)
         end
 
         def get_request endpoint_uri
@@ -89,14 +74,6 @@ 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 put_request endpoint_uri
-            Net::HTTP::Put.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

@@ -1,5 +1,3 @@
-require_relative '../model/tenant.rb'
-
 module DIT3::Api::Wrappers
     class Tenants
         def initialize client
@@ -10,13 +8,9 @@ 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}"))
+                @client.get("/tenants/#{name}")
             rescue DIT3::Api::ApiError
                 nil
             end

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dit3-api
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Andrew Maraev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: oauth2-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: A simple hello world gem
+date: 2018-01-10 00:00:00.000000000 Z
+dependencies: []
+description: DIT3 API Client
 email: a.maraev@simbirsoft.com
 executables: []
 extensions: []
@@ -33,10 +19,7 @@ files:
 - lib/dit3/api.rb
 - lib/dit3/api/api_error.rb
 - lib/dit3/api/client.rb
-- lib/dit3/api/model/account.rb
-- lib/dit3/api/model/tenant.rb
 - lib/dit3/api/oauth_client.rb
-- lib/dit3/api/wrappers/accounts.rb
 - lib/dit3/api/wrappers/tenants.rb
 homepage: http://rubygems.org/gems/dit3-api
 licenses:
@@ -61,5 +44,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: DIT 3 API Ruby client.
+summary: DIT3 API Client
 test_files: []

data/lib/dit3/api/model/account.rb

@@ -1,17 +0,0 @@
-module DIT3::Api::Model
-    class Account
-        attr_reader :id
-        attr_reader :name
-        attr_reader :email
-        attr_reader :locale
-        attr_reader :tenant
-
-        def initialize hash
-            @id = hash['id']
-            @name = hash['name']
-            @email = hash['email']
-            @locale = hash['locale']
-            @tenant = hash['tenant']
-        end
-    end
-end

data/lib/dit3/api/model/tenant.rb

@@ -1,17 +0,0 @@
-module DIT3::Api::Model
-    class Tenant
-        attr_reader :name
-        attr_reader :id
-
-        def initialize hash
-            @name = hash['name']
-            @id = hash['id']
-        end
-
-        def to_hash
-            hash = {}
-            instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
-            hash
-        end
-    end
-end

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

@@ -1,25 +0,0 @@
-require_relative '../model/account.rb'
-
-module DIT3::Api::Wrappers
-    class Accounts
-        def initialize client
-            @client = client
-        end
-
-        def get name
-            begin
-                DIT3::Api::Model::Account.new(@client.get("/accounts/#{name}"))
-            rescue DIT3::Api::ApiError
-                nil
-            end
-        end
-
-        def set_tenant name, tenant
-            @client.put("/accounts/#{name}/tenant", tenant.to_hash())
-        end
-
-        def exists? name
-            !get(name).nil?
-        end
-    end
-end