squib 0.14.beta1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101d4863fdad657cfe813322ce495cc3f0e10a26
-  data.tar.gz: 82d6ae835f5ad51d56829919653e9b0b50bea912
+  metadata.gz: d12b1f10b21ed987702d0440f995d7e088b9eeee
+  data.tar.gz: 135fb921bda10d91f08d5ad2be0f0dd9dbfbb718
 SHA512:
-  metadata.gz: 9265cd7e35588ba4471e87773d909e03dd612accaa421353672db396ec3f3818fc5ef6858f6de419100258e5bcc30ddb3b994e7830c27edc0425ca2c85e91827
-  data.tar.gz: 4600e52c633a965d33f44b8754bb9e319fd247602e6d4c94515dd5844b2f18a9368f0563af9b5583693fe38f887e76e043691ec75a4720021e98a24ae0c34829
+  metadata.gz: ba54e4c7ea4359d98dae54ceaa986f94c97f0acffb965be4f695e653cc775a424ffb86bca55ee3b19b49b5d12be1671f0671095cc17e648ccaf84ff59dac025b
+  data.tar.gz: ab7316a04968bb5e4863144f2eb2937f63e03f5c1896eae349657669e9d7d30108e00edd91006b1e96b885befea322d6f817d150716c8d653f72fa065fca28f8

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Squib CHANGELOG
 Squib follows [semantic versioning](http://semver.org).
 
-## v0.14.0 / Unreleased
+## v0.14.0 / 2017-11-06
 
 Features:
 * `save_pdf/save_sheet` method now supports `sprue`, which allows you to define templated layouts and position your cards freely (#217) by @felixleong. See docs for how to use this _very_ powerful feature!
@@ -26,6 +26,7 @@ Bugs:
 
 Chores:
 * Going back to our policy of locking in our dependencies so that we don't have new gems breaking things.
+* Bumped deps, Cairo to 1.15.10 and Pango et al. to 3.1.9
 
 Special thanks to @sparr, @felixleong, @blinks, @vador for all of their work!!
 

data/lib/squib/api/save.rb

@@ -58,7 +58,7 @@ module Squib
       else
         tmpl = Sprue.load sprue_file.sprue, dpi
         Graphics::SaveSpruePNG.
-          new(self, tmpl, batch).
+          new(self, tmpl, sheet).
           render_sheet(range)
       end
     end

data/lib/squib/args/sheet.rb

@@ -21,6 +21,7 @@ module Squib
 
       def self.parameters
         {
+          count_format: '%02d',
           crop_margin_bottom: 0,
           crop_margin_left: 0,
           crop_margin_right: 0,
@@ -35,6 +36,7 @@ module Squib
           gap: 0,
           height: 2550,
           margin: 75,
+          prefix: 'sheet_',
           rows: :infinite,
           columns: 5,
           trim_radius: 38,
@@ -91,8 +93,12 @@ module Squib
         (count.to_f / columns.to_f).ceil
       end
 
-      def full_filename
-        "#{dir}/#{file}"
+      def full_filename(i=nil)
+        if i.nil?
+          "#{dir}/#{file}"
+        else
+          "#{dir}/#{prefix}#{count_format % i}.png"
+        end
       end
 
       def crop_coords(x, y, deck_w, deck_h)

data/lib/squib/graphics/save_sprue.rb

@@ -2,12 +2,11 @@ module Squib
   module Graphics
     # Helper class to generate templated sheet.
     class SaveSprue
-      def initialize(deck, tmpl, outfile)
+      def initialize(deck, tmpl, sheet_args)
         @deck = deck
         @tmpl = tmpl
         @page_number = 1
-        @outfile = outfile
-        @rotated_delta = (@tmpl.card_width - @deck.width).abs / 2
+        @sheet_args = sheet_args # might be Args::Sheet or Args::SaveBatch
         @overlay_lines = @tmpl.crop_lines.select do |line|
           line['overlay_on_cards']
         end
@@ -17,12 +16,9 @@ module Squib
         cc = init_cc
         cc.set_source_color(:white) # white backdrop TODO make option
         cc.paint
-        card_set = @tmpl.cards
-        per_sheet = card_set.size
-        default_angle = @tmpl.card_default_rotation
-        if default_angle.zero?
-          default_angle = check_card_orientation
-        end
+        slots = @tmpl.cards
+        per_sheet = slots.size
+        check_oversized_card
 
         draw_overlay_below_cards cc if range.size
 
@@ -31,17 +27,12 @@ module Squib
             cc = next_page_if_needed(cc, i, per_sheet)
 
             card = @deck.cards[i]
-            slot = card_set[i % per_sheet]
-            x = slot['x']
-            y = slot['y']
-            angle = slot['rotate'] != 0 ? slot['rotate'] : default_angle
-
-            if angle != 0
-              draw_rotated_card cc, card, x, y, angle
-            else
-              cc.set_source card.cairo_surface, x, y
-            end
-            cc.paint
+            slot = slots[i % per_sheet]
+
+            draw_card cc, card, 
+                      slot['x'], slot['y'], 
+                      slot['rotate'], 
+                      @sheet_args.trim, @sheet_args.trim_radius
 
             bar.increment
           end
@@ -130,50 +121,36 @@ module Squib
         end
       end
 
-      def check_card_orientation
-        clockwise = 1.5 * Math::PI
-        if @deck.width <= @tmpl.card_width &&
-           @deck.height <= @tmpl.card_height
-          return 0
-        elsif (
-            @deck.width == @tmpl.card_height &&
-            @deck.height == @tmpl.card_width)
-          Squib.logger.warn {
-            'Rotating cards to match card orientation in template.'
-          }
-          return clockwise
-        end
-
+      def check_oversized_card
         Squib.logger.warn {
-          'Card size is larger than sprue\'s expected card size. '\
-          'Cards may overlap.'
-        }
-        return 0
+          "Card size is larger than sprue's expected card size "\
+          "of #{@tmpl.card_width}x#{@tmpl.card_height}. Cards may overlap."
+        } if (@deck.width - 2.0 * @sheet_args.trim)  > @tmpl.card_width ||
+             (@deck.height - 2.0 * @sheet_args.trim) > @tmpl.card_height
       end
 
-      def draw_rotated_card(cc, card, x, y, angle)
+      def draw_card(cc, card, x, y, angle, trim, trim_radius)
+        # Compute the true size of the card after trimming
+        w = @deck.width - 2.0 * trim
+        h = @deck.height - 2.0 * trim
+
         # Normalize the angles first
+        # TODO do this in the args class
         angle = angle % (2 * Math::PI)
         angle = 2 * Math::PI - angle if angle < 0
 
-        # Determine what's the delta we need to translate our cards
-        delta_shift = @deck.width < @deck.height ? 1 : -1
-        if angle.zero? || angle == Math::PI
-          delta = 0
-        elsif angle < Math::PI
-          delta = -delta_shift * @rotated_delta
-        else
-          delta = delta_shift * @rotated_delta
-        end
-
         # Perform the actual rotation and drawing
         mat = cc.matrix # Save the transformation matrix to revert later
         cc.translate x, y
-        cc.translate @deck.width / 2, @deck.height / 2
+        cc.translate @deck.width / 2.0, @deck.height / 2.0
         cc.rotate angle
-        cc.translate(-@deck.width / 2 + delta, -@deck.height / 2 + delta)
+        cc.translate -@deck.width / 2.0, -@deck.height / 2.0
+        cc.rounded_rectangle(trim, trim, w, h, trim_radius, trim_radius) # clip
+        cc.clip
         cc.set_source card.cairo_surface, 0, 0
         cc.matrix = mat
+        cc.paint
+        cc.reset_clip
       end
     end
 
@@ -201,7 +178,7 @@ module Squib
       end
 
       def full_filename
-        @outfile.full_filename
+        @sheet_args.full_filename
       end
     end
 
@@ -221,7 +198,7 @@ module Squib
       end
 
       def full_filename
-        @outfile.full_filename @page_number
+        @sheet_args.full_filename @page_number
       end
     end
   end

data/lib/squib/version.rb

@@ -6,5 +6,5 @@ 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.14.beta1'
+  VERSION = '0.14.0'
 end

data/samples/data/_excel.rb

@@ -51,5 +51,5 @@ Squib::Deck.new(cards: resource_data['Name'].size) do
   rect width: :deck, height: :deck
   text str: resource_data['Name'], align: :center, width: :deck, hint: 'red'
   text str: resource_data['Cost'], align: :right, width: :deck, hint: 'red'
-  save_sheet prefix: 'sample_excel_resources_' # save to a whole sheet
+  save_sheet prefix: 'sample_excel_resources_', columns: 3
 end

data/samples/sprues/_advanced_sprues.rb

@@ -0,0 +1,24 @@
+require 'squib'
+
+# This is a more advanced example of Sprues
+# (mostly so we can have a torturous regression test)
+#  - Uses a custom sprue
+#  - Weird rotations
+#  - Center-positioned
+#  - Multiple pages
+Squib::Deck.new(cards: 6, width: '2.2in', height: '2.1in') do
+  background color: :blue #blue never shows up! Yay clipping...
+  rect stroke_width: 5, stroke_color: :red, fill_color: :salmon
+  cut_zone margin: '0.125in',
+           stroke_width: 2, stroke_color: :purple
+
+  circle x: width/2, y: height/2, radius: 20 # midpoint
+
+  text str: (0..9).map{ |i| "Card #{i}\n\n" },
+       font: 'Sans 32', align: :center, valign: :middle,
+       height: :deck, width: :deck
+  
+  save_sheet sprue: 'my_sprues/weird_sprue.yml',
+             trim: '0.2in', trim_radius: '10pt',
+             prefix: "advanced_sprues_"
+end

data/squib.gemspec

@@ -29,16 +29,16 @@ 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.15.9'
+  spec.add_runtime_dependency 'cairo',                 '1.15.10'
   spec.add_runtime_dependency 'classy_hash',           '0.2.1'
-  spec.add_runtime_dependency 'gio2',                  '3.1.8'
-  spec.add_runtime_dependency 'gobject-introspection', '3.1.8'
+  spec.add_runtime_dependency 'gio2',                  '3.1.9'
+  spec.add_runtime_dependency 'gobject-introspection', '3.1.9'
   spec.add_runtime_dependency 'highline',              '1.7.8'
   spec.add_runtime_dependency 'mercenary',             '0.3.6'
   spec.add_runtime_dependency 'nokogiri',              '1.8.1'
-  spec.add_runtime_dependency 'pango',                 '3.1.8'
+  spec.add_runtime_dependency 'pango',                 '3.1.9'
   spec.add_runtime_dependency 'roo',                   '2.7.1'
-  spec.add_runtime_dependency 'rsvg2',                 '3.1.8'
+  spec.add_runtime_dependency 'rsvg2',                 '3.1.9'
   spec.add_runtime_dependency 'ruby-progressbar',      '1.9.0'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.14.beta1
+  version: 0.14.0
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.9
+        version: 1.15.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.9
+        version: 1.15.10
 - !ruby/object:Gem::Dependency
   name: classy_hash
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,6 @@ extra_rdoc_files:
 - samples/images/_cairo_access.rb
 - samples/images/_images.rb
 - samples/images/_more_load_images.rb
-- samples/images/_unicode.rb
 - samples/intro/01_hello.rb
 - samples/intro/02_options.rb
 - samples/intro/03_layout.rb
@@ -289,6 +288,7 @@ extra_rdoc_files:
 - samples/saves/_showcase.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
+- samples/sprues/_advanced_sprues.rb
 - samples/sprues/_builtin_sprues.rb
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb
@@ -432,7 +432,6 @@ files:
 - samples/images/_cairo_access.rb
 - samples/images/_images.rb
 - samples/images/_more_load_images.rb
-- samples/images/_unicode.rb
 - samples/intro/01_hello.rb
 - samples/intro/02_options.rb
 - samples/intro/03_layout.rb
@@ -451,6 +450,7 @@ files:
 - samples/saves/_showcase.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
+- samples/sprues/_advanced_sprues.rb
 - samples/sprues/_builtin_sprues.rb
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb
@@ -478,12 +478,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
@@ -503,7 +503,6 @@ test_files:
 - samples/images/_cairo_access.rb
 - samples/images/_images.rb
 - samples/images/_more_load_images.rb
-- samples/images/_unicode.rb
 - samples/intro/01_hello.rb
 - samples/intro/02_options.rb
 - samples/intro/03_layout.rb
@@ -522,6 +521,7 @@ test_files:
 - samples/saves/_showcase.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
+- samples/sprues/_advanced_sprues.rb
 - samples/sprues/_builtin_sprues.rb
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb

data/samples/images/_unicode.rb

@@ -1,27 +0,0 @@
-require 'squib'
-
-# Here's a handy list of game-related UTF-8 characters
-# for those early pre-graphics prototypes
-game_chars = %W(\u2620 \u2622 \u2623 \u00AB \u00BB \u2039 \u203A \u2022 \u20D8 \u20D9 \u20DA \u2023 \u20E1 \u20D4 \u20D5 \u20D6 \u20D7 \u2190 \u2191 \u2192 \u2193 \u2194 \u2196 \u2197 \u2198 \u2199 \u219A \u219B \u219C \u219D \u219E \u219F \u21A0 \u21A1 \u21A2 \u21A3 \u21A4 \u21A5 \u21A6 \u21A7 \u21A8 \u21A9 \u21AA \u21AB \u21AC \u21AD \u21AE \u21AF \u21B0 \u21B1 \u21B2 \u21B3 \u21B4 \u21B5 \u21B6 \u21B7 \u21B8 \u21B9 \u21BA \u21BB \u21C4 \u21C5 \u21C6 \u21C7 \u21C8 \u21C9 \u21CA \u21CD \u21CE \u21CF \u21D0 \u21D1 \u21D2 \u21D3 \u21D4 \u21D5 \u21D6 \u21D7 \u21D8 \u21D9 \u21DA \u21DB \u21DC \u21DD \u21DC \u21E0 \u21E1 \u21E2 \u21E3 \u21E4 \u21E5 \u21E6 \u21E7 \u21E8 \u21E9 \u21EA \u20DE \u20DD \u20DF \u20E0 \u2205 \u220E \u2234 \u2295 \u2296 \u2297 \u2298 \u2349 \u2299 \u229A \u229E \u22B9 \u2302 \u2316 \u231A \u231B \u2326 \u232B \u2327 \u2331 \u2460 \u2461 \u2462 \u2463 \u2464 \u2465 \u2466 \u2467 \u2468 \u2469 \u246A \u246B \u246C \u246D \u246E \u246F \u2470 \u2471 \u2472 \u2473 \u2600 \u2601 \u2602 \u2603 \u2604 \u2605 \u2606 \u2607 \u260E \u2611 \u261A \u261B \u261C \u261D \u261E \u261F \u2624 \u262E \u262F \u2639 \u263A \u2654 \u2655 \u2656 \u2657 \u2658 \u2659 \u265A \u265B \u265C \u265D \u265E \u265F \u2660 \u2661 \u2662 \u2663 \u2664 \u2665 \u2666 \u2667 \u2668 \u2690 \u2691 \u2692 \u2693 \u2694 \u2696 \u2699 \u269B \u26A0 \u26A1 \u26BD \u26BE \u26C4 \u26C5 \u26D4 \u26EA \u26F2 \u26F3 \u26F5 \u26FA \u26FD \u2707 \u270A \u270B \u270C \u2713 \u2714 \u271C \u27F2 \u27F3 \u27F4 \u2B1B \u2B1C \u1F601 \u00BD \u00BE \u00BC \u2153 \u2154 \u2155 \u2156 \u2157 )
-
-cell_height = 80
-cell_width = 400
-cols = 7
-x, y = 1, 80
-Squib::Deck.new(height: (game_chars.size / cols + 1) * cell_height,
-                width: cell_width * cols) do
-  background color: :white
-  text str: 'Game-related UTF8 icons. Generated by Squib, https://github.com/andymeneely/squib'
-  game_chars.each_with_index do |c, i|
-    rect fill_color: %w(#eeee #ffff)[i % 2],
-         width: cell_width, height: cell_height, x: x, y: y
-    text str: c.inspect, font: 'Sans 14',                  x: x, y: y
-    text str: c,         font: 'Sans,Segoe UI Symbol 14',  x: x + 300, y: y
-    x += cell_width
-    if i % cols == cols - 1
-      x = 1
-      y += cell_height if i % cols == cols - 1
-    end
-  end
-  save_png prefix: 'unicode_'
-end