stocks_exchange_api_client 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f20bbdfb95093e37810f7c8e6043735bd1541b117a853e2a9d360fc8220f74
-  data.tar.gz: 599d208824ddde9fa115213a0568fd5205d9d5a86caa7e62f3822fbc585f4916
+  metadata.gz: a3b9f4a242d3ee4b520912a52f1081c358b5ea19beb300b4d47a3aab67a798d4
+  data.tar.gz: ffda3c3fce465e7e6b76870322d7586029222e81eb4cb2429f06c09f344f0e5c
 SHA512:
-  metadata.gz: 330b054d1086b65df58dd91937139f606756fae43ab3cc0cb0f084e39bb2f32f5784e42c191d2f294accd4152cfb542e91c48a1fd73cfb1f9ffe89721361571b
-  data.tar.gz: 59b538f6a5ec4d5d97059947af9f5a94f00664aa0f5310d1e1bbbbbe43f9a7ae174ca90e88fc557363f2f0431a42b6af2faaafe5bde14ab54b2e8bd99a4b5f17
+  metadata.gz: '09413046673714035f8509efa697c16b463997bbeb2591cf0b1a4468f347ddada2d1e4f63f3f255c984afec29874da7a2857444e953aff74a8062d9778bb3d4a'
+  data.tar.gz: 75b96003a8fad63a4968007f704a341dc217e9ccc6527c068105d240a463473c04e5072805378f14909c1f149bb194155ba0e405b9fc6f63b1c18cd48568990d

data/README.md

@@ -12,7 +12,6 @@ STEX (former Stocks.Exchange) provides all the core exchange functionality, and
 ## General
 The base URL for all the requests other than public methods is 
 ```
-https://app.stocks.exchange/api2
 https://app.stex.com/api2
 https://api3.stex.com
 ```

data/lib/stocks_exchange_api_client.rb

@@ -115,31 +115,36 @@ module StocksExchangeApiClient
     end
 
     def get_token
-      if File.exist?(JSON_SETTINGS)
-        current_token = JSON.parse(File.read(JSON_SETTINGS))
-      else
-        current_token = {'access_token' => configuration.option[:token_object][:access_token],
-                         'refresh_token' => configuration.option[:token_object][:refresh_token],
-                         'expires_in' => nil,
-                         'expires_in_date' => nil}
-      end
-      if !current_token.nil? && !current_token['expires_in_date'].nil?
-        return current_token['access_token'] if DateTime.parse(current_token['expires_in_date']).to_datetime > DateTime.now.to_datetime
+      if !configuration.s2s
+        if File.exist?(JSON_SETTINGS)
+                current_token = JSON.parse(File.read(JSON_SETTINGS))
+              else
+                current_token = {'access_token' => configuration.option[:token_object][:access_token],
+                                 'refresh_token' => configuration.option[:token_object][:refresh_token],
+                                 'expires_in' => nil,
+                                 'expires_in_date' => nil}
+              end
+              if !current_token.nil? && !current_token['expires_in_date'].nil?
+                return current_token['access_token'] if DateTime.parse(current_token['expires_in_date']).to_datetime > DateTime.now.to_datetime
+              end
+              begin
+                response = HTTParty.post(configuration.option[:access_token_url], body: {
+                    grant_type: 'refresh_token',
+                    refresh_token: current_token['refresh_token'],
+                    client_id: configuration.option[:client_id],
+                    client_secret: configuration.option[:client_secret],
+                    scope: configuration.option[:scope]
+                }).body
+                current_token = JSON.parse(response)
+                current_token['expires_in_date'] = Time.at(Time.now.to_i + current_token['expires_in']).to_s
+                File.write(JSON_SETTINGS, current_token.to_json)
+                current_token['access_token']
+              rescue StandardError => e
+                puts "Rescued: #{e.inspect}"
+              end
       end
-      begin
-        response = HTTParty.post(configuration.option[:access_token_url], body: {
-            grant_type: 'refresh_token',
-            refresh_token: current_token['refresh_token'],
-            client_id: configuration.option[:client_id],
-            client_secret: configuration.option[:client_secret],
-            scope: configuration.option[:scope]
-        }).body
-        current_token = JSON.parse(response)
-        current_token['expires_in_date'] = Time.at(Time.now.to_i + current_token['expires_in']).to_s
-        File.write(JSON_SETTINGS, current_token.to_json)
-        current_token['access_token']
-      rescue StandardError => e
-        puts "Rescued: #{e.inspect}"
+      if configuration.s2s
+        configuration.option[:token_object][:access_token]
       end
     end
 

data/lib/stocks_exchange_api_client/configuration.rb

@@ -1,12 +1,20 @@
+require 'stocks_exchange_api_client/errors/configuration_error'
+
 module StocksExchangeApiClient
   class Configuration
-    URL_V2 = 'https://app.stocks.exchange/api2'.freeze
+    URL_V2 = 'https://app.stex.com/api2'.freeze
     URL_V3 = 'https://api3.stex.com'.freeze
-    attr_accessor :url, :option, :use_version
+    attr_accessor :url, :option, :use_version, :s2s
 
-    def initialize
-      @use_version ||= 2
-      @url ||= URL_V2
+    def initialize(url: URL_V2, option: {}, use_version: 2, s2s: false)
+      if use_version == 3
+        @url||= URL_V3
+      else
+        @url||= URL_V3
+      end
+      @option||= option
+      @use_version||= use_version
+      @s2s||= s2s
     end
 
     def validate!
@@ -15,11 +23,16 @@ module StocksExchangeApiClient
           raise Errors::ConfigurationError
         end
       end
-      if use_version == 3
+      if use_version == 3 && !s2s
         unless option[:client_id] && option[:client_secret] && option[:token_object][:access_token] && option[:token_object][:refresh_token]
           raise Errors::ConfigurationError
         end
       end
+      if use_version == 3 && s2s
+          unless option[:token_object][:access_token]
+            raise Errors::ConfigurationError
+          end
+      end
     end
   end
 end

data/lib/stocks_exchange_api_client/errors/configuration_error.rb

@@ -2,7 +2,7 @@ module StocksExchangeApiClient
   module Errors
     class ConfigurationError < StandardError
       def initialize
-        super 'Not all config vars were set. Stocks Exchange requires API key and API secret. Get this fields on url https://app.stocks.exchange/en/profile/settings'
+        super 'Not all config vars were set. Stocks Exchange requires API key and API secret. Get this fields on url https://app.stex.com/profile/settings'
       end
     end
   end

data/lib/stocks_exchange_api_client/version.rb

@@ -1,3 +1,3 @@
 module StocksExchangeApiClient
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stocks_exchange_api_client
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Stocks Exchange
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl