aromancer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cceb1c6a55e9d5753254eb63ee964d5607a6d1cf2726bb84cce84992cdc5c8
-  data.tar.gz: 8c9b7c1dc2d9d5366f1aa32aa0b40c60d77f31a8779f3a818da897f1e20fc73e
+  metadata.gz: 5ebbde2a81b320eab73f2035b03d5166c5bcec1c01eaef7e51e4a010a8ab8251
+  data.tar.gz: 044c185f6741090deb4e179c8716e35d23e1b6a775c42db683ee079db8cb1419
 SHA512:
-  metadata.gz: 8d003f5fe55523266a5c68e7960e3e55eeaf8e2b687c5cd4d2bbeb1ea33e78d85d2c878e2309a5154c51eb84d053a1e593ddd9d7a92d9db5c031b223ef735257
-  data.tar.gz: de814ec7a6c83262ff9d6b9b699bfb01943080ffe01a0436d570fc14a49991baea16138b9ba4741e7f654769cc2fe3a1efd2c8c71b13f11c84e0b74a1661919d
+  metadata.gz: d992314e5e012369313167b145991a687ec0cfaa2a4e6b8ef445f147333e64e287eb70e9208215fac91b6ef20b04e0b3f740ee20ffd7f3c1b60197ad536dd4ad
+  data.tar.gz: 9210fd3030350a65b7f56ee68be13296a2707514f9cb1cf378e792b95868ad08c0009ec7c6c7409d6060919ee28911b557b4b4e673b933f47790b50ea2a46b4f

data/README.md

@@ -1 +1,27 @@
-## aromancer gem
+# [aromancer](https://rubygems.org/gems/aromancer)
+## word
+### sentence
+#### scroll
+#### chapter
+##### dictionary
+##### story
+###### legend
+###### [aromancer_serve](https://github.com/arowmancy/aromancer_serve)
+
+`tl;dr`
+
+```bash
+gem install aromancer && aromancer serve
+```
+> then, from different terminal run
+```bash
+aromancer
+```
+#### `in-game`
+> go to `configure` and verify settings
+
+[rubygems](https://rubygems.org/gems/aromancer)
+[license](http://opensource.org/licenses/MIT)
+[issues](https://github.com/i2097i/aromancer/issues)
+
+#### aromancer by i2097i is copyright (2026)

data/aromancer.gemspec

@@ -13,7 +13,7 @@
 require_relative "lib/aromancer/version"
 
 Gem::Specification.new do |spec|
-  spec.name = "aromancer"
+  spec.name = Aromancer.to_s.downcase
   spec.version = Aromancer::VERSION
   spec.authors = ["i2097i"]
   spec.email = ["i2097i@hotmail.com"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.files         = `git ls-files`.split("\n").reject{|p| p.match?(/^(spec|.release|.*.gem$)/)}
   spec.bindir        = "bin"
-  spec.executables   = ["aromancer"]
+  spec.executables   = [Aromancer.to_s.downcase]
   spec.require_paths = ["lib", "db"]
   spec.required_ruby_version = ">= 4.0.7"
 

data/bin/aromancer

@@ -12,4 +12,8 @@
 
 require :aromancer.to_s
 
-Aromancer::Cli.run
+if ARGV[0] == :serve.to_s
+  Aromancer::Serve.run
+else
+  Aromancer::Cli.run
+end

data/checksums/aromancer-0.0.7.gem.sha512

@@ -0,0 +1 @@
+2183e762fd2705e60f043abdb5db94f220945cad83e3dc6813bb0c03f5bd000cd3cf3b4628a470335b075ef8a6180644d9d6e18695f17bc202fe9d8cb3126068

data/lib/aromancer/api.rb

@@ -13,19 +13,18 @@
 module Aromancer
   class Api
 
-    DATE_FORMAT = "%A %d %b %Y %I:%M:%S %p"
-
     def self.storage_headers(result)
       result.kind_of?(Aromancer::Server::InternalError) ? nil : result.headers
     end
 
     def self.register_error(response)
-      Aromancer::Storage.set_last_error({
+      le = {
         status: response.status,
         headers: storage_headers(response),
-        body: response.body.to_s[0..444]
-      })
-
+        body: response.body.to_s
+      }
+      Aromancer::Storage.set_last_error(le)
+      Aromancer.print_last_error
       signed_out = false
       signed_out = response.status == 401
       # error_body = nil
@@ -96,7 +95,7 @@ module Aromancer
       result = Aromancer::Server.sign_out
       # clear storage
       Aromancer::Storage.instance.clear_cache!
-      Aromancer::Storage.set_signed_out_flag(true)
+      Aromancer::Storage.set_signed_out_flag(false)
       Aromancer::Storage.set_player(nil)
       Aromancer::Storage.set_legends(nil)
       Aromancer::Storage.set_arena(nil)
@@ -139,7 +138,18 @@ module Aromancer
     end
 
     def self.set_active_legend_id(active_legend_id)
+
+      previous_arena = Aromancer::Storage.get_arena
       Aromancer::Storage.set_arena(nil)
+
+      # update local storage first
+      player = Aromancer::Storage.get_player
+      unless player.nil?
+        previous_active_legend_id = player["active_legend_id"]
+        player["active_legend_id"] = active_legend_id
+        Aromancer::Storage.set_player(player)
+      end
+      Aromancer::Storage.instance.clear_cache!
       result = Aromancer::Server.update_player({player: {
         active_legend_id: active_legend_id,
         status: active_legend_id.nil? ? :lobby : :playing
@@ -149,6 +159,14 @@ module Aromancer
         response = JSON.parse(result.body)
         Aromancer::Storage.set_player(response)
       else
+        # revert local storage
+        player = Aromancer::Storage.get_player
+        unless player.nil?
+          player["active_legend_id"] = previous_active_legend_id
+          Aromancer::Storage.set_player(player)
+        end
+        Aromancer::Storage.set_arena(previous_arena)
+
         register_error(result)
       end
     end
@@ -164,8 +182,8 @@ module Aromancer
       end
     end
 
-    def self.load_stream
-      result = Aromancer::Server.get_stream
+    def self.load_stream(count = nil)
+      result = Aromancer::Server.get_stream(count)
 
       if result.status == 200
         response = JSON.parse(result.body)
@@ -186,24 +204,24 @@ module Aromancer
       end
     end
 
-    def self.create_turn(arena_params)
-      result = Aromancer::Server.create_turn({arena: arena_params})
-      if result.status == 201
+    def self.submit_turn(request_uuid, option = {})
+      result = Aromancer::Server.submit_turn(request_uuid, option)
+      if result.status == 200
         response = JSON.parse(result.body)
+        Aromancer::Storage.set_arena(response)
       else
         register_error(result)
       end
     end
 
-    def self.update_turn(arena_params)
-      result = Aromancer::Server.update_turn({arena: arena_params})
+    def self.load_rules
+      result = Aromancer::Server.load_rules
       if result.status == 200
-        response = JSON.parse(result.body)
+        return JSON.parse(result.body)
       else
         register_error(result)
       end
     end
-
   end
 
 end

data/lib/aromancer/prompt.rb

@@ -28,8 +28,24 @@ module Aromancer
       Aromancer::Prompt.instance.prompt
     end
 
-    def self.say(message)
-      (message.kind_of?(String) ? message.split("\n").each{|l| p.say(l.to_s.center(TTY::Screen.width))} : message)
+    def self.print_divider(text = nil)
+      puts "\n" if TTY::Screen.width > 99.9
+      self.p.say((text || "").center(TTY::Screen.width / 2.2, "-").center(TTY::Screen.width))
+      puts "\n" if TTY::Screen.width > 99.9
+    end
+
+    def self.say(message, ljust: false, rjust: false)
+      center = !ljust && !rjust
+      if message.kind_of?(String)
+        # puts "\n" if TTY::Screen.width > 99.9
+        message.split("\n").each{|l|
+          self.p.say(l.to_s.ljust(TTY::Screen.width)) if ljust
+          self.p.say(l.to_s.center(TTY::Screen.width)) if center
+          self.p.say(l.to_s.rjust(TTY::Screen.width)) if rjust
+        }
+      else
+        self.p.say(message)
+      end
     end
   end
 

data/lib/aromancer/routes.rb

@@ -13,6 +13,8 @@
 module Aromancer
   class Routes
 
+    WIDTH_MULTIPLIER = TTY::Screen.width / 4.0
+
     def self.resume
       return main_menu if Aromancer::Storage.get_signed_out_flag
 
@@ -28,12 +30,7 @@ module Aromancer
         rescue ArgumentError => e
           authentication
         end
-        return
       end
-
-      legend_menu if !active_legend.nil? &&
-        (Aromancer::Storage.get_player && Aromancer::Storage.get_player&.symbolize_keys[:active_legend_id])
-      authentication
     end
 
     def self.cls
@@ -58,9 +55,8 @@ module Aromancer
 
       if arena.nil?
         Aromancer.print_last_error("routes.legend.arena_failed")
-        Aromancer::Api.set_active_legend_id(nil)
         Aromancer::Prompt.p.ask(I18n.t("shared.key_press"))
-        main_menu
+        Aromancer::Api.set_active_legend_id(nil)
       else
         arena
       end
@@ -182,6 +178,20 @@ module Aromancer
       Thread.main[:route] = __method__.to_sym
     end
 
+    def self.rules
+      return if Thread.main[:route] == __method__.to_sym
+      rules = Aromancer::Api.load_rules
+      Aromancer::Prompt.say(rules["rules"], ljust: true)
+
+      Thread.main[:menu_options][__method__.to_sym] = [
+        {name: I18n.t("shared.key_press"), value: :key_press}
+      ]
+      Thread.main[:menu_runners][__method__.to_sym] = [
+        {value: :key_press, proc: Proc.new{ main_menu }}
+      ]
+      Thread.main[:route] = __method__.to_sym
+    end
+
     def self.main_menu
       cls
       Aromancer::Prompt.say(I18n.t("shared.navigate", route: :main_menu)) if Aromancer::Storage.get_preference(:debug)
@@ -204,6 +214,7 @@ module Aromancer
         {name: I18n.t("routes.main_menu.new_game"), value: :new},
         {name: I18n.t("routes.main_menu.load_game"), value: :load},
         {name: I18n.t("routes.main_menu.find_game"), value: :find},
+        {name: I18n.t("routes.main_menu.rules"), value: :rules},
         {name: I18n.t("routes.main_menu.configure"), value: :configure},
         {name: I18n.t("routes.main_menu.sign_out"), value: :out},
         {name: I18n.t("shared.exit"), value: :exit}
@@ -227,6 +238,9 @@ module Aromancer
         {value: :configure, proc: Proc.new{
           configure
         }},
+        {value: :rules, proc: Proc.new{
+          rules
+        }},
         {value: :out, proc: Proc.new{
           case Aromancer::Prompt.p.select(I18n.t("shared.confirm"), [:no, :yes], cycle: true, per_page: 11)
           when :no
@@ -235,7 +249,10 @@ module Aromancer
             Aromancer::Api.sign_out
             authentication
           end
-        }}
+        }},
+        {value: :exit, proc: Proc.new{
+          exit
+        }},
       ]
       Thread.main[:route] = __method__.to_sym
     end
@@ -301,7 +318,7 @@ module Aromancer
 
       Thread.main[:menu_options][__method__.to_sym] = [{name: I18n.t("shared.back"), value: :back}] + legend_array.map{|l|
         {
-          name: "#{I18n.t("routes.legend.title")}_#{l["id"]} (#{l["status"]}) #{DateTime.parse(l["created_at"])&.strftime(Aromancer::Api::DATE_FORMAT)}",
+          name: "#{l["value_display"]} > #{l["status"]} > #{Aromancer.date_display(l["created_at"])}",
           value: l["id"]
         }
       }
@@ -331,19 +348,18 @@ module Aromancer
       Thread.main[:route] = __method__.to_sym
     end
 
-    def self.stream
-      Aromancer::Api.load_stream
+    def self.stream(display_only: false, recent_count: nil)
+      return if Thread.main[:route] == __method__.to_sym
+      Aromancer::Prompt.print_divider(I18n.t("routes.stream.title"))
+      Aromancer::Api.load_stream(recent_count)
       stream = Aromancer::Storage.get_stream
-      Aromancer::Prompt.say(I18n.t("routes.stream.title"))
-      Aromancer::Prompt.say([
-        :timestamp,
-        :description
-      ].join(", "))
-
-      stream["stream"].each{|e|
-        Aromancer::Prompt.say("\n")
-        Aromancer::Prompt.say([e["updated_at"], e["description"]].join("\n"))
+      stream["stream"].last(
+        recent_count.nil? ? stream["stream"].count : recent_count
+      ).each{|e|
+        Aromancer::Prompt.say("[#{Aromancer.time_display(e["updated_at"])}]: #{e["description"]}", ljust: true)
       }
+      Aromancer::Prompt.print_divider(I18n.t("routes.stream.end"))
+      return if display_only
 
       Thread.main[:menu_options][__method__.to_sym] ||= [{name: I18n.t("shared.key_press"), value: nil}]
       Thread.main[:menu_runners][__method__.to_sym] ||= [
@@ -360,34 +376,53 @@ module Aromancer
       al = active_legend
       if !al.nil?
         if al["status"] == "complete"
-          Aromancer::Api.set_active_legend_id(nil)
-          Aromancer::Prompt.say(I18n.t("routes.legend.legend_complete"))
-          return legends
+          Thread.main[:menu_options][__method__.to_sym] = [
+            {name: I18n.t("shared.key_press"), value: :key_press}
+          ]
+          Thread.main[:menu_runners][__method__.to_sym] = [
+            {value: :key_press, proc: Proc.new{
+              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
+              Aromancer::Api.set_active_legend_id(nil)
+              legends
+            }}
+          ]
+          Thread.main[:route] = __method__.to_sym
+          return
         elsif al["status"] == "created"
           Thread.main[:menu_options][__method__.to_sym] = [
             {name: :reload, value: :reload}, {name: I18n.t("shared.back"), value: :back}
           ]
-          Thread.main[:menu_runners][__method__.to_sym] ||= [
+          Thread.main[:menu_runners][__method__.to_sym] = [
             {value: :reload, proc: Proc.new{ legend_menu }},
             {value: :back, proc: Proc.new{
               Aromancer::Api.set_active_legend_id(nil)
-              main_menu
+              legends
             }}
           ]
           Thread.main[:route] = __method__.to_sym
           return
+        elsif active_legend["player"] && (active_legend["player"]["words"] || []).count == 0
+          Aromancer::Api.load_arena
+          return
         end
+      else
+        Thread.main[:menu_runners] = {}
+        Thread.main[:menu_options] = {}
+        Thread.main[:route] = :main_menu
       end
-      hs = Aromancer::Storage.get_preference(:hide_sentences)
-      hs_value = "#{hs ? "" : "hide_"}signed_sentences".to_sym
+
+      hide_sentences_pref = Aromancer::Storage.get_preference(:hide_sentences)
+      hide_sentences_pref_value = "#{hide_sentences_pref ? "" : "hide_"}signed_sentences".to_sym
+      hide_stream_pref = Aromancer::Storage.get_preference(:hide_stream)
+      hide_stream_pref_value = "#{hide_stream_pref ? "" : "hide_"}title".to_sym
 
       Thread.main[:route] = __method__.to_sym
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("routes.legend.unspoken_words"), value: :words},
         {name: I18n.t("routes.legend.spoken_words"), value: :spoken_words},
         {name: I18n.t("routes.legend.unsigned_sentences"), value: :unsigned_sentences},
-        {name: I18n.t("routes.legend.#{hs_value}"), value: hs_value},
-        {name: I18n.t("routes.stream.title"), value: :stream},
+        {name: I18n.t("routes.legend.#{hide_sentences_pref_value}"), value: hide_sentences_pref_value},
+        {name: I18n.t("routes.stream.#{hide_stream_pref_value}"), value: hide_stream_pref_value},
         {name: I18n.t("routes.main_menu.title"), value: :main_menu}
       ]
 
@@ -395,11 +430,14 @@ module Aromancer
         {value: :words, proc: Proc.new{ words }},
         {value: :spoken_words, proc: Proc.new{ spoken_words }},
         {value: :unsigned_sentences, proc: Proc.new{ unsigned_sentences }},
-        {value: hs_value, proc: Proc.new{
+        {value: hide_sentences_pref_value, proc: Proc.new{
           Aromancer::Storage.toggle_preference(:hide_sentences)
           legend_menu
         }},
-        {value: :stream, proc: Proc.new{ stream }},
+        {value: hide_stream_pref_value, proc: Proc.new{
+          Aromancer::Storage.toggle_preference(:hide_stream)
+          legend_menu
+        }},
         {value: :main_menu, proc: Proc.new{
           Aromancer::Api.set_active_legend_id(nil)
           main_menu
@@ -415,54 +453,69 @@ module Aromancer
       al_status = ((al || {})["status"] || "").to_sym
       if !al.nil? &&
         [:created, :complete].include?(al_status)
+
+        stream(display_only: true) # display entire stream
+        Aromancer::Prompt.print_divider(al["value_display"])
         Aromancer::Prompt.say(arena["title"])
-        Aromancer::Prompt.say(I18n.t("routes.legend.title"))
-        Aromancer::Prompt.say(I18n.t("routes.legend.subtitle", subtitle: al["status"]))
-        Aromancer::Prompt.say(I18n.t("routes.legend.players"))
-        Aromancer::Prompt.say(JSON.pretty_generate(arena["players"]))
-        Aromancer::Prompt.p.ask(I18n.t("shared.key_press"))
+        Aromancer::Prompt.say(arena["players"].map{|p| "#{p["alias"]}(#{p["score"]})"}.join(" | "))
+
         if al_status == :complete
-          Aromancer::Api.set_active_legend_id(nil)
-          sleep(1)
-          return main_menu
+          Thread.main[:menu_options][:legend_menu] = [
+            {name: I18n.t("shared.key_press"), value: :key_press}
+          ]
+          Thread.main[:menu_runners][:legend_menu] = [
+            {value: :key_press, proc: Proc.new{
+              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
+              Aromancer::Api.set_active_legend_id(nil)
+              legends
+            }}
+          ]
         else
           Aromancer::Api.get_legends
-          legend_menu
+
+          Thread.main[:menu_options][:legend_menu] = [
+            {name: I18n.t("shared.back"), value: :back},
+            {name: I18n.t("shared.key_press"), value: :key_press}
+          ]
+          Thread.main[:menu_runners][:legend_menu] = [
+            {value: :back, proc: Proc.new{
+              Aromancer::Prompt.say(I18n.t("routes.legend.returning_to_main"))
+              Aromancer::Api.set_active_legend_id(nil)
+              legends
+            }},
+            {value: :key_press, proc: Proc.new{ legend_menu }}
+          ]
         end
+        return
       end
 
       return if arena.nil? || arena["turn_player"].nil?
 
-      # todo: pre-calculate needed widths. this isn't really working
-      word_width = 5.0
-      wpr = (TTY::Screen.width / word_width).floor
-
-      # puts "wpr: #{wpr}"
-      # puts TTY::Screen.width
-
       turn_player = arena["turn_player"]
 
       # title
-      Aromancer::Prompt.say("\n\n")
-      data = [
-        [arena["title"]],
-        ["#{turn_player["alias"]}'s turn"],
-        ["dealer is #{arena["dealer"]["alias"]}"]
-      ]
-      title_table = TTY::Table.new(data)
-      Aromancer::Prompt.say(title_table.render(:ascii))
-
-      # players
-      data = [
-        [I18n.t("routes.legend.players")] + arena["players"].map{|p| "#{p["alias"]} (#{p["score"]})"}
-      ]
-      players_table = TTY::Table.new(data)
-      Aromancer::Prompt.say(players_table.render(:ascii))
+      Aromancer::Prompt.say("\n")
+      ([
+          "#{I18n.t("routes.legend.title")}: #{(active_legend || {})["value_display"]}",
+          "#{arena["title"]}: #{turn_player["alias"]}'s turn. dealer is #{arena["dealer"]["alias"]}"
+        ] + arena["players"].map{|p| "#{p["alias"].rjust(11)} (#{p["score"]})"}
+      ).each{|l| Aromancer::Prompt.say(l, rjust: true)}
+
+      if !arena["bot_player"].nil?
+        # todo: show/hide preference
+        render_alchemy_for(arena["bot_player"])
+      end
+      render_scroll(arena)
+      render_alchemy_for(arena["player"])
+    end
 
+    # todo: move this to helper class. not a route
+    def self.render_scroll(arena)
+      Aromancer::Prompt.print_divider(I18n.t("routes.legend.scroll"))
       # spoken words
       Aromancer::Prompt.say(I18n.t("routes.legend.spoken_words"))
-
-      data = arena["scroll_words"].map{|sw| sw["value_display"]}.each_slice(wpr).to_a || []
+      Aromancer::Prompt.say("\n")
+      data = arena["scroll_words"].map{|sw| sw["value_display"]}.each_slice(Aromancer::Routes::WIDTH_MULTIPLIER).to_a || []
       while data.any? && data.last.length < data.first.length
         data.last << ""
       end
@@ -472,34 +525,52 @@ module Aromancer
       unless arena["sentences"].empty?
         # unsigned sentences
         Aromancer::Prompt.say(I18n.t("routes.legend.unsigned_sentences"))
-        data = arena["sentences"].map{|sw| sw["value_display"]}.each_slice(wpr).to_a || []
+        Aromancer::Prompt.say("\n")
+        data = arena["sentences"].map{|sw| sw["value_display"]}.each_slice(Aromancer::Routes::WIDTH_MULTIPLIER).to_a || []
         while data.any? && data.last.length < data.first.length
           data.last << ""
         end
         unsigned_sentences_table = TTY::Table.new(data)
-        Aromancer::Prompt.say(unsigned_sentences_table.render(:unicode))
+        Aromancer::Prompt.say(unsigned_sentences_table.render)
       end
+    end
 
+    # todo: move this to helper class. not a route
+    def self.render_alchemy_for(player)
       # unspoken words
+      if player["id"].to_i != Aromancer::Storage.get_player["id"].to_i
+        Aromancer::Prompt.print_divider(I18n.t("routes.legend.alchemy_for", name: player["alias"]))
+      else
+        Aromancer::Prompt.print_divider(I18n.t("routes.legend.your_alchemy"))
+      end
       Aromancer::Prompt.say(I18n.t("routes.legend.unspoken_words"))
-      data = arena["player"]["words"].map{|w| w["value_display"]}.each_slice(wpr).to_a || []
+      Aromancer::Prompt.say("\n\n")
+      words = player["words"].map{|w| w["value_display"]}
+      data = words.each_slice(Aromancer::Routes::WIDTH_MULTIPLIER).to_a || []
       while data.any? && data.last.length < data.first.length
         data.last << ""
       end
       words_table = TTY::Table.new(data)
       Aromancer::Prompt.say(words_table.render(:ascii))
 
-      unless arena["player"]["sentences"].empty?
+      unless player["sentences"].empty?
         # signed sentences
-        Aromancer::Prompt.say("#{I18n.t("routes.legend.signed_sentences")} (#{arena["player"]["sentences"].length})")
+        Aromancer::Prompt.say("#{I18n.t("routes.legend.signed_sentences")} (#{player["sentences"].length})")
         unless Aromancer::Storage.get_preference(:hide_sentences)
-          data = arena["player"]["sentences"].map{|s| s["value_display"]}.each_slice(wpr).to_a || []
+          data = player["sentences"].map{|s| s["value_display"]}.each_slice(Aromancer::Routes::WIDTH_MULTIPLIER).to_a || []
           while data.any? && data.last.length < data.first.length
             data.last << ""
           end
           sentences_table = TTY::Table.new(data)
-          Aromancer::Prompt.say(sentences_table.render(:ascii))
+          Aromancer::Prompt.say(sentences_table.render)
         end
+        Aromancer::Prompt.say("\n\n")
+      end
+
+      unless player["id"].to_i != Aromancer::Storage.get_player["id"].to_i ||
+        Aromancer::Storage.get_preference(:hide_stream)
+
+        stream(display_only: true, recent_count: 5)
       end
     end
 
@@ -548,7 +619,7 @@ module Aromancer
       arena = arena_data
       Thread.main[:menu_options][__method__.to_sym] = [
         {name: I18n.t("shared.back"), value: :back}
-      ] + arena["sentences"].map{|s| {name: "id: #{s["id"]}, value: #{s["value"]}", value: s["id"]}}
+      ] + arena["sentences"].map{|s| {name: s["value_display"], value: s["id"]}}
 
       Thread.main[:menu_runners][__method__.to_sym] = [
         {value: :back, proc: Proc.new{ legend_menu }}
@@ -566,7 +637,7 @@ module Aromancer
 
       Aromancer::Prompt.say(I18n.t("shared.navigate", route: :word)) if Aromancer::Storage.get_preference(:debug)
       possibilities = Aromancer::Api.load_word_possibilities(selected_word_id)
-
+      request_uuid = possibilities["uuid"]
       if Aromancer::Storage.get_preference(:debug)
         Aromancer::Prompt.say(JSON.pretty_generate(possibilities))
       end
@@ -603,21 +674,11 @@ module Aromancer
           end
         }},
         {value: :player_word, proc: Proc.new{
-          wytyd = I18n.t("routes.legend.place_on_scroll", word: selected_word["value_display"])
-          Aromancer::Prompt.say(wytyd)
-          Aromancer::Api.create_turn({
-            wytyd: wytyd,
-            word_id: selected_word["id"]
-          })
+          Aromancer::Api.submit_turn(request_uuid)
           legend_menu
         }},
         {value: nil, proc: Proc.new{|o|
-          if o["http_verb"] == "post"
-            Aromancer::Api.create_turn(JSON.parse(o["payload"]))
-          else
-            Aromancer::Api.update_turn(JSON.parse(o["payload"]))
-          end
-
+          Aromancer::Api.submit_turn(request_uuid, {option_uuid: o[:uuid.to_s]})
           legend_menu
         }}
       ]

data/lib/aromancer/server.rb

@@ -141,7 +141,7 @@ module Aromancer
       end
     end
 
-    def self.get_stream
+    def self.get_stream(count = nil)
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
       return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
 
@@ -149,7 +149,7 @@ module Aromancer
         Faraday.new(
           url: Aromancer::Storage.get_server_url,
           headers: HEADERS.merge(auth_header),
-        ).get("/legends/#{legend_id}/stream")
+        ).get("/legends/#{legend_id}/stream?count=#{count || nil}")
       rescue StandardError => e
         InternalError.build(e)
       end
@@ -169,7 +169,7 @@ module Aromancer
       end
     end
 
-    def self.create_turn(params)
+    def self.submit_turn(request_uuid, params = {})
       legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
       return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
 
@@ -178,22 +178,18 @@ module Aromancer
           url: Aromancer::Storage.get_server_url,
           headers: HEADERS.merge(auth_header),
           params: params
-        ).post("/legends/#{legend_id}/arena")
+        ).put("/legends/#{legend_id}/arena/#{request_uuid}")
       rescue StandardError => e
         InternalError.build(e)
       end
     end
 
-    def self.update_turn(params)
-      legend_id = (Aromancer::Storage.get_player || {})["active_legend_id"]
-      return InternalError.build(StandardError.new("no active legend")) if legend_id.nil?
-
+    def self.load_rules
       begin
         Faraday.new(
           url: Aromancer::Storage.get_server_url,
           headers: HEADERS.merge(auth_header),
-          params: params
-        ).put("/legends/#{legend_id}/arena")
+        ).get("/")
       rescue StandardError => e
         InternalError.build(e)
       end

data/lib/aromancer/storage.rb

@@ -12,7 +12,7 @@ module Aromancer
   class Storage
     include Singleton
 
-    DEFAULT_SERVER = "http://aromancer.com"
+    DEFAULT_SERVER = "http://127.0.0.1"
 
     attr_accessor :storage_open, :cache
 
@@ -48,7 +48,7 @@ module Aromancer
       return Time.now.to_i
     end
 
-    def self.get_preference(preference, default: :default)
+    def self.get_preference(preference, default: nil)
       p_key = "preference_#{preference}"
       p = instance.get_key(p_key)
       if p.nil?
@@ -64,7 +64,8 @@ module Aromancer
     end
 
     def self.toggle_preference(key)
-      set_preference(key, !get_preference(key))
+      v = get_preference(key)
+      set_preference(key, !v)
     end
 
     def self.toggle_force_ssl
@@ -130,7 +131,7 @@ module Aromancer
 
     def self.set_server_url(server_url)
       uri = URI.parse(server_url)
-      if uri.kind_of?(URI::HTTP) or uri.kind_of?(URI::HTTPS)
+      if uri.kind_of?(URI::HTTP) || uri.kind_of?(URI::HTTPS)
         URI_KEYS.each{|k|
           uri.kind_of?(URI::HTTP) && get_preference(:force_ssl) ? toggle_force_ssl : nil
           Aromancer::Storage.instance.set_key("server_url_#{k}", uri.select(k).first)

data/lib/aromancer/version.rb

@@ -11,5 +11,5 @@
 =end
 
 module Aromancer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/aromancer.rb

@@ -14,19 +14,33 @@ require_relative :reiquire.to_s
 Reiquire::aromancer
 
 module Aromancer
-  THROTTLE_MS = 0.2
+  THROTTLE_MS = 0.1
+  ERROR_EXPIRATION = 7.77.to_f
   FONT = TTY::Font.new(:standard)
+  DATE_FORMAT = "%A %d %b %Y %I:%M:%S %p"
+  TIME_FORMAT = "%I:%M:%S %p"
 
   UNICODE = {
     close: "\u2A2F",
     check: "\u2713"
   }
 
+  class Serve
+    def self.run
+      unless Dir.exist?("#{Aromancer.to_s.downcase}_serve")
+        system("git clone git@github.com:arowmancy/aromancer_serve.git")
+      end
+      FileUtils.chdir :aromancer_serve.to_s do
+        system("bin/setup")
+      end
+    end
+  end
+
   # instance runs on main thread
   class Cli
     include Singleton
 
-    attr_accessor :ui_thread, :ws_thread, :busy, :last_render
+    attr_accessor :ui_thread, :ws_thread, :busy, :ws_busy, :last_render, :error_timeout
 
     # user entry point
     def self.run
@@ -34,13 +48,16 @@ module Aromancer
       Aromancer::Storage.get_preference(:debug, default: false)
       Aromancer::Storage.get_preference(:force_ssl, default: true)
       Aromancer::Storage.get_preference(:hide_sentences, default: true)
+      Aromancer::Storage.get_preference(:hide_stream, default: true)
 
       self.instance.last_render = 0
+      self.instance.error_timeout = Time.now.to_i
 
       # load player on-start
       Aromancer::Api.set_active_legend_id(nil) unless Aromancer::Storage.get_player.nil?
 
       Thread.main[:route] = :authentication
+      Thread.main[:menu_runners] = {}
       Thread.main[:menu_options] = {}
       Aromancer::Prompt.say(I18n.t("shared.welcome", version: Aromancer::VERSION))
       Aromancer::Prompt.say(I18n.t("shared.server_url", url: Aromancer::Storage::get_server_url))
@@ -52,13 +69,15 @@ module Aromancer
         rescue NoMethodError => e
           if Aromancer::Storage.get_preference(:debug)
             Aromancer::Prompt.say(I18n.t("shared.last_error"))
-            Aromancer::Prompt.say(e.inspect)
+            Aromancer::Prompt.say(JSON.pretty_generate(e[:body.to_s]))
+            Aromancer::Prompt.say("sleeping 5 on main thread...")
             sleep(5)
           end
           self.instance.start_ui_thread
           self.instance.start_ws_thread
           sleep(1)
         rescue Interrupt => e
+          Aromancer::Prompt.say("interrupt on main thread...exiting immediately.")
           exit
         end
       end
@@ -69,12 +88,13 @@ module Aromancer
     end
 
     def start_ui_thread(force = false)
-      return if (@busy || Time.now - @last_render < 2) && !force
+      return if (@busy || Time.now - @last_render < 2.0) && !force
 
       @busy = true
       self.ui_thread&.exit
       self.ui_thread&.kill
       Thread.main[:menu_runners] = {}
+      Thread.main[:menu_options] = {}
       Aromancer::Prompt.instance.reload!
       self.ui_thread = Thread.new do
         loop do
@@ -82,8 +102,8 @@ module Aromancer
           menu_runners = Thread.main[:menu_runners][Thread.main[:route]]
           unless menu_options.nil? || menu_runners.nil?
             Aromancer::Routes.resume
-            sleep(THROTTLE_MS)
             Aromancer.print_hud
+            sleep(THROTTLE_MS)
             v = Aromancer::Prompt.p.select("", menu_options, show_help: :always, cycle: true, per_page: 11)
             runners = menu_runners.select{|r| r[:value] == v}
             runners = menu_runners.select{|r| r[:value].nil?} if runners.empty?
@@ -91,32 +111,35 @@ module Aromancer
             if runners.any?
               r = runners.first
               r[:proc].call(v)
-            else
-              exit
             end
+
           else
             Aromancer::Routes.resume
           end
           Aromancer::Cli.instance.busy = false
           Aromancer::Cli.instance.last_render = Time.now
-          # sleep(THROTTLE_MS)
+          sleep(THROTTLE_MS)
         end
       end
     end
 
     def start_ws_thread
+      return if @ws_busy
+      @ws_busy = true
       self.ws_thread.kill unless self.ws_thread.nil?
       self.ws_thread = Thread.new do
         Aromancer::Websocket.instance.disconnect
         loop do
           player = Aromancer::Storage.get_player
           if player.nil?
+            @ws_busy = true
             Aromancer::Websocket.instance.disconnect
           elsif !player["api_key"].nil?
             # attempt websocket connection
+            @ws_busy = true
             Aromancer::Websocket.instance.connect
           end
-
+          @ws_busy = false
           sleep(4)
         end
       end
@@ -132,7 +155,16 @@ module Aromancer
     "#{`echo $HOME`.strip}/.aromancer"
   end
 
+  def self.date_display(raw)
+    DateTime.parse(raw)&.strftime(Aromancer::DATE_FORMAT).downcase.gsub(" ", "_")
+  end
+
+  def self.time_display(raw)
+    DateTime.parse(raw)&.strftime(Aromancer::TIME_FORMAT).downcase.gsub(" ", "_")
+  end
+
   def self.print_hud
+    print_last_error
     websocket_status = "#{Aromancer::Storage.instance.get_key(:websocket_scheme)}: #{Aromancer::Websocket.instance.socket.nil? ? UNICODE[:close] : UNICODE[:check] }"
     player_status = if Aromancer::Storage.get_player.nil?
       I18n.t("routes.main_menu.not_signed_in")
@@ -141,13 +173,20 @@ module Aromancer
     end
 
     Aromancer::Prompt.say(
-      [nil, player_status, websocket_status, nil].join(" | ")
+      [nil, :v.to_s + Aromancer::VERSION, player_status, websocket_status, nil,].join(" | ")
     )
   end
 
   def self.print_last_error(i18n_key = nil)
+    if Time.now.to_f - Aromancer::Cli.instance.error_timeout.to_f >= Aromancer::ERROR_EXPIRATION
+      Aromancer::Cli.instance.error_timeout = Time.now.to_i
+      Aromancer::Storage.set_last_error(nil)
+      return
+    end
+
     last_error = Aromancer::Storage.get_last_error
     return if last_error.nil?
+
     last_error = last_error.symbolize_keys
     message = last_error[:body]
     begin
@@ -156,7 +195,13 @@ module Aromancer
     rescue JSON::ParserError => e
       message = last_error[:body]
     end
-    Aromancer::Prompt.say(I18n.t(i18n_key || "shared.last_error", status: last_error[:status], error: message))
-    Aromancer::Storage.set_last_error(nil)
+
+    if message.kind_of?(Hash)
+      message = JSON.pretty_generate(message)
+    elsif message.kind_of?(String)
+      message = message[0..777]
+    end
+
+    Aromancer::Prompt.say(I18n.t(i18n_key || "shared.last_error", status: last_error[:status], error: message), rjust: true)
   end
 end

data/locale/en.yml

@@ -29,6 +29,7 @@ en:
       new_game: "new game"
       load_game: "load game"
       find_game: "find game"
+      rules: "rules"
       player_count: "enter player count (1-2): "
       sign_out: "sign out"
       not_signed_in: "signed out"
@@ -43,14 +44,15 @@ en:
       debug: "debug (%{stored})"
       debug_toggle: "debug preference toggled to %{value}"
     new_game:
-      player_count: "number of players"
-      story_count: "number of stories"
+      player_count: "players"
+      story_count: "stories"
       starting: "starting new game..."
       status: "status"
       cancelled: "cancelled. game not created."
     legend:
       title: "legend"
       subtitle: "%{subtitle}"
+      alchemy_for: "alchemy_for_%{name}:"
       arena_failed: "arena failed to load (%{status}). %{error}"
       scroll: "scroll"
       spoken_words: "scroll words"
@@ -66,6 +68,8 @@ en:
       place_on_scroll: "place %{word} on the scroll."
       options_for_word: "available options for the %{word} word."
       last_error: "last error"
+      returning_to_main: "returning to main menu..."
+      your_alchemy: "alchemy"
     legends:
       help: ""
     legend_menu:
@@ -74,5 +78,5 @@ en:
       help: ""
     stream:
       title: "stream"
-
-
+      end: "eos"
+      hide_title: "hide stream"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aromancer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - i2097i
@@ -246,6 +246,7 @@ files:
 - checksums/aromancer-0.0.4.gem.sha512
 - checksums/aromancer-0.0.5.gem.sha512
 - checksums/aromancer-0.0.6.gem.sha512
+- checksums/aromancer-0.0.7.gem.sha512
 - gem_graph.png
 - lib/aromancer.rb
 - lib/aromancer/.DS_Store