aro 0.2.1 → 0.2.2

data/sys/{models/deck.rb → aro/models/teck.rb}

@@ -1,20 +1,19 @@
 =begin
 
-  deck.rb
+  teck.rb
 
-  deck object.
+  teck object.
 
   by i2097i
 
 =end
 
 require :base64.to_s
-require_relative :"../shr/t".to_s
 
-class Aro::Deck < ActiveRecord::Base
-  has_many :logs
+class Aro::Teck < ActiveRecord::Base
+  has_many :tlogs
 
-  DECK_FILE = :".deck"
+  DECK_FILE = :".teck"
   CARD_DELIM = :","
 
   before_create :populate_cards
@@ -22,24 +21,24 @@ class Aro::Deck < ActiveRecord::Base
 
   def self.make(new_name)
     return nil unless Aro::Mancy.is_initialized?
-    Aro::Db.new
-    new_deck = Aro::Deck.create(name: new_name)
-    Aro::Deck.select_deck(new_deck) if Aro::Deck.current_deck.nil?
-    new_deck
+    Aro::Db.load
+    new_teck = Aro::Teck.create(name: new_name)
+    Aro::Teck.select_teck(new_teck) if Aro::Teck.current_teck.nil?
+    new_teck
   end
 
   def self.fresh_cards
-    I18n.t("cards.index").map{|c| "+#{c}"}.join(Aro::Deck::CARD_DELIM.to_s)
+    I18n.t("cards.index").map{|c| "+#{c}"}.join(Aro::Teck::CARD_DELIM.to_s)
   end
 
   def populate_cards
-    self.cards = Aro::Deck.fresh_cards
+    self.cards = Aro::Teck.fresh_cards
   end
 
   def generate_log
-    prev_cards = Base64::decode64(logs.last.card_data) if logs.any?
+    prev_cards = Base64::decode64(tlogs.last.card_data) if tlogs.any?
     if (prev_cards.present? && prev_cards != cards) || (prev_cards.nil? || prev_cards.empty?)
-      logs.create(
+      tlogs.create(
         card_data: Base64::encode64(cards || ""),
         drawn_data: Base64::encode64(drawn || "")
       )
@@ -47,28 +46,28 @@ class Aro::Deck < ActiveRecord::Base
   end
 
   def self.display_selection_menu
-    unless Aro::Deck.any?
-      Aro::P.say(I18n.t("cli.messages.no_decks"))
+    unless Aro::Teck.any?
+      Aro::P.say(I18n.t("cli.messages.no_tecks"))
       exit(CLI::EXIT_CODES[:SUCCESS])
     end
-    c_d = Aro::Deck.current_deck
-    Aro::Deck.all.each do |d|
+    c_d = Aro::Teck.current_teck
+    Aro::Teck.all.each do |d|
       Aro::P.say("#{d.id == c_d.id ? :*.to_s : " "}#{d.id}): #{d.name}")
     end
   end
 
-  def self.select_deck(deck)
-    return unless deck.present?
-    Aro::P.say(I18n.t("cli.messages.deck_selected", name: deck.name, room: Aro::Mancy::aro_mancy_name))
-    File.open(Aro::Deck::DECK_FILE.to_s, "w") do |file|
-      file.write(deck.id)
+  def self.select_teck(teck)
+    return unless teck.present?
+    Aro::P.say(I18n.t("cli.messages.teck_selected", name: teck.name, room: Aro::Mancy::aro_mancy_name))
+    File.open(Aro::Teck::DECK_FILE.to_s, "w") do |file|
+      file.write(teck.id)
     end
   end
 
-  def self.current_deck
+  def self.current_teck
     if File.exist?(DECK_FILE.to_s)
-      current_deck_id = File.read(DECK_FILE.to_s)
-      return Aro::Deck.find_by(id: current_deck_id)
+      current_teck_id = File.read(DECK_FILE.to_s)
+      return Aro::Teck.find_by(id: current_teck_id)
     end
   end
 
@@ -76,54 +75,54 @@ class Aro::Deck < ActiveRecord::Base
     card.gsub(/[+-]/, "").strip
   end
 
-  def show(count_n: Aro::Mancy::S, order_o: Aro::Log::ORDERING[:DESC])
+  def show(count_n: Aro::Mancy::S, order_o: Aro::Tlog::ORDERING[:DESC])
     unless count_n.kind_of?(Numeric) && count_n.to_i > Aro::Mancy::O
       if count_n&.to_s&.to_sym == Aro::Mancy::ALL
-        count_n = logs.count
+        count_n = tlogs.count
       else
         count_n = Aro::Mancy::S
       end
     end
-    count_n = [[Aro::Mancy::S, count_n.to_i].max, logs.count].min
+    count_n = [[Aro::Mancy::S, count_n.to_i].max, tlogs.count].min
     Aro::V.say("count_n: #{count_n}")
     Aro::V.say("order_o: #{order_o}")
 
-    unless Aro::Log::ORDERING.values.include?(order_o)
+    unless Aro::Tlog::ORDERING.values.include?(order_o)
       Aro::P.say(I18n.t("cli.warnings.invalid_order"))
-      order_o = Aro::Log::ORDERING[:DESC]
+      order_o = Aro::Tlog::ORDERING[:DESC]
     end
 
     # perform query
-    h_logs = logs.order(created_at: order_o).first(count_n)
+    tlog_records = tlogs.order(created_at: order_o).first(count_n)
 
     # todo: this is doing more work than it needs to. needs debugging.
-    # Aro::V.say("h_logs.count: #{h_logs.count}")
+    # Aro::V.say("tlog_records.count: #{tlog_records.count}")
 
     # for now tests just expect text output
-    return h_logs if Aro::Config.is_test?
+    return tlog_records if Aro::Config.is_test?
 
     Aro::D.say(I18n.t("cli.messages.showing", name: name, count: count_n, order: order_o))
 
     Aos::Vw::Game.show_game({
-      deck: self,
-      h_logs: h_logs,
+      teck: self,
+      tlog_records: tlog_records,
       count_n: count_n,
       order_o: order_o
     })
   end
 
   def explore
-    # allows user to browse each card in the current deck.
+    # allows user to browse each card in the current teck.
     answer = Aro::P.p.select(
       Aro::Mancy::PS1.to_s + I18n.t("cli.messages.choose_card"),
       # formatted for tty-prompt gem
-      cards.split(Aro::Deck::CARD_DELIM.to_s).map{|c| [I18n.t("cards.#{Aro::Deck.card_strip(c)}.name"), c]}.to_h,
+      cards.split(Aro::Teck::CARD_DELIM.to_s).map{|c| [I18n.t("cards.#{Aro::Teck.card_strip(c)}.name"), c]}.to_h,
       per_page: Aro::Config.display_configuration[:HEIGHT] - Aro::Mancy::S,
       cycle: true,
       default: Aro::Mancy::S
     )
     # {name: "four of swords", tag_list: ["lord of rest from strife", "libra", "jupiter", "introspection", "recuperation", "regain strength", "rest", "solitude", "stability"], reversed_tag_list: ["lord of rest from strife", "libra", "jupiter", "burnt out", "inundated", "need a break", "overwhelmed"], summary: "", reversed_summary: ""}
-    definition = I18n.t("cards.#{Aro::Deck.card_strip(answer)}")
+    definition = I18n.t("cards.#{Aro::Teck.card_strip(answer)}")
     indent = Aro::Mancy::N
     Aro::P.say(definition[:name])
     Aro::P.say(definition[:summary])
@@ -135,27 +134,27 @@ class Aro::Deck < ActiveRecord::Base
   end
 
   def shuffle
-    # shuffles the current deck and generates a log record.
-    update(cards: cards.split(Aro::Deck::CARD_DELIM.to_s).shuffle.join(Aro::Deck::CARD_DELIM.to_s))
+    # shuffles the current teck and generates a log record.
+    update(cards: cards.split(Aro::Teck::CARD_DELIM.to_s).shuffle.join(Aro::Teck::CARD_DELIM.to_s))
   end
 
   def reset
-    # completely reset the deck. replace all drawn and reset order.
+    # completely reset the teck. replace all drawn and reset order.
     # all orientations will be set to upright.
-    update(cards: Aro::Deck.fresh_cards, drawn: "")
+    update(cards: Aro::Teck.fresh_cards, drawn: "")
   end
 
   def replace
     # replaces all drawn cards FIFO and puts them on the bottom of
-    # the deck. this will preserve all card orientations.
-    cards_arr = cards.split(Aro::Deck::CARD_DELIM.to_s) || []
-    drawn_arr = drawn&.split(Aro::Deck::CARD_DELIM.to_s) || []
+    # the teck. this will preserve all card orientations.
+    cards_arr = cards.split(Aro::Teck::CARD_DELIM.to_s) || []
+    drawn_arr = drawn&.split(Aro::Teck::CARD_DELIM.to_s) || []
 
     # append each drawn card to cards
     drawn_arr.each{|dc| cards_arr << dc }
 
     # clear drawn
-    update(drawn: "", cards: cards_arr.join(Aro::Deck::CARD_DELIM.to_s))
+    update(drawn: "", cards: cards_arr.join(Aro::Teck::CARD_DELIM.to_s))
   end
 
   def draw(is_dt_dimension: true, z_max: 7, z: 1)
@@ -166,11 +165,11 @@ class Aro::Deck < ActiveRecord::Base
     dev_tarot = nil
 
     # get cards
-    cards_arr = cards.split(Aro::Deck::CARD_DELIM.to_s) || []
+    cards_arr = cards.split(Aro::Teck::CARD_DELIM.to_s) || []
     # get abs_cards
-    abs_cards_arr = cards_arr.map{|c| Aro::Deck.card_strip(c)}
+    abs_cards_arr = cards_arr.map{|c| Aro::Teck.card_strip(c)}
     # get drawn
-    drawn_arr = drawn&.split(Aro::Deck::CARD_DELIM.to_s) || []
+    drawn_arr = drawn&.split(Aro::Teck::CARD_DELIM.to_s) || []
 
     if cards_arr.empty?
       Aro::P.say("there are no cards left to draw.")
@@ -219,8 +218,8 @@ class Aro::Deck < ActiveRecord::Base
 
     # update database 
     update(
-      cards: cards_arr.join(Aro::Deck::CARD_DELIM.to_s),
-      drawn: drawn_arr.join(Aro::Deck::CARD_DELIM.to_s)
+      cards: cards_arr.join(Aro::Teck::CARD_DELIM.to_s),
+      drawn: drawn_arr.join(Aro::Teck::CARD_DELIM.to_s)
     )
   end
 end

data/sys/aro/models/tlog.rb

@@ -0,0 +1,20 @@
+=begin
+
+  tlog.rb
+
+  teck tlog object.
+
+  by i2097i
+
+=end
+
+require_relative :"./teck".to_s
+
+class Aro::Tlog < ActiveRecord::Base
+  belongs_to :teck, :class_name => :"#{Aro::Teck.name}".to_s
+
+  ORDERING = {
+    ASC: :asc,
+    DESC: :desc
+  }
+end

data/sys/cli/constants.rb

@@ -31,7 +31,7 @@ module CLI
     ARO: {
       CREATE: :create,
       CONFIG: :config,
-      DECK: :deck,
+      DECK: :teck,
       DOM: :dom,
       INIT: :init,
     },

data/sys/cli/dom.rb

@@ -26,7 +26,7 @@ module CLI
         Aro::P.say(I18n.t("dom.errors.failed_already_initialized"))
       elsif Aro::Dom.in_arodom? && !Aro::Dom.is_initialized?
         arodome = Aro::Dom.new
-        arodome.generate
+        arodome.generate(ARGV[Aro::Mancy::OS], ARGV[Aro::Mancy::E])
       else
         CLI::Nterface.exit_error_invalid_usage!
       end

data/sys/cli/{deck.rb → teck.rb}

@@ -1,8 +1,8 @@
 =begin
   
-  deck.rb
+  teck.rb
 
-  process deck commands.
+  process teck commands.
 
   by i2097i
 
@@ -10,7 +10,7 @@
 
 module CLI
   # cli entrypoint
-  def self.deck
+  def self.teck
     action = CLI::ARGV1&.to_sym
 
     if CLI::FLAGS[:HELP].include?(action.to_s)
@@ -18,26 +18,26 @@ module CLI
       CLI.usage::usage
       exit(CLI::EXIT_CODES[:SUCCESS])
     elsif action.nil? || action == :aos
-      # no args, open deck menu
+      # no args, open teck menu
       if Aro::Mancy.in_aro?
-        Aro::Db.new
-        Aro::Deck.display_selection_menu
+        Aro::Db.load
+        Aro::Teck.display_selection_menu
       else
         Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
       end
     elsif action == CLI::CMDS[:DECK][:NEW]
       CLI::Nterface.exit_error_missing_args! if CLI::ARGV2.nil?
       if Aro::Mancy.in_aro?
-        Aro::Db.new
-        deck = Aro::Deck.make(CLI::ARGV2.to_s)
-        Aro::P.say(I18n.t("cli.messages.deck_created_sucessfully", name: deck.name))
-        Aro::Deck.display_selection_menu
+        Aro::Db.load
+        teck = Aro::Teck.make(CLI::ARGV2.to_s)
+        Aro::P.say(I18n.t("cli.messages.teck_created_sucessfully", name: teck.name))
+        Aro::Teck.display_selection_menu
       else
         Aro::P.say(I18n.t("cli.errors.not_in_aro" , cmd: Aro::Mancy::I2097I))
       end
     elsif CLI::CMDS[:DECK].values.include?(action)    
       if Aro::Mancy.game.nil?
-        Aro::P.say(I18n.t("cli.errors.missing_deck", cmd: Aro::Mancy::I2097I))
+        Aro::P.say(I18n.t("cli.errors.missing_teck", cmd: Aro::Mancy::I2097I))
         exit(CLI::EXIT_CODES[:GENERAL_ERROR])
       end
 
@@ -76,9 +76,9 @@ module CLI
 
       Aro::Mancy.game.show(**CLI::shoptions)
     else
-      Aro::Db.new
-      Aro::Deck.select_deck(
-        Aro::Deck.find_by(name: action)
+      Aro::Db.load
+      Aro::Teck.select_teck(
+        Aro::Teck.find_by(name: action)
       )
     end
   end
@@ -87,7 +87,7 @@ module CLI
   # todo: better naming
   def self.shoptions
     show_options_count = Aro::Mancy::S
-    show_options_order = Aro::Log::ORDERING[:DESC]
+    show_options_order = Aro::Tlog::ORDERING[:DESC]
     
     # Aro::D.say("ARGV.map{|a| a.to_sym} => #{ARGV.map{|a| a.to_sym}}")
     

data/sys/cli.rb

@@ -2,18 +2,19 @@
   
   cli
 
-  the very first file loaded.
+  aro cli module.
 
   by i2097i
 
 =end
 
 module CLI
+  # todo: set an Aro::Mancy.instance.you variable here:
   argv_sanitized = Aos::Os.sanitize_you(ARGV.join(" ")).split(" ")
 
   if CLI::CMDS[:DECK].values.include?(argv_sanitized[0]&.to_sym)
-    # enable deck shortcut (skip typing deck while in-game)
-    ARGV0 = :deck
+    # enable teck shortcut (skip typing teck while in-game)
+    ARGV0 = :teck
     ARGV1 = argv_sanitized[0]&.to_sym
     ARGV2 = argv_sanitized[1]&.to_sym
   else