cotcube-bardata 0.1.15.4 → 0.1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c3d1d43865ad1b7bba959025aa38ecf0ea574a8a946740f8226aa06741e600
-  data.tar.gz: 4da3026ca588bd848648242c8f21d482e86bb8be72f4a6f0e45b543fca461e05
+  metadata.gz: e1ab9094e7e7e6c04a90f1f1a640b902de5a0c688403a5d79c53a7b3f11c9434
+  data.tar.gz: 16175de316f036ec9a930b43d700fc241999afaffca728bf2ba436470255c957
 SHA512:
-  metadata.gz: 1235c3ba86c1aa51cd0925912e8f60b07c898498070d86f00d45747aa3041b69039974f04524c4fec187f924bff495596ac0ec32d812d444f8cb5d2b8d223afe
-  data.tar.gz: a9c4753b1cb05598d18c9d0f62d4ecb652b4430ec84ee8ad9900d2cdf0d9bc5330e5b5a8b8b0fa6ff2dda82a72b1087b5f8c28d257b9ce3c6763dd22080c1681
+  metadata.gz: f549b77c54222c0424d0f96c20a43634ab18af6001efffbc27ef3a4d21ee56e4fe67e727399dbbce47335b82d7e3733350b7b5469a22acee970c682eefef1d0c
+  data.tar.gz: 5153e8ad6cfae659c0f538e42cf635b53a3e543bb41a0decc8daf9169f62bce92dd0f7cd8b2d7a71a983a953b5be57b1e2fff7e6679f14662d6369524b486ca0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.15.5 (November 08, 2021)
+  - decommissioned .get_id_set in favor of Cotcube::Helpers.get_id_set
+
 ## 0.1.15.4 (October 26, 2021)
   - daily: including the sourcing factor (:bcf) into provide_daily and continuous
 

data/VERSION

@@ -1 +1 @@
-0.1.15.4
+0.1.15.5

data/cotcube-bardata.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport',      '~> 6'
   spec.add_dependency 'colorize',           '~> 0.8'
-  spec.add_dependency 'cotcube-helpers',    '~> 0.1'
+  spec.add_dependency 'cotcube-helpers',    '~> 0.2'
   spec.add_dependency 'cotcube-indicators', '~> 0.1'
   spec.add_dependency 'httparty',           '~> 0.18'
   spec.add_dependency 'parallel',           '~> 1'

data/lib/cotcube-bardata/cached.rb

@@ -30,7 +30,7 @@ module Cotcube
       end
 
       headers = %i[contract datetime open high low close volume]
-      sym      = get_id_set(symbol: symbol, id: id, contract: contract)
+      sym      = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, contract: contract)
       contract = contract[-3..]
       dir      = "#{config[:data_path]}/cached/#{sym[:id]}_#{filter.to_s.downcase}"
       symlink  = "#{config[:data_path]}/cached/#{sym[:symbol]}_#{filter.to_s.downcase}"

data/lib/cotcube-bardata/daily.rb

@@ -33,7 +33,7 @@ module Cotcube
         range = (range_begin..range_end)
       end
 
-      sym = get_id_set(symbol: symbol, id: id, contract: contract)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, contract: contract)
       contract = contract[2..4] if contract.to_s.size == 5
       id = sym[:id]
       id_path   = "#{config[:data_path]}/daily/#{id}"
@@ -81,7 +81,8 @@ module Cotcube
       end
       data.map do |bar| 
         indicators.each do |k,v|
-          bar[k] = v.call(bar).round(rounding)
+          tmp = v.call(bar)
+          bar[k] = tmp.respond_to?(:round) ? tmp.round(rounding) : tmp
         end
       end unless indicators.empty?
       if range.nil?
@@ -101,7 +102,7 @@ module Cotcube
       measuring = lambda {|c| puts "[continuous] Time measured until '#{c}': #{(Time.now.to_f - measure.to_f).round(2)}sec" unless measure.nil? }
 
       measuring.call("Starting")
-      sym = get_id_set(symbol: symbol, id: id)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id)
       id  = sym[:id]
       symbol = sym[:symbol]
       ticksize = sym[:ticksize] 
@@ -175,7 +176,8 @@ module Cotcube
           p avg_bar if debug
           indicators.each do |k,v|
             print format('%12s:  ', k.to_s) if debug
-            avg_bar[k] = v.call(avg_bar).round(rounding)
+            tmp = v.call(avg_bar)
+            avg_bar[k] = tmp.respond_to?(:round) ? tmp.round(rounding) : tmp
             puts avg_bar[k] if debug
           end
           %i[tr atr5].each { |ind| 
@@ -236,7 +238,7 @@ module Cotcube
         %i[volume oi].include?(selector)
 
       measuring.call("Starting")
-      sym = get_id_set(symbol: symbol, id: id)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id)
       id  = sym[:id]
       # noinspection RubyNilAnalysis
       data = continuous(id: id, config: config, measure: measure).map do |x|
@@ -300,7 +302,7 @@ module Cotcube
         %i[volume oi].include?(selector)
 
       measuring.call("Entering function")
-      sym = get_id_set(symbol: symbol, id: id)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id)
       if %w[R6 BJ GE].include? sym[:symbol]
         puts "Rejecting to process symbol '#{sym[:symbol]}'.".light_red
         return []

data/lib/cotcube-bardata/eods.rb

@@ -4,7 +4,7 @@ module Cotcube
   # Missing top level documentation
   module Bardata
     def most_liquid_for(symbol: nil, id: nil, date: last_trade_date, config: init)
-      id = get_id_set(symbol: symbol, id: id, config: config)[:id]
+      id = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, config: config)[:id]
       provide_eods(id: id, dates: date, contracts_only: true).first
     end
 
@@ -15,7 +15,7 @@ module Cotcube
                                     date: last_trade_date,
                                     filter: :volume_part,
                                     age: 1.hour)
-      sym  = get_id_set(symbol: symbol, id: id) if symbol || id
+      sym  = Cotcube::Helpers.get_id_set(symbol: symbol, id: id) if symbol || id
       # noinspection RubyScope
       eods = provide_eods(id: sym.nil? ? nil : sym[:id], config: config, dates: date, filter: filter)
       result = []
@@ -62,7 +62,7 @@ module Cotcube
       end
 
       symbol = contract[0..1] if contract.to_s.size == 5
-      sym = get_id_set(symbol: symbol, id: id, config: config) if symbol || id
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, config: config) if symbol || id
       # if no id can be clarified from given arguments, return all matching contracts from all available symbols
       # raise ArgumentError, "Could not guess :id or :symbol from 'contract: #{contract}', please clarify." if id.nil?
       raise ArgumentError, ':filter must be in [:volume_part, :oi_part]' unless %i[volume_part oi_part].include? filter

data/lib/cotcube-bardata/helpers.rb

@@ -45,42 +45,6 @@ module Cotcube
       result
     end
 
-    def get_id_set(symbol: nil, id: nil, contract: nil, config: init)
-      contract = contract.to_s.upcase if contract.is_a? Symbol
-      id       =       id.to_s.upcase if       id.is_a? Symbol
-      symbol   =   symbol.to_s.upcase if   symbol.is_a? Symbol
-
-      if contract.is_a?(String) && (contract.length == 5)
-        c_symbol = contract[0..1]
-        if (not symbol.nil?) && (symbol != c_symbol)
-          raise ArgumentError,
-                "Mismatch between given symbol #{symbol} and contract #{contract}"
-        end
-
-        symbol = c_symbol
-      end
-
-      unless symbol.nil?
-        sym = symbols.select { |s| s[:symbol] == symbol.to_s.upcase }.first
-        if sym.nil? || sym[:id].nil?
-          raise ArgumentError,
-                "Could not find match in #{config[:symbols_file]} for given symbol #{symbol}"
-        end
-        raise ArgumentError, "Mismatching symbol #{symbol} and given id #{id}" if (not id.nil?) && (sym[:id] != id)
-
-        return sym
-      end
-      unless id.nil?
-        sym = symbols.select { |s| s[:id] == id.to_s }.first
-        if sym.nil? || sym[:id].nil?
-          raise ArgumentError,
-                "Could not find match in #{config[:symbols_file]} for given id #{id}"
-        end
-        return sym
-      end
-      raise ArgumentError, 'Need :id, :symbol or valid :contract '
-    end
-
     def compare(contract:, format: '%5.2f')
       format = "%#{format}" unless format[0] == '%'
       daily = provide(contract: contract, interval: :daily)

data/lib/cotcube-bardata/provide.rb

@@ -17,7 +17,7 @@ module Cotcube
                 force_update: false,
                 force_recent: false)
 
-      sym = get_id_set(symbol: symbol, id: id, contract: contract, config: config)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, contract: contract, config: config)
 
       case interval
       when :quarters, :hours, :quarter, :hour

data/lib/cotcube-bardata/quarters.rb

@@ -16,7 +16,7 @@ module Cotcube
         raise ArgumentError, "Contract '#{contract}' is bogus, should be like 'M21' or 'ESM21'"
       end
 
-      sym = get_id_set(symbol: symbol, id: id, contract: contract)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id, contract: contract)
 
       contract = contract[2..4] if contract.to_s.size == 5
       id = sym[:id]

data/lib/cotcube-bardata/range_matrix.rb

@@ -24,7 +24,7 @@ module Cotcube
     def range_matrix(symbol: nil, id: nil, base: nil, print: false, dim: 0.05, days_only: false, last_n: 60, &block)
       # rubocop:disable Style/MultilineBlockChain
       symbol ||= base.last[:contract][0..1] if id.nil?
-      sym = get_id_set(symbol: symbol, id: id)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id)
       source = {}
       target = {}
       if base.nil?

data/lib/cotcube-bardata/trading_hours.rb

@@ -28,7 +28,7 @@ module Cotcube
         end
       end
 
-      sym = get_id_set(symbol: symbol, id: id)
+      sym = Cotcube::Helpers.get_id_set(symbol: symbol, id: id)
 
       file = "#{config[:data_path]}/trading_hours/#{sym[:symbol]}_#{filter}.csv"
       puts "Trying to use #{file} for #{symbol} + #{filter}" if debug

data/lib/cotcube-bardata.rb

@@ -62,10 +62,6 @@ module Cotcube
                     :range_matrix,
                     # create an array of ranges based on specified source data
                     :trading_hours,
-                    # receive id / symbol information on an uncertain set of parameters
-                    # TODO: decommision sppearance of get_id_set and symbols in cotcube::bardata
-                    :get_id_set,
-                    :symbols,
                     #
                     :select_specific_date,
                     :extended_select_for_range,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-bardata
 version: !ruby/object:Gem::Version
-  version: 0.1.15.4
+  version: 0.1.15.5
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: cotcube-indicators
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Functions to provide bardata; and some simple time series aggregations