api_auth-client 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e8971d12299355746c2105b860d727dd53ccb0f
-  data.tar.gz: 1799f574233186f9a684215c1a7d0812ea8e2b20
+SHA256:
+  metadata.gz: 455d5827fdd8ae7651d128b4e0f2617d6060389603d0b93d32db72235ad569f3
+  data.tar.gz: 5058e1cb48faaa17d4e49b2f793ce230f51694941453a4f9ee04024b222e44eb
 SHA512:
-  metadata.gz: 856c0df82b6d75937b380bc874ca6061d1b3d1d80d29ce239a5eb6d9742ff34c87d23ed8d0676ae498a1ed22ea69ac47f98461413eb837f8ce7f326f3ae4bc44
-  data.tar.gz: e4987909bac40b0cfa7722e5a8cee13f541013cd2c92e1eae36bfa04dd469f8b3b8554e24e6e10125f9235b78403effba7bfc7341f4480d43a8ce1966983d891
+  metadata.gz: 490476ac43525e3dd7f1069ee8ae8846e38f5cacc9af91386b847d19e7c0a8b37eca1cd98c3ef44a7ed6711b41d7d30b35eba25d1a54e3fb84048a71b4687cc2
+  data.tar.gz: a6e40302f1a0f903ebbff5f945ad55a90aee8f9d3ea9cb75c4d33af6c19a411fd7e64f81d9364cce18332ff6a1ffee4fdc000bb2e702d774f48c1c7ca18b82d0

data/.ruby-version

@@ -1 +1 @@
-2.3.5
+3.4.7

data/README.md

@@ -27,7 +27,9 @@ Or install it yourself as:
 
 ```ruby
 class VolabitClient < ApiAuth::Client::Base
-  connect url: 'https://www.volabit.com/api/v1'
+  connect url: 'https://www.volabit.com/api/v1',
+          app_id: 'some-app-id',
+          secret_key: 'some-app-secret'
 
   def tickers
     connection.get('/tickers')

data/lib/api_auth/client/base.rb

@@ -10,12 +10,15 @@ module ApiAuth
       end
 
       module ClassMethods
-        attr_reader :attr_url, :attr_app_id, :attr_secret_key
+        attr_reader :attr_url, :attr_app_id, :attr_secret_key, :attr_type, :attr_auth_token, :attr_args
 
-        def connect(url:, app_id: nil, secret_key: nil)
+        def connect(url:, app_id: nil, secret_key: nil, type: :hmac, auth_token: nil, args: {}) # rubocop:disable Metrics/ParameterLists
           @attr_url = url
           @attr_app_id = app_id
           @attr_secret_key = secret_key
+          @attr_type = type&.to_sym
+          @attr_auth_token = auth_token
+          @attr_args = args
         end
       end
 
@@ -26,6 +29,9 @@ module ApiAuth
           url: self.class.attr_url,
           app_id: self.class.attr_app_id,
           secret_key: self.class.attr_secret_key,
+          type: self.class.attr_type,
+          auth_token: self.class.attr_auth_token,
+          args: self.class.attr_args || {},
         )
       end
     end

data/lib/api_auth/client/connection.rb

@@ -6,12 +6,15 @@ require 'api-auth'
 module ApiAuth
   module Client
     class Connection
-      attr_reader :url, :app_id, :secret_key
+      attr_reader :url, :app_id, :secret_key, :type, :auth_token, :args
 
-      def initialize(url:, app_id: nil, secret_key: nil)
+      def initialize(url:, app_id: nil, secret_key: nil, type: nil, auth_token: nil, args: {}) # rubocop:disable Metrics/ParameterLists
         @url = url
         @app_id = app_id
         @secret_key = secret_key
+        @type = type
+        @auth_token = auth_token
+        @args = args
       end
 
       %i[
@@ -20,11 +23,11 @@ module ApiAuth
         put
         delete
       ].each do |mtd|
-        define_method("#{mtd}!") do |path, payload = {}|
+        define_method("#{mtd}!") do |path = nil, payload = {}|
           query(mtd, path, payload)
         end
 
-        define_method(mtd) do |path, payload = {}|
+        define_method(mtd) do |path = nil, payload = {}|
           begin
             send("#{mtd}!", path, payload)
           rescue ConnectionError, ApiEndpointError => e
@@ -54,26 +57,32 @@ module ApiAuth
           url: endpoint_uri(path),
           ssl_version: 'SSLv23',
           headers: json_headers,
-        }
-        params[:payload] = payload.to_json if mtd == :post
+        }.merge(args&.except(:headers)&.to_h)
+
+        params[:payload] = payload.to_json if payload.present?
+        params.merge!(user: app_id, password: secret_key) if type == :basic
         RestClient::Request.new(params)
       end
 
       def json_headers
-        {
+        headers = {
           content_type: :json,
           accept: :json,
         }
+        headers.merge!(authorization: "Bearer #{auth_token}") if type == :token
+        headers.merge!(args[:headers]) if args.key?(:headers)
+        headers
       end
 
       def execute(req)
-        return req.execute if app_id.nil? || app_id.empty?
-
-        ::ApiAuth.sign!(req, app_id, secret_key, with_http_method: true).execute
+        req = ::ApiAuth.sign!(req, app_id, secret_key, with_http_method: true).execute if type == :hmac
+        req.execute
       end
 
       def endpoint_uri(path = '')
-        "#{url}/#{path.gsub(%r{^\/}, '')}"
+        return "#{url}/#{path.gsub(%r{^\/}, '')}" if path.present?
+
+        url
       end
     end
   end

data/lib/api_auth/client/response.rb

@@ -19,7 +19,7 @@ module ApiAuth
         parsed.send(arg) if parsed.respond_to?(arg)
       end
 
-      def to_json
+      def to_json(*_args)
         JSON.parse(response)
       rescue JSON::ParserError
         { 'error' => 'Bad JSON', 'body' => response.body }

data/lib/api_auth/client/version.rb

@@ -2,6 +2,6 @@
 
 module ApiAuth
   module Client
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: api_auth-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Genaro Madrid
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -185,7 +184,6 @@ files:
 homepage: https://github.com/Mifiel/api-auth-client
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Base ApiClient
 test_files: []