squib 0.9.0 → 0.10.0

data/samples/{hand.rb → saves/_hand.rb}

@@ -7,7 +7,7 @@ Squib::Deck.new(cards: 8, layout: 'playing-card.yml') do
   text str: ('A'..'Z').to_a, layout: :bonus_ul, font: 'Sans bold 100'
 
   # Defaults are sensible
-  hand #saves to _output/hand.png
+  hand # saves to _output/hand.png
 
   # Here's a prettier version:
   #  - Each card is trimmed with rounded corners
@@ -21,4 +21,3 @@ Squib::Deck.new(cards: 8, layout: 'playing-card.yml') do
   # Tip: you can have the top card be on the left by reversing the range
   #  angle_range: (Math::PI / 4)..(Math::PI / -4)
 end
-

data/samples/{portrait-landscape.rb → saves/_portrait_landscape.rb}

@@ -8,16 +8,16 @@ require 'squib'
 Squib::Deck.new(width: 825, height: 1125) do
   background color: '#aaa'
 
-  text str: 'This is portrait'
+  text str: 'This is portrait and trimmed'
 
-  save_png prefix: 'portrait_'
+  save_png prefix: 'portrait_', trim: 10, trim_radius: 15
 end
 
 # Money cards are landscape
 Squib::Deck.new(width: 1125, height: 825) do
   background color: '#aaa'
 
-  text str: 'This is landscape'
+  text str: 'This is landscape and trimmed', x: 15, y: 10
 
-  save_png prefix: 'landscape_', rotate: true
+  save_png prefix: 'landscape_', rotate: :clockwise, trim: 25, trim_radius: 15
 end

data/samples/{showcase.rb → saves/_showcase.rb}

@@ -9,7 +9,7 @@ Squib::Deck.new(cards: 4) do
   text str: %w(Grifter Thief Thug Kingpin),
        font: 'Helvetica,Sans weight=800 120',
        x: 78, y: 78, width: '2.25in', align: :center
-  svg file: 'spanner.svg', x: (825-500)/2, y: 500, width: 500, height: 500
+  svg file: 'spanner.svg', x: (825 - 500) / 2, y: 500, width: 500, height: 500
 
   # Defaults are pretty sensible.
   showcase file: 'showcase.png'
@@ -22,4 +22,4 @@ Squib::Deck.new(cards: 4) do
            file: 'showcase2.png'
 
   save_png prefix: 'showcase_individual_' # to show that they're not trimmed
-end
+end

data/samples/{draw_shapes.rb → shapes/_draw_shapes.rb}

@@ -36,7 +36,7 @@ Squib::Deck.new do
   star x: 300, y: 1000, n: 5, inner_radius: 15, outer_radius: 40,
        fill_color: :cyan, stroke_color: :burgundy, stroke_width: 5
 
-  #default draw is fill-then-stroke. Can be changed to stroke-then-fill
+  # default draw is fill-then-stroke. Can be changed to stroke-then-fill
   star x: 375, y: 1000, n: 5, inner_radius: 15, outer_radius: 40,
        fill_color: :cyan, stroke_color: :burgundy,
        stroke_width: 5, stroke_strategy: :stroke_first

data/samples/text/_text.rb

@@ -1,13 +1,14 @@
 require 'squib'
 require 'squib/sample_helpers'
 
-Squib::Deck.new(width: 1000, height: 2000) do
+Squib::Deck.new(width: 1000, height: 1250) do
   draw_graph_paper width, height
 
-  sample 'Font strings are quite expressive. Specify family, modifiers, then size. Font names with spaces in them should also have a backup afterward to help with parsing.' do |x, y|
+  sample 'Font strings are quite expressive. Specify family, modifiers, then size. Font names with spaces in them should end with a comma to help with parsing.' do |x, y|
     text font: 'Arial bold italic 32', str: 'Bold and italic!', x: x, y: y - 50
     text font: 'Arial weight=300 32', str: 'Light bold!', x: x, y: y
-    text font: 'Times New Roman,Arial 32', str: 'Times New Roman', x: x, y: y + 50
+    text font: 'Times New Roman, 32', str: 'Times New Roman', x: x, y: y + 50
+    text font: 'NoSuchFont,Arial 32', str: 'Arial Backup', x: x, y: y + 100
   end
 
   sample 'Specify width and height to see a text box. Also: set "hint" to see the extents of your text box' do |x, y|

data/samples/text_options.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 require 'squib'
 
-data = {'name' => ['Thief', 'Grifter', 'Mastermind'],
-        'level' => [1,2,3]}
+data = { 'name' => ['Thief', 'Grifter', 'Mastermind'],
+        'level' => [1, 2, 3] }
 longtext = "This is left-justified text, with newlines.\nWhat do you know about tweetle beetles? well... When tweetle beetles fight, it's called a tweetle beetle battle. And when they battle in a puddle, it's a tweetle beetle puddle battle. AND when tweetle beetles battle with paddles in a puddle, they call it a tweetle beetle puddle paddle battle. AND... When beetles battle beetles in a puddle paddle battle and the beetle battle puddle is a puddle in a bottle... ..they call this a tweetle beetle bottle puddle paddle battle muddle."
 
 Squib::Deck.new(width: 825, height: 1125, cards: 3) do
@@ -37,7 +37,7 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do
   # Extents come back as an array of hashes, which can get split out like this
   ws = extents.inject([]) { |arr, ext| arr << ext[:width] + 10; arr }
   hs = extents.inject([]) { |arr, ext| arr << ext[:height] + 10; arr }
-  rect x: 65 - margin/2, y: 550 - margin/2,
+  rect x: 65 - margin / 2, y: 550 - margin / 2,
        width: ws, height: hs,
        radius: 10, stroke_color: :black
 
@@ -79,15 +79,15 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do
     embed.svg key: ':health:', width: 28, height: 28, file: 'glass-heart.svg'
   end
 
-  text str: "Fill n <span fgcolor=\"\#ff0000\">stroke</span>",
+  text str: 'Fill n <span fgcolor="#ff0000">stroke</span>',
        color: :green, stroke_width: 2.0, stroke_color: :blue,
        x: '1.8in', y: '2.9in', width: '0.85in', font: 'Sans Bold 26', markup: true
 
-  text str: "Stroke n <span fgcolor=\"\#ff0000\">fill</span>",
+  text str: 'Stroke n <span fgcolor="#ff0000">fill</span>',
        color: :green, stroke_width: 2.0, stroke_color: :blue, stroke_strategy: :stroke_first,
        x: '1.8in', y: '3.0in', width: '0.85in', font: 'Sans Bold 26', markup: true
 
-  text str: "Dotted",
+  text str: 'Dotted',
        color: :white, stroke_width: 2.0, dash: '4 2', stroke_color: :black,
        x: '1.8in', y: '3.1in', width: '0.85in', font: 'Sans Bold 26', markup: true
   #

data/samples/unicode.rb

@@ -14,7 +14,7 @@ Squib::Deck.new(height: (game_chars.size / cols + 1) * cell_height,
   text str: 'Game-related UTF8 icons. Generated by Squib, https://github.com/andymeneely/squib'
   game_chars.each_with_index do |c, i|
     rect fill_color: %w(#eeee #ffff)[i % 2],
-         width: cell_width, height: cell_height,            x: x, y: y
+         width: cell_width, height: cell_height, x: x, y: y
     text str: c.inspect, font: 'Sans 42',                  x: x, y: y
     text str: c,         font: 'Sans,Segoe UI Symbol 42',  x: x + 300, y: y
     x += cell_width

data/spec/api/api_data_spec.rb

@@ -38,26 +38,81 @@ describe Squib::Deck do
 
     it 'explodes quantities' do
       expect(Squib.csv(file: csv_file('qty.csv'))).to eq({
-        'Name'  => %w(Ha Ha Ha Ho),
+        'Name' => %w(Ha Ha Ha Ho),
         'Qty' => [3, 3, 3, 1],
         })
     end
 
     it 'explodes quantities on specified header' do
       expect(Squib.csv(explode: 'Quantity', file: csv_file('qty_named.csv'))).to eq({
-        'Name'  => %w(Ha Ha Ha Ho),
+        'Name' => %w(Ha Ha Ha Ho),
         'Quantity' => [3, 3, 3, 1],
         })
     end
 
+    it 'loads inline data' do
+      hash = Squib.csv(data: "h1,h2\n1,2\n3,4")
+      expect(hash).to eq({
+        'h1' => [1, 3],
+        'h2' => [2, 4]
+        })
+    end
+
+    it 'loads csv with newlines' do
+      hash = Squib.csv(file: csv_file('newline.csv'))
+      expect(hash).to eq({
+        'title' => ['Foo'],
+        'level' => [1],
+        'notes' => ["a\nb"]
+      })
+    end
+
+    it 'loads custom CSV options' do
+      hash = Squib.csv(file: csv_file('custom_opts.csv'),
+                       col_sep: '-', quote_char: '|')
+      expect(hash).to eq({
+        'x' => ['p'],
+        'y' => ['q-r']
+        })
+    end
+
+    it 'yields to block when given' do
+      data = Squib.csv(file: csv_file('basic.csv')) do |header, value|
+        case header
+        when 'h1'
+          value * 2
+        else
+          'ha'
+        end
+      end
+      expect(data).to eq({
+        'h1' => [2, 6],
+        'h2' => %w(ha ha),
+        })
+    end
+
+    it 'replaces newlines whenever its a string' do
+      data = Squib.csv(file: csv_file('yield.csv')) do |header, value|
+        if value.respond_to? :gsub
+          value.gsub '%n', "\n"
+        else
+          value
+        end
+      end
+      expect(data).to eq({
+        'a' => ["foo\nbar", 1],
+        'b' => [1, "blah\n"],
+        })
+    end
+
   end
 
   context '#xlsx' do
     it 'loads basic xlsx data' do
       expect(Squib.xlsx(file: xlsx_file('basic.xlsx'))).to eq({
         'Name'           => %w(Larry Curly Mo),
-        'General Number' => %w(1 2 3), #general types always get loaded as strings with no conversion
-        'Actual Number'  =>  [4.0, 5.0, 6.0], #numbers get auto-converted to integers
+        'General Number' => %w(1 2 3), # general types always get loaded as strings with no conversion
+        'Actual Number' => [4.0, 5.0, 6.0], # numbers get auto-converted to integers
         })
     end
 

data/spec/api/api_settings_spec.rb

@@ -35,4 +35,4 @@ describe Squib::Deck do
 
   end
 
-end
+end

data/spec/args/box_spec.rb

@@ -3,7 +3,7 @@ require 'squib/args/box'
 
 describe Squib::Args::Box do
   subject(:box) { Squib::Args::Box.new }
-  let(:expected_defaults) { {x: [0], y: [0], width: [:deck], height: [:deck] } }
+  let(:expected_defaults) { { x: [0], y: [0], width: [:deck], height: [:deck] } }
 
   it 'intitially has no params set' do
     expect(box).not_to respond_to(:x, :y, :width, :height)
@@ -20,13 +20,13 @@ describe Squib::Args::Box do
   end
 
   it 'extracts the defaults from Box on an empty hash' do
-    box.load!({foo: :bar})
+    box.load!({ foo: :bar })
     expect(box).to have_attributes(expected_defaults)
     expect(box).not_to respond_to(:foo)
   end
 
   context 'single expansion' do
-    let(:args)    { {x: [1, 2], y: 3} }
+    let(:args)    { { x: [1, 2], y: 3 } }
     before(:each) { box.load!(args, expand_by: 2) }
     it 'expands box' do
       expect(box).to have_attributes({
@@ -81,7 +81,7 @@ describe Squib::Args::Box do
     end
 
     it 'warns on non-existent layouts' do
-      args = { layout: :heal}
+      args = { layout: :heal }
       expect(Squib.logger).to receive(:warn).with('Layout "heal" does not exist in layout file - using default instead').at_least(:once)
       box.load!(args, expand_by: 2, layout: layout)
       expect(box).to have_attributes(
@@ -94,7 +94,7 @@ describe Squib::Args::Box do
   context 'unit conversion' do
 
     it 'converts units on all args' do
-      args = {x: ['1in', '2in'], y: 300, width: '1in', height: '1in'}
+      args = { x: ['1in', '2in'], y: 300, width: '1in', height: '1in' }
       box.load!(args, expand_by: 2)
       expect(box).to have_attributes(
         x: [300, 600],
@@ -108,7 +108,7 @@ describe Squib::Args::Box do
 
   context 'validation' do
     it 'replaces with deck width and height' do
-      args = {width: :deck, height: :deck}
+      args = { width: :deck, height: :deck }
       deck = OpenStruct.new(width: 123, height: 456)
       box = Squib::Args::Box.new(deck)
       box.load!(args, expand_by: 1)
@@ -116,7 +116,7 @@ describe Squib::Args::Box do
     end
 
     it 'has radius override x_radius and y_radius' do
-      args = {x_radius: 1, y_radius: 2, radius: 3}
+      args = { x_radius: 1, y_radius: 2, radius: 3 }
       box.load!(args, expand_by: 2)
       expect(box).to have_attributes(x_radius: [3, 3], y_radius: [3, 3])
     end

data/spec/args/draw_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 require 'squib/args/draw'
 
 describe Squib::Args::Draw do
-  let(:custom_colors) { {'foo' => 'abc'} }
+  let(:custom_colors) { { 'foo' => 'abc' } }
   subject(:draw)      {Squib::Args::Draw.new(custom_colors)}
 
   context 'unit conversion' do
 
     it 'converts units on stroke width' do
-      args = {stroke_width: '2in'}
+      args = { stroke_width: '2in' }
       draw.load!(args, expand_by: 2)
       expect(draw).to have_attributes(stroke_width: [600, 600])
     end
@@ -16,11 +16,11 @@ describe Squib::Args::Draw do
   end
 
   context 'dsl overrides' do
-    subject(:draw)      {Squib::Args::Draw.new(custom_colors, {stroke_width: 0.0})}
+    subject(:draw) {Squib::Args::Draw.new(custom_colors, { stroke_width: 0.0 })}
 
     it 'works when specified' do
       draw.load!({}) # go right to defaults
-      expect(draw.stroke_width).to eq( [0.0] ) #ordinarily a non-zero according
+      expect(draw.stroke_width).to eq([0.0]) # ordinarily a non-zero according
     end
 
   end
@@ -28,7 +28,7 @@ describe Squib::Args::Draw do
   context 'validation' do
 
     it 'converts to Cairo options' do
-      args = {join: 'bevel', cap: 'round'}
+      args = { join: 'bevel', cap: 'round' }
       draw.load!(args)
       expect(draw).to have_attributes(
         join: [Cairo::LINE_JOIN_BEVEL],
@@ -37,62 +37,62 @@ describe Squib::Args::Draw do
     end
 
     it 'parses dash options' do
-      args = {dash: '3 4 5'}
+      args = { dash: '3 4 5' }
       draw.load!(args)
       expect(draw).to have_attributes(dash: [[3, 4, 5]])
     end
 
     it 'parses more complex dash options' do
-      args = {dash: '30.5,  90,  5'}
+      args = { dash: '30.5,  90,  5' }
       draw.load!(args)
       expect(draw).to have_attributes(dash: [[30.5, 90, 5]])
     end
 
     it 'does unit conversion on dash options' do
-      args = {dash: '3in  4in 5in'}
+      args = { dash: '3in  4in 5in' }
       draw.load!(args)
       expect(draw).to have_attributes(dash: [[900, 1200, 1500]])
     end
 
     it 'converts line caps to Cairo constants' do
-      args = {cap: :SQUARE}
+      args = { cap: :SQUARE }
       draw.load! args
-      expect(draw).to have_attributes( cap: [Cairo::LINE_CAP_SQUARE] )
+      expect(draw).to have_attributes(cap: [Cairo::LINE_CAP_SQUARE])
     end
 
     it 'converts line join' do
-      args = {join: 'round'}
+      args = { join: 'round' }
       draw.load! args
-      expect(draw).to have_attributes( join: [Cairo::LINE_JOIN_ROUND] )
+      expect(draw).to have_attributes(join: [Cairo::LINE_JOIN_ROUND])
     end
 
     it 'allows fill_first stroke_strategy' do
-      args = {stroke_strategy: :FILL_first}
+      args = { stroke_strategy: :FILL_first }
       draw.load! args
-      expect(draw).to have_attributes( stroke_strategy: [:fill_first] )
+      expect(draw).to have_attributes(stroke_strategy: [:fill_first])
     end
 
     it 'allows stroke_first stroke_strategy' do
-      args = {stroke_strategy: '  stroke_FIRST '}
+      args = { stroke_strategy: '  stroke_FIRST ' }
       draw.load! args
-      expect(draw).to have_attributes( stroke_strategy: [:stroke_first] )
+      expect(draw).to have_attributes(stroke_strategy: [:stroke_first])
     end
 
     it 'disallows anything not stroke_first and fill_first' do
-      args = {stroke_strategy: 'foo'}
+      args = { stroke_strategy: 'foo' }
       expect { draw.load! args }.to raise_error("Only 'stroke_first' or 'fill_first' allowed")
     end
 
     context 'custom colors' do
 
       it 'looks up custom colors in the config' do
-        draw.load!({color: 'foo'})
+        draw.load!({ color: 'foo' })
         expect(draw.color).to eq ['abc']
       end
 
       it 'passes on through for non-custom color' do
         draw = Squib::Args::Draw.new(custom_colors)
-        draw.load!({color: 'bar'})
+        draw.load!({ color: 'bar' })
         expect(draw.color).to eq ['bar']
       end
 

data/spec/args/embed_key_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper'
-require 'squib/args/embed_key'
-
-describe Squib::Args::EmbedKey do
-
-  context '#validate_key' do
-
-    it 'converts to string' do
-      expect(subject.validate_key(2.5)).to eq ('2.5')
-    end
-
-  end
-end
+require 'spec_helper'
+require 'squib/args/embed_key'
+
+describe Squib::Args::EmbedKey do
+
+  context '#validate_key' do
+
+    it 'converts to string' do
+      expect(subject.validate_key(2.5)).to eq ('2.5')
+    end
+
+  end
+end

data/spec/args/input_file_spec.rb

@@ -7,13 +7,13 @@ describe Squib::Args::InputFile do
   context 'validate_file' do
 
     it 'allows a file if it exists' do
-      args = {file: __FILE__} # I code therefore I am.
+      args = { file: __FILE__ } # I code therefore I am.
       ifile.load!(args, expand_by: 1)
       expect(ifile).to have_attributes(file: [File.expand_path(__FILE__)])
     end
 
     it 'raises on non-existent file' do
-      args = {file: 'foo.rb'}
+      args = { file: 'foo.rb' }
       expect { ifile.load!(args, expand_by: 1) }.to raise_error("File #{File.expand_path('foo.rb')} does not exist!")
     end
 

data/spec/args/paint_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 require 'squib/args/paint'
 
 describe Squib::Args::Draw do
-  let(:custom_colors) { {'foo' => 'abc'} }
-  subject(:paint)      {Squib::Args::Paint.new(custom_colors)}
+  let(:custom_colors) { { 'foo' => 'abc' } }
+  subject(:paint) {Squib::Args::Paint.new(custom_colors)}
 
   context 'alpha' do
 
     it 'can be a float' do
-      args = {alpha: 0.6}
+      args = { alpha: 0.6 }
       paint.load!(args)
       expect(paint.alpha).to eq [0.6]
     end
 
     it 'raises exception when not a float' do
-      args = {alpha: /6/}
+      args = { alpha: /6/ }
       expect { paint.load!(args) }.to raise_error('alpha must respond to to_f')
     end
 
   end
-end
+end