squib 0.16.0.pre.preview1 → 0.16.0.pre.preview2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24cc3f2b97503042d0ad1a0db003e8cb585e4853389c78b49c54c036f45bf4e2
-  data.tar.gz: aa49287f4fa01039f4ea8737e862d24637ba47142d84849e54335b44b00f4424
+  metadata.gz: b29314be4965781e64f6f4d476fd7f0bbc629459636144f3a779637070315087
+  data.tar.gz: da76c57ce49a539e118d565b474088034a043552cf873df1affd457e12d6666e
 SHA512:
-  metadata.gz: 529665761713e33f8743356a90af15ab244e8e09ffbb4836d1aa3dd1e0398cba320ffb0e443aff355cc71604146f03865b413c3307a76d372860a07b35a8bb2b
-  data.tar.gz: 0fe62d7d34630c98c2750e5da46d4fd5633692f6f5cab22248b4650e6f8bfa2964ac0c107f5efd847c44342ad7b2ccf41634719b6c6cf84a55154ca1bcaba405
+  metadata.gz: 7eddabde27b55fa664fe9501d46cecd4acef80e9135738f385196332465c9efc3fc87c9ae9137d2327cf0a8355f71a2bc646ac94d8f1b9fcd758a931237369d7
+  data.tar.gz: a53b8248edc59ab15560fadc73e1c4a0f3615b4c976c940a2226a54681f13b7b225d85d50ee46bed5b7955c8e4f1236f7e7fc80911dedea8cc23b71b3a0cf90b

data/lib/squib/args/xywh_shorthands.rb

@@ -3,49 +3,44 @@ require_relative 'unit_conversion'
 module Squib
   module Args
     module XYWHShorthands
-      WIDTH_MINUS_REGEX = /^width\s*\-\s*/
-      HEIGHT_MINUS_REGEX = /^height\s*\-\s*/
-      WIDTH_DIV_REGEX = /^width\s*\/\s*/
-      HEIGHT_DIV_REGEX = /^height\s*\/\s*/
-      MIDDLE_PLUS_REGEX = /^middle\s*\+\s*/
-      MIDDLE_MINUS_REGEX = /^middle\s*\-\s*/
 
+      MIDDLE_ONLY = /^(middle|center)\s*$/
+      DECK_ONLY = /^deck\s*$/
+      MIDDLE_MINUS_REGEX = /^(middle|center)\s*\-\s*/
+      MIDDLE_PLUS_REGEX = /^(middle|center)\s*\+\s*/
+      DECK_MINUS_REGEX = /^deck\s*\-\s*/
+      DECK_PLUS_REGEX = /^deck\s*\+\s*/
+      DECK_DIV_REGEX = /^deck\s*\/\s*/
 
       # dimension is usually either deck_width or deck_height
       def apply_shorthands(arg, deck, axis: :x)
         dimension = (axis == :x) ? deck.width : deck.height
         arg_s = arg.to_s
         case arg_s
-        when 'middle'
+        when MIDDLE_ONLY
           dimension / 2.0
-        when 'center'
-          dimension / 2.0
-        when 'deck'
+        when DECK_ONLY
           dimension
-        when WIDTH_MINUS_REGEX # e.g. width - 1.5in
-          n = arg_s.sub WIDTH_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          deck.width - n
-        when HEIGHT_MINUS_REGEX # e.g. height - 1.5in
-          n = arg_s.sub HEIGHT_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          deck.height - n
-        when WIDTH_DIV_REGEX # e.g. width / 3
-          n = arg_s.sub WIDTH_DIV_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
-          deck.width / n
-        when HEIGHT_DIV_REGEX # e.g. height / 3
-          n = arg_s.sub HEIGHT_DIV_REGEX, ''
+        when MIDDLE_MINUS_REGEX # e.g. width: middle - 3
+          n = arg_s.sub MIDDLE_MINUS_REGEX, ''
           n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
-          deck.height / n
+          dimension / 2.0 - n
         when MIDDLE_PLUS_REGEX # e.g. middle + 1.5in
           n = arg_s.sub MIDDLE_PLUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
           dimension / 2.0 + n
-        when MIDDLE_MINUS_REGEX # e.g. middle - 1.5in
-          n = arg_s.sub MIDDLE_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          dimension / 2.0 - n
+        when DECK_MINUS_REGEX # e.g. width: deck - 1.5in
+          n = arg_s.sub DECK_MINUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension - n
+        when DECK_PLUS_REGEX # e.g. deck + 1.5in (which is weird but ok)
+          n = arg_s.sub DECK_PLUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension + n
+        when DECK_DIV_REGEX # e.g. width: deck/3
+          n = arg_s.sub DECK_DIV_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension / n
         else
           arg
         end

data/lib/squib/dsl/save_png.rb

@@ -29,19 +29,16 @@ module Squib
 
       def run(opts)
         warn_if_unexpected opts
-        Dir.chdir(deck.img_dir) do
-          range = Args.extract_range opts, deck
-          batch = Args.extract_save_batch opts, deck
-          @bar.start("Saving PNGs to #{batch.summary}", deck.size) do |bar|
-            range.map do |i|
-              deck.cards[i].save_png(batch[i])
-              bar.increment
-            end
-
+        range = Args.extract_range opts, deck
+        batch = Args.extract_save_batch opts, deck
+        @bar.start("Saving PNGs to #{batch.summary}", deck.size) do |bar|
+          range.map do |i|
+            deck.cards[i].save_png(batch[i])
+            bar.increment
           end
         end
-
       end
     end
+
   end
 end

data/lib/squib/version.rb

@@ -6,5 +6,6 @@ module Squib
   # Most of the time this is in the alpha of the next release.
   # e.g. v0.0.5a is on its way to becoming v0.0.5
   #
-  VERSION = '0.16.0-preview1'
+  VERSION = '0.16.0-preview2'
 end
+

data/samples/units/_shorthands.rb

@@ -20,14 +20,13 @@ Squib::Deck.new(width: '0.5in', height: '0.25in') do
 
   # We can also do width-, height-, width/, height/
   rect x: 20, y: 5, stroke_color: :green,
-  width: 'width - 0.1in', height: 10
+  width: 'deck - 0.1in', height: 10
 
-  rect x: 10, y: 50, width: 10, height: 'height / 3',
+  rect x: 10, y: 50, width: 10, height: 'deck / 3',
        stroke_color: :purple
 
   # And middle+/-
-
-  rect x: 'middle + 0.1in', y: 'middle - 0.1in',
+  rect x: 'middle + 0.1in', y: 'center - 0.1in',
        width: '0.1in', height: '0.1in', fill_color: :blue
 
   # Layouts apply this too.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre.preview1
+  version: 0.16.0.pre.preview2
 platform: ruby
 authors:
 - Andy Meneely
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo