squib 0.10.0 → 0.11.0

data/samples/{layouts.rb → layouts/layouts.rb}

@@ -57,7 +57,6 @@ Squib::Deck.new(layout: 'hand.yml') do
     text str: icon.capitalize, layout: icon,
          hint: :red, valign: 'middle', align: 'center'
   end
-  png file: 'pokercard.png', alpha: 0.5
   save_png prefix: 'layout_builtin_hand_'
 end
 

data/samples/layouts/spanner.svg

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   viewBox="0 0 128 128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="100%"
+   height="100%"
+   sodipodi:docname="spanner.svg">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="1002"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="98.928938"
+     inkscape:cy="62.194589"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3767"
+     inkscape:document-units="in"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <g
+     id="g3767"
+     transform="matrix(0.24961486,0,0,0.24961486,0.197194,96.049335)">
+    <rect
+       ry="67.108368"
+       y="-378.68747"
+       x="5.3126979"
+       height="501.3746"
+       width="501.3746"
+       id="backdrop"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:10.62539577;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       inkscape:label="#rect3765" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 36.267098,-7.709219 C 16.393265,5.1318032 3.2161811,27.462365 3.2161811,52.884128 c 0,39.825874 32.2852369,72.111092 72.1110909,72.111092 23.870397,0 44.964938,-11.67699 58.089488,-29.545518 -11.26063,7.275808 -24.65607,11.517748 -39.060173,11.517748 -39.825853,0 -72.11109,-32.285221 -72.11109,-72.111095 0,-15.95546 5.248882,-30.6218942 14.021601,-42.565574 z"
+       id="path3790"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6"
+       transform="matrix(18.68858,0,0,18.68858,-3385.6437,-2608.3849)">
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         id="path8"
+         d="m 192.2325,129.3203 -10,10 v 5.5625 h 5.375 l 10.0938,-10.0938 -5.4688,-5.4688 z" />
+      <path
+         style="fill:#ffffff;stroke:#000000"
+         inkscape:connector-curvature="0"
+         id="path10"
+         d="m 181.7796,141.8591 15.6196,-15.6178 m 3.349,3.3486 -15.8051,15.8032" />
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         id="path12"
+         d="m 201.2023,119.7104 c -2.8283,-0.73 -5.9623,-0.004 -8.1759,2.2097 -3.3293,3.3292 -3.3293,8.7358 -2e-5,12.065 3.32928,3.3292 8.7358,3.3292 12.065,0 2.216,-2.216 2.9436,-5.3452 2.2097,-8.1759 l -5.6348,5.6348 -4.8172,-1.2816 -1.2816,-4.8171 5.6348,-5.6348 z" />
+    </g>
+  </g>
+</svg>

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/shapes/_draw_shapes.rb

@@ -3,8 +3,8 @@ require 'squib'
 Squib::Deck.new do
   background color: :white
 
-  grid x: 10, y: 10, width: 50,  height: 50,  stroke_color: '#0066FF', stroke_width: 1.5
-  grid x: 10, y: 10, width: 200, height: 200, stroke_color: '#0066FF', stroke_width: 3
+  grid x: 10, y: 10, width: 50,  height: 50,  stroke_color: '#0066FF', stroke_width: 1.5, angle: 0.1
+  grid x: 10, y: 10, width: 200, height: 200, stroke_color: '#0066FF', stroke_width: 3, angle: 0.1
 
   rect x: 305, y: 105, width: 200, height: 50, dash: '4 2'
 
@@ -12,6 +12,12 @@ Squib::Deck.new do
        fill_color: :blue, stroke_color: :red, stroke_width: 50.0,
        join: 'bevel'
 
+  rect x: 550, y: 105, width: 100, height: 100,
+       stroke_width: 5, stroke_color: :orange, angle: -0.2
+
+  ellipse x: 675, y: 105, width: 65, height: 100,
+       stroke_width: 5, stroke_color: :orange, angle: -0.2
+
   circle x: 600, y: 600, radius: 75,
          fill_color: :gray, stroke_color: :green, stroke_width: 8.0
 

data/spec/api/api_units_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Squib::Deck do
+
+  let(:deck) { Squib::Deck.new }
+
+  context '#in' do
+    it 'converts inches properly' do
+      expect(deck.inches(1)).to eq 300
+    end
+
+    it 'handles strings too' do
+      expect(deck.inches('1')).to eq 300
+    end
+  end
+
+  context '#cm' do
+    it 'converts inches properly' do
+      expect(deck.cm(1)).to eq 118.1102361
+    end
+
+    it 'handles strings too' do
+      expect(deck.cm('1')).to eq 118.1102361
+    end
+  end
+
+  context '#mm' do
+    it 'converts inches properly' do
+      expect(deck.mm(1)).to eq 11.81102361
+    end
+
+    it 'handles strings too' do
+      expect(deck.mm('1')).to eq 11.81102361
+    end
+  end
+
+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/showcase_special_spec.rb

@@ -1,15 +1,15 @@
-require 'spec_helper'
-require 'squib/args/showcase_special'
-
-describe Squib::Args::ShowcaseSpecial do
-  subject(:showcase_special) { Squib::Args::ShowcaseSpecial.new }
-
-  context '#face_right?' do
-    it 'compares face to right' do
-      opts = { face: 'LEFT ' }
-      showcase_special.load! opts
-      expect(showcase_special.face_right?).to be false
-    end
-  end
-
-end
+require 'spec_helper'
+require 'squib/args/showcase_special'
+
+describe Squib::Args::ShowcaseSpecial do
+  subject(:showcase_special) { Squib::Args::ShowcaseSpecial.new }
+
+  context '#face_right?' do
+    it 'compares face to right' do
+      opts = { face: 'LEFT ' }
+      showcase_special.load! opts
+      expect(showcase_special.face_right?).to be false
+    end
+  end
+
+end

data/spec/args/unit_conversion_spec.rb

@@ -15,8 +15,15 @@ describe Squib::Args::UnitConversion do
     expect(subject.parse('1 in')).to eq(300)
   end
 
-  it 'does cm'                      do
+  it 'does cm' do
     expect(subject.parse('1cm')).to eq(118.1102361)
+    expect(subject.parse('1cm  ')).to eq(118.1102361)
   end
 
+  it 'does mm' do
+    expect(subject.parse('1mm')).to eq(11.81102361)
+    expect(subject.parse('1mm  ')).to eq(11.81102361)
+  end
+
+
 end

data/spec/data/csv/qty.csv

@@ -1,3 +1,3 @@
-Name,Qty
-Ha, 3
+Name,Qty
+Ha, 3
 Ho, 1

data/spec/data/csv/qty_named.csv

@@ -1,3 +1,3 @@
-Name,Quantity
-Ha, 3
+Name,Quantity
+Ha, 3
 Ho, 1

data/spec/data/csv/with_spaces.csv

@@ -1,3 +1,3 @@
-  With Spaces  ,h2,h3
-a b c      , 2,3
+  With Spaces  ,h2,h3
+a b c      , 2,3
 3          ,4

data/spec/data/layouts/extends-units-mixed.yml

@@ -0,0 +1,8 @@
+parent:
+  x: 0.5in
+  y: 1in
+
+child:
+  extends: parent
+  x: += 1in
+  y: -= 0.5in

data/spec/data/layouts/extends-units.yml

@@ -0,0 +1,8 @@
+parent:
+  x: 0.5in
+  y: 1in
+
+child:
+  extends: parent
+  x: += 1in
+  y: -= 0.5in

data/spec/data/samples/autoscale_font/_autoscale_font.rb.txt

@@ -14,6 +14,9 @@ cairo: set_source_color(["white"])
 cairo: paint([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([0, 0])
+cairo: rotate([0])
+cairo: translate([0, 0])
 cairo: rounded_rectangle([0, 0, 300, 100, 0, 0])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
@@ -25,6 +28,9 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([0, 0])
+cairo: rotate([0])
+cairo: translate([0, 0])
 cairo: rounded_rectangle([0, 0, 300, 100, 0, 0])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
@@ -36,6 +42,9 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([0, 0])
+cairo: rotate([0])
+cairo: translate([0, 0])
 cairo: rounded_rectangle([0, 0, 300, 100, 0, 0])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])