xlogin-apiclient 0.1.6 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83943d818f1f52aed3bb0d97f36d52473e7a1f42
-  data.tar.gz: 399db00e2c8f0dc6f9a74ad3132a6a37433dfec8
+SHA256:
+  metadata.gz: 8f3e532530879c3353dcfb7f59479eb4b0f0c1b399f89ee8c65dbf024cee76f5
+  data.tar.gz: 9ea1381765bf42a205d649f5eaf42b490f9dbfd16de7fde69d4843192f5c2156
 SHA512:
-  metadata.gz: 44ee7f3f4a7ddbb964d0fa58a3161f83c81ab90cd704f8734fd0c4444821cfaa8b97bfad0b22e3142318f4332827bc03814909a3e13d95c1eba25fe6db19f375
-  data.tar.gz: 25603c911d6daf0f972bd658e071129ed84a890c666f3026f657d3c1e2e421a802b92895bc20fe32ca4a0419f9dd8194df36c4675b331ed02a863f6a74fe0a4d
+  metadata.gz: cb5e5d6fbcb8fcf18b41d39b71e87f39ae8a63622711668b369a3736185e12c772a3e95c440120302044936127cb1f3bb9136a891bd41cf7cc65b3ce511798b8
+  data.tar.gz: b877ebf767de4ae72912d31cc802a479e9284aed5515f7430b38ccccd2af2e48b5549c192a7a1c84581d7965f47ebef32ed3cf25d96e9b329d26edf4854cea8d

data/lib/xlogin/apiclient.rb

@@ -1,78 +1,75 @@
 require 'json'
 require 'net/http'
-require 'ostruct'
+require 'stringio'
+require 'addressable/uri'
+require 'em-eventsource'
 require "xlogin/apiclient/version"
 
-module Xlogin
-  module APIClient
-    class APIError < 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"
+module Xlogin
+  class APIClient
+    DEFAULT_TIMEOUT = 60
 
-        http(:post, uri, req.to_h)
-      rescue => e
-        raise APIError.new(e.message)
-      end
+    class Error < StandardError; end
 
-      private
-      def http(method, uri, **args)
-	http = Net::HTTP.new(uri.host, uri.port)
+    class << self
+      attr_accessor :base_url
+      attr_accessor :timeout
+    end
 
-	klass = Net::HTTP.const_get(method.to_s.capitalize)
-	req  = klass.new(uri.path)
-	req["Accept"] = "application/json"
+    attr_reader :type, :args
 
-	unless args.empty?
-	  req["Content-Type"] = "application/json"
-	  req.body = JSON.dump(args)
-	end
+    def initialize(base_url: self.class.base_url, **args)
+      raise Error.new('base_url not defined') unless base_url
 
-	resp = http.request(req)
-	body = resp.body
+      @uri  = Addressable::URI.parse(base_url)
+      @type = args.delete(:type)
+      @args = args
+    end
 
-        Response.new(body.nil? ? {} : JSON.parse(body))
-      end
+    def cmd(args, &block)
+      params = {driver: @type, target: @args, command: args}
+      request(**params.transform_keys(&:to_sym), &block)
     end
 
-    class Factory
-      def initialize(uri)
-	@base_uri = URI(uri)
-      end
+    private
+    def request(**params, &block)
+      uri = @uri.dup
+      uri.query = "q=#{URI.encode_www_form_component(JSON.generate(params))}"
+
+      if block
+        resp = StringIO.new
+        EM.run do
+          source = EventMachine::EventSource.new(uri.to_s)
+          source.message do |message|
+            data = JSON.parse(message) || {}
+            if chunk = data['chunk']
+              resp.print data['chunk']
+              block.call(data['chunk'])
+            end
+          end
+          source.error do |e|
+            EM.stop
+          end
+          source.start
+        end
+        return resp.string
+      else
+        req = Net::HTTP::Get.new(uri.request_uri)
+        req["Accept"] = "application/json"
 
-      def create(**args)
-        Client.new(@base_uri, args)
-      end
-    end
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = self.class.timeout || DEFAULT_TIMEOUT
+        http.read_timeout = self.class.timeout || DEFAULT_TIMEOUT
 
-    class Request < OpenStruct
-      def initialize(**args)
-        super(*args)
-        self.captures ||= []
-      end
+        resp = http.request(req)
+        raise Error.new(resp.message) unless resp.code =~ /^2[0-9]{2}$/
 
-      def to_h
-        super.delete_if { |k, v| k == :captures && v.empty? }
-      end
-    end
+        data = resp.body ? JSON.parse(resp.body) : {}
+        raise Error.new(data['error']) unless data['success']
 
-    class Response < OpenStruct
+        return data['payload'].join
+      end
     end
   end
 end

data/lib/xlogin/apiclient/cli.rb

@@ -0,0 +1,18 @@
+require 'optparse'
+
+
+module Xlogin
+  module APIClient
+    class CLI
+
+      def self.run(args = ARGV)
+        Xlogin::APIClient::CLI.new.run(args)
+      end
+
+      def run(args)
+      end
+
+    end
+  end
+end
+

data/lib/xlogin/apiclient/version.rb

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

data/xlogin-apiclient.gemspec

@@ -25,4 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency 'addressable'
+  spec.add_dependency 'em-eventsource'
 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.5
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: em-eventsource
+  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
@@ -54,6 +82,7 @@ files:
 - bin/console
 - bin/setup
 - lib/xlogin/apiclient.rb
+- lib/xlogin/apiclient/cli.rb
 - lib/xlogin/apiclient/version.rb
 - xlogin-apiclient.gemspec
 homepage: https://github.com/haccht/xlogin-apiclient.
@@ -75,8 +104,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.