squib 0.10.0 → 0.11.0

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

@@ -4,6 +4,9 @@ cairo: set_source_color(["white"])
 cairo: paint([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([38, 38])
+cairo: rotate([0])
+cairo: translate([-38, -38])
 cairo: rounded_rectangle([38, 38, 750, 1050, 38, 38])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
@@ -15,6 +18,9 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([75, 75])
+cairo: rotate([0])
+cairo: translate([-75, -75])
 cairo: rounded_rectangle([75, 75, 128, 128, 25, 25])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])

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

@@ -4,6 +4,9 @@ cairo: set_source_color(["#ddd"])
 cairo: paint([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([37.5, 37.5])
+cairo: rotate([0])
+cairo: translate([-37.5, -37.5])
 cairo: rounded_rectangle([37.5, 37.5, 750.0, 1050.0, 25, 25])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
@@ -15,6 +18,9 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([75.0, 75.0])
+cairo: rotate([0])
+cairo: translate([-75.0, -75.0])
 cairo: rounded_rectangle([75.0, 75.0, 675.0, 975.0, 25, 25])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])
@@ -26,6 +32,9 @@ cairo: set_dash([[]])
 cairo: stroke([])
 cairo: restore([])
 cairo: save([])
+cairo: translate([472.4409444, 472.4409444])
+cairo: rotate([0])
+cairo: translate([-472.4409444, -472.4409444])
 cairo: rounded_rectangle([472.4409444, 472.4409444, 100, 100, 0, 0])
 cairo: set_source_color(["#0000"])
 cairo: fill_preserve([])

data/spec/graphics/embedding_utils_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+require 'squib/graphics/embedding_utils'
+
+describe Squib::EmbeddingUtils do
+
+  context(:indices) do
+    it 'returns nothing when given nothing' do
+      expect(Squib::EmbeddingUtils.indices('just some text', [])).to eq({})
+    end
+
+    it 'returns emptiness for given keys that are not in the string' do
+      str = 'just some text'
+      keys = [':tool:']
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => []
+      })
+    end
+
+    it 'returns correctly for one key, one time' do
+      str = 'some :tool: text'
+      keys = [':tool:']
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [5..11]
+      })
+    end
+
+    it 'handles one key, multiple times' do
+      str = 'some :tool: text :tool:'
+      keys = [':tool:']
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [5..11, 17..23]
+      })
+    end
+
+    it 'handles one key, multiple times next to each other' do
+      str = 'some :tool::tool: text'
+      keys = [':tool:']
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [5..11, 11..17]
+      })
+    end
+
+    it 'handles multiple keys, one time each' do
+      str = 'some :tool: heart text'
+      keys = %w(:tool: heart)
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [5..11],
+        'heart' => [12..17]
+      })
+    end
+
+    it 'handles multiple keys, multiple times each' do
+      str = ':tool:some :tool: heart text heart tool'
+      keys = %w(:tool: heart)
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [0..6, 11..17],
+        'heart' => [18..23, 29..34]
+      })
+    end
+
+    it 'handles multibyte properly' do
+      str = '💡 📷 :tool: heart text'
+      keys = %w(:tool: heart 💡)
+      expect(Squib::EmbeddingUtils.indices(str, keys)).to eq({
+        ':tool:' => [10..16],
+        'heart' => [17..22],
+        '💡' => [3..4]
+      })
+    end
+
+
+  end
+end

data/spec/layout_parser_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Squib::LayoutParser do
 
   it 'loads a normal layout with no extends' do
-    layout = Squib::LayoutParser.load_layout(layout_file('no-extends.yml'))
+    layout = subject.load_layout(layout_file('no-extends.yml'))
     expect(layout).to eq({ 'frame' => {
             'x' => 38,
             'valign' => :middle,
@@ -15,7 +15,7 @@ describe Squib::LayoutParser do
   end
 
   it 'loads with a single extends' do
-    layout = Squib::LayoutParser.load_layout(layout_file('single-extends.yml'))
+    layout = subject.load_layout(layout_file('single-extends.yml'))
     expect(layout).to eq({ 'frame' => {
             'x' => 38,
             'y' => 38,
@@ -31,7 +31,7 @@ describe Squib::LayoutParser do
   end
 
   it 'applies the extends regardless of order' do
-    layout = Squib::LayoutParser.load_layout(layout_file('pre-extends.yml'))
+    layout = subject.load_layout(layout_file('pre-extends.yml'))
     expect(layout).to eq({ 'frame' => {
             'x' => 38,
             'y' => 38,
@@ -47,7 +47,7 @@ describe Squib::LayoutParser do
   end
 
   it 'applies the single-level extends multiple times' do
-    layout = Squib::LayoutParser.load_layout(layout_file('single-level-multi-extends.yml'))
+    layout = subject.load_layout(layout_file('single-level-multi-extends.yml'))
     expect(layout).to eq({ 'frame' => {
             'x' => 38,
             'y' => 38,
@@ -69,7 +69,7 @@ describe Squib::LayoutParser do
   end
 
   it 'applies multiple extends in a single rule' do
-    layout = Squib::LayoutParser.load_layout(layout_file('multi-extends-single-entry.yml'))
+    layout = subject.load_layout(layout_file('multi-extends-single-entry.yml'))
     expect(layout).to eq({ 'aunt' => {
             'a' => 101,
             'b' => 102,
@@ -93,7 +93,7 @@ describe Squib::LayoutParser do
   end
 
   it 'applies multi-level extends' do
-    layout = Squib::LayoutParser.load_layout(layout_file('multi-level-extends.yml'))
+    layout = subject.load_layout(layout_file('multi-level-extends.yml'))
     expect(layout).to eq({ 'frame' => {
             'x' => 38,
             'y' => 38,
@@ -116,26 +116,26 @@ describe Squib::LayoutParser do
 
   it 'fails on a self-circular extends' do
     file = layout_file('self-circular-extends.yml')
-    expect { Squib::LayoutParser.load_layout(file) }
+    expect { subject.load_layout(file)}
       .to raise_error(RuntimeError, 'Invalid layout: circular extends with \'a\'')
   end
 
   it 'fails on a easy-circular extends' do
     file = layout_file('easy-circular-extends.yml')
-    expect { Squib::LayoutParser.load_layout(file) }
+    expect { subject.load_layout(file)}
       .to raise_error(RuntimeError, 'Invalid layout: circular extends with \'a\'')
   end
 
   it 'hard on a easy-circular extends' do
     file = layout_file('hard-circular-extends.yml')
-    expect { Squib::LayoutParser.load_layout(file) }
+    expect { subject.load_layout(file)}
       .to raise_error(RuntimeError, 'Invalid layout: circular extends with \'a\'')
   end
 
   it 'redefines keys on multiple layouts' do
     a = layout_file('multifile-a.yml')
     b = layout_file('multifile-b.yml')
-    layout = Squib::LayoutParser.load_layout([a, b])
+    layout = subject.load_layout([a, b])
     expect(layout).to eq({
         'title'    => { 'x' => 300 },
         'subtitle' => { 'x' => 200 },
@@ -146,7 +146,7 @@ describe Squib::LayoutParser do
   it 'evaluates extends on each file first' do
     a = layout_file('multifile-extends-a.yml')
     b = layout_file('multifile-extends-b.yml')
-    layout = Squib::LayoutParser.load_layout([a, b])
+    layout = subject.load_layout([a, b])
     expect(layout).to eq({
         'grandparent' => { 'x' => 100 },
         'parent_a'    => { 'x' => 110, 'extends' => 'grandparent' },
@@ -157,12 +157,12 @@ describe Squib::LayoutParser do
   end
 
   it 'loads nothing on an empty layout file' do
-    layout = Squib::LayoutParser.load_layout(layout_file('empty.yml'))
+    layout = subject.load_layout(layout_file('empty.yml'))
     expect(layout).to eq({})
   end
 
   it 'handles extends on a rule with no args' do
-    layout = Squib::LayoutParser.load_layout(layout_file('empty-rule.yml'))
+    layout = subject.load_layout(layout_file('empty-rule.yml'))
     expect(layout).to eq({
       'empty' => nil
     })
@@ -170,14 +170,14 @@ describe Squib::LayoutParser do
 
   it 'logs an error when a file is not found' do
     expect(Squib.logger).to receive(:error).once
-    Squib::LayoutParser.load_layout('yeti')
+    subject.load_layout('yeti')
   end
 
   it 'freaks out if you extend something doesn\'t exist' do
     expect(Squib.logger)
       .to receive(:error)
       .with("Processing layout: 'verbal' attempts to extend a missing 'kaisersoze'")
-    layout = Squib::LayoutParser.load_layout(layout_file('extends-nonexists.yml'))
+    layout = subject.load_layout(layout_file('extends-nonexists.yml'))
     expect(layout).to eq({
       'verbal' => {
           'font_size' => 25,
@@ -186,11 +186,36 @@ describe Squib::LayoutParser do
       })
   end
 
+  it 'does unit conversion when extending' do
+    layout = subject.load_layout(layout_file('extends-units.yml'))
+    expect(layout).to eq({
+      'parent' => { 'x' => '0.5in', 'y' => '1in'},
+      'child'  => { 'x' => 450.0, 'y' => 150.0, 'extends' => 'parent' },
+    })
+  end
+
+  it 'does unit conversion on non-300 dpis' do
+    parser = Squib::LayoutParser.new(100)
+    layout = parser.load_layout(layout_file('extends-units.yml'))
+    expect(layout).to eq({
+      'parent' => { 'x' => '0.5in', 'y' => '1in'},
+      'child'  => { 'x' => 150.0, 'y' => 50.0, 'extends' => 'parent' },
+    })
+  end
+
+  it 'does mixed unit conversion when extending' do
+    layout = subject.load_layout(layout_file('extends-units-mixed.yml'))
+    expect(layout).to eq({
+      'parent' => { 'x' => '0.5in', 'y' => '1in'},
+      'child'  => { 'x' => 450.0, 'y' => 150.0, 'extends' => 'parent' },
+    })
+  end
+
   it 'loads progressively on multiple calls' do
     a = layout_file('multifile-a.yml')
     b = layout_file('multifile-b.yml')
-    layout = Squib::LayoutParser.load_layout(a)
-    layout = Squib::LayoutParser.load_layout(b, layout)
+    layout = subject.load_layout(a)
+    layout = subject.load_layout(b, layout)
     expect(layout).to eq({
         'title'    => { 'x' => 300 },
         'subtitle' => { 'x' => 200 },

data/spec/spec_helper.rb

@@ -65,6 +65,7 @@ def scrub_hex(str)
   str.gsub(/0x\w{1,8}/, '')
      .gsub(/ptr=\w{1,8}/, '')
      .gsub(/#<Pango::FontDescription:.*>/, '')
+     .gsub(/#<Pango::AttrList:.*>/, 'Pango::AttrList')
      .gsub(/#<Cairo::ImageSurface:.*>/, 'ImageSurface')
      .gsub(/#<Cairo::LinearPattern:.*>/, 'LinearPattern')
      .gsub(/#<Cairo::RadialPattern:.*>/, 'RadialPattern')
@@ -103,6 +104,8 @@ def mock_cairo(strio)
   allow(pango).to receive(:alignment).and_return(Pango::Layout::Alignment::LEFT)
   allow(pango).to receive(:text).and_return('foo')
   allow(pango).to receive(:context).and_return(pango_cxt)
+  allow(pango).to receive(:attributes).and_return(nil)
+  allow(pango_cxt).to receive(:set_shape_renderer)
   allow(pango_cxt).to receive(:font_options=)
   allow(iter).to receive(:next_char!).and_return(false)
   allow(iter).to receive(:char_extents).and_return(Pango::Rectangle.new(5, 5, 5, 5))
@@ -120,7 +123,8 @@ def mock_cairo(strio)
   end
 
   %w(font_description= text= width= height= wrap= ellipsize= alignment=
-    justify= spacing= markup= ellipsized?).each do |m|
+    justify= spacing= markup= ellipsized? attributes=
+    set_shape_renderer).each do |m|
     allow(pango).to receive(m) {|*args| strio << scrub_hex("pango: #{m}(#{args})\n") }
   end
 

data/squib.gemspec

@@ -28,12 +28,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'cairo', '~> 1.15.2'
-  spec.add_runtime_dependency 'pango', '~> 3.0.1'
+  spec.add_runtime_dependency 'pango', '~> 3.0.9'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.7'
-  spec.add_runtime_dependency 'roo', '~> 2.3.0'
-  spec.add_runtime_dependency 'rsvg2', '~> 3.0.0'
+  spec.add_runtime_dependency 'roo', '~> 2.4.0'
+  spec.add_runtime_dependency 'rsvg2', '~> 3.0.9'
   spec.add_runtime_dependency 'mercenary', '~> 0.3.4'
   spec.add_runtime_dependency 'ruby-progressbar', '~> 1.8'
+  spec.add_runtime_dependency 'gobject-introspection', '~> 3.0.9' # for bug 172
+  spec.add_runtime_dependency 'gio2', '~> 3.0.9' # for bug 172
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: gobject-introspection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: gio2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,8 +276,8 @@ extra_rdoc_files:
 - samples/intro/03_layout.rb
 - samples/intro/04_arrays.rb
 - samples/intro/05_excel.rb
-- samples/layouts.rb
-- samples/layouts_builtin.rb
+- samples/layouts/builtin_layouts.rb
+- samples/layouts/layouts.rb
 - samples/ranges.rb
 - samples/saves/_hand.rb
 - samples/saves/_portrait_landscape.rb
@@ -322,6 +350,7 @@ files:
 - docs/dsl/inches.rst
 - docs/dsl/index.rst
 - docs/dsl/line.rst
+- docs/dsl/mm.rst
 - docs/dsl/png.rst
 - docs/dsl/polygon.rst
 - docs/dsl/rect.rst
@@ -395,6 +424,7 @@ files:
 - lib/squib/deck.rb
 - lib/squib/graphics/background.rb
 - lib/squib/graphics/cairo_context_wrapper.rb
+- lib/squib/graphics/embedding_utils.rb
 - lib/squib/graphics/gradient_regex.rb
 - lib/squib/graphics/hand.rb
 - lib/squib/graphics/image.rb
@@ -438,8 +468,6 @@ files:
 - samples/config_text_markup.rb
 - samples/config_text_markup.yml
 - samples/custom-config.yml
-- samples/custom-layout.yml
-- samples/custom-layout2.yml
 - samples/custom_config.rb
 - samples/customconfig-imgdir/shiny-purse2.png
 - samples/customconfig-imgdir/spanner2.svg
@@ -456,8 +484,18 @@ files:
 - samples/intro/03_layout.rb
 - samples/intro/04_arrays.rb
 - samples/intro/05_excel.rb
-- samples/layouts.rb
-- samples/layouts_builtin.rb
+- samples/layouts/_output/.gitignore
+- samples/layouts/builtin_layouts.rb
+- samples/layouts/custom-layout.yml
+- samples/layouts/custom-layout2.yml
+- samples/layouts/expected_layouts_builtin_economy_00.png
+- samples/layouts/expected_layouts_builtin_fantasy_00.png
+- samples/layouts/expected_layouts_builtin_hand_00.png
+- samples/layouts/expected_layouts_builtin_playing_card_00.png
+- samples/layouts/expected_layouts_builtin_tuck_box_00.png
+- samples/layouts/layouts.rb
+- samples/layouts/shiny-purse.png
+- samples/layouts/spanner.svg
 - samples/load_images_config.yml
 - samples/offset.svg
 - samples/pokercard.png
@@ -477,6 +515,7 @@ files:
 - samples/units.rb
 - spec/api/api_data_spec.rb
 - spec/api/api_settings_spec.rb
+- spec/api/api_units_spec.rb
 - spec/args/box_spec.rb
 - spec/args/draw_spec.rb
 - spec/args/embed_key_spec.rb
@@ -509,6 +548,8 @@ files:
 - spec/data/layouts/empty-rule.yml
 - spec/data/layouts/empty.yml
 - spec/data/layouts/extends-nonexists.yml
+- spec/data/layouts/extends-units-mixed.yml
+- spec/data/layouts/extends-units.yml
 - spec/data/layouts/hard-circular-extends.yml
 - spec/data/layouts/multi-extends-single-entry.yml
 - spec/data/layouts/multi-level-extends.yml
@@ -550,6 +591,7 @@ files:
 - spec/data/xlsx/with_macros.xlsm
 - spec/deck_spec.rb
 - spec/graphics/cairo_context_wrapper_spec.rb
+- spec/graphics/embedding_utils_spec.rb
 - spec/graphics/graphics_save_doc_spec.rb
 - spec/layout_parser_spec.rb
 - spec/logger_spec.rb
@@ -641,13 +683,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
 test_files:
 - spec/api/api_data_spec.rb
 - spec/api/api_settings_spec.rb
+- spec/api/api_units_spec.rb
 - spec/args/box_spec.rb
 - spec/args/draw_spec.rb
 - spec/args/embed_key_spec.rb
@@ -680,6 +723,8 @@ test_files:
 - spec/data/layouts/empty-rule.yml
 - spec/data/layouts/empty.yml
 - spec/data/layouts/extends-nonexists.yml
+- spec/data/layouts/extends-units-mixed.yml
+- spec/data/layouts/extends-units.yml
 - spec/data/layouts/hard-circular-extends.yml
 - spec/data/layouts/multi-extends-single-entry.yml
 - spec/data/layouts/multi-level-extends.yml
@@ -721,6 +766,7 @@ test_files:
 - spec/data/xlsx/with_macros.xlsm
 - spec/deck_spec.rb
 - spec/graphics/cairo_context_wrapper_spec.rb
+- spec/graphics/embedding_utils_spec.rb
 - spec/graphics/graphics_save_doc_spec.rb
 - spec/layout_parser_spec.rb
 - spec/logger_spec.rb