cryptum 0.0.295 → 0.0.297

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8a973520cc84bc4c4b0863483876ebb7ef56c57074a689c39274e307d80901
-  data.tar.gz: 61a524bfd3fbd7c6c30e947ef39d51d9c5ac651233bb4283c007df39e740351d
+  metadata.gz: 5d651a0ca3efe974092a296cd303aab2f3fb330aae312211f8b67ee635cf5d72
+  data.tar.gz: 88b317dfbc646326c5837cb2e8e67c04b53b7e407bbc873bdcf2789a46fc7c5a
 SHA512:
-  metadata.gz: 8edfe820abd1bb769bc3497e23d199bd3e989e82bd0d67b281c547a1da8dd2acb8d7f349825fa183b91c8714f60257f5054731e4e02c65bfbc418b533d90e189
-  data.tar.gz: 26c845aa5fa48831c6a53c43b391212b6dcdcd87f4f8583d05a51bbfb823e8d7970f8b560eee7d93834efd98f9382d6ebe4e525d22bda441d65fbc2cc836cb98
+  metadata.gz: 225543e25f6e4cbd59bba1bddc1f3e83f431615d0fefffd48d30c3fd3a50b990c2f75fafdc124758fb198b3d7fa36aded12b5ba4b0804b36c5ee0350129e8ec5
+  data.tar.gz: 4900f66dc40bae7872776177afd2876e72293f99bc57bb1f54e1cce082287fad9ed2091f078c8443e036b4004fa5fb7e513f739824b4ac2fe0f0b5c3cec99ec8

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-08 03:39:16 UTC using RuboCop version 1.39.0.
+# on 2022-12-08 22:21:57 UTC using RuboCop version 1.40.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -73,6 +73,14 @@ Layout/MultilineOperationIndentation:
     - 'lib/cryptum/ui/order_execution.rb'
     - 'lib/cryptum/ui/ticker.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'lib/cryptum/ui/order_execution.rb'
+
 # Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
@@ -85,14 +93,14 @@ Layout/TrailingWhitespace:
     - 'lib/cryptum/ui/order_plan.rb'
     - 'lib/cryptum/ui/order_timer.rb'
 
-# Offense count: 85
+# Offense count: 87
 Lint/UselessAssignment:
   Enabled: false
 
 # Offense count: 47
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 407
+  Max: 419
 
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
@@ -108,22 +116,22 @@ Metrics/BlockNesting:
 # Offense count: 19
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 76
+  Max: 75
 
 # Offense count: 68
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 390
+  Max: 406
 
 # Offense count: 17
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 538
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 79
+  Max: 78
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
@@ -216,9 +224,9 @@ Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cryptum/matrix.rb'
 
-# Offense count: 21
+# Offense count: 27
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 216
+  Max: 222

data/Gemfile

@@ -25,7 +25,7 @@ gem 'rdoc', '6.5.0'
 gem 'require_all', '3.0.0'
 gem 'rest-client', '2.1.0'
 gem 'rspec', '3.12.0'
-gem 'rubocop', '1.39.0'
+gem 'rubocop', '1.40.0'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.15.0'
 gem 'ruby-prof', '1.4.3'

data/lib/cryptum/event/history.rb

@@ -28,12 +28,14 @@ module Cryptum
                     :order_plan_details_win_active,
                     :order_plan_index_offset,
                     :order_plan_max_rows_to_display,
+                    :order_plan_max_records_available_to_display,
                     :order_plan_row_to_select,
                     :order_plan_selected_data,
                     :order_execute_win_active,
                     :order_execute_details_win_active,
                     :order_execute_index_offset,
                     :order_execute_max_rows_to_display,
+                    :order_execute_max_records_available_to_display,
                     :order_execute_row_to_select,
                     :order_execute_selected_data,
                     :recalculate_order_plan
@@ -57,12 +59,14 @@ module Cryptum
         self.order_plan_details_win_active = false
         self.order_plan_index_offset = 0
         self.order_plan_max_rows_to_display = 6
+        self.order_plan_max_records_available_to_display = 6
         self.order_plan_row_to_select = order_plan_index_offset
         self.order_plan_selected_data = { color: :white }
         self.order_execute_win_active = false
         self.order_execute_details_win_active = false
         self.order_execute_index_offset = 0
         self.order_execute_max_rows_to_display = 6
+        self.order_execute_max_records_available_to_display = 6
         self.order_execute_row_to_select = order_execute_index_offset
         self.order_execute_selected_data = { color: :white }
         self.recalculate_order_plan = false

data/lib/cryptum/event/scroll.rb

@@ -45,16 +45,26 @@ module Cryptum
         terminal_win.key_press_event.key_esc = false
         terminal_win.key_press_event.key_down_arrow = false
 
+        order_book = event_history.order_book
+
         if event_history.order_plan_win_active
+          order_plan_length = order_book[:order_plan].length
+          last_row = order_plan_length - 1
+          event_history.order_plan_max_records_available_to_display = last_row if last_row < event_history.order_plan_max_rows_to_display
+
           event_history.order_plan_row_to_select += 1
-          event_history.order_plan_index_offset += 1 if event_history.order_plan_row_to_select > event_history.order_plan_max_rows_to_display
-          event_history.order_plan_row_to_select = event_history.order_plan_max_rows_to_display if event_history.order_plan_row_to_select > event_history.order_plan_max_rows_to_display
+          event_history.order_plan_index_offset += 1 if event_history.order_plan_row_to_select > event_history.order_plan_max_records_available_to_display
+          event_history.order_plan_row_to_select = event_history.order_plan_max_records_available_to_display if event_history.order_plan_row_to_select > event_history.order_plan_max_records_available_to_display
         end
 
         if event_history.order_execute_win_active
+          order_history_meta_length = order_book[:order_history_meta].length
+          last_row = order_history_meta_length - 1
+          event_history.order_execute_max_records_available_to_display = last_row if last_row < event_history.order_execute_max_rows_to_display
+
           event_history.order_execute_row_to_select += 1
-          event_history.order_execute_index_offset += 1 if event_history.order_execute_row_to_select > event_history.order_execute_max_rows_to_display
-          event_history.order_execute_row_to_select = event_history.order_execute_max_rows_to_display if event_history.order_execute_row_to_select > event_history.order_execute_max_rows_to_display
+          event_history.order_execute_index_offset += 1 if event_history.order_execute_row_to_select > event_history.order_execute_max_records_available_to_display
+          event_history.order_execute_row_to_select = event_history.order_execute_max_records_available_to_display if event_history.order_execute_row_to_select > event_history.order_execute_max_records_available_to_display
         end
       rescue StandardError => e
         raise e
@@ -99,16 +109,18 @@ module Cryptum
         terminal_win.key_press_event.key_esc = false
         terminal_win.key_press_event.key_page_down = false
 
+        order_book = event_history.order_book
+
         if event_history.order_plan_win_active
+          order_plan_length = order_book[:order_plan].length
           event_history.order_plan_row_to_select = 0
-          event_history.order_plan_index_offset += event_history.order_plan_max_rows_to_display + 1
-          event_history.order_plan_row_to_select = event_history.order_plan_max_rows_to_display if event_history.order_plan_row_to_select > event_history.order_plan_max_rows_to_display
+          event_history.order_plan_index_offset += event_history.order_plan_max_rows_to_display + 1 unless event_history.order_plan_index_offset > order_plan_length
         end
 
         if event_history.order_execute_win_active
+          order_history_meta_length = order_book[:order_history_meta].length
           event_history.order_execute_row_to_select = 0
-          event_history.order_execute_index_offset += event_history.order_execute_max_rows_to_display + 1
-          event_history.order_execute_row_to_select = event_history.order_execute_max_rows_to_display if event_history.order_execute_row_to_select > event_history.order_execute_max_rows_to_display
+          event_history.order_execute_index_offset += event_history.order_execute_max_rows_to_display + 1 unless event_history.order_execute_index_offset > order_history_meta_length
         end
       rescue StandardError => e
         raise e
@@ -149,16 +161,24 @@ module Cryptum
         terminal_win.key_press_event.key_esc = false
         terminal_win.key_press_event.key_end = false
 
+        order_book = event_history.order_book
+
         if event_history.order_plan_win_active
-          order_plan_length = event_history.order_book[:order_plan].length
-          event_history.order_plan_row_to_select = event_history.order_plan_max_rows_to_display
-          event_history.order_plan_index_offset = order_plan_length - event_history.order_plan_max_rows_to_display
+          order_plan_length = order_book[:order_plan].length
+          last_row = order_plan_length - 1
+          event_history.order_plan_max_records_available_to_display = last_row if last_row < event_history.order_plan_max_rows_to_display
+
+          event_history.order_plan_row_to_select = event_history.order_plan_max_records_available_to_display
+          event_history.order_plan_index_offset = order_plan_length - event_history.order_plan_max_records_available_to_display
         end
 
         if event_history.order_execute_win_active
-          order_history_meta_length = event_history.order_book[:order_history_meta].length
-          event_history.order_execute_row_to_select = event_history.order_plan_max_rows_to_display
-          event_history.order_execute_index_offset = order_history_meta_length - event_history.order_execute_max_rows_to_display
+          order_history_meta_length = order_book[:order_history_meta].length
+          last_row = order_history_meta_length - 1
+          event_history.order_execute_max_records_available_to_display = last_row if last_row < event_history.order_execute_max_rows_to_display
+
+          event_history.order_execute_row_to_select = event_history.order_execute_max_records_available_to_display
+          event_history.order_execute_index_offset = order_history_meta_length - event_history.order_execute_max_records_available_to_display
         end
       rescue StandardError => e
         raise e

data/lib/cryptum/event.rb

@@ -38,7 +38,7 @@ module Cryptum
       fiat_portfolio_file = "#{option_choice.repo_root}/order_books/#{fiat}_PORTFOLIO.json"
 
       # Determine if Summary UI needs updated data
-      Cryptum::Portfolio::Balance.refresh(
+      event_history = Cryptum::Portfolio::Balance.refresh(
         env: env,
         option_choice: option_choice,
         terminal_win: terminal_win,
@@ -53,7 +53,7 @@ module Cryptum
         terminal_win.market_trend_ui_resize = true
       end
 
-      Cryptum::UI::Portfolio.refresh(
+      event_history = Cryptum::UI::Portfolio.refresh(
         option_choice: option_choice,
         portfolio_win: terminal_win.portfolio_section,
         event_history: event_history,
@@ -91,7 +91,7 @@ module Cryptum
 
         market_trend_event = event_history.market_trend_event = event_history.event if event_history.event_type == :l2update
         market_trend_event = event_history.market_trend_event if terminal_win.market_trend_ui_resize
-        Cryptum::UI::MarketTrend.refresh(
+        event_history = Cryptum::UI::MarketTrend.refresh(
           option_choice: option_choice,
           market_trend_win: terminal_win.market_trend_section,
           event_history: event_history,
@@ -113,7 +113,7 @@ module Cryptum
       )
 
       unless event_history.order_plan_details_win_active
-        Cryptum::UI::OrderPlan.refresh(
+        event_history = Cryptum::UI::OrderPlan.refresh(
           option_choice: option_choice,
           order_plan_win: terminal_win.order_plan_section,
           env: env,
@@ -130,7 +130,7 @@ module Cryptum
       end
 
       if event_history.order_plan_details_win_active
-        Cryptum::UI::OrderPlanDetails.refresh(
+        event_history = Cryptum::UI::OrderPlanDetails.refresh(
           option_choice: option_choice,
           order_plan_details_win: terminal_win.order_plan_details_section,
           event_history: event_history,
@@ -139,7 +139,7 @@ module Cryptum
       end
 
       unless event_history.order_execute_details_win_active
-        Cryptum::UI::OrderExecution.refresh(
+        event_history = Cryptum::UI::OrderExecution.refresh(
           option_choice: option_choice,
           order_execute_win: terminal_win.order_execute_section,
           env: env,
@@ -152,7 +152,7 @@ module Cryptum
       end
 
       if event_history.order_execute_details_win_active
-        Cryptum::UI::OrderExecuteDetails.refresh(
+        event_history = Cryptum::UI::OrderExecuteDetails.refresh(
           option_choice: option_choice,
           order_execute_details_win: terminal_win.order_execute_details_section,
           event_history: event_history,

data/lib/cryptum/ui/market_trend.rb

@@ -90,6 +90,8 @@ module Cryptum
         )
 
         market_trend_win.refresh
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/order_execute_details.rb

@@ -290,6 +290,8 @@ module Cryptum
         )
 
         order_execute_details_win.refresh
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/order_execution.rb

@@ -412,12 +412,18 @@ module Cryptum
         )
 
         # ROWS 3-10
+        max_rows_to_display = event_history.order_execute_max_rows_to_display
+        max_records_available_to_display = event_history.order_execute_max_records_available_to_display
         first_row = event_history.order_execute_index_offset
-        last_row = first_row + event_history.order_execute_max_rows_to_display
+        last_row = first_row + max_rows_to_display
+        remaining_blank_rows = 0
         if last_row >= order_history_meta.length
           last_row = order_history_meta.length - 1
-          first_row = last_row - event_history.order_execute_max_rows_to_display
+          event_history.order_execute_max_records_available_to_display = last_row if last_row < max_rows_to_display
+          first_row = event_history.order_execute_max_records_available_to_display - last_row
+          # event_history.order_execute_index_offset = first_row
           event_history.order_execute_index_offset = first_row
+          remaining_blank_rows = max_rows_to_display - last_row
         end
 
         if order_history_meta.any?
@@ -451,7 +457,7 @@ module Cryptum
             profit_out = Cryptum.beautify_large_number(
               value: meta[:profit]
             )
-            plan_no = "#{meta[:plan_no]}|"
+            plan_no = meta[:plan_no]
 
             buy_created_at_hash_arr = order_history.select do |oh|
               oh[:id] == meta[:buy_order_id]
@@ -471,7 +477,7 @@ module Cryptum
             targ_tick = "$#{target_price_out}"
             profit = "|Profit: $#{meta[:profit]}"
 
-            order_exec_ln = "#{buy_created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}"
+            order_exec_ln = "#{buy_created_at}|#{invest}#{tick}#{size}#{tpm_out}#{targ_tick}#{profit}|#{plan_no}"
 
             order_execute_win.setpos(out_line_no, Cryptum::UI.col_first)
             order_execute_win.clrtoeol
@@ -485,8 +491,23 @@ module Cryptum
           event_history.order_execute_selected_data = selected_order
         end
 
+        # Clear to SUMMARY
+        # (Only Applicable if order_book[:order_history_meta] < max_rows_to_display)
+        out_line_no+=1
+        rows_to_blank = (out_line_no + remaining_blank_rows) - 1
+        (out_line_no..rows_to_blank).each do |clr_line|
+          out_line_no = clr_line
+          order_execute_win.setpos(clr_line, Cryptum::UI.col_first)
+          order_execute_win.clrtoeol
+          Cryptum::UI.colorize(
+            ui_win: order_execute_win,
+            color: :white,
+            style: :normal,
+            string: ''.ljust(col_just1, ' ')
+          )
+        end
+
         # ROW 10
-        out_line_no += 1
         order_execute_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_execute_win.clrtoeol
         Cryptum::UI.colorize(
@@ -521,6 +542,8 @@ module Cryptum
 
         # Reset Order Ready Boolean
         event_history.order_ready = false
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/order_plan.rb

@@ -22,7 +22,7 @@ module Cryptum
         fiat_portfolio_file = opts[:fiat_portfolio_file]
 
         ticker_price = event_history.order_book[:ticker_price].to_f
-        return unless ticker_price.positive?
+        return event_history unless ticker_price.positive?
 
         market_trend_color = plan_color = :white
 
@@ -331,12 +331,19 @@ module Cryptum
           plan_color = :cyan if market_trend_color == :red
           plan_color = :green if market_trend_color == :green
 
+          # ROWS 3-10
+          max_rows_to_display = event_history.order_plan_max_rows_to_display
+          max_records_available_to_display = event_history.order_plan_max_records_available_to_display
           first_row = event_history.order_plan_index_offset
-          last_row = first_row + event_history.order_plan_max_rows_to_display
+          last_row = first_row + max_rows_to_display
+          remaining_blank_rows = 0
           if last_row >= order_plan.length
             last_row = order_plan.length - 1
-            first_row = last_row - event_history.order_plan_max_rows_to_display
+            event_history.order_plan_max_records_available_to_display = last_row if last_row < max_rows_to_display
+            first_row = last_row - event_history.order_plan_max_records_available_to_display
             event_history.order_plan_index_offset = first_row
+            event_history.order_plan_index_offset = first_row
+            remaining_blank_rows = max_rows_to_display - last_row
           end
 
           selected_order = event_history.order_plan_selected_data
@@ -402,8 +409,23 @@ module Cryptum
           end
         end
 
-        # ROW 10
+        # Clear to SUMMARY
+        # (Only Applicable if order_book[:order_plan] < max_rows_to_display)
         out_line_no += 1
+        rows_to_blank = (out_line_no + remaining_blank_rows) - 1
+        (out_line_no..remaining_blank_rows).each do |clr_line|
+          out_line_no = clr_line
+          order_plan_win.setpos(clr_line, Cryptum::UI.col_first)
+          Cryptum::UI.colorize(
+            ui_win: order_plan_win,
+            color: :white,
+            style: :normal,
+            string: ''.ljust(col_just1, ' ')
+          )
+        end
+
+        # ROW 10
+        # out_line_no += 1
         order_plan_win.setpos(out_line_no, Cryptum::UI.col_first)
         order_plan_win.clrtoeol
         Cryptum::UI.colorize(
@@ -435,6 +457,8 @@ module Cryptum
         )
 
         order_plan_win.refresh
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/order_plan_details.rb

@@ -215,6 +215,8 @@ module Cryptum
         )
 
         order_plan_details_win.refresh
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/ui/portfolio.rb

@@ -204,6 +204,8 @@ module Cryptum
         )
 
         portfolio_win.refresh
+
+        event_history
       rescue Interrupt
         # Exit Gracefully if CTRL+C is Pressed During Session
         Cryptum.exit_gracefully(which_self: self)

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.295'
+  VERSION = '0.0.297'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.295
+  version: 0.0.297
 platform: ruby
 authors:
 - 0day Inc.
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 1.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 1.40.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement