bitopro 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd7f48092821353323e10f01efa13708704480d1f3b2e5cadf8552c9821dcc7
-  data.tar.gz: e1857340c2333eddb86a90ee5d2d6f6ba5712bc5c3897c0fef7e06fcb47695e7
+  metadata.gz: 1e5c53c96852494993e32b2148fe51924f5ab735724cc397a22ec6167b31bb07
+  data.tar.gz: befe9c38587c12d2704471ca03d731c2d5e54bd931edd47a1eff7ed05ccf3e82
 SHA512:
-  metadata.gz: 06e7ddd7b8b215c7ecc95325fa81c40867ae475874deb736be37a8b2f826068d3fa62af5b2e69251260b0c28e19947be927468ab94e6370bfce57a2c9ded4c48
-  data.tar.gz: 687fd5425ab1601c28b3a7d31fc8a9ec7dcc4b1e56324560d770f8200fd505f91f48196bc345946a700ca8c2fd4df21ab79486476318ed3d5f72bacb6ab46eca
+  metadata.gz: da5bf8178cefc5ad31ce79cfc4d8081121df3e4273908ace9823e6618b9319cf010a352aa10c438be019894b82f730f68e7f5644f911dd0bb81933a5b472af10
+  data.tar.gz: d3d93dbddbc92db71d5e6ad68bc7b7d82c8e394eff030acc506ef00d73e82910d7e1263b6ea9df61c27eda5fc7900f4101de592828ce2aa76c652239f46b261d

data/lib/bitopro/api/account.rb

@@ -1,5 +1,7 @@
 module Bitopro
   module Account
+    class Error < StandardError; end
+
     def account_balance
       authenticated_get("/accounts/balance")
     end
@@ -9,7 +11,9 @@ module Bitopro
     end
 
     def order_list(pair: "", page: 1, active: false)
-      authenticated_get("/orders/#{currency_pair}", params: { page: page, active: active })
+      raise Error, "pair is required" unless pair
+
+      authenticated_get("/orders/#{pair}", params: { page: page, active: active })
     end
   end
 end

data/lib/bitopro/client.rb

@@ -6,6 +6,7 @@ module Bitopro
   class Client
     class SetupError < StandardError; end
 
+    AUTH_HTTP_ACTION = %w(get post delete)
     BASE_URL = "https://api.bitopro.com/v2".freeze
 
     include Bitopro::Public
@@ -18,71 +19,33 @@ module Bitopro
 
     private
 
-    def build_url(url)
+    def complete_url(url)
       "#{BASE_URL}#{url}"
     end
 
-    def authenticated_get(url, params = {})
-      raise SetupError, "Must be set configure before call authenticate action" unless Bitopro.configured?
+     AUTH_HTTP_ACTION.each do |action|
+      define_method "authenticated_#{action}" do |url, params = {}|
+        raise SetupError, "Must be set configure before call authenticate action" unless Bitopro.configured?
 
-      complete_url = build_url(url)
+        json_body = build_json_body(params: params, action: action)
+        payload = build_payload(json_body)
+        headers = build_headers(payload)
 
-      json_body = { identity: @config.email, nonce: timestamp }.to_json
-      payload = build_payload(json_body)
-      headers = build_headers(payload)
+        response = RestClient::Request.execute(method: action,
+                                               url: complete_url(url),
+                                               headers: headers,
+                                               payload: params,
+                                               timeout: 10)
 
-      response = RestClient::Request.execute(method: :get,
-                                             url: complete_url,
-                                             headers: headers,
-                                             payload: params,
-                                             timeout: 10)
-
-      JSON.parse(response.body)
-    end
-
-    def authenticated_post(url, params = {})
-      raise SetupError, "Must be set configure before call authenticate action" unless Bitopro.configured?
-
-      complete_url = build_url(url)
-
-      json_body = params[:body].to_json
-      payload = build_payload(json_body)
-      headers = build_headers(payload)
-
-      response = RestClient::Request.execute(method: :post,
-                                             url: complete_url,
-                                             headers: headers,
-                                             payload: json_body,
-                                             timeout: 10)
-
-      JSON.parse(response.body)
-    end
-
-    def authenticated_delete(url, params = {})
-      raise BitoproSetupError, "Must be set configure before call authenticate action" unless Bitopro.configured?
-
-      complete_url = build_url(url)
-
-      json_body = { identity: @config.email, nonce: timestamp }.to_json
-      payload = build_payload(json_body)
-      headers = build_headers(payload)
-
-      response = RestClient::Request.execute(method: :delete,
-                                             url: complete_url,
-                                             headers: headers,
-                                             payload: params,
-                                             timeout: 10)
-
-      JSON.parse(response.body)
+        JSON.parse(response.body)
+      end
     end
 
     def get(url, params = {})
-      complete_url = build_url(url)
-      headers = { "X-BITOPRO-API": "ruby" }
       response = RestClient::Request.execute(method: :get,
-                                             url: complete_url,
+                                             url: complete_url(url),
                                              payload: params,
-                                             headers: headers,
+                                             headers: tracking_header,
                                              timeout: 10)
 
       JSON.parse(response.body)
@@ -92,6 +55,11 @@ module Bitopro
       Base64.strict_encode64(json_body)
     end
 
+    def build_json_body(params:, action:)
+      body = action == "post" ? params[:body] : { identity: @config.email, nonce: timestamp }
+      body.to_json
+    end
+
     def timestamp
       (Time.now.to_f * 1000).floor
     end
@@ -100,13 +68,16 @@ module Bitopro
       OpenSSL::HMAC.hexdigest("SHA384", @config.secret, payload)
     end
 
+    def tracking_header
+      { "X-BITOPRO-API": "ruby" }
+    end
+
     def build_headers(payload)
       {
-        "X-BITOPRO-API": "ruby",
         "X-BITOPRO-APIKEY": @config.key,
         "X-BITOPRO-PAYLOAD": payload,
         "X-BITOPRO-SIGNATURE": signature(payload)
-      }
+      }.merge!(tracking_header)
     end
   end
 end

data/lib/bitopro/version.rb

@@ -1,3 +1,3 @@
 module Bitopro
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitopro
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - niclin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ rubyforge_project:
 rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: bitopro-1.0.3
+summary: bitopro-1.0.4
 test_files:
 - spec/spec_helper.rb
 - spec/bitopro/config_spec.rb