cotcube-bardata 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db21286fcb1a011326db3d27333b3417ec497db6c5b005250e0dcc11d355839
-  data.tar.gz: 1eca29b839ae84d43c601f793501237cabc5de25363ea1bd55f6c707393d98ba
+  metadata.gz: a701303a258aaaf6050922e35eaacf53ce09fc43fc25778492ebb0b11fb9890c
+  data.tar.gz: 389709153f639e14638832e701f19a295181e1b81e26a8aa2ba2baf5c0587ee9
 SHA512:
-  metadata.gz: 3b46cbfbd3bf8117a5076691d9eaa8985ea551d822838e69cf4336a97161e77d3c0ab5b9427f957a08a219a19290d76832527cadbf2956d16053762443e8f25b
-  data.tar.gz: b082544cd2ac1c4a36a5e23a7ce2da9764fd9ce4fa7f09a72b28a579301eb007fda3ea8c8856cb5f9a9fea6756d2c6ee2a4d84224195840793ff49d1c7985855
+  metadata.gz: ee32360405d9597e82c6eb9d7678895ecd1c7db9872ed2ecdd8efbd4fc0cd2ec4cea21d2546e867a45af3655ab251a34d39855d7b7d7865458ea60ff8ba65811
+  data.tar.gz: 7a4387b1834d811a61e9bd04fbe0a263f7f4a730b2a15cb928fb956929acefa5097a502fa548c26356f5ccac051d7f037344c42e320400a8a5eab55266119b81

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.8 (January 27, 2021)
+  - in helpers, #extended_range_for_date: fixed comparison signs
+  - range_matrix: applied cops, noted appearance of Cotcube::Helpers.simple_series_stats
+  - cached: Fixing wrong comparison sign
+  - daily: slimmed down results for #continuous_overview
+
 ## 0.1.7 (January 14, 2021)
   - added :range parameter to :provide, hence to :provide_cached, :provide_daily
   - added forgotten module_functions

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/cotcube-bardata.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'parallel',           '~> 1'
   spec.add_dependency 'yaml',               '~> 0.1'
 
-  spec.add_development_dependency 'rake',  '>= 12'
+  # using ~> in favor of >= to overcome warning
+  spec.add_development_dependency 'rake',  '~> 13'
   spec.add_development_dependency 'rspec', '~>3.6'
-  spec.add_development_dependency 'yard', '~>0.9'
+  spec.add_development_dependency 'yard',  '~>0.9'
 end

data/lib/cotcube-bardata/cached.rb

@@ -59,7 +59,9 @@ module Cotcube
                      end
                    end
           return result
-        elsif File.mtime(file) < File.mtime(quarters_file)
+        elsif File.mtime(file) + 1.day > File.mtime(quarters_file)
+          puts "CACHE #{File.mtime(file)}\t#{file}"
+          puts "QUART #{File.mtime(quarters_file)}\t#{quarters_file}"
           result = if range.nil?
                      base
                    else
@@ -71,7 +73,9 @@ module Cotcube
           # rubocop:enable Metrics/BlockNesting
           return result
         else
-          puts "File #{file} exists, but is neither closed nor current. Running update.".colorize(:light_green)
+          # write a (positive warning, that the cache needs to be updated, as cached value is older
+          #   than one day but not closed
+          puts "File #{file} exists, but is neither closed nor current. Running update...".colorize(:light_green)
         end
       end
       begin

data/lib/cotcube-bardata/daily.rb

@@ -132,6 +132,13 @@ module Cotcube
       end
       data.reject! { |x| x[selector].empty? }
       result = data.group_by { |x| x[selector].first[:contract] }
+      result.each_key do |key|
+        result[key].map! do |x|
+          x[:volume].select! { |z| z[:contract] == key }
+          x[:oi].select!     { |z| z[:contract] == key }
+          x
+        end
+      end
       if human
         result.each do |k, v|
           next unless filter.nil? || v.first[selector].first[:contract][2..4] =~ (/#{filter}/)
@@ -152,5 +159,91 @@ module Cotcube
       end
       result
     end
+
+    def continuous_table(symbol: nil, id: nil,
+                         selector: :volume,
+                         filter: nil,
+                         debug: false)
+      raise ArgumentError, 'Selector must be either :volume or :oi' unless selector.is_a?(Symbol) &&
+                                                                           %i[volume oi].include?(selector)
+
+      sym = get_id_set(symbol: symbol, id: id)
+      if %w[R6 BJ GE].include? sym[:symbol]
+        puts "Rejecting to process symbol '#{sym[:symbol]}'."
+        return
+      end
+      id  = sym[:id]
+      dfm = lambda do |x, y = Date.today.year|
+        k = Date.strptime("#{y} #{x.negative? ? x + 366 : x}", '%Y %j')
+        k -= 1 while [0, 6].include?(k.wday)
+        k.strftime('%a, %Y-%m-%d')
+      rescue StandardError
+        puts "#{sym[:symbol]}\t#{x}\t#{y}"
+      end
+
+      ytoday = Date.today.yday
+      data = continuous_overview(id: id, selector: selector, filter: filter, human: false, config: init)
+             .reject { |k, _| k[-2..].to_i == Date.today.year % 2000 }
+             .group_by { |k, _| k[2] }
+      output_sent = 0
+      data.keys.sort.each do |month|
+        puts "Processing #{sym[:symbol]}#{month}" if debug
+        v0 = data[month]
+        ydays = v0.map { |_, v1| Date.parse(v1.last[:date]).yday }
+        fdays = v0.map { |_, v1| Date.parse(v1.first[:date]).yday }.sort
+        # if the last ml day nears the end of the year, we must fix
+        ydays.map! { |x| x > 350 ? x - 366 : x } if ydays.min < 50
+        fday  = fdays[fdays.size / 2]
+        yavg  = ydays.reduce(:+) / ydays.size
+        # a contract is proposed to use after fday - 1, but before ydays.min (green)
+        # it is warned to user after fday - 1 but before yavg - 1            (red)
+        # it is warned red >= yavg - 1 and <= yavg + 1
+        color = if (ytoday >= yavg - 1) && (ytoday <= yavg + 1)
+                  :light_red
+                elsif (ytoday > ydays.min) && (ytoday < yavg - 1)
+                  :light_yellow
+                elsif (ytoday >= (fday > yavg ? 0 : fday - 5)) && (ytoday <= ydays.min)
+                  :light_green
+                else
+                  :white
+                end
+        if debug || (color != :white)
+          # rubocop:disable Layout/ClosingParenthesisIndentation
+          puts "#{sym[:symbol]
+               }#{month
+             }\t#{format '%12s', sym[:type]
+             }\t#{ytoday
+              }/#{fday
+             }\t#{format '%5d', ydays.min
+             }: #{dfm.call(ydays.min)
+             }\t#{format '%5d', yavg
+             }: #{dfm.call(yavg)
+             }\t#{format '%5d', ydays.max
+             }: #{dfm.call(ydays.max)}".colorize(color)
+          output_sent += 1
+        end
+        next unless debug
+
+        v0.each do |contract, v1|
+          puts "\t#{contract
+               }\t#{v1.first[:date]
+               }\t#{Date.parse(v1.last[:date]).strftime('%a')
+               }, #{v1.last[:date]
+               } (#{Date.parse(v1.last[:date]).yday}"
+          # rubocop:enable Layout/ClosingParenthesisIndentation
+        end
+      end
+      case output_sent
+      when 0
+        puts "WARNING: No output was sent for symbol '#{sym[:symbol]}'.".colorize(:light_yellow)
+      when 1
+        # all ok
+        true
+      else
+        puts "---- #{output_sent} for #{sym[:symbol]} ---------------"
+
+      end
+      nil
+    end
   end
 end

data/lib/cotcube-bardata/helpers.rb

@@ -36,11 +36,11 @@ module Cotcube
             ' is assumed (starting 5 pm CT yesterday, ending 4 pm CT today)'.colorize(:light_yellow)
         end
         result = select_specific_date(date: starting, base: base)
-        result += base.select { |d| d[:datetime] > starting and d[:datetime] < ending.to_date }
+        result += base.select { |d| d[:datetime] >= starting and d[:datetime] < ending.to_date }
         result += select_specific_date(date: ending, base: base)
         result.uniq!
       else
-        result = base.select { |x| x[:datetime] >= starting and x[:datetime] < ending }
+        result = base.select { |x| x[:datetime] >= starting and x[:datetime] <= ending }
       end
       result
     end

data/lib/cotcube-bardata/range_matrix.rb

@@ -12,7 +12,7 @@ module Cotcube
     #   2. avg:
     #   3. lower: like median, but not at 1/2 but 1/4
     #   4. median:
-    #   5. upper: like median, bot not at 1/2 but 3/4
+    #   5. upper: like median, but not at 1/2 but 3/4
     #   6. max:
     # and columns:
     #   1.a) all days os the series
@@ -20,6 +20,8 @@ module Cotcube
     #   1.c) the last 200 days
     #   2.a-c) same with days reduced to weeks (c: 52 weeks)
     #   3.a-c) same with days reduced to months (c: 12 months)
+    #
+    # NOTE: there is now a new method Cotcube::Helpers.simple_series_stats, that should be used in favor.
     def range_matrix(symbol: nil, id: nil, print: false, dim: 0.05)
       # rubocop:disable Style/MultilineBlockChain
       sym = get_id_set(symbol: symbol, id: id)
@@ -38,36 +40,43 @@ module Cotcube
         target[period][:all_size]   =  source[period].size
         target[period][:all_avg]    = (source[period].map { |x| x[:range] }.reduce(:+) / source[period].size).round
         target[period][:all_lower]  =  source[period].sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (source[period].size * 1 / 4).round ]
-        target[period][:all_median] =  source[period].sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (source[period].size * 2 / 4).round ]
-        target[period][:all_upper]  =  source[period].sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (source[period].size * 3 / 4).round ]
+          x[:range]
+        end.map { |x| x[:range] }[ (source[period].size * 1 / 4).round ]
+
+        target[period][:all_median] = source[period].sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (source[period].size * 2 / 4).round ]
+
+        target[period][:all_upper] = source[period].sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (source[period].size * 3 / 4).round ]
+
         target[period][:all_max] = source[period].map { |x| x[:range] }.max
         target[period][:all_records] = source[period].sort_by do |x|
-                                         -x[:range]
-                                       end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
+          -x[:range]
+        end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
 
         tenth = (source[period].size * dim).round
         custom = source[period].sort_by { |x| x[:range] }[tenth..source[period].size - tenth]
+
         target[period][:dim_size]   =  custom.size
         target[period][:dim_avg]    = (custom.map { |x| x[:range] }.reduce(:+) / custom.size).round
         target[period][:dim_lower]  =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 1 / 4).round ]
-        target[period][:dim_median] =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 2 / 4).round ]
-        target[period][:dim_upper]  =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 3 / 4).round ]
-        target[period][:dim_max]    =  custom.map { |x| x[:range] }.max
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 1 / 4).round ]
+
+        target[period][:dim_median] = custom.sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 2 / 4).round ]
+
+        target[period][:dim_upper] = custom.sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 3 / 4).round ]
+
+        target[period][:dim_max] = custom.map { |x| x[:range] }.max
         target[period][:dim_records] = custom.sort_by do |x|
-                                         -x[:range]
-                                       end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
+          -x[:range]
+        end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
 
         range = case period
                 when :months
@@ -83,18 +92,18 @@ module Cotcube
         target[period][:rec_size]   =  custom.size
         target[period][:rec_avg]    = (custom.map { |x| x[:range] }.reduce(:+) / custom.size).round
         target[period][:rec_lower]  =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 1 / 4).round ]
-        target[period][:rec_median] =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 2 / 4).round ]
-        target[period][:rec_upper]  =  custom.sort_by do |x|
-                                         x[:range]
-                                       end.map { |x| x[:range] }[ (custom.size * 3 / 4).round ]
-        target[period][:rec_max]    =  custom.map { |x| x[:range] }.max
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 1 / 4).round ]
+        target[period][:rec_median] = custom.sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 2 / 4).round ]
+        target[period][:rec_upper] = custom.sort_by do |x|
+          x[:range]
+        end.map { |x| x[:range] }[ (custom.size * 3 / 4).round ]
+        target[period][:rec_max] = custom.map { |x| x[:range] }.max
         target[period][:rec_records] = custom.sort_by do |x|
-                                         -x[:range]
-                                       end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
+          -x[:range]
+        end.map { |x| { contract: x[:contract], range: x[:range] } }.take(5)
       end
 
       if print

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-bardata
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement