squib 0.6.0 → 0.7.0

data/spec/data/samples/tgc_proofs.rb.txt

@@ -1,79 +1,81 @@
-cairo: antialias=(["subpixel"])
-cairo: save([])
-cairo: set_source_color([:white])
-cairo: paint([])
-cairo: restore([])
-cairo: save([])
-cairo: rounded_rectangle([38, 38, 750, 1050, 38, 38])
-cairo: set_source_color([:black])
-cairo: set_line_width([2.0])
-cairo: stroke([])
-cairo: rounded_rectangle([38, 38, 750, 1050, 38, 38])
-cairo: set_source_color(["#0000"])
-cairo: fill([])
-cairo: restore([])
-cairo: save([])
-cairo: rounded_rectangle([75, 75, 128, 128, 25, 25])
-cairo: set_source_color([:black])
-cairo: set_line_width([2.0])
-cairo: stroke([])
-cairo: rounded_rectangle([75, 75, 128, 128, 25, 25])
-cairo: set_source_color(["#0000"])
-cairo: fill([])
-cairo: restore([])
-cairo: save([])
-cairo: set_source_color([:black])
-cairo: translate([220, 78])
-cairo: rotate([0])
-cairo: move_to([0, 0])
-pango: font_description=([MockDouble])
-pango: text=(["Mastermind"])
-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: restore([])
-cairo: save([])
-cairo: set_source_color([:black])
-cairo: translate([75, 85])
-cairo: rotate([0])
-cairo: move_to([0, 0])
-pango: font_description=([MockDouble])
-pango: text=(["3"])
-pango: width=([131072])
-pango: wrap=([#<Pango::Layout::WrapMode word-char>])
-pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
-pango: alignment=([#<Pango::Layout::Alignment center>])
-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: translate([620, 75])
-cairo: rotate([0])
-cairo: translate([-620, -75])
-cairo: set_source([ImageSurface, 620, 75])
-cairo: paint([1.0])
-cairo: restore([])
-cairo: save([])
-cairo: translate([620, 218])
-cairo: rotate([0])
-cairo: scale([1.0, 1.0])
-cairo: render_rsvg_handle([RSVG::Handle, nil])
-cairo: restore([])
-cairo: save([])
-cairo: translate([0, 0])
-cairo: rotate([0])
-cairo: translate([0, 0])
-cairo: set_source([ImageSurface, 0, 0])
-cairo: paint([0.5])
-cairo: restore([])
-surface: write_to_png(["_output/tgc_sample_00.png"])
+cairo: antialias=(["subpixel"])
+cairo: save([])
+cairo: set_source_color(["white"])
+cairo: paint([])
+cairo: restore([])
+cairo: save([])
+cairo: rounded_rectangle([38, 38, 750, 1050, 38, 38])
+cairo: set_source_color(["#0000"])
+cairo: fill_preserve([])
+cairo: set_source_color(["black"])
+cairo: set_line_width([2.0])
+cairo: set_line_join([0])
+cairo: set_line_cap([0])
+cairo: set_dash([[]])
+cairo: stroke([])
+cairo: restore([])
+cairo: save([])
+cairo: rounded_rectangle([75, 75, 128, 128, 25, 25])
+cairo: set_source_color(["#0000"])
+cairo: fill_preserve([])
+cairo: set_source_color(["black"])
+cairo: set_line_width([2.0])
+cairo: set_line_join([0])
+cairo: set_line_cap([0])
+cairo: set_dash([[]])
+cairo: stroke([])
+cairo: restore([])
+cairo: save([])
+cairo: set_source_color(["black"])
+cairo: translate([220, 78])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["Mastermind"])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment left>])
+pango: justify=([false])
+cairo: move_to([0, 0])
+cairo: move_to([0, 0])
+cairo: show_pango_layout([MockDouble])
+pango: ellipsized?([])
+cairo: restore([])
+cairo: save([])
+cairo: set_source_color(["black"])
+cairo: translate([75, 85])
+cairo: rotate([0])
+cairo: move_to([0, 0])
+pango: font_description=([MockDouble])
+pango: text=(["3"])
+pango: width=([131072])
+pango: wrap=([#<Pango::Layout::WrapMode word-char>])
+pango: ellipsize=([#<Pango::Layout::EllipsizeMode end>])
+pango: alignment=([#<Pango::Layout::Alignment center>])
+pango: justify=([false])
+cairo: move_to([0, 0])
+cairo: move_to([0, 0])
+cairo: show_pango_layout([MockDouble])
+pango: ellipsized?([])
+cairo: restore([])
+cairo: save([])
+cairo: translate([620, 75])
+cairo: rotate([0])
+cairo: translate([-620, -75])
+cairo: set_source([ImageSurface, 620, 75])
+cairo: paint([1.0])
+cairo: restore([])
+cairo: save([])
+cairo: translate([620, 218])
+cairo: rotate([0])
+cairo: scale([1.0, 1.0])
+cairo: render_rsvg_handle([RSVG::Handle, nil])
+cairo: restore([])
+cairo: save([])
+cairo: translate([0, 0])
+cairo: rotate([0])
+cairo: translate([0, 0])
+cairo: set_source([ImageSurface, 0, 0])
+cairo: paint([0.5])
+cairo: restore([])
+surface: write_to_png(["_output/tgc_sample_00.png"])

data/spec/data/samples/units.rb.txt

@@ -5,29 +5,35 @@ cairo: paint([])
 cairo: restore([])
 cairo: save([])
 cairo: rounded_rectangle([37.5, 37.5, 750.0, 1050.0, 25, 25])
-cairo: set_source_color([:black])
+cairo: set_source_color(["#0000"])
+cairo: fill_preserve([])
+cairo: set_source_color(["black"])
 cairo: set_line_width([2.0])
+cairo: set_line_join([0])
+cairo: set_line_cap([0])
+cairo: set_dash([[]])
 cairo: stroke([])
-cairo: rounded_rectangle([37.5, 37.5, 750.0, 1050.0, 25, 25])
-cairo: set_source_color(["#0000"])
-cairo: fill([])
 cairo: restore([])
 cairo: save([])
 cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
-cairo: set_source_color([:black])
+cairo: set_source_color(["#0000"])
+cairo: fill_preserve([])
+cairo: set_source_color(["black"])
 cairo: set_line_width([2.0])
+cairo: set_line_join([0])
+cairo: set_line_cap([0])
+cairo: set_dash([[]])
 cairo: stroke([])
-cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
-cairo: set_source_color(["#0000"])
-cairo: fill([])
 cairo: restore([])
 cairo: save([])
 cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
-cairo: set_source_color([:black])
+cairo: set_source_color(["#0000"])
+cairo: fill_preserve([])
+cairo: set_source_color(["black"])
 cairo: set_line_width([2.0])
+cairo: set_line_join([0])
+cairo: set_line_cap([0])
+cairo: set_dash([[]])
 cairo: stroke([])
-cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
-cairo: set_source_color(["#0000"])
-cairo: fill([])
 cairo: restore([])
 surface: write_to_png(["_output/units_00.png"])

data/spec/graphics/cairo_context_wrapper_spec.rb

@@ -1,75 +1,84 @@
-require 'spec_helper'
-require 'squib/graphics/cairo_context_wrapper'
-
-describe Squib::Graphics::CairoContextWrapper do
-
-  let(:cairo) { double(Cairo::Context) }
-  subject     { Squib::Graphics::CairoContextWrapper.new(cairo) }
-
-  it 'passes on colors as normal' do
-    expect(cairo).to receive(:set_source_color).with('blue')
-    subject.set_source_squibcolor('blue')
-  end
-
-  it 'passes on color symbols as normal' do
-    expect(cairo).to receive(:set_source_color).with(:blue)
-    subject.set_source_squibcolor(:blue)
-  end
-
-  it 'passes on color hashes' do
-    expect(cairo).to receive(:set_source_color)
-      .with('#aabbccdd')
-    subject.set_source_squibcolor('#aabbccdd')
-  end
-
-  context 'regex variations for linear gradients' do
-    before(:each) do
-      dbl = double(Cairo::LinearPattern)
-      expect(Cairo::LinearPattern).to receive(:new).with(1,2,3,4).and_return(dbl)
-      expect(dbl).to   receive(:add_color_stop).with(0.0, 'blue')
-      expect(dbl).to   receive(:add_color_stop).with(1.0, 'red')
-      expect(cairo).to receive(:set_source).with(dbl)
-    end
-
-    it('handles no decimals'  ) { subject.set_source_squibcolor('(1,2) (3,4) blue@0 red@1') }
-    it('handles decimals'     ) { subject.set_source_squibcolor('(1.0,2.0) (3.0,4.0) blue@0 red@1') }
-    it('handles no whitespace') { subject.set_source_squibcolor('(1,2)(3,4)blue@0red@1') }
-    it('handles whitespace'   ) { subject.set_source_squibcolor('  (  1  ,  2  )  ( 3  ,  4  )  blue@0   red@1   ') }
-  end
-
-  context 'regex variations for radial gradients' do
-    before(:each) do
-      dbl = double(Cairo::RadialPattern)
-      expect(Cairo::RadialPattern).to receive(:new).with(1,2,5,3,4,6).and_return(dbl)
-      expect(dbl).to   receive(:add_color_stop).with(0.0, 'blue')
-      expect(dbl).to   receive(:add_color_stop).with(1.0, 'red')
-      expect(cairo).to receive(:set_source).with(dbl)
-    end
-
-    it('handles no decimals'  ) { subject.set_source_squibcolor('(1,2,5) (3,4,6) blue@0 red@1') }
-    it('handles decimals'     ) { subject.set_source_squibcolor('(1.0,2.0,5.0) (3.0,4.0,6.0) blue@0 red@1') }
-    it('handles no whitespace') { subject.set_source_squibcolor('(1,2,5)(3,4,6)blue@0red@1') }
-    it('handles whitespace'   ) { subject.set_source_squibcolor('  (  1  ,  2  , 5 )  ( 3  ,  4 , 6 )  blue@0   red@1   ') }
-  end
-
-  context 'regex handles hash notation' do
-    it 'on radial patterns' do
-      dbl = double(Cairo::RadialPattern)
-      expect(Cairo::RadialPattern).to receive(:new).with(1,2,5,3,4,6).and_return(dbl)
-      expect(dbl).to   receive(:add_color_stop).with(0.0, '#def')
-      expect(dbl).to   receive(:add_color_stop).with(1.0, '#112233')
-      expect(cairo).to receive(:set_source).with(dbl)
-      subject.set_source_squibcolor('(1,2,5) (3,4,6) #def@0 #112233@1')
-    end
-
-    it 'on linear patterns' do
-      dbl = double(Cairo::LinearPattern)
-      expect(Cairo::LinearPattern).to receive(:new).with(1,2,3,4).and_return(dbl)
-      expect(dbl).to   receive(:add_color_stop).with(0.0, '#def')
-      expect(dbl).to   receive(:add_color_stop).with(1.0, '#112233')
-      expect(cairo).to receive(:set_source).with(dbl)
-      subject.set_source_squibcolor('(1,2) (3,4) #def@0 #112233@1')
-    end
-  end
-
-end
+require 'spec_helper'
+require 'squib/graphics/cairo_context_wrapper'
+
+describe Squib::Graphics::CairoContextWrapper do
+
+  let(:cairo) { double(Cairo::Context) }
+  subject     { Squib::Graphics::CairoContextWrapper.new(cairo) }
+
+  context '#set_source_squibcolor' do
+
+    it 'passes on colors as normal' do
+      expect(cairo).to receive(:set_source_color).with('blue')
+      subject.set_source_squibcolor('blue')
+    end
+
+    it 'passes on color symbols as normal' do
+      expect(cairo).to receive(:set_source_color).with(:blue)
+      subject.set_source_squibcolor(:blue)
+    end
+
+    it 'passes on color hashes' do
+      expect(cairo).to receive(:set_source_color)
+        .with('#aabbccdd')
+      subject.set_source_squibcolor('#aabbccdd')
+    end
+
+    it 'raises on nil' do
+      expect { subject.set_source_squibcolor(nil) }.to raise_error('nil is not a valid color')
+    end
+
+  end
+
+
+  context 'regex variations for linear gradients' do
+    before(:each) do
+      dbl = double(Cairo::LinearPattern)
+      expect(Cairo::LinearPattern).to receive(:new).with(1,2,3,4).and_return(dbl)
+      expect(dbl).to   receive(:add_color_stop).with(0.0, 'blue')
+      expect(dbl).to   receive(:add_color_stop).with(1.0, 'red')
+      expect(cairo).to receive(:set_source).with(dbl)
+    end
+
+    it('handles no decimals'  ) { subject.set_source_squibcolor('(1,2) (3,4) blue@0 red@1') }
+    it('handles decimals'     ) { subject.set_source_squibcolor('(1.0,2.0) (3.0,4.0) blue@0 red@1') }
+    it('handles no whitespace') { subject.set_source_squibcolor('(1,2)(3,4)blue@0red@1') }
+    it('handles whitespace'   ) { subject.set_source_squibcolor('  (  1  ,  2  )  ( 3  ,  4  )  blue@0   red@1   ') }
+  end
+
+  context 'regex variations for radial gradients' do
+    before(:each) do
+      dbl = double(Cairo::RadialPattern)
+      expect(Cairo::RadialPattern).to receive(:new).with(1,2,5,3,4,6).and_return(dbl)
+      expect(dbl).to   receive(:add_color_stop).with(0.0, 'blue')
+      expect(dbl).to   receive(:add_color_stop).with(1.0, 'red')
+      expect(cairo).to receive(:set_source).with(dbl)
+    end
+
+    it('handles no decimals'  ) { subject.set_source_squibcolor('(1,2,5) (3,4,6) blue@0 red@1') }
+    it('handles decimals'     ) { subject.set_source_squibcolor('(1.0,2.0,5.0) (3.0,4.0,6.0) blue@0 red@1') }
+    it('handles no whitespace') { subject.set_source_squibcolor('(1,2,5)(3,4,6)blue@0red@1') }
+    it('handles whitespace'   ) { subject.set_source_squibcolor('  (  1  ,  2  , 5 )  ( 3  ,  4 , 6 )  blue@0   red@1   ') }
+  end
+
+  context 'regex handles hash notation' do
+    it 'on radial patterns' do
+      dbl = double(Cairo::RadialPattern)
+      expect(Cairo::RadialPattern).to receive(:new).with(1,2,5,3,4,6).and_return(dbl)
+      expect(dbl).to   receive(:add_color_stop).with(0.0, '#def')
+      expect(dbl).to   receive(:add_color_stop).with(1.0, '#112233')
+      expect(cairo).to receive(:set_source).with(dbl)
+      subject.set_source_squibcolor('(1,2,5) (3,4,6) #def@0 #112233@1')
+    end
+
+    it 'on linear patterns' do
+      dbl = double(Cairo::LinearPattern)
+      expect(Cairo::LinearPattern).to receive(:new).with(1,2,3,4).and_return(dbl)
+      expect(dbl).to   receive(:add_color_stop).with(0.0, '#def')
+      expect(dbl).to   receive(:add_color_stop).with(1.0, '#112233')
+      expect(cairo).to receive(:set_source).with(dbl)
+      subject.set_source_squibcolor('(1,2) (3,4) #def@0 #112233@1')
+    end
+  end
+
+end

data/spec/graphics/graphics_images_spec.rb

@@ -1,85 +1,94 @@
-require 'spec_helper'
-require 'squib'
-
-describe Squib::Card do
-
-  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
-
-      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
-
-      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
-
-      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
-
-      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
-
-      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
-
-end
+require 'spec_helper'
+require 'squib'
+require 'ostruct'
+
+describe Squib::Card do
+
+  let(:deck)    { double(Squib::Deck) }
+  let(:context) { double(Cairo::Context) }
+  let(:svg)     { double(RSVG::Handle) }
+  let(:png)     { double(Cairo::ImageSurface) }
+  let(:box)     { OpenStruct.new({x: 37, y: 38, width: :native, height: :native})}
+  let(:paint)   { OpenStruct.new({alpha: 0.9, blend: :none, mask: '' })}
+  let(:trans)   { OpenStruct.new({angle: 0.0})}
+
+  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
+
+      card = Squib::Card.new(deck, 100, 150)
+      # png(file, x, y, alpha, blend, angle)
+      card.png('foo.png', box, paint, trans)
+    end
+
+    it 'sets blend when needed' do
+      context.as_null_object
+      expect(context).to receive(:operator=).with(:overlay).once
+
+      card = Squib::Card.new(deck, 100, 150)
+      paint.blend = :overlay
+      card.png('foo.png', box, paint, trans)
+    end
+  end
+
+  context '#svg' do
+    let(:svg_args) { OpenStruct.new({data: '<svg></svg>', id: 'id'}) }
+
+    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
+
+      card = Squib::Card.new(deck, 100, 150)
+      card.svg(nil, svg_args, box, paint, trans)
+    end
+
+    it 'sets blend when needed' do
+      context.as_null_object
+      svg.as_null_object
+      expect(context).to receive(:operator=).with(:overlay).once
+
+      card = Squib::Card.new(deck, 100, 150)
+      paint.blend = :overlay
+      card.svg(nil, svg_args, box, paint, trans)
+    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
+
+      card = Squib::Card.new(deck, 100, 150)
+      box.width = 200
+      box.height = 300
+      card.svg(nil, svg_args, box, paint, trans)
+    end
+  end
+
+end