xlogin-apiclient 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d1de84a151795ecb712cdf1d9a411afab32709
-  data.tar.gz: 1894a25a7ce10d72ae0b4829ac376f87f6b7c239
+  metadata.gz: 83943d818f1f52aed3bb0d97f36d52473e7a1f42
+  data.tar.gz: 399db00e2c8f0dc6f9a74ad3132a6a37433dfec8
 SHA512:
-  metadata.gz: 199dd4dd3248199ad21ca3b3f5727cfdeb847ea8184767bb1a84cb19356608a0633dc2546ffc0528362eb174055bb350d0964eae6988a8b0a02358620574e4eb
-  data.tar.gz: 0216ca99501315becc906df9cba5dc34ba4a56a7cb287f09d1f15059185e1e70d555c09029b0b1d6e561d2c660cefe831e43d8d7cb6d61267e86872607515b1e
+  metadata.gz: 44ee7f3f4a7ddbb964d0fa58a3161f83c81ab90cd704f8734fd0c4444821cfaa8b97bfad0b22e3142318f4332827bc03814909a3e13d95c1eba25fe6db19f375
+  data.tar.gz: 25603c911d6daf0f972bd658e071129ed84a890c666f3026f657d3c1e2e421a802b92895bc20fe32ca4a0419f9dd8194df36c4675b331ed02a863f6a74fe0a4d

data/lib/xlogin/apiclient.rb

@@ -8,33 +8,27 @@ module Xlogin
     class APIError < StandardError; end
 
     class Client
-
-      def initialize(uri)
-	@base_uri = URI(uri)
-      end
-
-      def exec(req = Request.new, &block)
-        vendor = self.class.name.slice(/\w+$/).downcase
-        method("exec_#{vendor}").call(req, &block)
+      def initialize(base_uri, type:, **args)
+        @uri  = base_uri
+        @type = type
+        @args = args
       end
 
-      def method_missing(name, *args, &block)
-        super unless name =~ /^exec_(\w+)$/
+      def cmd(req = Request.new, &block)
+        if req.kind_of?(String)
+          req, _req = Request.new, req
+          req.command = _req
+        end
 
-        begin
-          req = args.shift || Request.new
-          uri = URI(@base_uri)
-          uri.path = "/vendors/#{$1}/actions"
+        req.xlogin = @args
+        block.call(req) if block
 
-          block.call(req) if block
-          http(:post, uri, req.to_h)
-        rescue => e
-          raise APIError.new(e.message)
-        end
-      end
+        uri = @uri.dup
+        uri.path += "/vendors/#{@type}/actions"
 
-      def respond_to_missing?(name, include_private = false)
-        name =~ /^exec_(\w+)$/
+        http(:post, uri, req.to_h)
+      rescue => e
+        raise APIError.new(e.message)
       end
 
       private
@@ -52,16 +46,33 @@ module Xlogin
 
 	resp = http.request(req)
 	body = resp.body
-	body.nil? ? {} : JSON.parse(body)
+
+        Response.new(body.nil? ? {} : JSON.parse(body))
       end
+    end
 
+    class Factory
+      def initialize(uri)
+	@base_uri = URI(uri)
+      end
+
+      def create(**args)
+        Client.new(@base_uri, args)
+      end
     end
 
     class Request < OpenStruct
-      def initialize(*args)
+      def initialize(**args)
         super(*args)
         self.captures ||= []
       end
+
+      def to_h
+        super.delete_if { |k, v| k == :captures && v.empty? }
+      end
+    end
+
+    class Response < OpenStruct
     end
   end
 end

data/lib/xlogin/apiclient/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin-apiclient
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler