ratatui_ruby 0.3.1 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.builds/ruby-3.2.yml +14 -12
- data/.builds/ruby-3.3.yml +14 -12
- data/.builds/ruby-3.4.yml +14 -12
- data/.builds/ruby-4.0.0.yml +14 -12
- data/AGENTS.md +54 -13
- data/CHANGELOG.md +186 -1
- data/README.md +17 -15
- data/doc/application_architecture.md +116 -0
- data/doc/application_testing.md +12 -7
- data/doc/contributors/better_dx.md +543 -0
- data/doc/contributors/design/ruby_frontend.md +1 -1
- data/doc/contributors/developing_examples.md +203 -0
- data/doc/contributors/documentation_style.md +97 -0
- data/doc/contributors/dwim_dx.md +366 -0
- data/doc/contributors/example_analysis.md +82 -0
- data/doc/custom.css +14 -0
- data/doc/event_handling.md +119 -0
- data/doc/images/all_events.png +0 -0
- data/doc/images/analytics.png +0 -0
- data/doc/images/block_padding.png +0 -0
- data/doc/images/block_titles.png +0 -0
- data/doc/images/box_demo.png +0 -0
- data/doc/images/calendar_demo.png +0 -0
- data/doc/images/cell_demo.png +0 -0
- data/doc/images/chart_demo.png +0 -0
- data/doc/images/custom_widget.png +0 -0
- data/doc/images/flex_layout.png +0 -0
- data/doc/images/gauge_demo.png +0 -0
- data/doc/images/hit_test.png +0 -0
- data/doc/images/line_gauge_demo.png +0 -0
- data/doc/images/list_demo.png +0 -0
- data/doc/images/list_styles.png +0 -0
- data/doc/images/login_form.png +0 -0
- data/doc/images/map_demo.png +0 -0
- data/doc/images/mouse_events.png +0 -0
- data/doc/images/popup_demo.png +0 -0
- data/doc/images/quickstart_dsl.png +0 -0
- data/doc/images/quickstart_lifecycle.png +0 -0
- data/doc/images/ratatui_logo_demo.png +0 -0
- data/doc/images/readme_usage.png +0 -0
- data/doc/images/rich_text.png +0 -0
- data/doc/images/scroll_text.png +0 -0
- data/doc/images/scrollbar_demo.png +0 -0
- data/doc/images/sparkline_demo.png +0 -0
- data/doc/images/table_flex.png +0 -0
- data/doc/images/table_select.png +0 -0
- data/doc/images/widget_style_colors.png +0 -0
- data/doc/index.md +1 -0
- data/doc/interactive_design.md +121 -0
- data/doc/quickstart.md +147 -72
- data/examples/all_events/app.rb +169 -0
- data/examples/all_events/app.rbs +7 -0
- data/examples/all_events/test_app.rb +139 -0
- data/examples/analytics/app.rb +258 -0
- data/examples/analytics/app.rbs +7 -0
- data/examples/analytics/test_app.rb +132 -0
- data/examples/block_padding/app.rb +63 -0
- data/examples/block_padding/app.rbs +7 -0
- data/examples/block_padding/test_app.rb +31 -0
- data/examples/block_titles/app.rb +61 -0
- data/examples/block_titles/app.rbs +7 -0
- data/examples/block_titles/test_app.rb +34 -0
- data/examples/box_demo/app.rb +216 -0
- data/examples/box_demo/app.rbs +7 -0
- data/examples/box_demo/test_app.rb +88 -0
- data/examples/calendar_demo/app.rb +101 -0
- data/examples/calendar_demo/app.rbs +7 -0
- data/examples/calendar_demo/test_app.rb +108 -0
- data/examples/cell_demo/app.rb +108 -0
- data/examples/cell_demo/app.rbs +7 -0
- data/examples/cell_demo/test_app.rb +36 -0
- data/examples/chart_demo/app.rb +203 -0
- data/examples/chart_demo/app.rbs +7 -0
- data/examples/chart_demo/test_app.rb +102 -0
- data/examples/custom_widget/app.rb +51 -0
- data/examples/custom_widget/app.rbs +7 -0
- data/examples/custom_widget/test_app.rb +30 -0
- data/examples/flex_layout/app.rb +156 -0
- data/examples/flex_layout/app.rbs +7 -0
- data/examples/flex_layout/test_app.rb +65 -0
- data/examples/gauge_demo/app.rb +182 -0
- data/examples/gauge_demo/app.rbs +7 -0
- data/examples/gauge_demo/test_app.rb +120 -0
- data/examples/hit_test/app.rb +175 -0
- data/examples/hit_test/app.rbs +7 -0
- data/examples/hit_test/test_app.rb +102 -0
- data/examples/line_gauge_demo/app.rb +190 -0
- data/examples/line_gauge_demo/app.rbs +7 -0
- data/examples/line_gauge_demo/test_app.rb +129 -0
- data/examples/list_demo/app.rb +253 -0
- data/examples/list_demo/app.rbs +12 -0
- data/examples/list_demo/test_app.rb +237 -0
- data/examples/list_styles/app.rb +140 -0
- data/examples/list_styles/app.rbs +7 -0
- data/examples/list_styles/test_app.rb +157 -0
- data/examples/{login_form.rb → login_form/app.rb} +12 -16
- data/examples/login_form/app.rbs +7 -0
- data/examples/login_form/test_app.rb +51 -0
- data/examples/map_demo/app.rb +90 -0
- data/examples/map_demo/app.rbs +7 -0
- data/examples/map_demo/test_app.rb +149 -0
- data/examples/{mouse_events.rb → mouse_events/app.rb} +29 -27
- data/examples/mouse_events/app.rbs +7 -0
- data/examples/mouse_events/test_app.rb +53 -0
- data/examples/{popup_demo.rb → popup_demo/app.rb} +15 -17
- data/examples/popup_demo/app.rbs +7 -0
- data/examples/{test_popup_demo.rb → popup_demo/test_app.rb} +18 -26
- data/examples/quickstart_dsl/app.rb +36 -0
- data/examples/quickstart_dsl/app.rbs +7 -0
- data/examples/quickstart_dsl/test_app.rb +29 -0
- data/examples/quickstart_lifecycle/app.rb +39 -0
- data/examples/quickstart_lifecycle/app.rbs +7 -0
- data/examples/quickstart_lifecycle/test_app.rb +29 -0
- data/examples/ratatui_logo_demo/app.rb +79 -0
- data/examples/ratatui_logo_demo/app.rbs +7 -0
- data/examples/ratatui_logo_demo/test_app.rb +51 -0
- data/examples/ratatui_mascot_demo/app.rb +84 -0
- data/examples/ratatui_mascot_demo/app.rbs +7 -0
- data/examples/ratatui_mascot_demo/test_app.rb +47 -0
- data/examples/readme_usage/app.rb +29 -0
- data/examples/readme_usage/app.rbs +7 -0
- data/examples/readme_usage/test_app.rb +29 -0
- data/examples/rich_text/app.rb +141 -0
- data/examples/rich_text/app.rbs +7 -0
- data/examples/rich_text/test_app.rb +166 -0
- data/examples/scroll_text/app.rb +103 -0
- data/examples/scroll_text/app.rbs +7 -0
- data/examples/scroll_text/test_app.rb +110 -0
- data/examples/scrollbar_demo/app.rb +143 -0
- data/examples/scrollbar_demo/app.rbs +7 -0
- data/examples/scrollbar_demo/test_app.rb +77 -0
- data/examples/sparkline_demo/app.rb +240 -0
- data/examples/sparkline_demo/app.rbs +10 -0
- data/examples/sparkline_demo/test_app.rb +107 -0
- data/examples/table_flex/app.rb +65 -0
- data/examples/table_flex/app.rbs +7 -0
- data/examples/table_flex/test_app.rb +36 -0
- data/examples/table_select/app.rb +198 -0
- data/examples/table_select/app.rbs +7 -0
- data/examples/table_select/test_app.rb +180 -0
- data/examples/widget_style_colors/app.rb +104 -0
- data/examples/widget_style_colors/app.rbs +14 -0
- data/examples/widget_style_colors/test_app.rb +48 -0
- data/ext/ratatui_ruby/Cargo.lock +889 -115
- data/ext/ratatui_ruby/Cargo.toml +4 -3
- data/ext/ratatui_ruby/clippy.toml +7 -0
- data/ext/ratatui_ruby/extconf.rb +7 -0
- data/ext/ratatui_ruby/src/events.rs +218 -229
- data/ext/ratatui_ruby/src/lib.rs +38 -10
- data/ext/ratatui_ruby/src/rendering.rs +90 -10
- data/ext/ratatui_ruby/src/style.rs +281 -98
- data/ext/ratatui_ruby/src/terminal.rs +119 -25
- data/ext/ratatui_ruby/src/text.rs +171 -0
- data/ext/ratatui_ruby/src/widgets/barchart.rs +97 -24
- data/ext/ratatui_ruby/src/widgets/block.rs +31 -3
- data/ext/ratatui_ruby/src/widgets/calendar.rs +45 -44
- data/ext/ratatui_ruby/src/widgets/canvas.rs +46 -29
- data/ext/ratatui_ruby/src/widgets/chart.rs +69 -27
- data/ext/ratatui_ruby/src/widgets/clear.rs +3 -1
- data/ext/ratatui_ruby/src/widgets/gauge.rs +11 -4
- data/ext/ratatui_ruby/src/widgets/layout.rs +218 -15
- data/ext/ratatui_ruby/src/widgets/line_gauge.rs +92 -0
- data/ext/ratatui_ruby/src/widgets/list.rs +91 -11
- data/ext/ratatui_ruby/src/widgets/mod.rs +3 -0
- data/ext/ratatui_ruby/src/widgets/overlay.rs +3 -2
- data/ext/ratatui_ruby/src/widgets/paragraph.rs +35 -13
- data/ext/ratatui_ruby/src/widgets/ratatui_logo.rs +29 -0
- data/ext/ratatui_ruby/src/widgets/ratatui_mascot.rs +44 -0
- data/ext/ratatui_ruby/src/widgets/scrollbar.rs +59 -7
- data/ext/ratatui_ruby/src/widgets/sparkline.rs +70 -6
- data/ext/ratatui_ruby/src/widgets/table.rs +173 -64
- data/ext/ratatui_ruby/src/widgets/tabs.rs +105 -5
- data/lib/ratatui_ruby/cell.rb +166 -0
- data/lib/ratatui_ruby/event/focus_gained.rb +49 -0
- data/lib/ratatui_ruby/event/focus_lost.rb +50 -0
- data/lib/ratatui_ruby/event/key.rb +211 -0
- data/lib/ratatui_ruby/event/mouse.rb +124 -0
- data/lib/ratatui_ruby/event/paste.rb +71 -0
- data/lib/ratatui_ruby/event/resize.rb +80 -0
- data/lib/ratatui_ruby/event.rb +79 -0
- data/lib/ratatui_ruby/schema/bar_chart/bar.rb +45 -0
- data/lib/ratatui_ruby/schema/bar_chart/bar_group.rb +27 -0
- data/lib/ratatui_ruby/schema/bar_chart.rb +228 -19
- data/lib/ratatui_ruby/schema/block.rb +186 -14
- data/lib/ratatui_ruby/schema/calendar.rb +74 -17
- data/lib/ratatui_ruby/schema/canvas.rb +215 -48
- data/lib/ratatui_ruby/schema/center.rb +49 -11
- data/lib/ratatui_ruby/schema/chart.rb +151 -41
- data/lib/ratatui_ruby/schema/clear.rb +41 -72
- data/lib/ratatui_ruby/schema/constraint.rb +82 -22
- data/lib/ratatui_ruby/schema/cursor.rb +27 -9
- data/lib/ratatui_ruby/schema/draw.rb +53 -0
- data/lib/ratatui_ruby/schema/gauge.rb +59 -15
- data/lib/ratatui_ruby/schema/layout.rb +95 -13
- data/lib/ratatui_ruby/schema/line_gauge.rb +78 -0
- data/lib/ratatui_ruby/schema/list.rb +93 -19
- data/lib/ratatui_ruby/schema/overlay.rb +34 -8
- data/lib/ratatui_ruby/schema/paragraph.rb +87 -30
- data/lib/ratatui_ruby/schema/ratatui_logo.rb +25 -0
- data/lib/ratatui_ruby/schema/ratatui_mascot.rb +29 -0
- data/lib/ratatui_ruby/schema/rect.rb +64 -15
- data/lib/ratatui_ruby/schema/scrollbar.rb +132 -24
- data/lib/ratatui_ruby/schema/shape/label.rb +66 -0
- data/lib/ratatui_ruby/schema/sparkline.rb +122 -15
- data/lib/ratatui_ruby/schema/style.rb +49 -21
- data/lib/ratatui_ruby/schema/table.rb +119 -21
- data/lib/ratatui_ruby/schema/tabs.rb +75 -13
- data/lib/ratatui_ruby/schema/text.rb +90 -0
- data/lib/ratatui_ruby/session.rb +146 -0
- data/lib/ratatui_ruby/test_helper.rb +156 -13
- data/lib/ratatui_ruby/version.rb +1 -1
- data/lib/ratatui_ruby.rb +143 -23
- data/sig/ratatui_ruby/event.rbs +69 -0
- data/sig/ratatui_ruby/ratatui_ruby.rbs +2 -1
- data/sig/ratatui_ruby/schema/bar_chart/bar.rbs +16 -0
- data/sig/ratatui_ruby/schema/bar_chart/bar_group.rbs +13 -0
- data/sig/ratatui_ruby/schema/bar_chart.rbs +20 -2
- data/sig/ratatui_ruby/schema/block.rbs +5 -4
- data/sig/ratatui_ruby/schema/calendar.rbs +6 -2
- data/sig/ratatui_ruby/schema/canvas.rbs +52 -39
- data/sig/ratatui_ruby/schema/center.rbs +3 -3
- data/sig/ratatui_ruby/schema/chart.rbs +8 -5
- data/sig/ratatui_ruby/schema/constraint.rbs +8 -5
- data/sig/ratatui_ruby/schema/cursor.rbs +1 -1
- data/sig/ratatui_ruby/schema/draw.rbs +23 -0
- data/sig/ratatui_ruby/schema/gauge.rbs +4 -2
- data/sig/ratatui_ruby/schema/layout.rbs +11 -1
- data/sig/ratatui_ruby/schema/line_gauge.rbs +16 -0
- data/sig/ratatui_ruby/schema/list.rbs +5 -1
- data/sig/ratatui_ruby/schema/paragraph.rbs +4 -1
- data/{lib/ratatui_ruby/output.rb → sig/ratatui_ruby/schema/ratatui_logo.rbs} +3 -2
- data/sig/ratatui_ruby/{buffer.rbs → schema/ratatui_mascot.rbs} +4 -3
- data/sig/ratatui_ruby/schema/rect.rbs +2 -1
- data/sig/ratatui_ruby/schema/scrollbar.rbs +18 -2
- data/sig/ratatui_ruby/schema/sparkline.rbs +6 -2
- data/sig/ratatui_ruby/schema/table.rbs +8 -1
- data/sig/ratatui_ruby/schema/tabs.rbs +5 -1
- data/sig/ratatui_ruby/schema/text.rbs +22 -0
- data/tasks/resources/build.yml.erb +13 -11
- data/tasks/terminal_preview/app_screenshot.rb +35 -0
- data/tasks/terminal_preview/crash_report.rb +54 -0
- data/tasks/terminal_preview/example_app.rb +25 -0
- data/tasks/terminal_preview/launcher_script.rb +48 -0
- data/tasks/terminal_preview/preview_collection.rb +60 -0
- data/tasks/terminal_preview/preview_timing.rb +22 -0
- data/tasks/terminal_preview/safety_confirmation.rb +58 -0
- data/tasks/terminal_preview/saved_screenshot.rb +55 -0
- data/tasks/terminal_preview/system_appearance.rb +11 -0
- data/tasks/terminal_preview/terminal_window.rb +138 -0
- data/tasks/terminal_preview/window_id.rb +14 -0
- data/tasks/terminal_preview.rake +28 -0
- data/tasks/test.rake +1 -1
- metadata +174 -53
- data/doc/images/examples-analytics.rb.png +0 -0
- data/doc/images/examples-box_demo.rb.png +0 -0
- data/doc/images/examples-calendar_demo.rb.png +0 -0
- data/doc/images/examples-chart_demo.rb.png +0 -0
- data/doc/images/examples-custom_widget.rb.png +0 -0
- data/doc/images/examples-dashboard.rb.png +0 -0
- data/doc/images/examples-list_styles.rb.png +0 -0
- data/doc/images/examples-login_form.rb.png +0 -0
- data/doc/images/examples-map_demo.rb.png +0 -0
- data/doc/images/examples-mouse_events.rb.png +0 -0
- data/doc/images/examples-popup_demo.rb.gif +0 -0
- data/doc/images/examples-quickstart_lifecycle.rb.png +0 -0
- data/doc/images/examples-scroll_text.rb.png +0 -0
- data/doc/images/examples-scrollbar_demo.rb.png +0 -0
- data/doc/images/examples-stock_ticker.rb.png +0 -0
- data/doc/images/examples-system_monitor.rb.png +0 -0
- data/doc/images/examples-table_select.rb.png +0 -0
- data/examples/analytics.rb +0 -88
- data/examples/box_demo.rb +0 -71
- data/examples/calendar_demo.rb +0 -55
- data/examples/chart_demo.rb +0 -84
- data/examples/custom_widget.rb +0 -43
- data/examples/dashboard.rb +0 -72
- data/examples/list_styles.rb +0 -66
- data/examples/map_demo.rb +0 -58
- data/examples/quickstart_dsl.rb +0 -30
- data/examples/quickstart_lifecycle.rb +0 -40
- data/examples/readme_usage.rb +0 -21
- data/examples/scroll_text.rb +0 -74
- data/examples/scrollbar_demo.rb +0 -75
- data/examples/stock_ticker.rb +0 -93
- data/examples/system_monitor.rb +0 -94
- data/examples/table_select.rb +0 -70
- data/examples/test_analytics.rb +0 -65
- data/examples/test_box_demo.rb +0 -38
- data/examples/test_calendar_demo.rb +0 -66
- data/examples/test_dashboard.rb +0 -38
- data/examples/test_list_styles.rb +0 -61
- data/examples/test_login_form.rb +0 -63
- data/examples/test_map_demo.rb +0 -100
- data/examples/test_scroll_text.rb +0 -130
- data/examples/test_stock_ticker.rb +0 -39
- data/examples/test_system_monitor.rb +0 -40
- data/examples/test_table_select.rb +0 -37
- data/ext/ratatui_ruby/src/buffer.rs +0 -54
- data/lib/ratatui_ruby/dsl.rb +0 -64
|
@@ -1,29 +1,39 @@
|
|
|
1
1
|
// SPDX-FileCopyrightText: 2025 Kerrick Long <me@kerricklong.com>
|
|
2
2
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
3
3
|
|
|
4
|
-
use crate::
|
|
4
|
+
use crate::style::{parse_color_value, parse_modifier_str, parse_style};
|
|
5
5
|
use crate::widgets;
|
|
6
|
-
use magnus::{prelude::*, Error, Value};
|
|
7
|
-
use ratatui::{layout::Rect, Frame};
|
|
6
|
+
use magnus::{prelude::*, Error, RArray, Value};
|
|
7
|
+
use ratatui::{buffer::Buffer, layout::Rect, style::Style, Frame};
|
|
8
8
|
|
|
9
9
|
pub fn render_node(frame: &mut Frame, area: Rect, node: Value) -> Result<(), Error> {
|
|
10
10
|
if node.respond_to("render", true)? {
|
|
11
|
-
let wrapper = BufferWrapper::new(frame.buffer_mut());
|
|
12
11
|
let ruby = magnus::Ruby::get().unwrap();
|
|
13
12
|
let ruby_area = {
|
|
14
13
|
let module = ruby.define_module("RatatuiRuby")?;
|
|
15
14
|
let class = module.const_get::<_, magnus::RClass>("Rect")?;
|
|
16
15
|
class.funcall::<_, _, Value>("new", (area.x, area.y, area.width, area.height))?
|
|
17
16
|
};
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
|
|
18
|
+
// Call render with just the area (no buffer!)
|
|
19
|
+
let commands: Value = node.funcall("render", (ruby_area,))?;
|
|
20
|
+
|
|
21
|
+
// Process returned draw commands
|
|
22
|
+
if let Some(arr) = RArray::from_value(commands) {
|
|
23
|
+
for i in 0..arr.len() {
|
|
24
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
25
|
+
let index = isize::try_from(i).map_err(|e| Error::new(ruby.exception_range_error(), e.to_string()))?;
|
|
26
|
+
let cmd: Value = arr.entry(index)?;
|
|
27
|
+
process_draw_command(frame.buffer_mut(), cmd)?;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
20
30
|
return Ok(());
|
|
21
31
|
}
|
|
22
32
|
|
|
23
|
-
|
|
24
|
-
let class_name = unsafe { class.name() };
|
|
33
|
+
// SAFETY: Immediate conversion to owned string avoids GC-unsafe borrowed reference.
|
|
34
|
+
let class_name = unsafe { node.class().name() }.into_owned();
|
|
25
35
|
|
|
26
|
-
match class_name.
|
|
36
|
+
match class_name.as_str() {
|
|
27
37
|
"RatatuiRuby::Paragraph" => widgets::paragraph::render(frame, area, node)?,
|
|
28
38
|
"RatatuiRuby::Clear" => widgets::clear::render(frame, area, node)?,
|
|
29
39
|
"RatatuiRuby::Cursor" => widgets::cursor::render(frame, area, node)?,
|
|
@@ -32,6 +42,7 @@ pub fn render_node(frame: &mut Frame, area: Rect, node: Value) -> Result<(), Err
|
|
|
32
42
|
"RatatuiRuby::Layout" => widgets::layout::render(frame, area, node)?,
|
|
33
43
|
"RatatuiRuby::List" => widgets::list::render(frame, area, node)?,
|
|
34
44
|
"RatatuiRuby::Gauge" => widgets::gauge::render(frame, area, node)?,
|
|
45
|
+
"RatatuiRuby::LineGauge" => widgets::line_gauge::render(frame, area, node)?,
|
|
35
46
|
"RatatuiRuby::Table" => widgets::table::render(frame, area, node)?,
|
|
36
47
|
"RatatuiRuby::Block" => widgets::block::render(frame, area, node)?,
|
|
37
48
|
"RatatuiRuby::Tabs" => widgets::tabs::render(frame, area, node)?,
|
|
@@ -41,9 +52,78 @@ pub fn render_node(frame: &mut Frame, area: Rect, node: Value) -> Result<(), Err
|
|
|
41
52
|
"RatatuiRuby::Calendar" => widgets::calendar::render(frame, area, node)?,
|
|
42
53
|
"RatatuiRuby::Sparkline" => widgets::sparkline::render(frame, area, node)?,
|
|
43
54
|
"RatatuiRuby::Chart" | "RatatuiRuby::LineChart" => {
|
|
44
|
-
widgets::chart::render(frame, area, node)
|
|
55
|
+
widgets::chart::render(frame, area, node)?;
|
|
45
56
|
}
|
|
57
|
+
"RatatuiRuby::RatatuiLogo" => widgets::ratatui_logo::render(frame, area, node)?,
|
|
58
|
+
"RatatuiRuby::RatatuiMascot" => widgets::ratatui_mascot::render_ratatui_mascot(frame, area, node)?,
|
|
46
59
|
_ => {}
|
|
47
60
|
}
|
|
48
61
|
Ok(())
|
|
49
62
|
}
|
|
63
|
+
|
|
64
|
+
fn process_draw_command(buffer: &mut Buffer, cmd: Value) -> Result<(), Error> {
|
|
65
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
66
|
+
// SAFETY: Immediate conversion to owned string avoids GC-unsafe borrowed reference.
|
|
67
|
+
let class_name = unsafe { cmd.class().name() }.into_owned();
|
|
68
|
+
|
|
69
|
+
match class_name.as_str() {
|
|
70
|
+
"RatatuiRuby::Draw::StringCmd" => {
|
|
71
|
+
let x: u16 = cmd.funcall("x", ())?;
|
|
72
|
+
let y: u16 = cmd.funcall("y", ())?;
|
|
73
|
+
let string: String = cmd.funcall("string", ())?;
|
|
74
|
+
let style_val: Value = cmd.funcall("style", ())?;
|
|
75
|
+
let style = parse_style(style_val)?;
|
|
76
|
+
buffer.set_string(x, y, string, style);
|
|
77
|
+
}
|
|
78
|
+
"RatatuiRuby::Draw::CellCmd" => {
|
|
79
|
+
let x: u16 = cmd.funcall("x", ())?;
|
|
80
|
+
let y: u16 = cmd.funcall("y", ())?;
|
|
81
|
+
let cell_val: Value = cmd.funcall("cell", ())?;
|
|
82
|
+
|
|
83
|
+
let area = buffer.area;
|
|
84
|
+
if x >= area.x + area.width || y >= area.y + area.height {
|
|
85
|
+
return Ok(());
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
let symbol: String = cell_val.funcall("char", ())?;
|
|
89
|
+
let fg_val: Value = cell_val.funcall("fg", ())?;
|
|
90
|
+
let bg_val: Value = cell_val.funcall("bg", ())?;
|
|
91
|
+
let modifiers_val: Value = cell_val.funcall("modifiers", ())?;
|
|
92
|
+
|
|
93
|
+
let mut style = Style::default();
|
|
94
|
+
|
|
95
|
+
if !fg_val.is_nil() {
|
|
96
|
+
if let Some(color) = parse_color_value(fg_val)? {
|
|
97
|
+
style = style.fg(color);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
if !bg_val.is_nil() {
|
|
101
|
+
if let Some(color) = parse_color_value(bg_val)? {
|
|
102
|
+
style = style.bg(color);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
if let Some(mods_array) = RArray::from_value(modifiers_val) {
|
|
107
|
+
for i in 0..mods_array.len() {
|
|
108
|
+
let index = isize::try_from(i).map_err(|e| Error::new(ruby.exception_range_error(), e.to_string()))?;
|
|
109
|
+
let mod_str: String = mods_array.entry::<String>(index)?;
|
|
110
|
+
if let Some(modifier) = parse_modifier_str(&mod_str) {
|
|
111
|
+
style = style.add_modifier(modifier);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
if let Some(cell) = buffer.cell_mut((x, y)) {
|
|
117
|
+
cell.set_symbol(&symbol).set_style(style);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
_ => {
|
|
121
|
+
return Err(Error::new(
|
|
122
|
+
ruby.exception_type_error(),
|
|
123
|
+
format!("Unknown draw command: {class_name}"),
|
|
124
|
+
));
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
Ok(())
|
|
129
|
+
}
|
|
@@ -1,14 +1,54 @@
|
|
|
1
|
-
// SPDX-FileCopyrightText: 2025 Kerrick Long <me@kerricklong.com>
|
|
2
|
-
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
3
|
-
|
|
4
1
|
use magnus::{prelude::*, Error, Symbol, Value};
|
|
5
2
|
use ratatui::{
|
|
6
3
|
style::{Color, Modifier, Style},
|
|
7
|
-
|
|
4
|
+
text::Line,
|
|
5
|
+
widgets::{Block, BorderType, Borders, Padding},
|
|
6
|
+
layout::Alignment,
|
|
7
|
+
symbols,
|
|
8
8
|
};
|
|
9
|
+
use bumpalo::Bump;
|
|
9
10
|
|
|
10
11
|
pub fn parse_color(color_str: &str) -> Option<Color> {
|
|
11
|
-
|
|
12
|
+
// Try standard ratatui parsing first (named colors, indexed, etc.)
|
|
13
|
+
if let Ok(color) = color_str.parse::<Color>() {
|
|
14
|
+
return Some(color);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
// Try hex parsing manually: #RRGGBB
|
|
18
|
+
let hex_str = color_str.trim();
|
|
19
|
+
if hex_str.starts_with('#') && hex_str.len() == 7 {
|
|
20
|
+
if let Ok(hex_val) = u32::from_str_radix(&hex_str[1..], 16) {
|
|
21
|
+
let r = ((hex_val >> 16) & 0xFF) as u8;
|
|
22
|
+
let g = ((hex_val >> 8) & 0xFF) as u8;
|
|
23
|
+
let b = (hex_val & 0xFF) as u8;
|
|
24
|
+
return Some(Color::Rgb(r, g, b));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
None
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
pub fn parse_color_value(val: Value) -> Result<Option<Color>, Error> {
|
|
32
|
+
if val.is_nil() {
|
|
33
|
+
return Ok(None);
|
|
34
|
+
}
|
|
35
|
+
let s: String = val.funcall("to_s", ())?;
|
|
36
|
+
Ok(parse_color(&s))
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
pub fn parse_modifier_str(s: &str) -> Option<Modifier> {
|
|
40
|
+
match s {
|
|
41
|
+
"bold" => Some(Modifier::BOLD),
|
|
42
|
+
"italic" => Some(Modifier::ITALIC),
|
|
43
|
+
"dim" => Some(Modifier::DIM),
|
|
44
|
+
"reversed" => Some(Modifier::REVERSED),
|
|
45
|
+
"underlined" => Some(Modifier::UNDERLINED),
|
|
46
|
+
"slow_blink" => Some(Modifier::SLOW_BLINK),
|
|
47
|
+
"rapid_blink" => Some(Modifier::RAPID_BLINK),
|
|
48
|
+
"crossed_out" => Some(Modifier::CROSSED_OUT),
|
|
49
|
+
"hidden" => Some(Modifier::HIDDEN),
|
|
50
|
+
_ => None,
|
|
51
|
+
}
|
|
12
52
|
}
|
|
13
53
|
|
|
14
54
|
pub fn parse_style(style_val: Value) -> Result<Style, Error> {
|
|
@@ -19,44 +59,45 @@ pub fn parse_style(style_val: Value) -> Result<Style, Error> {
|
|
|
19
59
|
|
|
20
60
|
let mut style = Style::default();
|
|
21
61
|
|
|
22
|
-
let fg
|
|
62
|
+
let (fg, bg, modifiers_val) = if let Some(hash) = magnus::RHash::from_value(style_val) {
|
|
63
|
+
(
|
|
64
|
+
hash.lookup(ruby.to_symbol("fg")).unwrap_or_else(|_| ruby.qnil().as_value()),
|
|
65
|
+
hash.lookup(ruby.to_symbol("bg")).unwrap_or_else(|_| ruby.qnil().as_value()),
|
|
66
|
+
hash.lookup(ruby.to_symbol("modifiers")).unwrap_or_else(|_| ruby.qnil().as_value()),
|
|
67
|
+
)
|
|
68
|
+
} else {
|
|
69
|
+
(
|
|
70
|
+
style_val.funcall("fg", ())?,
|
|
71
|
+
style_val.funcall("bg", ())?,
|
|
72
|
+
style_val.funcall("modifiers", ())?,
|
|
73
|
+
)
|
|
74
|
+
};
|
|
75
|
+
|
|
23
76
|
if !fg.is_nil() {
|
|
24
|
-
let fg_str
|
|
25
|
-
|
|
26
|
-
|
|
77
|
+
if let Ok(fg_str) = fg.funcall::<_, _, String>("to_s", ()) {
|
|
78
|
+
if let Some(color) = parse_color(&fg_str) {
|
|
79
|
+
style = style.fg(color);
|
|
80
|
+
}
|
|
27
81
|
}
|
|
28
82
|
}
|
|
29
83
|
|
|
30
|
-
let bg: Value = style_val.funcall("bg", ())?;
|
|
31
84
|
if !bg.is_nil() {
|
|
32
|
-
let bg_str
|
|
33
|
-
|
|
34
|
-
|
|
85
|
+
if let Ok(bg_str) = bg.funcall::<_, _, String>("to_s", ()) {
|
|
86
|
+
if let Some(color) = parse_color(&bg_str) {
|
|
87
|
+
style = style.bg(color);
|
|
88
|
+
}
|
|
35
89
|
}
|
|
36
90
|
}
|
|
37
91
|
|
|
38
|
-
let modifiers_val: Value = style_val.funcall("modifiers", ())?;
|
|
39
92
|
if !modifiers_val.is_nil() {
|
|
40
|
-
let modifiers_array = magnus::RArray::from_value(modifiers_val)
|
|
41
|
-
|
|
42
|
-
ruby.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
let sym: Symbol = modifiers_array.entry(i as isize)?;
|
|
49
|
-
match sym.to_string().as_str() {
|
|
50
|
-
"bold" => style = style.add_modifier(Modifier::BOLD),
|
|
51
|
-
"italic" => style = style.add_modifier(Modifier::ITALIC),
|
|
52
|
-
"dim" => style = style.add_modifier(Modifier::DIM),
|
|
53
|
-
"reversed" => style = style.add_modifier(Modifier::REVERSED),
|
|
54
|
-
"underlined" => style = style.add_modifier(Modifier::UNDERLINED),
|
|
55
|
-
"slow_blink" => style = style.add_modifier(Modifier::SLOW_BLINK),
|
|
56
|
-
"rapid_blink" => style = style.add_modifier(Modifier::RAPID_BLINK),
|
|
57
|
-
"crossed_out" => style = style.add_modifier(Modifier::CROSSED_OUT),
|
|
58
|
-
"hidden" => style = style.add_modifier(Modifier::HIDDEN),
|
|
59
|
-
_ => {}
|
|
93
|
+
if let Some(modifiers_array) = magnus::RArray::from_value(modifiers_val) {
|
|
94
|
+
for i in 0..modifiers_array.len() {
|
|
95
|
+
let index = isize::try_from(i).map_err(|e| Error::new(ruby.exception_range_error(), e.to_string()))?;
|
|
96
|
+
if let Ok(sym) = modifiers_array.entry::<Symbol>(index) {
|
|
97
|
+
if let Some(m) = parse_modifier_str(&sym.to_string()) {
|
|
98
|
+
style = style.add_modifier(m);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
60
101
|
}
|
|
61
102
|
}
|
|
62
103
|
}
|
|
@@ -64,87 +105,229 @@ pub fn parse_style(style_val: Value) -> Result<Style, Error> {
|
|
|
64
105
|
Ok(style)
|
|
65
106
|
}
|
|
66
107
|
|
|
67
|
-
pub fn
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
108
|
+
pub fn parse_border_set<'a>(set_val: Value, bump: &'a Bump) -> Result<symbols::border::Set<'a>, Error> {
|
|
109
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
110
|
+
let hash = magnus::RHash::from_value(set_val).ok_or_else(|| {
|
|
111
|
+
Error::new(ruby.exception_type_error(), "expected hash for border_set")
|
|
112
|
+
})?;
|
|
71
113
|
|
|
72
|
-
let
|
|
73
|
-
|
|
74
|
-
|
|
114
|
+
let get_char = |key: &str| -> Result<Option<&'a str>, Error> {
|
|
115
|
+
let mut val: Value = hash.lookup(ruby.to_symbol(key)).unwrap_or_else(|_| ruby.qnil().as_value());
|
|
116
|
+
if val.is_nil() {
|
|
117
|
+
val = hash.lookup(ruby.str_new(key)).unwrap_or_else(|_| ruby.qnil().as_value());
|
|
118
|
+
}
|
|
119
|
+
if val.is_nil() {
|
|
120
|
+
Ok(None)
|
|
121
|
+
} else {
|
|
122
|
+
let s: String = val.funcall("to_s", ())?;
|
|
123
|
+
Ok(Some(bump.alloc_str(&s)))
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
let mut set = symbols::border::Set::default();
|
|
128
|
+
if let Some(s) = get_char("top_left")? { set.top_left = s; }
|
|
129
|
+
if let Some(s) = get_char("top_right")? { set.top_right = s; }
|
|
130
|
+
if let Some(s) = get_char("bottom_left")? { set.bottom_left = s; }
|
|
131
|
+
if let Some(s) = get_char("bottom_right")? { set.bottom_right = s; }
|
|
132
|
+
if let Some(s) = get_char("vertical_left")? { set.vertical_left = s; }
|
|
133
|
+
if let Some(s) = get_char("vertical_right")? { set.vertical_right = s; }
|
|
134
|
+
if let Some(s) = get_char("horizontal_top")? { set.horizontal_top = s; }
|
|
135
|
+
if let Some(s) = get_char("horizontal_bottom")? { set.horizontal_bottom = s; }
|
|
136
|
+
|
|
137
|
+
Ok(set)
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
pub fn parse_bar_set<'a>(set_val: Value, bump: &'a Bump) -> Result<symbols::bar::Set<'a>, Error> {
|
|
141
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
142
|
+
let hash = magnus::RHash::from_value(set_val).ok_or_else(|| {
|
|
143
|
+
Error::new(ruby.exception_type_error(), "expected hash for bar_set")
|
|
144
|
+
})?;
|
|
145
|
+
|
|
146
|
+
let get_char = |key: &str| -> Result<Option<&'a str>, Error> {
|
|
147
|
+
let mut val: Value = hash.lookup(ruby.to_symbol(key)).unwrap_or_else(|_| ruby.qnil().as_value());
|
|
148
|
+
if val.is_nil() {
|
|
149
|
+
val = hash.lookup(ruby.str_new(key)).unwrap_or_else(|_| ruby.qnil().as_value());
|
|
150
|
+
}
|
|
151
|
+
if val.is_nil() {
|
|
152
|
+
Ok(None)
|
|
153
|
+
} else {
|
|
154
|
+
let s: String = val.funcall("to_s", ())?;
|
|
155
|
+
Ok(Some(bump.alloc_str(&s)))
|
|
156
|
+
}
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
let mut set = symbols::bar::Set::default();
|
|
160
|
+
if let Some(s) = get_char("empty")? { set.empty = s; }
|
|
161
|
+
if let Some(s) = get_char("one_eighth")? { set.one_eighth = s; }
|
|
162
|
+
if let Some(s) = get_char("one_quarter")? { set.one_quarter = s; }
|
|
163
|
+
if let Some(s) = get_char("three_eighths")? { set.three_eighths = s; }
|
|
164
|
+
if let Some(s) = get_char("half")? { set.half = s; }
|
|
165
|
+
if let Some(s) = get_char("five_eighths")? { set.five_eighths = s; }
|
|
166
|
+
if let Some(s) = get_char("three_quarters")? { set.three_quarters = s; }
|
|
167
|
+
if let Some(s) = get_char("seven_eighths")? { set.seven_eighths = s; }
|
|
168
|
+
if let Some(s) = get_char("full")? { set.full = s; }
|
|
169
|
+
|
|
170
|
+
Ok(set)
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
pub fn parse_block(block_val: Value, bump: &Bump) -> Result<Block<'_>, Error> {
|
|
174
|
+
if block_val.is_nil() { return Ok(Block::default()); }
|
|
75
175
|
|
|
76
176
|
let mut block = Block::default();
|
|
177
|
+
if let Ok(v) = block_val.funcall::<&str, _, Value>("style", ()) {
|
|
178
|
+
if !v.is_nil() { block = block.style(parse_style(v)?); }
|
|
179
|
+
}
|
|
77
180
|
|
|
78
|
-
if
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
181
|
+
if let Ok(v) = block_val.funcall::<&str, _, Value>("title_style", ()) {
|
|
182
|
+
if !v.is_nil() { block = block.title_style(parse_style(v)?); }
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
if let Ok(title) = block_val.funcall::<&str, _, Value>("title", ()) {
|
|
186
|
+
if !title.is_nil() {
|
|
187
|
+
let s: String = title.funcall("to_s", ())?;
|
|
188
|
+
block = block.title(Line::from(s));
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
if let Ok(v) = block_val.funcall::<&str, _, Value>("title_alignment", ()) {
|
|
193
|
+
if let Some(align_sym) = Symbol::from_value(v) {
|
|
194
|
+
match align_sym.to_string().as_str() {
|
|
195
|
+
"center" => block = block.title_alignment(Alignment::Center),
|
|
196
|
+
"right" => block = block.title_alignment(Alignment::Right),
|
|
197
|
+
_ => block = block.title_alignment(Alignment::Left),
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
block = parse_titles(block_val, block)?;
|
|
203
|
+
block = parse_borders(block_val, block, bump)?;
|
|
204
|
+
block = parse_padding(block_val, block);
|
|
205
|
+
|
|
206
|
+
Ok(block)
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
fn parse_titles(block_val: Value, mut block: Block<'_>) -> Result<Block<'_>, Error> {
|
|
210
|
+
if let Ok(titles_val) = block_val.funcall::<&str, _, Value>("titles", ()) {
|
|
211
|
+
if titles_val.is_nil() { return Ok(block); }
|
|
212
|
+
if let Some(titles_array) = magnus::RArray::from_value(titles_val) {
|
|
213
|
+
for i in 0..titles_array.len() {
|
|
214
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
215
|
+
let index = isize::try_from(i).map_err(|e| Error::new(ruby.exception_range_error(), e.to_string()))?;
|
|
216
|
+
let title_item: Value = titles_array.entry(index)?;
|
|
217
|
+
let mut content = String::new();
|
|
218
|
+
let mut alignment = Alignment::Left;
|
|
219
|
+
let mut is_bottom = false;
|
|
220
|
+
let mut style = Style::default();
|
|
221
|
+
|
|
222
|
+
if let Some(hash) = magnus::RHash::from_value(title_item) {
|
|
223
|
+
if let Ok(v) = hash.lookup::<_, Value>(ruby.to_symbol("content")) {
|
|
224
|
+
if !v.is_nil() { content = v.funcall("to_s", ())?; }
|
|
225
|
+
}
|
|
226
|
+
if let Ok(v) = hash.lookup::<_, Value>(ruby.to_symbol("alignment")) {
|
|
227
|
+
if let Some(s) = Symbol::from_value(v) {
|
|
228
|
+
match s.to_string().as_str() {
|
|
229
|
+
"center" => alignment = Alignment::Center,
|
|
230
|
+
"right" => alignment = Alignment::Right,
|
|
231
|
+
_ => {}
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
if let Ok(v) = hash.lookup::<_, Value>(ruby.to_symbol("position")) {
|
|
236
|
+
if let Some(s) = Symbol::from_value(v) {
|
|
237
|
+
if s.to_string().as_str() == "bottom" { is_bottom = true; }
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
if let Ok(v) = hash.lookup::<_, Value>(ruby.to_symbol("style")) {
|
|
241
|
+
if !v.is_nil() { style = parse_style(v)?; }
|
|
242
|
+
}
|
|
243
|
+
} else {
|
|
244
|
+
content = title_item.funcall("to_s", ())?;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
let line = Line::from(content).alignment(alignment).style(style);
|
|
248
|
+
block = if is_bottom { block.title_bottom(line) } else { block.title_top(line) };
|
|
93
249
|
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
Ok(block)
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
fn parse_borders<'a>(block_val: Value, mut block: Block<'a>, bump: &'a Bump) -> Result<Block<'a>, Error> {
|
|
256
|
+
if let Ok(borders_val) = block_val.funcall::<&str, _, Value>("borders", ()) {
|
|
257
|
+
if !borders_val.is_nil() {
|
|
258
|
+
let mut ratatui_borders = Borders::NONE;
|
|
259
|
+
if let Some(sym) = Symbol::from_value(borders_val) {
|
|
97
260
|
match sym.to_string().as_str() {
|
|
98
|
-
"all" => ratatui_borders
|
|
99
|
-
"top" => ratatui_borders
|
|
100
|
-
"bottom" => ratatui_borders
|
|
101
|
-
"left" => ratatui_borders
|
|
102
|
-
"right" => ratatui_borders
|
|
261
|
+
"all" => ratatui_borders = Borders::ALL,
|
|
262
|
+
"top" => ratatui_borders = Borders::TOP,
|
|
263
|
+
"bottom" => ratatui_borders = Borders::BOTTOM,
|
|
264
|
+
"left" => ratatui_borders = Borders::LEFT,
|
|
265
|
+
"right" => ratatui_borders = Borders::RIGHT,
|
|
103
266
|
_ => {}
|
|
104
267
|
}
|
|
268
|
+
} else if let Some(arr) = magnus::RArray::from_value(borders_val) {
|
|
269
|
+
for i in 0..arr.len() {
|
|
270
|
+
let ruby = magnus::Ruby::get().unwrap();
|
|
271
|
+
let index = isize::try_from(i).map_err(|e| Error::new(ruby.exception_range_error(), e.to_string()))?;
|
|
272
|
+
let sym: Symbol = arr.entry(index)?;
|
|
273
|
+
match sym.to_string().as_str() {
|
|
274
|
+
"all" => ratatui_borders |= Borders::ALL,
|
|
275
|
+
"top" => ratatui_borders |= Borders::TOP,
|
|
276
|
+
"bottom" => ratatui_borders |= Borders::BOTTOM,
|
|
277
|
+
"left" => ratatui_borders |= Borders::LEFT,
|
|
278
|
+
"right" => ratatui_borders |= Borders::RIGHT,
|
|
279
|
+
_ => {}
|
|
280
|
+
}
|
|
281
|
+
}
|
|
105
282
|
}
|
|
283
|
+
block = block.borders(ratatui_borders);
|
|
106
284
|
}
|
|
107
|
-
block = block.borders(ratatui_borders);
|
|
108
285
|
}
|
|
109
286
|
|
|
110
|
-
if
|
|
111
|
-
|
|
112
|
-
if let
|
|
113
|
-
|
|
287
|
+
if let Ok(v) = block_val.funcall::<&str, _, Value>("border_style", ()) {
|
|
288
|
+
if !v.is_nil() { block = block.border_style(parse_style(v)?); }
|
|
289
|
+
else if let Ok(color_val) = block_val.funcall::<&str, _, Value>("border_color", ()) {
|
|
290
|
+
if !color_val.is_nil() {
|
|
291
|
+
if let Ok(s) = color_val.funcall::<&str, _, String>("to_s", ()) {
|
|
292
|
+
if let Some(c) = parse_color(&s) { block = block.border_style(Style::default().fg(c)); }
|
|
293
|
+
}
|
|
294
|
+
}
|
|
114
295
|
}
|
|
115
296
|
}
|
|
116
297
|
|
|
298
|
+
if let Ok(v) = block_val.funcall::<&str, _, Value>("border_set", ()) {
|
|
299
|
+
if !v.is_nil() { block = block.border_set(parse_border_set(v, bump)?); }
|
|
300
|
+
else if let Ok(v) = block_val.funcall::<&str, _, Value>("border_type", ()) {
|
|
301
|
+
if let Some(sym) = Symbol::from_value(v) {
|
|
302
|
+
match sym.to_string().as_str() {
|
|
303
|
+
"rounded" => block = block.border_type(BorderType::Rounded),
|
|
304
|
+
"double" => block = block.border_type(BorderType::Double),
|
|
305
|
+
"thick" => block = block.border_type(BorderType::Thick),
|
|
306
|
+
"quadrant_inside" => block = block.border_type(BorderType::QuadrantInside),
|
|
307
|
+
"quadrant_outside" => block = block.border_type(BorderType::QuadrantOutside),
|
|
308
|
+
_ => block = block.border_type(BorderType::Plain),
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
}
|
|
117
313
|
Ok(block)
|
|
118
314
|
}
|
|
119
315
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
assert_eq!(parse_color("dark_gray"), Some(Color::DarkGray));
|
|
136
|
-
assert_eq!(parse_color("light_red"), Some(Color::LightRed));
|
|
137
|
-
assert_eq!(parse_color("light_green"), Some(Color::LightGreen));
|
|
138
|
-
assert_eq!(parse_color("light_yellow"), Some(Color::LightYellow));
|
|
139
|
-
assert_eq!(parse_color("light_blue"), Some(Color::LightBlue));
|
|
140
|
-
assert_eq!(parse_color("light_magenta"), Some(Color::LightMagenta));
|
|
141
|
-
assert_eq!(parse_color("light_cyan"), Some(Color::LightCyan));
|
|
142
|
-
|
|
143
|
-
assert_eq!(parse_color("#ffffff"), Some(Color::Rgb(255, 255, 255)));
|
|
144
|
-
assert_eq!(parse_color("#000000"), Some(Color::Rgb(0, 0, 0)));
|
|
145
|
-
assert_eq!(parse_color("#FF0000"), Some(Color::Rgb(255, 0, 0)));
|
|
146
|
-
|
|
147
|
-
assert_eq!(parse_color("invalid"), None);
|
|
148
|
-
assert_eq!(parse_color(""), None);
|
|
316
|
+
fn parse_padding(block_val: Value, block: Block<'_>) -> Block<'_> {
|
|
317
|
+
if let Ok(padding_val) = block_val.funcall::<&str, _, Value>("padding", ()) {
|
|
318
|
+
if padding_val.is_nil() { return block; }
|
|
319
|
+
if let Ok(p) = u16::try_convert(padding_val) {
|
|
320
|
+
return block.padding(Padding::uniform(p));
|
|
321
|
+
}
|
|
322
|
+
if let Some(arr) = magnus::RArray::from_value(padding_val) {
|
|
323
|
+
if arr.len() == 4 {
|
|
324
|
+
let left: u16 = arr.entry(0).unwrap_or(0);
|
|
325
|
+
let right: u16 = arr.entry(1).unwrap_or(0);
|
|
326
|
+
let top: u16 = arr.entry(2).unwrap_or(0);
|
|
327
|
+
let bottom: u16 = arr.entry(3).unwrap_or(0);
|
|
328
|
+
return block.padding(Padding::new(left, right, top, bottom));
|
|
329
|
+
}
|
|
330
|
+
}
|
|
149
331
|
}
|
|
332
|
+
block
|
|
150
333
|
}
|