xlogin-apiclient 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83943d818f1f52aed3bb0d97f36d52473e7a1f42
-  data.tar.gz: 399db00e2c8f0dc6f9a74ad3132a6a37433dfec8
+SHA256:
+  metadata.gz: 18a35f6ba98b58373950e71f3c3a87683087981acc457099952fe85beb474957
+  data.tar.gz: 6501f3d09a773b2925e779d5c72a7905e9871a0e002bb99560bea537b8747cdd
 SHA512:
-  metadata.gz: 44ee7f3f4a7ddbb964d0fa58a3161f83c81ab90cd704f8734fd0c4444821cfaa8b97bfad0b22e3142318f4332827bc03814909a3e13d95c1eba25fe6db19f375
-  data.tar.gz: 25603c911d6daf0f972bd658e071129ed84a890c666f3026f657d3c1e2e421a802b92895bc20fe32ca4a0419f9dd8194df36c4675b331ed02a863f6a74fe0a4d
+  metadata.gz: 84722296fb0c543e96fe23629845694c76a96dbac5f6d7812b3daf3022374163f4e389110b772931517e43fa895fe3baac23e03dbd8908fadaf020986d72d41e
+  data.tar.gz: 0ac161f727446451c8981e66e80c4c69be3821eab9cf7ad6998b95738cfba11cde028f9fa75e8d51e08f2fff16b73e5ae9c2327c762918ec7e4f66427530a800

data/lib/xlogin/apiclient.rb

@@ -1,78 +1,44 @@
 require 'json'
 require 'net/http'
-require 'ostruct'
+require 'addressable/uri'
 require "xlogin/apiclient/version"
 
 module Xlogin
-  module APIClient
-    class APIError < StandardError; end
+  class APIClient
+    class Error < StandardError; end
 
-    class Client
-      def initialize(base_uri, type:, **args)
-        @uri  = base_uri
-        @type = type
-        @args = args
-      end
-
-      def cmd(req = Request.new, &block)
-        if req.kind_of?(String)
-          req, _req = Request.new, req
-          req.command = _req
-        end
-
-        req.xlogin = @args
-        block.call(req) if block
-
-        uri = @uri.dup
-        uri.path += "/vendors/#{@type}/actions"
-
-        http(:post, uri, req.to_h)
-      rescue => e
-        raise APIError.new(e.message)
-      end
-
-      private
-      def http(method, uri, **args)
-	http = Net::HTTP.new(uri.host, uri.port)
-
-	klass = Net::HTTP.const_get(method.to_s.capitalize)
-	req  = klass.new(uri.path)
-	req["Accept"] = "application/json"
-
-	unless args.empty?
-	  req["Content-Type"] = "application/json"
-	  req.body = JSON.dump(args)
-	end
+    class << self
+      attr_accessor :base_url
+    end
 
-	resp = http.request(req)
-	body = resp.body
+    def initialize(base_url: self.class.base_url, **args)
+      raise Error.new('base_url not defined') unless base_url
 
-        Response.new(body.nil? ? {} : JSON.parse(body))
-      end
+      @uri  = Addressable::URI.parse(base_url)
+      @type = args.delete(:type)
+      @args = args
     end
 
-    class Factory
-      def initialize(uri)
-	@base_uri = URI(uri)
-      end
-
-      def create(**args)
-        Client.new(@base_uri, args)
-      end
+    def cmd(args)
+      params = {driver: @type, target: @args, command: args}
+      resp = request(**params.transform_keys(&:to_sym))
+      resp['payload'].join
     end
 
-    class Request < OpenStruct
-      def initialize(**args)
-        super(*args)
-        self.captures ||= []
-      end
+    private
+    def request(**params)
+      uri = @uri.dup
+      uri.query = "q=#{URI.encode_www_form_component(JSON.generate(params))}"
 
-      def to_h
-        super.delete_if { |k, v| k == :captures && v.empty? }
-      end
-    end
+      req = Net::HTTP::Get.new(uri.request_uri)
+      req["Accept"] = "application/json"
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      body = http.request(req).body
+      resp = body ? JSON.parse(body) : {}
+      return resp if resp['success']
 
-    class Response < OpenStruct
+      raise Error.new(resp['error'])
     end
   end
 end

data/lib/xlogin/apiclient/version.rb

@@ -1,5 +1,5 @@
 module Xlogin
   module Apiclient
-    VERSION = "0.1.6"
+    VERSION = "0.2.0"
   end
 end

data/xlogin-apiclient.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency 'addressable'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin-apiclient
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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: API client for xlogin-api.
 email:
 - haccht@users.noreply.github.com
@@ -75,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: API client for xlogin-api.