watchcow 0.1.12 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9278d3d386832cfad1db4406ee6c5b0343c2dd096135aaedd9a4cf98c6ff59cd
-  data.tar.gz: c098df95b942ed5ba925f5af509f3845378d79aca20103d6d11d7830711f3439
+  metadata.gz: 1df0dc2cf2e5b29f6a7823afbfb19bf5f5d457cf9b81f06d289130cdf15e4eb2
+  data.tar.gz: 4041b2e5e30678b67db33958b6c86c7399ba01018cef6f5c364899976a9f1789
 SHA512:
-  metadata.gz: fd615fc5b8559d39e6f05d5f3f29da5742b0b6e5e25398b2446557e7e8bfc8f37708fafde6cc6ec743b885a27171eebbff077386db05ff0183dec45e8203fa89
-  data.tar.gz: 6d93a1703a8bc79de7e84ba126de8e39ddb435780b5a9d4f937b755dd17ed91d707de013d6ca5e1eb2d55ecb18136f02e3534b28166a6c9758b12a7d49620580
+  metadata.gz: 6e59700b75480c9abb161c0a495f51461918d0e574b531e77f48c3c31bb480836b9356cc08dd7b2c494ee4dcfeb4788c1887a1fcb496bdb42da4176fbfd2c31b
+  data.tar.gz: bcf6f472b21b27f9ea62a029cad0e38a4d6a9953ccb31a5837686ace18b974bb4da19823a1fb7f36857a9dea738ea25216e276fdfe9e53d3d6322a556d14dae1

data/lib/watchcow/api_symbol.rb

@@ -1,20 +1,6 @@
 module Watchcow
   module ApiSymbol
     class << self
-      def contract_list
-        %w{btc eth link dot eos trx ada ltc bch xrp bsv etc fil}
-      end
-
-      def dm_types
-        data = mapping.select do |k, v|
-          v.in? current_types
-        end.keys
-      end
-
-      def current_types
-        Watchcow::ContractInfo.current_contracts
-      end
-
       def mapping
         {
           'cq' => 'quarter',

data/lib/watchcow/contract_info.rb

@@ -9,7 +9,10 @@ module Watchcow
       end
 
       def current_contracts
-        call.dig('data').map{|x| x["contract_type"]}.uniq
+        types = call.dig('data').group_by{|x| x["symbol"]}
+        types.map do |k, v|
+          { k=> v.map{|x| Watchcow::ApiSymbol.mapping.invert[x["contract_type"]]}}
+        end.inject(&:merge)
       end
     end
   end

data/lib/watchcow/rate.rb

@@ -5,40 +5,22 @@ module Watchcow
     class << self
       def call coin=nil
         results = []
-        coin_list = coin.nil? ? Watchcow::ApiSymbol.contract_list : [coin]
-        coin_list.each do |coin|
-          Watchcow::ApiSymbol.dm_types.each do |t|
+        coin_list = coin.nil? ? Watchcow::ContractInfo.current_contracts : Watchcow::ContractInfo.current_contracts.select{|k, v| k == coin.upcase}
+        coin_list.each do |coin, contract_types|
+          contract_types.each do |t|
             dm_symbol = {symbol: "#{coin}_#{t}"}
-            spot_symbol = {symbol: "#{coin}usdt"}
+            spot_symbol = {symbol: "#{coin.downcase}usdt"}
             begin
               dm_result = Watchcow::MarketDepth.call(params: dm_symbol, k: :future)
-              # puts dm_symbol.dig(:symbol)
               spot_result = Watchcow::MarketDepth.call(params: spot_symbol, k: :spot)
-              # puts spot_symbol.dig(:symbol)
               dm_result = JSON.parse dm_result
-              days_remain = self.days_remain_of(coin, t)
+              days_remain = 
+              n = 1
             rescue
-              redo
+              n += 1
+              redo if n <= 3
             end
-
-            dm_first_bid = dm_result.dig('tick', 'bids')[0][0].to_f
-            spot_first_bid = spot_result.dig('tick', 'bids')[0][0].to_f
-            margin_annual = (((dm_first_bid - spot_first_bid) / spot_first_bid) / days_remain * 365 * 100).round(6)
-            margin_expect = margin_annual / 365 * days_remain
-            base_gap = dm_first_bid - spot_first_bid
-            gap_rate = base_gap / dm_first_bid * 100
-            real_margin_expect = (1.0 / spot_first_bid - 1.0 / dm_first_bid) * spot_first_bid * 100
-            result = {
-              coin: "#{coin}_#{t}",
-              margin: margin_annual,
-              days: days_remain,
-              expected_margin: margin_expect,
-              real_margin_expected: real_margin_expect,
-              dm_first_bid: dm_first_bid,
-              spot_first_bid: spot_first_bid,
-              base_gap: base_gap,
-              gap_rate: gap_rate
-            }
+            result = cals dm_result, spot_result, coin, t
             results.push(result)
           end
         end
@@ -54,14 +36,38 @@ module Watchcow
         }
       end
 
+      private
+
       def days_remain_of symbol, t
-        @contract_info = Watchcow::ContractInfo.call
-        line = @contract_info.dig('data').select do |h|
+        contract_info = Watchcow::ContractInfo.call
+        line = contract_info.dig('data').select do |h|
           h.dig('symbol') == symbol.upcase && h.dig('contract_type') == Watchcow::ApiSymbol.mapping[t]
         end.first
         contract_time = "#{line.dig("delivery_date").to_date.to_s} 16:00".in_time_zone('Asia/Chongqing').to_time
         ((contract_time - Time.now.to_time) / 1.hours) / 24
       end
+
+      def cals dm_result, spot_result, coin, t
+        days_remain = days_remain_of(coin, t)
+        dm_first_bid = dm_result.dig('tick', 'bids')[0][0].to_f
+        spot_first_bid = spot_result.dig('tick', 'bids')[0][0].to_f
+        margin_annual = (((dm_first_bid - spot_first_bid) / spot_first_bid) / days_remain * 365 * 100).round(6)
+        margin_expect = margin_annual / 365 * days_remain
+        base_gap = dm_first_bid - spot_first_bid
+        gap_rate = base_gap / dm_first_bid * 100
+        real_margin_expect = (1.0 / spot_first_bid - 1.0 / dm_first_bid) * spot_first_bid * 100
+        result = {
+          coin: "#{coin}_#{t}",
+          margin: margin_annual,
+          days: days_remain,
+          expected_margin: margin_expect,
+          real_margin_expected: real_margin_expect,
+          dm_first_bid: dm_first_bid,
+          spot_first_bid: spot_first_bid,
+          base_gap: base_gap,
+          gap_rate: gap_rate
+        }
+      end
     end
   end
 end

data/lib/watchcow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Watchcow
-  VERSION = "0.1.12"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchcow
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.12
 platform: ruby
 authors:
 - DrinE Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty