From 763550b63a495e573e0d1c6f26449fa157d161f5 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Wed, 14 May 2025 15:37:09 +0200 Subject: [PATCH] refactor ruby --- .../call_script_function_that_causes_runtime_error.rb | 2 +- assets/tests/ruby/call_script_function_with_params.rb | 8 ++++---- assets/tests/ruby/return_via_promise.rb | 8 ++++---- ...ion_gets_called_from_script_with_multiple_params.rb | 2 +- .../ruby/script_function_gets_called_from_rust.rb | 6 +++--- ...ction_gets_called_from_rust_with_multiple_params.rb | 10 +++++----- ...function_gets_called_from_rust_with_single_param.rb | 6 +++--- tests/tests.rs | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/assets/tests/ruby/call_script_function_that_causes_runtime_error.rb b/assets/tests/ruby/call_script_function_that_causes_runtime_error.rb index c9a193a..ae0afac 100644 --- a/assets/tests/ruby/call_script_function_that_causes_runtime_error.rb +++ b/assets/tests/ruby/call_script_function_that_causes_runtime_error.rb @@ -1,3 +1,3 @@ def test_func - print("abc" + 5) + print('abc' + 5) end diff --git a/assets/tests/ruby/call_script_function_with_params.rb b/assets/tests/ruby/call_script_function_with_params.rb index 4c3bfd5..ba6c271 100644 --- a/assets/tests/ruby/call_script_function_with_params.rb +++ b/assets/tests/ruby/call_script_function_with_params.rb @@ -1,7 +1,7 @@ -STATE = { - "called_with" => nil +$state = { + 'called_with' => nil } -def test_func(x) - called_with = x +def test_func(val) + $state['called_with'] = val end diff --git a/assets/tests/ruby/return_via_promise.rb b/assets/tests/ruby/return_via_promise.rb index 51635ec..dc9d107 100644 --- a/assets/tests/ruby/return_via_promise.rb +++ b/assets/tests/ruby/return_via_promise.rb @@ -1,9 +1,9 @@ -STATE = { +$state = { 'x' => nil } def test_func - rust_func.and_then do |x| - STATE['x'] = x - end + # rust_func.and_then do |x| + # $state['x'] = x + # end end diff --git a/assets/tests/ruby/rust_function_gets_called_from_script_with_multiple_params.rb b/assets/tests/ruby/rust_function_gets_called_from_script_with_multiple_params.rb index 852897c..fea8542 100644 --- a/assets/tests/ruby/rust_function_gets_called_from_script_with_multiple_params.rb +++ b/assets/tests/ruby/rust_function_gets_called_from_script_with_multiple_params.rb @@ -1,3 +1,3 @@ def test_func - rust_func(5, "test") + rust_func(5, 'test') end diff --git a/assets/tests/ruby/script_function_gets_called_from_rust.rb b/assets/tests/ruby/script_function_gets_called_from_rust.rb index 2ed4705..0fae6da 100644 --- a/assets/tests/ruby/script_function_gets_called_from_rust.rb +++ b/assets/tests/ruby/script_function_gets_called_from_rust.rb @@ -1,7 +1,7 @@ -STATE = { - "times_called" => 0 +$state = { + 'times_called' => 0 } def test_func - STATE["times_called"] += 1 + $state['times_called'] += 1 end diff --git a/assets/tests/ruby/script_function_gets_called_from_rust_with_multiple_params.rb b/assets/tests/ruby/script_function_gets_called_from_rust_with_multiple_params.rb index 8d255b1..4cc49e7 100644 --- a/assets/tests/ruby/script_function_gets_called_from_rust_with_multiple_params.rb +++ b/assets/tests/ruby/script_function_gets_called_from_rust_with_multiple_params.rb @@ -1,9 +1,9 @@ -STATE = { - 'a_value' => nil, - 'b_value' => nil +$state = { + 'a_value' => nil, + 'b_value' => nil } def test_func(a, b) - STATE['a_value'] = a - STATE['b_value'] = b + $state['a_value'] = a + $state['b_value'] = b end diff --git a/assets/tests/ruby/script_function_gets_called_from_rust_with_single_param.rb b/assets/tests/ruby/script_function_gets_called_from_rust_with_single_param.rb index 21b2eb9..769ea1c 100644 --- a/assets/tests/ruby/script_function_gets_called_from_rust_with_single_param.rb +++ b/assets/tests/ruby/script_function_gets_called_from_rust_with_single_param.rb @@ -1,7 +1,7 @@ -STATE = { - "a_value" => nil +$state = { + 'a_value' => nil } def test_func(a) - STATE["a_value"] = a + $state['a_value'] = a end diff --git a/tests/tests.rs b/tests/tests.rs index 676f75e..49ec68a 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -487,7 +487,7 @@ mod lua_tests { mod ruby_tests { use bevy::prelude::*; use bevy_scriptum::runtimes::ruby::{prelude::*, RubyScriptData}; - use magnus::{value::ReprValue, Module}; + use magnus::{value::ReprValue, Module, Object}; impl AssertStateKeyValue for RubyRuntime { type ScriptData = RubyScriptData; @@ -496,7 +496,7 @@ mod ruby_tests { let runtime = world.get_resource::().unwrap(); let key = key.to_string(); runtime.with_engine_thread(move |engine| { - let state: magnus::value::Value = engine.class_object().const_get("STATE").unwrap(); + let state: magnus::value::Value = engine.eval("$state").unwrap(); let res: i64 = state.funcall_public("[]", (key,)).unwrap(); assert_eq!(res, value) }) @@ -506,7 +506,7 @@ mod ruby_tests { let runtime = world.get_resource::().unwrap(); let key = key.to_string(); runtime.with_engine_thread(move |engine| { - let state: magnus::value::Value = engine.class_object().const_get("STATE").unwrap(); + let state: magnus::value::Value = engine.eval("$state").unwrap(); let res: i32 = state.funcall_public("[]", (key,)).unwrap(); assert_eq!(res, value) }) @@ -520,7 +520,7 @@ mod ruby_tests { ) { let runtime = world.get_resource::().unwrap(); runtime.with_engine(|engine| { - let state: magnus::value::Value = engine.class_object().const_get("STATE").unwrap(); + let state: magnus::value::Value = engine.eval("$state").unwrap(); let res: String = state.funcall_public("[]", (key,)).unwrap(); assert_eq!(res, value); });