squib 0.15.3 → 0.17.0

data/samples/system_font_debug/_list_fonts.rb

@@ -0,0 +1,14 @@
+# require 'squib'
+require_relative '../../lib/squib'
+
+# Per issue #334, sometimes Pango doesn't find the font file you want
+# Pango requires fonts to be installed on the system, but sometimes the
+# font name is not obvious. e.g. "Foo Regular" might be actually named "Foo"
+# Use these methods to debug this problem
+
+# Usually you would just run this method to see what fonts are installed
+# This is commented out to make our test cases
+# Squib.print_system_fonts
+
+Squib.system_fonts.include? 'Open Sans' # checks if we have Open Sans installed
+# Note: does nothing since it's just a check

data/samples/text/_text.rb

@@ -1,7 +1,7 @@
 require 'squib'
 require 'squib/sample_helpers'
 
-Squib::Deck.new(width: 1000, height: 1250) do
+Squib::Deck.new(width: 1000, height: 1450) do
   draw_graph_paper width, height
 
   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|
@@ -21,6 +21,11 @@ Squib::Deck.new(width: 1000, height: 1250) do
          hint: :red, width: 350, font: 'Serif bold 7'
   end
 
+  sample 'If you specify ellipsize: :autosize, the font size will autoscale.' do |x, y|
+    text str: 'This text doeas not fit with font size 7. It is autoscaled to the largest size that fits instead.', x: x - 50, y: y,
+         hint: :red, width: 350, height: 100, ellipsize: :autoscale, font: 'Serif bold 7'
+  end
+
   sample 'If you specify the width only, and turn off ellipsize, the height will auto-stretch.' do |x, y|
     text str: 'This has fixed width, but not fixed height.', x: x, y: y,
          hint: :red, width: 300, ellipsize: false, font: 'Serif bold 8'

data/samples/text/_text_options.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
-require 'squib'
+# require 'squib'
+require_relative '../../lib/squib'
 
 data = { 'name' => ['Thief', 'Grifter', 'Mastermind'],
         'level' => [1, 2, 3] }

data/samples/units/_cells.rb

@@ -0,0 +1,51 @@
+require 'squib'
+
+Squib::Deck.new(width: '1.5in', height: '1.5in') do
+  background color: :white
+
+  # Squib has a custom unit, called "cell"
+  # A "cell" unit defaults to 37.5px, which at 300dpi is 1/8in or 3.175mm
+  # This is a very common multiple for layouts.
+  # This helps us lay things out in grids without doing much math in our heads
+  # Here's an example... with grid!
+  grid width: '1 cell', height: '1 cell'
+
+  # Plurals are fine or just 'c' as a unit is fine
+  # Whitespace is pretty lenient too.
+  rect fill_color: :blue,
+       x: '1 cell', y: '2 cells',
+       width: '1c', height: '1cell  '
+
+  # Technically, the "cell" is actually a "unit", so you can even combine
+  # with xywh shorhands!!
+  rect fill_color: :red,
+       x: 'middle + 0.5c', y: 'deck - 1.5c',
+       width: '1c', height: '1c'
+
+  # And, unlike xywh shorthands, this applies basically everywhere we support
+  # unit conversion.
+  circle fill_color: :green,
+         x: '3c', y: '2c', radius: '1c'
+  # Decimals are fine too
+  circle fill_color: :green,
+         x: '5c', y: '2c', radius: '0.5c'
+  # Even dashes!
+  circle fill_color: '#0000', stroke_color: :purple,
+         x: '1c', y: '4c', radius: '0.5c', dash: '0.25c 0.25c'
+
+  # We can also do stuff in layout. Check out the yml file...
+  #  (even cleaner in Yaml since we don't need quotes!)
+  use_layout file: 'cells.yml'
+  rect layout: :example
+  rect layout: :extends_example
+
+  save_png prefix: 'cells_'
+end
+
+
+# You can customize this with the cell_px configuration option
+Squib::Deck.new(width: 100, height: 100, config: 'cell_config.yml') do
+  background color: :white
+  rect x: '1c', y: '1c', width: '1c', height: '1c', fill_color: :purple
+  save_png prefix: 'custom_cell_'
+end

data/samples/units/_shorthands.rb

@@ -0,0 +1,48 @@
+require_relative '../../lib/squib'
+
+# Lots of DSL methods have shorthands that are accepted for
+# x, y, width, and height parameters.
+Squib::Deck.new(width: '0.5in', height: '0.25in') do
+  background color: :white
+
+  # middle for x and y will resolve to half the height
+  text str: 'xymiddle', font: 'Sans Bold 3', hint: :red,
+       x: 'middle', y: :middle
+
+  # 'center' also works
+  rect width: 30, height: 30,
+       x: :center, y: 'center'
+
+  # Applies to shapes
+  triangle x1: 20, y1: 20,
+           x2: 60, y2: 20,
+           x3: :middle, y3: :middle
+
+  # We can also do width-, height-, width/, height/
+  rect x: 20, y: 5, stroke_color: :green,
+  width: 'deck - 0.1in', height: 10
+
+  rect x: 10, y: 50, width: 10, height: 'deck / 3',
+       stroke_color: :purple
+
+  # And middle+/-
+  rect x: 'middle + 0.1in', y: 'center - 0.1in',
+       width: '0.1in', height: '0.1in', fill_color: :blue
+
+  # Layouts apply this too.
+  use_layout file: 'shorthands.yml'
+  rect layout: :example
+
+  # HOWEVER! Shorthands don't combine in an "extends" situation,
+  # e.g. this won't work:
+  # parent:
+  #   x: middle
+  # child:
+  #   extends: parent
+  #   x: += 0.5in
+
+  # These shorthands are not intended for every xywh parameter or
+  # length parameter, see docs for when they do or do not apply.
+
+  save_png prefix: 'shorthand_'
+end

data/samples/units/_units.rb

@@ -23,10 +23,17 @@ Squib::Deck.new(width: '1.5in', height: '1.5in') do
   	   width: safe_width, height: safe_height,
        radius: '2 mm '
 
+  # Angles are also automatically converted to radians if you use deg
+  svg file: '../spanner.svg',
+      x: 100, y: 100, width: 40, height: 40, angle: '30deg'
+
   # We can also do stuff in layout. Check out the yml file...
   #  (even cleaner in Yaml since we don't need quotes!)
   use_layout file: 'using_units.yml'
   text str: 'Hello.', layout: :example
+  svg file: '../spanner.svg', layout: :angled
 
   save prefix: 'units_', format: :png
+
+  # But wait... there's more! See _shorthands.rb for more fanciness with units
 end

data/squib.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.specification_version = 2 if spec.respond_to? :specification_version=
   spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
   spec.rubygems_version = '2.2.2'
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.name          = 'squib'
   spec.version       = Squib::VERSION
@@ -15,9 +15,11 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'A Ruby DSL for prototyping card games'
   spec.description   = 'Squib is a Ruby DSL for prototyping card games'
+  spec.post_install_message   = 'Happy Squibbing!'
   spec.authors       = ['Andy Meneely']
   spec.email         = 'andy.meneely@gmail.com'
   spec.homepage      = 'https://github.com/andymeneely/squib'
+  spec.requirements << 'On Windows, you need the Ruby+DevKit. See https://rubyinstaller.org/downloads'
 
   spec.rdoc_options = ['--charset=UTF-8']
   spec.extra_rdoc_files = Dir['README.md', 'samples/**/*.rb']
@@ -29,20 +31,24 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(spec|samples|docs|benchmarks)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cairo',                 '~> 1.16'
-  spec.add_runtime_dependency 'classy_hash',           '0.2.1'
+  spec.add_runtime_dependency 'cairo',                 '~> 1.17'
+  spec.add_runtime_dependency 'classy_hash',           '1.0.0'
   spec.add_runtime_dependency 'gio2',                  '~> 3.4'
   spec.add_runtime_dependency 'gobject-introspection', '~> 3.4'
-  spec.add_runtime_dependency 'highline',              '2.0.2'
-  spec.add_runtime_dependency 'mercenary',             '0.3.6'
-  spec.add_runtime_dependency 'nokogiri',              '1.10.4'
+  spec.add_runtime_dependency 'highline',              '2.0.3'
+  spec.add_runtime_dependency 'mercenary',             '0.4.0'
+  spec.add_runtime_dependency 'nokogiri',              '~> 1.11'
   spec.add_runtime_dependency 'pango',                 '~> 3.4'
-  spec.add_runtime_dependency 'roo',                   '2.8.2'
+  spec.add_runtime_dependency 'rainbow',               '~> 3.0'
+  spec.add_runtime_dependency 'roo',                   '~> 2.8'
   spec.add_runtime_dependency 'rsvg2',                 '~> 3.4'
-  spec.add_runtime_dependency 'ruby-progressbar',      '~> 1.10'
+  spec.add_runtime_dependency 'ruby-progressbar',      '~> 1.11'
 
+  spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls', '>= 0.8.21'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rake'
   spec.add_development_dependency 'game_icons'
   spec.add_development_dependency 'launchy'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Andy Meneely
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: classy_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +220,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.21
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: game_icons
   requirement: !ruby/object:Gem::Requirement
@@ -298,10 +354,11 @@ extra_rdoc_files:
 - samples/ranges/_ranges.rb
 - samples/saves/_hand.rb
 - samples/saves/_portrait_landscape.rb
-- samples/saves/_saves.rb
 - samples/saves/_save_filenames.rb
 - samples/saves/_save_pdf.rb
+- samples/saves/_saves.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -310,35 +367,29 @@ extra_rdoc_files:
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
 - samples/sprues/_sprue_example.rb
-- samples/text/bug134.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
 - samples/text/_text_options.rb
+- samples/text/bug134.rb
+- samples/units/_cells.rb
+- samples/units/_shorthands.rb
 - samples/units/_units.rb
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Dockerfile
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - RELEASE TODO.md
 - Rakefile
-- appveyor.yml
 - bin/squib
 - lib/squib.rb
-- lib/squib/api/background.rb
-- lib/squib/api/data.rb
-- lib/squib/api/groups.rb
-- lib/squib/api/image.rb
-- lib/squib/api/save.rb
 - lib/squib/api/settings.rb
-- lib/squib/api/shapes.rb
-- lib/squib/api/text.rb
-- lib/squib/api/text_embed.rb
-- lib/squib/api/units.rb
 - lib/squib/args/arg_loader.rb
 - lib/squib/args/box.rb
 - lib/squib/args/card_range.rb
@@ -347,6 +398,7 @@ files:
 - lib/squib/args/csv_opts.rb
 - lib/squib/args/dir_validator.rb
 - lib/squib/args/draw.rb
+- lib/squib/args/drop_shadow.rb
 - lib/squib/args/embed_adjust.rb
 - lib/squib/args/embed_key.rb
 - lib/squib/args/hand_special.rb
@@ -363,6 +415,7 @@ files:
 - lib/squib/args/transform.rb
 - lib/squib/args/typographer.rb
 - lib/squib/args/unit_conversion.rb
+- lib/squib/args/xywh_shorthands.rb
 - lib/squib/builtin/layouts/economy.yml
 - lib/squib/builtin/layouts/fantasy.yml
 - lib/squib/builtin/layouts/hand.yml
@@ -413,6 +466,34 @@ files:
 - lib/squib/conf.rb
 - lib/squib/constants.rb
 - lib/squib/deck.rb
+- lib/squib/dsl/background.rb
+- lib/squib/dsl/circle.rb
+- lib/squib/dsl/csv.rb
+- lib/squib/dsl/curve.rb
+- lib/squib/dsl/cut_zone.rb
+- lib/squib/dsl/ellipse.rb
+- lib/squib/dsl/grid.rb
+- lib/squib/dsl/groups.rb
+- lib/squib/dsl/hand.rb
+- lib/squib/dsl/line.rb
+- lib/squib/dsl/png.rb
+- lib/squib/dsl/polygon.rb
+- lib/squib/dsl/rect.rb
+- lib/squib/dsl/safe_zone.rb
+- lib/squib/dsl/save.rb
+- lib/squib/dsl/save_pdf.rb
+- lib/squib/dsl/save_png.rb
+- lib/squib/dsl/save_sheet.rb
+- lib/squib/dsl/showcase.rb
+- lib/squib/dsl/star.rb
+- lib/squib/dsl/svg.rb
+- lib/squib/dsl/text.rb
+- lib/squib/dsl/text_embed.rb
+- lib/squib/dsl/triangle.rb
+- lib/squib/dsl/units.rb
+- lib/squib/dsl/xlsx.rb
+- lib/squib/dsl/yaml.rb
+- lib/squib/errors_warnings/warn_unexpected_params.rb
 - lib/squib/graphics/background.rb
 - lib/squib/graphics/cairo_context_wrapper.rb
 - lib/squib/graphics/embedding_utils.rb
@@ -426,7 +507,11 @@ files:
 - lib/squib/graphics/shapes.rb
 - lib/squib/graphics/showcase.rb
 - lib/squib/graphics/text.rb
+- lib/squib/import/csv_importer.rb
 - lib/squib/import/data_frame.rb
+- lib/squib/import/quantity_exploder.rb
+- lib/squib/import/xlsx_importer.rb
+- lib/squib/import/yaml_importer.rb
 - lib/squib/layout_parser.rb
 - lib/squib/progress.rb
 - lib/squib/sample_helpers.rb
@@ -435,6 +520,7 @@ files:
 - lib/squib/sprues/invalid_sprue_definition.rb
 - lib/squib/sprues/sprue.rb
 - lib/squib/sprues/sprue_schema.rb
+- lib/squib/system_fonts.rb
 - lib/squib/version.rb
 - samples/autoscale_font/_autoscale_font.rb
 - samples/backend/_backend.rb
@@ -469,6 +555,7 @@ files:
 - samples/saves/_save_pdf.rb
 - samples/saves/_saves.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -477,17 +564,20 @@ files:
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
 - samples/sprues/_sprue_example.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
 - samples/text/_text_options.rb
 - samples/text/bug134.rb
+- samples/units/_cells.rb
+- samples/units/_shorthands.rb
 - samples/units/_units.rb
 - squib.gemspec
 homepage: https://github.com/andymeneely/squib
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: Happy Squibbing!
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -496,15 +586,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+requirements:
+- On Windows, you need the Ruby+DevKit. See https://rubyinstaller.org/downloads
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
 test_files:
@@ -541,6 +632,7 @@ test_files:
 - samples/saves/_save_pdf.rb
 - samples/saves/_saves.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -549,8 +641,11 @@ test_files:
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
 - samples/sprues/_sprue_example.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
 - samples/text/_text_options.rb
 - samples/text/bug134.rb
+- samples/units/_cells.rb
+- samples/units/_shorthands.rb
 - samples/units/_units.rb