xlogin-apiclient 0.1.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5d1de84a151795ecb712cdf1d9a411afab32709
-  data.tar.gz: 1894a25a7ce10d72ae0b4829ac376f87f6b7c239
+SHA256:
+  metadata.gz: cd27729125f85dccd148ba59aa2db26d534bc236c9845be12f5fde54b47925d2
+  data.tar.gz: 483181f41617cdc735197e1206a21343f4c258da53f129f8d443e46d658b181e
 SHA512:
-  metadata.gz: 199dd4dd3248199ad21ca3b3f5727cfdeb847ea8184767bb1a84cb19356608a0633dc2546ffc0528362eb174055bb350d0964eae6988a8b0a02358620574e4eb
-  data.tar.gz: 0216ca99501315becc906df9cba5dc34ba4a56a7cb287f09d1f15059185e1e70d555c09029b0b1d6e561d2c660cefe831e43d8d7cb6d61267e86872607515b1e
+  metadata.gz: 296f10186c974b5e3e935c525a15299265543e8074b25f9dd5095abbddbdeabb009f96b58d49ae4be87ee34e535ba60dc399e14fbc3c4da1f68aa792053079d1
+  data.tar.gz: c51ca168d18595df7171791277cf5290f6c8229d94250f14ad465828c3798102d90364e697d76c2d1980d6f2dd42ccfca1df22757be2b9c9c7e1071eaec365a3

data/lib/xlogin/apiclient.rb

@@ -1,66 +1,67 @@
 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 APIClient
+    class Error < 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)
-      end
-
-      def method_missing(name, *args, &block)
-        super unless name =~ /^exec_(\w+)$/
+    class << self
+      attr_accessor :base_url
+    end
 
-        begin
-          req = args.shift || Request.new
-          uri = URI(@base_uri)
-          uri.path = "/vendors/#{$1}/actions"
+    attr_reader :type, :args
 
-          block.call(req) if block
-          http(:post, uri, req.to_h)
-        rescue => e
-          raise APIError.new(e.message)
-        end
-      end
+    def initialize(base_url: self.class.base_url, **args)
+      raise Error.new('base_url not defined') unless base_url
 
-      def respond_to_missing?(name, include_private = false)
-        name =~ /^exec_(\w+)$/
-      end
+      @uri  = Addressable::URI.parse(base_url)
+      @type = args.delete(:type)
+      @args = args
+    end
 
-      private
-      def http(method, uri, **args)
-	http = Net::HTTP.new(uri.host, uri.port)
+    def cmd(args, &block)
+      params = {driver: @type, target: @args, command: args}
+      request(**params.transform_keys(&:to_sym), &block)
+    end
 
-	klass = Net::HTTP.const_get(method.to_s.capitalize)
-	req  = klass.new(uri.path)
-	req["Accept"] = "application/json"
+    private
+    def request(**params, &block)
+      uri = @uri.dup
+      uri.query = "q=#{URI.encode_www_form_component(JSON.generate(params))}"
 
-	unless args.empty?
-	  req["Content-Type"] = "application/json"
-	  req.body = JSON.dump(args)
-	end
+      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"
 
-	resp = http.request(req)
-	body = resp.body
-	body.nil? ? {} : JSON.parse(body)
-      end
+        http = Net::HTTP.new(uri.host, uri.port)
+        resp = http.request(req)
+        raise Error.new(resp.message) unless resp.code =~ /^2[0-9]{2}$/
 
-    end
+        data = resp.body ? JSON.parse(resp.body) : {}
+        raise Error.new(data['error']) unless data['success']
 
-    class Request < OpenStruct
-      def initialize(*args)
-        super(*args)
-        self.captures ||= []
+        return data['payload'].join
       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.3"
+    VERSION = "0.2.4"
   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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 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.