From ac7769237c04122aedef107817591f124a5318f8 Mon Sep 17 00:00:00 2001 From: Andy Meneely Date: Thu, 30 Apr 2015 10:05:34 -0400 Subject: [PATCH] Fix the csv_import.rb sample to function properly --- samples/csv_import.rb | 8 ++--- samples/sample.csv | 6 ++-- spec/data/samples/csv_import.rb.txt | 42 +++--------------------- spec/samples/expected/sample_csv_00.png | Bin 5307 -> 6515 bytes spec/samples/expected/sample_csv_01.png | Bin 5307 -> 8751 bytes squib.sublime-project | 4 +++ 6 files changed, 14 insertions(+), 46 deletions(-) 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 7216d1879a41071403100ff1d0b1099c6988c08f..53fff6ef42c661d159f2be958db4fdec7e489a04 100644 GIT binary patch literal 6515 zcmeHM>r<0g9zGBXh#R!a)exaATcK-9VBG*B5HBcYDOu4PxhLEV2^S?QQf@|ZVJQm5 zC^&=$tt*tq5M2@w2q9aRr7Q#lOn?Lu6ar#`ARz=uNcwhWKlLx@>}1{#@64I!J#*$c zzw^>f-Ci9&l$&8k+t^G7M`~vB`Q$s$%+*3KH~D|+TJN&MD2dw-|a~s z@$BSDw+FjkI%jy#_ZBg3|0@);yIQ_ERKJ|o9%l={AGVb&D*y-|vn;{$Ms%rDBP{sW~{8Q()@`n%aZ3(P9F<(UqX$s_pyU_3M$gjGlfx8 zbw&Q&@ygh417)?N1*j@;Fj;Z0P@7&-n~ElMLzunyjJ%wtXdG;P!0CJt5YQa2>U|Bn zS~?Yqci2#~2_GdHS=&F^rzm;LZroLQpi{c$-SoY)4t-}{SK7Pm&Lod1b*qCw`aneG zJx%2JIV#D(b`G%KwPp1{Vo5Jb_ns5L9mnll; zolyD@uGeg8wJ4n(FW{@L7&<(E(6f70@@13ZgoIb7bIjHkzq{mir z&pcXRyVj-hMhE^H<~D_{SQ?wR8q0kdJKQGVu$; zE;chCq;ZKsy*3HsYg?tW5q#r@wCX+P(r1rv1@FmQpPkT<{hu5FWi^aKYXHtGO&-wINoj0e1 z$%$~n-(V!}X75N0lLVEvLebWF&stVqm5K&AL}P4b_QilL`9|rvE3@=Dz#a-aNp;}o zD$PFf&C>?}L50fLA)!G;fv9Cot!7rr+s1I zP>T^d?$3X6NN-!f4A&R(Hhb~(h;L<|CU`pujyxv|?DokEv@7e^ne_~5v>I=eh0dw@ z-#Mv?wpLG;If#`zBT@PDqY`~m#z5O-Ti>w1qu@j6Gunyd%x3|U8_4qSl1DOheD4kq?HsM|T6TIEtbpt;_;W!kFISM zk&eR&5m2|Oo*ht7+81r4&}n)>0(AcvubT5g$AmwW9)^!8^WFaBou$y7TM?V(mZ4;M zfPg~cy=owYg}{|!YyVrgjw-4L6tTkq2>g|%JJKW*OiIZl7EOBDWEo7Z$z&W&-q{o% z{MtSL79^`_O{QSWl^L^0`6%J~&tPDB Ay#N3J literal 5307 zcmeAS@N?(olHy`uVBq!ia0y~yV76pnU`gd*0*Z*vp63Ik*pj^6T^Rm@;DWu&Co?dJ z6nMHghE&XXd(DuML4oIh!GZnH7dFh6>uj2L*LX7ngNN0AW(J0ePgx8Mv2nZ%3r??Q zWGJaLWoXb_&&F`!=~V`XU3;V$9HxgeGrSm8G#Uh>sbDlCjFttX#o=g;Fj^^&whKm^ zMx(96(FXEpA7QkcG}==f?JSRu7mN;>jE)+O@PV^f%SqhFjT($xfuoTOp00i_>zopr E0Mc1IJpcdz diff --git a/spec/samples/expected/sample_csv_01.png b/spec/samples/expected/sample_csv_01.png index 7216d1879a41071403100ff1d0b1099c6988c08f..50f0cb85d6be7808bf101897662bd9acabdb5f52 100644 GIT binary patch literal 8751 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 literal 5307 zcmeAS@N?(olHy`uVBq!ia0y~yV76pnU`gd*0*Z*vp63Ik*pj^6T^Rm@;DWu&Co?dJ z6nMHghE&XXd(DuML4oIh!GZnH7dFh6>uj2L*LX7ngNN0AW(J0ePgx8Mv2nZ%3r??Q zWGJaLWoXb_&&F`!=~V`XU3;V$9HxgeGrSm8G#Uh>sbDlCjFttX#o=g;Fj^^&whKm^ zMx(96(FXEpA7QkcG}==f?JSRu7mN;>jE)+O@PV^f%SqhFjT($xfuoTOp00i_>zopr E0Mc1IJpcdz 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]",