squib 0.9.0 → 0.10.0

data/samples/{gradients.rb → colors/_gradients.rb}

@@ -31,4 +31,4 @@ Squib::Deck.new do
        color: '(0,0)(825,0) #000f@0.0 #0000@1.0'
 
   save_png prefix: 'gradient_'
-end
+end

data/samples/config_text_markup.rb

@@ -6,7 +6,7 @@ Squib::Deck.new(config: 'config_text_markup.yml') do
        x: 10, y: 10, width: 300, height: 200, font: 'Serif 20',
        markup: true, hint: :cyan
 
-  text str: "Notice also the antialiasing method.",
+  text str: 'Notice also the antialiasing method.',
        x: 320, y: 10, width: 300, height: 200, font: 'Arial Bold 20'
 
   save_png prefix: 'config_text_'
@@ -17,4 +17,4 @@ Squib::Deck.new(config: 'config_disable_quotes.yml') do
        x: 10, y: 10, width: 300, height: 200, font: 'Serif 20',
        markup: true, hint: :cyan
   save_png prefix: 'config_disable_text_'
-end
+end

data/samples/custom-config.yml

@@ -1,5 +1,5 @@
-progress_bars: true
-text_hint: '#FF0000'
-custom_colors:
-  foo: '#ccc'
-img_dir: customconfig-imgdir
+progress_bars: true
+text_hint: '#FF0000'
+custom_colors:
+  foo: '#ccc'
+img_dir: customconfig-imgdir

data/samples/custom_config.rb

@@ -1,18 +1,18 @@
-require 'squib'
-
-Squib::Deck.new(config: 'custom-config.yml') do
-  # Custom color defined in our config
-  background color: :foo
-
-  # Hints can be turned on in the config file
-  text str: 'The Title', x: 0, y: 78, width: 825,
-       font: 'Arial 72', align: :center
-
-  # Progress bars are shown for these commands
-  # And images are taken from img_dir, not the cwd.
-  png file: 'shiny-purse2.png', x: 620, y: 75
-  svg file: 'spanner2.svg', x: 620, y: 218
-  save_png prefix: 'custom-config_'
-  save_pdf file: 'custom-config-out.pdf'
-
-end
+require 'squib'
+
+Squib::Deck.new(config: 'custom-config.yml') do
+  # Custom color defined in our config
+  background color: :foo
+
+  # Hints can be turned on in the config file
+  text str: 'The Title', x: 0, y: 78, width: 825,
+       font: 'Arial 72', align: :center
+
+  # Progress bars are shown for these commands
+  # And images are taken from img_dir, not the cwd.
+  png file: 'shiny-purse2.png', x: 620, y: 75
+  svg file: 'spanner2.svg', x: 620, y: 218
+  save_png prefix: 'custom-config_'
+  save_pdf file: 'custom-config-out.pdf'
+
+end

data/samples/{csv_import.rb → data/_csv.rb}

@@ -22,5 +22,12 @@ Squib::Deck.new(cards: num_cards) do
   background color: :white
   rect # card border
   text str: data['Name'], font: 'Arial 54'
-  save_sheet  prefix: 'sample_csv_qty_', columns: 4
+  save_sheet prefix: 'sample_csv_qty_', columns: 4
 end
+
+# Additionally, CSV supports inline data specifically
+data = Squib.csv data: <<-EOCSV
+Name,Cost
+Knight,3
+Orc,1
+EOCSV

data/samples/{excel.rb → data/_excel.rb}

@@ -11,7 +11,7 @@ Squib::Deck.new(cards: 3) do
   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_excel_' #save to individual pngs
+  save format: :png, prefix: 'sample_excel_' # save to individual pngs
 end
 
 # xlsx is also a Squib-module-level function, so this also works:
@@ -22,7 +22,7 @@ Squib::Deck.new(cards: num_cards) do
   background color: :white
   rect # card border
   text str: data['Name'], font: 'Arial 54'
-  save_sheet  prefix: 'sample_xlsx_qty_', columns: 4
+  save_sheet prefix: 'sample_xlsx_qty_', columns: 4
 end
 
 
@@ -51,5 +51,5 @@ Squib::Deck.new(cards: resource_data['Name'].size) do
   rect width: :deck, height: :deck
   text str: resource_data['Name'], align: :center, width: :deck, hint: 'red'
   text str: resource_data['Cost'], align: :right, width: :deck, hint: 'red'
-  save_sheet prefix: 'sample_excel_resources_' #save to a whole sheet
+  save_sheet prefix: 'sample_excel_resources_' # save to a whole sheet
 end

data/samples/embed_text.rb

@@ -73,6 +73,27 @@ Squib::Deck.new do
     embed.svg key: ':tool:',   width: 28, height: 28, file: 'spanner.svg'
   end
 
+  embed_text = ':tool:' # JUST the icon
+  text(str: embed_text, x: 0, y: 640, width: 180, height: 50, markup: true,
+     font: 'Arial 21', align: :center, valign: :middle, hint: :red) do |embed|
+    embed.svg key: ':tool:', width: 28, height: 28, file: 'spanner.svg'
+  end
+
+  embed_text = ':purse:' # JUST the icon
+  text(str: embed_text, x: 200, y: 640, width: 180, height: 50, markup: true,
+     font: 'Arial 21', align: :center, valign: :middle, hint: :red) do |embed|
+    embed.png key: ':purse:', width: 28, height: 28, file: 'shiny-purse.png'
+  end
+
+  embed_text = ":tool: Death to Nemesis bug 103!! :purse:"
+  text(str: embed_text, font: 'Sans Bold 24', stroke_width: 2,
+       color: :red, stroke_color: :blue, dash: '3 3', align: :center,
+       valign: :middle, x: 0, y: 700, width: 380, height: 150,
+       hint: :magenta) do |embed|
+    embed.svg key: ':tool:', file: 'spanner.svg', width: 32, height: 32
+    embed.png key: ':purse:', file: 'shiny-purse.png', width: 32, height: 32
+  end
+
   save_png prefix: 'embed_'
 end
 

data/samples/hello_world.rb

@@ -3,4 +3,4 @@ require 'squib'
 Squib::Deck.new(cards: 2) do
   text str: %w(Hello World!)
   save_png
-end
+end

data/samples/{load_images.rb → images/_more_load_images.rb}

@@ -10,7 +10,7 @@ Squib::Deck.new(width: 825, height: 1125, cards: 1, config: 'load_images_config.
   # Can be scaled if width and height are set
   svg file: 'spanner.svg', x: 50, y: 50, width: 250, height: 250
   png file: 'shiny-purse.png', x: 305, y: 50, width: 250, height: 250
-  #...but PNGs will warn if it's an upscale, unless you disable them in config.yml
+  # ...but PNGs will warn if it's an upscale, unless you disable them in config.yml
 
   # Can be scaled using just width or height, if one of them is set to :scale
   svg file: 'spanner.svg', x: 200, y: 350, width: 35,     height: :scale
@@ -60,7 +60,7 @@ Squib::Deck.new(width: 825, height: 1125, cards: 1, config: 'load_images_config.
 
   # WARNING! If you choose to use the SVG ID, the x-y coordinates are still
   # relative to the SVG page. See this example in an SVG editor
-  svg file: 'offset.svg', id: 'thing',  x: 0, y: 0, width: 600, height: 600
+  svg file: 'offset.svg', id: 'thing', x: 0, y: 0, width: 600, height: 600
 
   # Over 15 different blending operators are supported.
   # See http://cairographics.org/operators

data/samples/layouts.rb

@@ -46,7 +46,7 @@ end
 Squib::Deck.new(layout: 'playing-card.yml') do
   text str: "A\u2660",      layout: :bonus_ul, font: 'Sans bold 100', hint: :red
   text str: "A\u2660",      layout: :bonus_lr, font: 'Sans bold 100', hint: :red
-  text str: "artwork here", layout: :art, hint: :red
+  text str: 'artwork here', layout: :art, hint: :red
   save_png prefix: 'layout_builtin_playing_card_'
 end
 
@@ -60,3 +60,13 @@ Squib::Deck.new(layout: 'hand.yml') do
   png file: 'pokercard.png', alpha: 0.5
   save_png prefix: 'layout_builtin_hand_'
 end
+
+# Layouts can also be specified in their own DSL method call
+# Each layout call will progressively be merged with the priors
+Squib::Deck.new do
+  use_layout file: 'custom-layout.yml'
+  use_layout file: 'custom-layout2.yml'
+  text str: 'The Title',   layout: :title # from custom-layout.yml
+  text str: 'The Subtitle', layout: :subtitle # redefined in custom-layout2.yml
+  save_png prefix: 'layout3_'
+end

data/samples/layouts_builtin.rb

@@ -1,51 +1,51 @@
-require 'squib'
-
-# This sample demonstrates the built-in layouts for Squib.
-# Each card demonstrates a different built-in layout.
-Squib::Deck.new(layout: 'fantasy.yml') do
-  background color: 'white'
-
-  set font: 'Times New Roman,Serif 32'
-  hint text: '#333' # show extents of text boxes to demo the layout
-
-  text str: 'fantasy.yml', layout: :title
-  text str: 'ur',          layout: :upper_right
-  text str: 'art',         layout: :art
-  text str: 'type',        layout: :type
-  text str: 'tr',          layout: :type_right
-  text str: 'description', layout: :description
-  text str: 'lr',          layout: :lower_right
-  text str: 'll',          layout: :lower_left
-  text str: 'credits',     layout: :copy
-
-  rect layout: :safe
-  rect layout: :cut
-  save_png prefix: 'layouts_builtin_fantasy_'
-end
-
-Squib::Deck.new(layout: 'economy.yml') do
-  background color: 'white'
-
-  set font: 'Times New Roman,Serif 32'
-  hint text: '#333' # show extents of text boxes to demo the layout
-
-  text str: 'economy.yml', layout: :title
-  text str: 'art',         layout: :art
-  text str: 'description', layout: :description
-  text str: 'type',        layout: :type
-  text str: 'lr',          layout: :lower_right
-  text str: 'll',          layout: :lower_left
-  text str: 'credits',     layout: :copy
-
-  rect layout: :safe
-  rect layout: :cut
-  save_png prefix: 'layouts_builtin_economy_'
-end
-
-# Stitch together a deck of all the above examples
-Squib::Deck.new(cards: 2) do
-  Dir.glob('_output/layouts_builtin_*.png').each.with_index do |file, i|
-    png file: file, range: i
-  end
-  save_sheet prefix: 'layouts_builtinsheet_'
-end
+require 'squib'
+
+# This sample demonstrates the built-in layouts for Squib.
+# Each card demonstrates a different built-in layout.
+Squib::Deck.new(layout: 'fantasy.yml') do
+  background color: 'white'
+
+  set font: 'Times New Roman,Serif 32'
+  hint text: '#333' # show extents of text boxes to demo the layout
+
+  text str: 'fantasy.yml', layout: :title
+  text str: 'ur',          layout: :upper_right
+  text str: 'art',         layout: :art
+  text str: 'type',        layout: :type
+  text str: 'tr',          layout: :type_right
+  text str: 'description', layout: :description
+  text str: 'lr',          layout: :lower_right
+  text str: 'll',          layout: :lower_left
+  text str: 'credits',     layout: :copy
+
+  rect layout: :safe
+  rect layout: :cut
+  save_png prefix: 'layouts_builtin_fantasy_'
+end
+
+Squib::Deck.new(layout: 'economy.yml') do
+  background color: 'white'
+
+  set font: 'Times New Roman,Serif 32'
+  hint text: '#333' # show extents of text boxes to demo the layout
+
+  text str: 'economy.yml', layout: :title
+  text str: 'art',         layout: :art
+  text str: 'description', layout: :description
+  text str: 'type',        layout: :type
+  text str: 'lr',          layout: :lower_right
+  text str: 'll',          layout: :lower_left
+  text str: 'credits',     layout: :copy
+
+  rect layout: :safe
+  rect layout: :cut
+  save_png prefix: 'layouts_builtin_economy_'
+end
+
+# Stitch together a deck of all the above examples
+Squib::Deck.new(cards: 2) do
+  Dir.glob('_output/layouts_builtin_*.png').each.with_index do |file, i|
+    png file: file, range: i
+  end
+  save_sheet prefix: 'layouts_builtinsheet_'
+end

data/samples/offset.svg

@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="747.59235"
-   height="747.39734"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="offset.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.76264655"
-     inkscape:cx="373.79617"
-     inkscape:cy="373.69867"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(5.1573995,-302.70286)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="thing"
-       sodipodi:cx="159.99248"
-       sodipodi:cy="152.67546"
-       sodipodi:rx="59.401001"
-       sodipodi:ry="59.401001"
-       d="m 219.39348,152.67546 c 0,32.80627 -26.59474,59.401 -59.401,59.401 -32.80627,0 -59.401,-26.59473 -59.401,-59.401 0,-32.80627 26.59473,-59.401 59.401,-59.401 32.80626,0 59.401,26.59473 59.401,59.401 z"
-       transform="matrix(0.95784259,0,0,0.95784259,531.73189,844.72627)"
-       inkscape:label="thing" />
-  </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="747.59235"
+   height="747.39734"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="offset.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.76264655"
+     inkscape:cx="373.79617"
+     inkscape:cy="373.69867"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="776"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(5.1573995,-302.70286)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="thing"
+       sodipodi:cx="159.99248"
+       sodipodi:cy="152.67546"
+       sodipodi:rx="59.401001"
+       sodipodi:ry="59.401001"
+       d="m 219.39348,152.67546 c 0,32.80627 -26.59474,59.401 -59.401,59.401 -32.80627,0 -59.401,-26.59473 -59.401,-59.401 0,-32.80627 26.59473,-59.401 59.401,-59.401 32.80626,0 59.401,26.59473 59.401,59.401 z"
+       transform="matrix(0.95784259,0,0,0.95784259,531.73189,844.72627)"
+       inkscape:label="thing" />
+  </g>
+</svg>

data/samples/ranges.rb

@@ -1,8 +1,8 @@
 require 'squib'
 
-data = {'name' => ['Thief', 'Grifter', 'Mastermind'],
+data = { 'name' => ['Thief', 'Grifter', 'Mastermind'],
         'type' => ['Thug', 'Thinker', 'Thinker'],
-        'level' => [1,2,3]}
+        'level' => [1, 2, 3] }
 
 Squib::Deck.new(width: 825, height: 1125, cards: 3) do
   # Default range is :all
@@ -26,7 +26,7 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do
   text range: -2..-1, str: 'Grifter and Mastermind only!', x: 25, y: 650
 
   # We can use Arrays too!
-  text range: [0,2], str: 'Thief and Mastermind only!!', x: 25, y:300
+  text range: [0, 2], str: 'Thief and Mastermind only!!', x: 25, y:300
 
   # Just about everything in Squib can be given an array that
   # corresponds to the deck's cards. This allows for each card to be styled differently
@@ -38,24 +38,24 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do
 
   # Useful idiom: construct a hash from card names back to its index (ID),
   # then use a range. No need to memorize IDs, and you can add cards easily
-  id = {} ; data['name'].each_with_index{ |name,i| id[name] = i}
+  id = {} ; data['name'].each_with_index{ |name, i| id[name] = i}
   text range: id['Thief']..id['Grifter'],
        str: 'Thief through Grifter with id lookup!!',
        x:25, y: 400
 
   # Useful idiom: generate arrays from a column called 'type'
-  type = {}; data['type'].each_with_index{ |t,i| (type[t] ||= []) << i}
+  type = {}; data['type'].each_with_index{ |t, i| (type[t] ||= []) << i}
   text range: type['Thinker'],
        str: 'Only for Thinkers!',
        x:25, y: 500
 
   # Useful idiom: draw a different number of images for different cards
-  hearts = [nil, 1, 2] #i.e. card 0 has no hearts, card 2 has 2 hearts drawn
+  hearts = [nil, 1, 2] # i.e. card 0 has no hearts, card 2 has 2 hearts drawn
   1.upto(2).each do |n|
     range = hearts.each_index.select { |i| hearts[i] == n}
     n.times do |i|
       svg file: 'glass-heart.svg', range: range,
-          x: 150, y: 55 + i*42, width: 40, height: 40
+          x: 150, y: 55 + i * 42, width: 40, height: 40
     end
   end