aromancer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 117a4ac8211f275343a236d489c481e073604599325d5df3d8f7032fe5c83256
-  data.tar.gz: 7fce17acc9a26840d6005d9ce16b91bac8a2c6f0cc0356827b3495b1ab6a6db4
+  metadata.gz: e0cceb1c6a55e9d5753254eb63ee964d5607a6d1cf2726bb84cce84992cdc5c8
+  data.tar.gz: 8c9b7c1dc2d9d5366f1aa32aa0b40c60d77f31a8779f3a818da897f1e20fc73e
 SHA512:
-  metadata.gz: d0d2618429769e3253eaeb474ae51fd5a7cbfa704eef19bbbb730fa1dacc25f0439eeafe6d8268028d0596a9f4efb3a16392ce4e1f0253d5f193642612d6d8f4
-  data.tar.gz: 6a53306414b2c2921f57e3e2f497ff25901af7f126740a003b572f7d4b2723a1a132be4bf702c3582041eb2965a5adde5d7909c1b0fa7c7531b30f8d1a5a9dde
+  metadata.gz: 8d003f5fe55523266a5c68e7960e3e55eeaf8e2b687c5cd4d2bbeb1ea33e78d85d2c878e2309a5154c51eb84d053a1e593ddd9d7a92d9db5c031b223ef735257
+  data.tar.gz: de814ec7a6c83262ff9d6b9b699bfb01943080ffe01a0436d570fc14a49991baea16138b9ba4741e7f654769cc2fe3a1efd2c8c71b13f11c84e0b74a1661919d

data/README.md

@@ -1,6 +1 @@
 ## aromancer gem
-
-# todos:
-- settings
-  - server url
-  - force ssl

data/checksums/aromancer-0.0.6.gem.sha512

@@ -0,0 +1 @@
+67c2e2ec251ed1f69ccd21bd1501d8a0ade0f56392d893217a5e528b40418a2f573ef3f3749d6a034b7a40c2fbf1d6e2486c2adfe488983d2e5a8d5149528109

data/lib/aromancer/api.rb

@@ -28,19 +28,21 @@ module Aromancer
 
       signed_out = false
       signed_out = response.status == 401
-      error_body = nil
-      begin
-        error_body = JSON.parse(response.body)
-      rescue StandardError => e
-      end
+      # error_body = nil
+      # begin
+      #   error_body = JSON.parse(response.body)
+      # rescue StandardError => e
+      # end
 
-      signed_out = signed_out &&
-        !error_body.nil? &&
-        error_body.keys.include?(:error_message.to_s) &&
-        error_body["error_message"] == "not signed in"
+      # signed_out = signed_out &&
+      #   !error_body.nil? &&
+      #   error_body.keys.include?(:error_message.to_s) &&
+      #   error_body["error_message"] == "not signed in"
 
-      Aromancer::Storage.instance.clear_cache! if signed_out
-      Aromancer::Storage.set_signed_out_flag(signed_out)
+      if signed_out
+        Aromancer::Storage.instance.clear_cache!
+        Aromancer::Storage.set_signed_out_flag(signed_out)
+      end
     end
 
     def self.sign_in
@@ -93,9 +95,15 @@ module Aromancer
     def self.sign_out
       result = Aromancer::Server.sign_out
       # clear storage
+      Aromancer::Storage.instance.clear_cache!
+      Aromancer::Storage.set_signed_out_flag(true)
       Aromancer::Storage.set_player(nil)
+      Aromancer::Storage.set_legends(nil)
+      Aromancer::Storage.set_arena(nil)
+      Aromancer::Storage.set_stream(nil)
       Aromancer::Storage.set_last_error(nil)
-      FileUtils.rm_rf(Aromancer::Storage.storage_filepath)
+
+      Aromancer::Websocket.instance.disconnect
 
       register_error(result) if result.status != 200
     end
@@ -110,6 +118,9 @@ module Aromancer
       result = Aromancer::Server.create_legend({legend: params})
       if result.status == 201
         response = JSON.parse(result.body)
+        if Aromancer::Storage.get_preference(:debug)
+          Aromancer::Prompt.say(JSON.pretty_generate(response))
+        end
         set_active_legend_id(response["id"])
       else
         register_error(result)
@@ -122,12 +133,13 @@ module Aromancer
         response = JSON.parse(result.body)
         Aromancer::Storage.set_legends(response)
       else
-        Aromancer::Storage.set_legends([])
+        Aromancer::Storage.set_legends(nil)
         register_error(result)
       end
     end
 
     def self.set_active_legend_id(active_legend_id)
+      Aromancer::Storage.set_arena(nil)
       result = Aromancer::Server.update_player({player: {
         active_legend_id: active_legend_id,
         status: active_legend_id.nil? ? :lobby : :playing
@@ -178,7 +190,6 @@ module Aromancer
       result = Aromancer::Server.create_turn({arena: arena_params})
       if result.status == 201
         response = JSON.parse(result.body)
-        load_arena
       else
         register_error(result)
       end
@@ -188,7 +199,6 @@ module Aromancer
       result = Aromancer::Server.update_turn({arena: arena_params})
       if result.status == 200
         response = JSON.parse(result.body)
-        load_arena
       else
         register_error(result)
       end