squib 0.5.1 → 0.6.0

data/spec/data/samples/load_images.rb.txt

@@ -52,6 +52,12 @@ cairo: scale([0.9765625, 0.9765625])
 cairo: render_rsvg_handle([RSVG::Handle, "#backdrop"])
 cairo: restore([])
 cairo: save([])
+cairo: translate([50, 600])
+cairo: rotate([0])
+cairo: scale([0.5859375, 0.5859375])
+cairo: render_rsvg_handle([RSVG::Handle, nil])
+cairo: restore([])
+cairo: save([])
 cairo: translate([0, 0])
 cairo: rotate([0])
 cairo: scale([0.8021390374331551, 0.8032128514056225])

data/spec/data/samples/text_options.rb.txt

@@ -560,6 +560,10 @@ cairo: update_pango_layout([MockDouble])
 cairo: move_to([0, 0])
 cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
+cairo: rounded_rectangle([0, 0, 0, 0, 0, 0])
+cairo: set_source_color([:cyan])
+cairo: set_line_width([2.0])
+cairo: stroke([])
 cairo: restore([])
 cairo: save([])
 cairo: set_source_color([:black])
@@ -577,6 +581,10 @@ cairo: update_pango_layout([MockDouble])
 cairo: move_to([0, 0])
 cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
+cairo: rounded_rectangle([0, 0, 0, 0, 0, 0])
+cairo: set_source_color([:cyan])
+cairo: set_line_width([2.0])
+cairo: stroke([])
 cairo: restore([])
 cairo: save([])
 cairo: set_source_color([:black])
@@ -594,6 +602,10 @@ cairo: update_pango_layout([MockDouble])
 cairo: move_to([0, 0])
 cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
+cairo: rounded_rectangle([0, 0, 0, 0, 0, 0])
+cairo: set_source_color([:cyan])
+cairo: set_line_width([2.0])
+cairo: stroke([])
 cairo: restore([])
 cairo: save([])
 cairo: set_source_color([:black])
@@ -824,6 +836,75 @@ cairo: update_pango_layout([MockDouble])
 cairo: show_pango_layout([MockDouble])
 cairo: restore([])
 cairo: save([])
+cairo: set_source_color([:green])
+cairo: translate([540.0, 900.0])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["Stroke n <span fgcolor=\"#ff0000\">fill</span>"])
+pango: markup=(["foo"])
+pango: width=([261120.0])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment left>])
+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: set_source_color([:blue])
+cairo: set_line_width([2.0])
+cairo: pango_layout_path([MockDouble])
+cairo: stroke([])
+cairo: restore([])
+cairo: save([])
+cairo: set_source_color([:green])
+cairo: translate([540.0, 900.0])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["Stroke n <span fgcolor=\"#ff0000\">fill</span>"])
+pango: markup=(["foo"])
+pango: width=([261120.0])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment left>])
+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: set_source_color([:blue])
+cairo: set_line_width([2.0])
+cairo: pango_layout_path([MockDouble])
+cairo: stroke([])
+cairo: restore([])
+cairo: save([])
+cairo: set_source_color([:green])
+cairo: translate([540.0, 900.0])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["Stroke n <span fgcolor=\"#ff0000\">fill</span>"])
+pango: markup=(["foo"])
+pango: width=([261120.0])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment left>])
+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: set_source_color([:blue])
+cairo: set_line_width([2.0])
+cairo: pango_layout_path([MockDouble])
+cairo: stroke([])
+cairo: restore([])
+cairo: save([])
 cairo: set_source_color([:black])
 cairo: translate([50, 1000])
 cairo: rotate([0])

data/spec/graphics/graphics_images_spec.rb

@@ -3,81 +3,82 @@ require 'squib'
 
 describe Squib::Card do
 
-  before(:example) do
-      @deck    = double(Squib::Deck)
-      @context = double(Cairo::Context)
-      @svg     = double(RSVG::Handle)
-      @png     = double(Cairo::ImageSurface)
-      allow(Cairo::Context).to receive(:new).and_return(@context)
-      allow(Cairo::ImageSurface).to receive(:from_png).and_return(@png)
-      allow(Cairo::ImageSurface).to receive(:new).and_return(@png)
-      allow(RSVG::Handle).to receive(:new_from_file).and_return(@svg)
-      allow(@deck).to receive(:dir).and_return('_output')
-      allow(@deck).to receive(:count_format).and_return('%02d')
-      allow(@deck).to receive(:prefix).and_return('card_')
-      allow(@deck).to receive(:antialias).and_return('best')
+  let(:deck)    { double(Squib::Deck) }
+  let(:context) { double(Cairo::Context) }
+  let(:svg)     { double(RSVG::Handle) }
+  let(:png)     { double(Cairo::ImageSurface) }
 
+  before(:each) do
+      allow(Cairo::Context).to receive(:new).and_return(context)
+      allow(Cairo::ImageSurface).to receive(:from_png).and_return(png)
+      allow(Cairo::ImageSurface).to receive(:new).and_return(png)
+      allow(RSVG::Handle).to receive(:new_from_data).and_return(svg)
+      allow(deck).to receive(:dir).and_return('_output')
+      allow(deck).to receive(:count_format).and_return('%02d')
+      allow(deck).to receive(:prefix).and_return('card_')
+      allow(deck).to receive(:antialias).and_return('subpixel')
+      allow(deck).to receive(:backend).and_return('memory')
   end
 
   context '#png' do
     it 'makes all the expected calls on a smoke test' do
-      expect(@context).to receive(:antialias=).with('subpixel')
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:translate).with(-37, -38).once
-      expect(@context).to receive(:rotate).with(0.0).once
-      expect(@context).to receive(:translate).with(37, 38).once
-      expect(@context).to receive(:set_source).with(@png, 37, 38).once
-      expect(@context).to receive(:paint).with(0.9).once
-      expect(@context).to receive(:restore).once
+      expect(context).to receive(:antialias=).with('subpixel')
+      expect(context).to receive(:save).once
+      expect(context).to receive(:translate).with(-37, -38).once
+      expect(context).to receive(:rotate).with(0.0).once
+      expect(context).to receive(:translate).with(37, 38).once
+      expect(context).to receive(:set_source).with(png, 37, 38).once
+      expect(context).to receive(:paint).with(0.9).once
+      expect(context).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       # png(file, x, y, alpha, blend, angle)
       card.png('foo.png', 37, 38, :native, :native, 0.9, :none, 0.0, nil)
     end
 
     it 'sets blend when needed' do
-      @context.as_null_object
-      expect(@context).to receive(:operator=).with(:overlay).once
+      context.as_null_object
+      expect(context).to receive(:operator=).with(:overlay).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       card.png('foo.png', 37, 38, :native, :native, 0.9, :overlay, 0.0, nil)
     end
   end
 
   context '#svg' do
     it 'makes all the expected calls on a smoke test' do
-      expect(@svg).to receive(:width).and_return(100).twice
-      expect(@svg).to receive(:height).and_return(100).twice
-      expect(@context).to receive(:antialias=).with('subpixel').once
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:rotate).with(0.0).once
-      expect(@context).to receive(:translate).with(37, 38).once
-      expect(@context).to receive(:scale).with(1.0, 1.0).once
-      expect(@context).to receive(:render_rsvg_handle).with(@svg, 'id').once
-      expect(@context).to receive(:restore).once
+      expect(svg).to receive(:width).and_return(100).twice
+      expect(svg).to receive(:height).and_return(100).twice
+      expect(context).to receive(:antialias=).with('subpixel').once
+      expect(context).to receive(:save).once
+      expect(context).to receive(:rotate).with(0.0).once
+      expect(context).to receive(:translate).with(37, 38).once
+      expect(context).to receive(:scale).with(1.0, 1.0).once
+      expect(context).to receive(:render_rsvg_handle).with(svg, 'id').once
+      expect(context).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
-      # svg(file, id, x, y, width, height, alpha, blend, angle)
-      card.svg('foo.png', 'id', 37, 38, :native, :native, 0.9, :none, 0.0, nil)
+      card = Squib::Card.new(deck, 100, 150)
+      # svg(file, data, id, x, y, width, height, alpha, blend, angle)
+      card.svg(nil, '<svg></svg>', 'id', 37, 38, :native, :native, 0.9, :none, 0.0, nil)
     end
 
     it 'sets blend when needed' do
-      @context.as_null_object
-      @svg.as_null_object
-      expect(@context).to receive(:operator=).with(:overlay).once
+      context.as_null_object
+      svg.as_null_object
+      expect(context).to receive(:operator=).with(:overlay).once
 
-      card = Squib::Card.new(@deck, 100, 150)
-      card.svg('foo.png', nil, 37, 38, :native, :native, 0.9, :overlay, 0.0, nil)
+      card = Squib::Card.new(deck, 100, 150)
+      card.svg(nil, '<svg></svg>', nil, 37, 38, :native, :native, 0.9, :overlay, 0.0, nil)
     end
 
     it 'sets width & height when needed' do
-      @context.as_null_object
-      expect(@svg).to receive(:width).and_return(100).once
-      expect(@svg).to receive(:height).and_return(100).once
-      expect(@context).to receive(:scale).with(2.0, 3.0).once
+      context.as_null_object
+      expect(svg).to receive(:width).and_return(100).once
+      expect(svg).to receive(:height).and_return(100).once
+      expect(context).to receive(:scale).with(2.0, 3.0).once
 
-      card = Squib::Card.new(@deck, 100, 150)
-      card.svg('foo.png', nil, 37, 38, 200, 300, 0.9, :none, 0.0, nil)
+      card = Squib::Card.new(deck, 100, 150)
+      card.svg(nil, '<svg></svg>', nil, 37, 38, 200, 300, 0.9, :none, 0.0, nil)
     end
   end
 

data/spec/graphics/graphics_shapes_spec.rb

@@ -3,33 +3,35 @@ require 'squib'
 
 describe Squib::Card do
 
-  def expect_stroke(fill_color, stroke_color, stroke_width)
-    expect(@context).to receive(:set_source_color).with(stroke_color).once
-    expect(@context).to receive(:set_line_width).with(stroke_width).once
-    expect(@context).to receive(:stroke).once
-    expect(@context).to receive(:set_source_color).with(fill_color).once
-    expect(@context).to receive(:fill).once
+  let(:deck) { double(Squib::Deck) }
+  let(:cxt)  { double(Cairo::Context) }
+
+  def expect_stroke(cxt, fill_color, stroke_color, stroke_width)
+    expect(cxt).to receive(:set_source_color).with(stroke_color).once
+    expect(cxt).to receive(:set_line_width).with(stroke_width).once
+    expect(cxt).to receive(:stroke).once
+    expect(cxt).to receive(:set_source_color).with(fill_color).once
+    expect(cxt).to receive(:fill).once
   end
 
   before(:each) do
-    @deck    = double(Squib::Deck)
-    @context = double(Cairo::Context)
-    allow(Cairo::Context).to receive(:new).and_return(@context)
-    allow(@deck).to receive(:dir).and_return('_output')
-    allow(@deck).to receive(:count_format).and_return('%02d')
-    allow(@deck).to receive(:prefix).and_return('card_')
-    allow(@deck).to receive(:antialias).and_return('best')
+    allow(Cairo::Context).to receive(:new).and_return(cxt)
+    allow(deck).to receive(:dir).and_return('_output')
+    allow(deck).to receive(:count_format).and_return('%02d')
+    allow(deck).to receive(:prefix).and_return('card_')
+    allow(deck).to receive(:antialias).and_return('subpixel')
+    allow(deck).to receive(:backend).and_return('memory')
   end
 
   context 'rect' do
     it 'make all the expected calls on a smoke test' do
-      expect(@context).to receive(:antialias=).with('subpixel')
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:rounded_rectangle).with(37, 38, 50, 100, 10, 15).twice
-      expect_stroke('#fff', '#f00', 2.0)
-      expect(@context).to receive(:restore).once
+      expect(cxt).to receive(:antialias=).with('subpixel')
+      expect(cxt).to receive(:save).once
+      expect(cxt).to receive(:rounded_rectangle).with(37, 38, 50, 100, 10, 15).twice
+      expect_stroke(cxt, '#fff', '#f00', 2.0)
+      expect(cxt).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       # rect(x, y, width, height, x_radius, y_radius,
       #      fill_color, stroke_color, stroke_width)
       card.rect(37, 38, 50, 100, 10, 15, '#fff', '#f00', 2.0)
@@ -38,14 +40,14 @@ describe Squib::Card do
 
   context 'circle' do
     it 'make all the expected calls on a smoke test' do
-      expect(@context).to receive(:antialias=).with('subpixel')
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:move_to).with(137, 38)
-      expect(@context).to receive(:circle).with(37, 38, 100).twice
-      expect_stroke('#fff', '#f00', 2.0)
-      expect(@context).to receive(:restore).once
+      expect(cxt).to receive(:antialias=).with('subpixel')
+      expect(cxt).to receive(:save).once
+      expect(cxt).to receive(:move_to).with(137, 38)
+      expect(cxt).to receive(:circle).with(37, 38, 100).twice
+      expect_stroke(cxt, '#fff', '#f00', 2.0)
+      expect(cxt).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       # circle(x, y, radius,
       #        fill_color, stroke_color, stroke_width)
       card.circle(37, 38, 100, '#fff', '#f00', 2.0)
@@ -54,29 +56,29 @@ describe Squib::Card do
 
   context 'triangle' do
     it 'make all the expected calls on a smoke test' do
-      expect(@context).to receive(:antialias=).with('subpixel')
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:triangle).with(1, 2, 3, 4, 5, 6).twice
-      expect_stroke('#fff', '#f00', 2.0)
-      expect(@context).to receive(:restore).once
+      expect(cxt).to receive(:antialias=).with('subpixel')
+      expect(cxt).to receive(:save).once
+      expect(cxt).to receive(:triangle).with(1, 2, 3, 4, 5, 6).twice
+      expect_stroke(cxt, '#fff', '#f00', 2.0)
+      expect(cxt).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       card.triangle(1, 2, 3, 4, 5, 6, '#fff', '#f00', 2.0)
     end
   end
 
   context 'line' do
     it 'make all the expected calls on a smoke test' do
-      expect(@context).to receive(:antialias=).with('subpixel')
-      expect(@context).to receive(:save).once
-      expect(@context).to receive(:move_to).with(1, 2).once
-      expect(@context).to receive(:line_to).with(3, 4).once
-      expect(@context).to receive(:set_source_color).with('#fff').once
-      expect(@context).to receive(:set_line_width).with(2.0).once
-      expect(@context).to receive(:stroke).once
-      expect(@context).to receive(:restore).once
+      expect(cxt).to receive(:antialias=).with('subpixel')
+      expect(cxt).to receive(:save).once
+      expect(cxt).to receive(:move_to).with(1, 2).once
+      expect(cxt).to receive(:line_to).with(3, 4).once
+      expect(cxt).to receive(:set_source_color).with('#fff').once
+      expect(cxt).to receive(:set_line_width).with(2.0).once
+      expect(cxt).to receive(:stroke).once
+      expect(cxt).to receive(:restore).once
 
-      card = Squib::Card.new(@deck, 100, 150)
+      card = Squib::Card.new(deck, 100, 150)
       card.line(1, 2, 3, 4, '#fff', 2.0)
     end
   end

data/spec/graphics/graphics_text_spec.rb

@@ -16,6 +16,8 @@ describe Squib::Card, '#text' do
       allow(deck).to receive(:count_format).and_return('%02d')
       allow(deck).to receive(:prefix).and_return('card_')
       allow(deck).to receive(:antialias).and_return('best')
+      allow(deck).to receive(:antialias).and_return('subpixel')
+      allow(deck).to receive(:backend).and_return('memory')
       allow(layout).to receive(:context).and_return(pango_cxt)
     end
 
@@ -50,11 +52,12 @@ describe Squib::Card, '#text' do
       # text(str, font, font_size, color,
       #      x, y, width, height,
       #      markup, justify, wrap, ellipsize,
-      #      spacing, align, valign, hint, angle)
+      #      spacing, align, valign, hint, angle,
+      #      stroke_width, stroke_color)
       ret = card.text(Squib::TextEmbed.new,'foo', 'Sans 12', nil, '#abc',
                       10, 15, 20, 25,
                       nil, false, false, false,
-                      1.0, :left, :top, nil, 0.0)
+                      1.0, :left, :top, nil, 0.0, '#fff', 0)
       expect(ret).to eq({width: 0, height: 0})
     end
   end
@@ -71,7 +74,8 @@ describe Squib::Card, '#text' do
       allow(deck).to receive(:dir).and_return('_output')
       allow(deck).to receive(:count_format).and_return('%02d')
       allow(deck).to receive(:prefix).and_return('card_')
-      allow(deck).to receive(:antialias).and_return('best')
+      allow(deck).to receive(:antialias).and_return('subpixel')
+      allow(deck).to receive(:backend).and_return('memory')
     end
 
     it 'aligns right with strings' do
@@ -80,7 +84,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, false, false,
-                1.0, 'right', :top, nil, 0.0)
+                1.0, 'right', :top, nil, 0.0, '#fff', 0)
     end
 
     it 'aligns center with strings' do
@@ -89,7 +93,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, false, false,
-                1.0, 'center', :top, nil, 0.0)
+                1.0, 'center', :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets wrap to char with string char' do
@@ -98,7 +102,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, 'char', false,
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets wrap to word with word string' do
@@ -107,7 +111,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, 'word', false,
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets wrap to word_char with symbol word_char' do
@@ -116,7 +120,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, :word_char, false,
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets wrap to word_char with true' do
@@ -125,7 +129,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, false,
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets ellipsize to start properly' do
@@ -134,7 +138,7 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, :start,
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
     end
 
     it 'sets ellipsize to middle properly' do
@@ -143,7 +147,17 @@ describe Squib::Card, '#text' do
       card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
                 10, 15, 20, 50,
                 nil, false, true, 'middle',
-                1.0, :left, :top, nil, 0.0)
+                1.0, :left, :top, nil, 0.0, '#fff', 0)
+    end
+
+    it 'implements stroke and fill when asked to' do
+      card = Squib::Card.new(deck, 100, 150)
+      expect(context).to receive(:set_line_width).with(3.0).once
+      expect(context).to receive(:pango_layout_path).once
+      card.text(Squib::TextEmbed.new, 'foo', 'Sans 12', nil, '#abc',
+                10, 15, 20, 50,
+                nil, false, true, 'middle',
+                1.0, :left, :top, nil, 0.0, '#f00', 3.0)
     end
 
   end