cryptum 0.0.296 → 0.0.298

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf9e8ff5a30bf0d5fec67e64e7e4129a6a27d243161f04b7ff0b6b08bbcb4461
-  data.tar.gz: bae6f468bb256f068bd7287f0e614776acf24bbf36543a103dba9be858b2b3ac
+  metadata.gz: 69d06a9abd94dc426eaabdddc720bbde8342c4ec6a88a8da70a5b7234b436bbd
+  data.tar.gz: 3cba0ca35d6ef1cf0b68310d0785498a2bb9c8eaf6561c207cd5950ef8d72125
 SHA512:
-  metadata.gz: 96c0366773165cc0d799e08976e3af8a9c734e6cef220dbae4ec13268102c78a5aebd0c4aafc54a1f007380c566997a08be47faa23a186acc9ad19f41e4806af
-  data.tar.gz: 421f86639fa6d674ba652f6ef3abc69518a5c0218ab6c57e1e4fc0a700a4f946e42c3ab3f9bd3cd5d569d73324eb3dc9977ee75ab0360960d3821e6dceec31cf
+  metadata.gz: c8d446c8b67ad4dded344e2c5935afd9333f2265b94203a56a396ffd90c5bfb6d874f8dcedd35d6f1c4d930c8729ffd0baadba9e7e2ba220958ee1c36ad8c576
+  data.tar.gz: 214f94202661ca2f5b77153b8c572b42b0c444ce3755b16a9262e2c8d6f74b9d03508d6e1c23f66b779c9988c8eafcca11cf04a40f5a7dcdf456237fbade97f8

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/lib/cryptum/api.rb

@@ -560,9 +560,10 @@ module Cryptum
         total_holdings
       )
 
-      File.open(fiat_portfolio_file, 'w') do |f|
-        f.puts fiat_portfolio.to_json
-      end
+      File.write(
+        fiat_portfolio_file,
+        JSON.pretty_generate(fiat_portfolio)
+      )
 
       crypto_portfolio
     rescue StandardError => e

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/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 if last_row < first_row
+        last_row = first_row + max_rows_to_display
+        remaining_blank_rows = 0
         if last_row >= order_history_meta.length
-          first_row = last_row - event_history.order_execute_max_rows_to_display
+          last_row = order_history_meta.length - 1
+          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(

data/lib/cryptum/ui/order_plan.rb

@@ -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(

data/lib/cryptum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.296
+  version: 0.0.298
 platform: ruby
 authors:
 - 0day Inc.