watchcow 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4152adcf0ced5a26e3befac32831afde5897b5addcb9e05270e57980148448e1
-  data.tar.gz: 7704db9e1dd1fcf40ef75ef7324375f17e75382369f0c3172bd15ce242ebf206
+  metadata.gz: 9278d3d386832cfad1db4406ee6c5b0343c2dd096135aaedd9a4cf98c6ff59cd
+  data.tar.gz: c098df95b942ed5ba925f5af509f3845378d79aca20103d6d11d7830711f3439
 SHA512:
-  metadata.gz: bbae037e0d859d8fe567485effdfbf9e53b9408715aaa27706c250c4fb7eef8645e646ec9215636af1212b8ef01c363fb0127b9f0a6d5e659ceaf0f41b35d226
-  data.tar.gz: 2d6ec45fc468831b5c82da5d1bb694b972ef633c2d96e7f5914bf57eea57f48bc39d0e97d8f4e542cdc71f852cf415ffe10633e902da945f6078f06621f4a523
+  metadata.gz: fd615fc5b8559d39e6f05d5f3f29da5742b0b6e5e25398b2446557e7e8bfc8f37708fafde6cc6ec743b885a27171eebbff077386db05ff0183dec45e8203fa89
+  data.tar.gz: 6d93a1703a8bc79de7e84ba126de8e39ddb435780b5a9d4f937b755dd17ed91d707de013d6ca5e1eb2d55ecb18136f02e3534b28166a6c9758b12a7d49620580

data/Gemfile.lock

@@ -1,23 +1,29 @@
 PATH
   remote: .
   specs:
-    watchcow (0.0.1)
+    watchcow (0.1.11)
       httparty (~> 0.14, >= 0.14.0)
       pry-rails (~> 0.3.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.1.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     coderay (1.1.3)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.5)
     diff-lcs (1.4.4)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    minitest (5.14.3)
     multi_xml (0.6.0)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -44,11 +50,17 @@ GEM
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 1.5.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-17
 
 DEPENDENCIES
+  activesupport (~> 6.1, >= 6.1.3.2)
+  httparty (= 0.14.0)
+  pry-rails
   rake (~> 13.0)
   rspec (~> 3.0)
   watchcow!

data/lib/watchcow/api_symbol.rb

@@ -6,7 +6,22 @@ module Watchcow
       end
 
       def dm_types
-        %w{nq cq cw nw}
+        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',
+          'nq' => 'next_quarter',
+          'nw' => 'next_week',
+          'cw' => 'this_week'
+        }
       end
     end
   end

data/lib/watchcow/contract_info.rb

@@ -7,6 +7,10 @@ module Watchcow
       def call
         JSON.parse(HTTParty.get(URL))
       end
+
+      def current_contracts
+        call.dig('data').map{|x| x["contract_type"]}.uniq
+      end
     end
   end
 end

data/lib/watchcow/market_depth.rb

@@ -5,7 +5,6 @@ module Watchcow
     URLPRO = "https://api.huobi.pro/market/depth"
 
     class << self
-      
       # Spot market or Futures market all goes here
       def call(params:, k:)
         url = target_url(params, k)

data/lib/watchcow/rate.rb

@@ -2,12 +2,6 @@ require 'active_support/core_ext'
 
 module Watchcow
   class Rate
-    KEYS = {
-      'cq' => 'quarter',
-      'nq' => 'next_quarter',
-      'nw' => 'next_week',
-      'cw' => 'this_week'
-    }
     class << self
       def call coin=nil
         results = []
@@ -26,14 +20,13 @@ module Watchcow
             rescue
               redo
             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
-            binding.pry if days_remain <= 0
             real_margin_expect = (1.0 / spot_first_bid - 1.0 / dm_first_bid) * spot_first_bid * 100
             result = {
               coin: "#{coin}_#{t}",
@@ -64,7 +57,7 @@ module Watchcow
       def days_remain_of symbol, t
         @contract_info = Watchcow::ContractInfo.call
         line = @contract_info.dig('data').select do |h|
-          h.dig('symbol') == symbol.upcase && h.dig('contract_type') == KEYS[t]
+          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

data/lib/watchcow/version.rb

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

metadata

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