diff --git a/samples/csv_import.rb b/samples/csv_import.rb index e2d5785..72a9ff0 100644 --- a/samples/csv_import.rb +++ b/samples/csv_import.rb @@ -5,15 +5,13 @@ Squib::Deck.new(cards: 2) do # Outputs a hash of arrays with the header names as keys data = csv file: 'sample.csv' - - text str: data['Name'], x: 250, y: 55, font: 'Arial 54' + text str: data['Type'], x: 250, y: 55, font: 'Arial 54' text str: data['Level'], x: 65, y: 65, font: 'Arial 72' - text str: data['Description'], x: 65, y: 600, font: 'Arial 36' + + save format: :png, prefix: 'sample_csv_' # You can also specify the sheet, starting at 0 data = xlsx file: 'sample.xlsx', sheet: 2 - - save format: :png, prefix: 'sample_csv_' end # CSV is also a Squib-module-level function, so this also works: diff --git a/samples/sample.csv b/samples/sample.csv index 334d668..2685b0f 100644 --- a/samples/sample.csv +++ b/samples/sample.csv @@ -1,3 +1,3 @@ -Type,"Quantity" -Thief,2 -Mastermind,1 \ No newline at end of file +Type,"Level" +Thief,1 +Mastermind,2 \ No newline at end of file diff --git a/spec/data/samples/csv_import.rb.txt b/spec/data/samples/csv_import.rb.txt index 53bb41c..f13a883 100644 --- a/spec/data/samples/csv_import.rb.txt +++ b/spec/data/samples/csv_import.rb.txt @@ -14,7 +14,7 @@ cairo: translate([250, 55]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=([""]) +pango: text=(["Thief"]) pango: wrap=([#]) pango: ellipsize=([#]) pango: alignment=([#]) @@ -31,7 +31,7 @@ cairo: translate([250, 55]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=([""]) +pango: text=(["Mastermind"]) pango: wrap=([#]) pango: ellipsize=([#]) pango: alignment=([#]) @@ -48,7 +48,7 @@ cairo: translate([65, 65]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=([""]) +pango: text=(["1"]) pango: wrap=([#]) pango: ellipsize=([#]) pango: alignment=([#]) @@ -65,41 +65,7 @@ cairo: translate([65, 65]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=([""]) -pango: wrap=([#]) -pango: ellipsize=([#]) -pango: alignment=([#]) -pango: justify=([false]) -pango: spacing=([0]) -cairo: update_pango_layout([MockDouble]) -cairo: move_to([0, 0]) -cairo: update_pango_layout([MockDouble]) -cairo: show_pango_layout([MockDouble]) -cairo: restore([]) -cairo: save([]) -cairo: set_source_color([:black]) -cairo: translate([65, 600]) -cairo: rotate([0]) -cairo: move_to([0, 0]) -pango: font_description=([MockDouble]) -pango: text=([""]) -pango: wrap=([#]) -pango: ellipsize=([#]) -pango: alignment=([#]) -pango: justify=([false]) -pango: spacing=([0]) -cairo: update_pango_layout([MockDouble]) -cairo: move_to([0, 0]) -cairo: update_pango_layout([MockDouble]) -cairo: show_pango_layout([MockDouble]) -cairo: restore([]) -cairo: save([]) -cairo: set_source_color([:black]) -cairo: translate([65, 600]) -cairo: rotate([0]) -cairo: move_to([0, 0]) -pango: font_description=([MockDouble]) -pango: text=([""]) +pango: text=(["2"]) pango: wrap=([#]) pango: ellipsize=([#]) pango: alignment=([#]) diff --git a/spec/samples/expected/sample_csv_00.png b/spec/samples/expected/sample_csv_00.png index 7216d18..53fff6e 100644 Binary files a/spec/samples/expected/sample_csv_00.png and b/spec/samples/expected/sample_csv_00.png differ diff --git a/spec/samples/expected/sample_csv_01.png b/spec/samples/expected/sample_csv_01.png index 7216d18..50f0cb8 100644 Binary files a/spec/samples/expected/sample_csv_01.png and b/spec/samples/expected/sample_csv_01.png differ diff --git a/squib.sublime-project b/squib.sublime-project index 32f18b3..196c0ae 100644 --- a/squib.sublime-project +++ b/squib.sublime-project @@ -32,6 +32,10 @@ "name": "rake run[draw_shapes]", "shell_cmd": "rake run[draw_shapes]", }, + { + "name": "rake run[csv_import]", + "shell_cmd": "rake run[csv_import]", + }, { "name": "rake run[config_text_markup]", "shell_cmd": "rake run[config_text_markup]",