squib 0.15.1 → 0.16.0

data/lib/squib/graphics/gradient_regex.rb

@@ -1,47 +1,47 @@
-module Squib
-  # @api private
-  module Graphics
-    STOPS = /   # used to capture the stops
-      \s*         # leading whitespace is ok
-      (\#?[\w]+)  # color
-      @           # no spaces here
-      (\d+\.?\d*) # offset number
-    /x
-
-    LINEAR_GRADIENT = /
-      \( \s*      # coordinate 1
-         (\d+\.?\d*) \s* # x1 number
-         ,\s*            # whitespace after comma is ok
-         (\d+\.?\d*) \s* # y1 number
-      \)
-      \s*        # space between coordinates is ok
-      \( \s*      # coordinate 2
-         (\d+\.?\d*) \s* # x2 number
-         ,\s*            # whitespace after comma is ok
-         (\d+\.?\d*) \s* # y2 number
-      \)
-      (#{STOPS})+ # stops
-      \s*         # trailing whitespace is ok
-    /x
-
-    RADIAL_GRADIENT = /
-      \( \s*      # coordinate 1
-        (\d+\.?\d*) \s* # x1 number
-        ,\s*            # whitespace after comma is ok
-        (\d+\.?\d*) \s* # y1 number
-        ,\s*            # whitespace after comma is ok
-        (\d+\.?\d*) \s* # r1 number
-      \)
-      \s*         # space between coordinates is ok
-      \( \s*      # coordinate 2
-        (\d+\.?\d*) \s* # x2 number
-        ,\s*            # whitespace after comma is ok
-        (\d+\.?\d*) \s* # y2 number
-        ,\s*            # whitespace after comma is ok
-        (\d+\.?\d*) \s* # r2 number
-      \)
-      (#{STOPS})+ # stops
-      \s*         # trailing whitespace is ok
-    /x
-  end
-end
+module Squib
+  # @api private
+  module Graphics
+    STOPS = /   # used to capture the stops
+      \s*         # leading whitespace is ok
+      (\#?[\w]+)  # color
+      @           # no spaces here
+      (\d+\.?\d*) # offset number
+    /x
+
+    LINEAR_GRADIENT = /
+      \( \s*      # coordinate 1
+         (\d+\.?\d*) \s* # x1 number
+         ,\s*            # whitespace after comma is ok
+         (\d+\.?\d*) \s* # y1 number
+      \)
+      \s*        # space between coordinates is ok
+      \( \s*      # coordinate 2
+         (\d+\.?\d*) \s* # x2 number
+         ,\s*            # whitespace after comma is ok
+         (\d+\.?\d*) \s* # y2 number
+      \)
+      (#{STOPS})+ # stops
+      \s*         # trailing whitespace is ok
+    /x
+
+    RADIAL_GRADIENT = /
+      \( \s*      # coordinate 1
+        (\d+\.?\d*) \s* # x1 number
+        ,\s*            # whitespace after comma is ok
+        (\d+\.?\d*) \s* # y1 number
+        ,\s*            # whitespace after comma is ok
+        (\d+\.?\d*) \s* # r1 number
+      \)
+      \s*         # space between coordinates is ok
+      \( \s*      # coordinate 2
+        (\d+\.?\d*) \s* # x2 number
+        ,\s*            # whitespace after comma is ok
+        (\d+\.?\d*) \s* # y2 number
+        ,\s*            # whitespace after comma is ok
+        (\d+\.?\d*) \s* # r2 number
+      \)
+      (#{STOPS})+ # stops
+      \s*         # trailing whitespace is ok
+    /x
+  end
+end

data/lib/squib/graphics/hand.rb

@@ -1,42 +1,42 @@
-require_relative 'cairo_context_wrapper'
-
-module Squib
-  class Deck
-
-    # Draw cards in a fan.
-    # @api private
-    def render_hand(range, sheet, hand)
-      cards       = range.collect { |i| @cards[i] }
-      center_x    = width / 2.0
-      center_y    = hand.radius + height
-      out_size    = 3.0 * center_y
-      angle_delta = (hand.angle_range.last - hand.angle_range.first) / cards.size
-      cxt = Cairo::Context.new(Cairo::RecordingSurface.new(0, 0, out_size, out_size))
-      cxt.translate(out_size / 2.0, out_size / 2.0)
-      cxt.rotate(hand.angle_range.first)
-      cxt.translate(-width, -width)
-      cards.each_with_index do |card, i|
-        cxt.translate(center_x, center_y)
-        cxt.rotate(angle_delta)
-        cxt.translate(-center_x, -center_y)
-        card.use_cairo do |card_cxt|
-          cxt.rounded_rectangle(sheet.trim, sheet.trim,
-                                width - (2 * sheet.trim), height - (2 * sheet.trim),
-                                sheet.trim_radius, sheet.trim_radius)
-          cxt.clip
-          cxt.set_source(card_cxt.target)
-          cxt.paint
-          cxt.reset_clip
-        end
-      end
-      x, y, w, h = cxt.target.ink_extents # I love Ruby assignment ;)
-      png_cxt = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(Cairo::ImageSurface.new(w + 2 * sheet.margin, h + 2 * sheet.margin)))
-      png_cxt.set_source_squibcolor(sheet.fill_color)
-      png_cxt.paint
-      png_cxt.translate(-x + sheet.margin, -y + sheet.margin)
-      png_cxt.set_source(cxt.target)
-      png_cxt.paint
-      png_cxt.target.write_to_png sheet.full_filename
-    end
-  end
-end
+require_relative 'cairo_context_wrapper'
+
+module Squib
+  class Deck
+
+    # Draw cards in a fan.
+    # @api private
+    def render_hand(range, sheet, hand)
+      cards       = range.collect { |i| @cards[i] }
+      center_x    = width / 2.0
+      center_y    = hand.radius + height
+      out_size    = 3.0 * center_y
+      angle_delta = (hand.angle_range.last - hand.angle_range.first) / cards.size
+      cxt = Cairo::Context.new(Cairo::RecordingSurface.new(0, 0, out_size, out_size))
+      cxt.translate(out_size / 2.0, out_size / 2.0)
+      cxt.rotate(hand.angle_range.first)
+      cxt.translate(-width, -width)
+      cards.each_with_index do |card, i|
+        cxt.translate(center_x, center_y)
+        cxt.rotate(angle_delta)
+        cxt.translate(-center_x, -center_y)
+        card.use_cairo do |card_cxt|
+          cxt.rounded_rectangle(sheet.trim, sheet.trim,
+                                width - (2 * sheet.trim), height - (2 * sheet.trim),
+                                sheet.trim_radius, sheet.trim_radius)
+          cxt.clip
+          cxt.set_source(card_cxt.target)
+          cxt.paint
+          cxt.reset_clip
+        end
+      end
+      x, y, w, h = cxt.target.ink_extents # I love Ruby assignment ;)
+      png_cxt = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(Cairo::ImageSurface.new(w + 2 * sheet.margin, h + 2 * sheet.margin)))
+      png_cxt.set_source_squibcolor(sheet.fill_color)
+      png_cxt.paint
+      png_cxt.translate(-x + sheet.margin, -y + sheet.margin)
+      png_cxt.set_source(cxt.target)
+      png_cxt.paint
+      png_cxt.target.write_to_png sheet.full_filename
+    end
+  end
+end

data/lib/squib/graphics/image.rb

@@ -1,123 +1,123 @@
-module Squib
-
-  # Cache all pngs we've already loaded
-  #
-  # :nodoc:
-  # @api private
-  def cache_load_image(file)
-    @img_cache ||= {}
-    @img_cache[file] ||= open_png file
-  end
-  module_function :cache_load_image
-
-  # Open a PNG file, checking magic bytes if it's a real PNG
-  # Magic bytes taken from:
-  # https://en.wikipedia.org/wiki/List_of_file_signatures
-  # :nodoc:
-  # @api private
-  PNG_MAGIC = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]
-  def open_png(file)
-    if PNG_MAGIC == File.read(file, 8).bytes
-      return Cairo::ImageSurface.from_png(file)
-    else
-      raise ArgumentError.new("ERROR: #{file} is not a PNG file")
-    end
-  end
-  module_function :open_png
-
-  class Card
-
-    # :nodoc:
-    # @api private
-    def png(file, box, paint, trans)
-      Squib.logger.debug {"RENDERING PNG: \n  file: #{file}\n  box: #{box}\n  paint: #{paint}\n  trans: #{trans}"}
-      return if file.nil? or file.eql? ''
-      png = Squib.cache_load_image(file)
-      use_cairo do |cc|
-        cc.translate(box.x, box.y)
-        box.width    = png.width.to_f  if box.width  == :native
-        box.height   = png.height.to_f if box.height == :native
-        box.width    = png.width.to_f * box.height.to_f / png.height.to_f if box.width == :scale
-        box.height   = png.height.to_f * box.width.to_f / png.width.to_f  if box.height == :scale
-
-        scale_width  = box.width.to_f / png.width.to_f
-        scale_height = box.height.to_f / png.height.to_f
-        warn_png_scale(file, scale_width, scale_height)
-        cc.scale(scale_width, scale_height)
-
-        cc.rotate(trans.angle)
-        cc.flip(trans.flip_vertical, trans.flip_horizontal, box.width / 2, box.height / 2)
-        cc.translate(-box.x, -box.y)
-
-        trans.crop_width  = png.width.to_f  if trans.crop_width  == :native
-        trans.crop_height = png.height.to_f if trans.crop_height == :native
-        cc.rounded_rectangle(box.x, box.y, trans.crop_width, trans.crop_height, trans.crop_corner_x_radius, trans.crop_corner_y_radius)
-        cc.clip
-        cc.translate(-trans.crop_x, -trans.crop_y)
-
-
-        cc.set_source(png, box.x, box.y)
-        cc.operator = paint.blend unless paint.blend == :none
-        if paint.mask.empty?
-          cc.paint(paint.alpha)
-        else
-          cc.set_source_squibcolor(paint.mask)
-          cc.mask(png, box.x, box.y)
-        end
-      end
-    end
-
-    # :nodoc:
-    # @api private
-    def warn_png_scale(file, scale_width, scale_height)
-      if @deck.conf.warn_png_scale? && (scale_width > 1.0 || scale_height > 1.0)
-        Squib.logger.warn "PNG is being upscaled - antialiasing could result: #{file}"
-      end
-    end
-
-    # :nodoc:
-    # @api private
-    def svg(file, svg_args, box, paint, trans)
-      Squib.logger.debug {"Rendering: #{file}, id: #{id} @#{x},#{y} #{width}x#{height}, alpha: #{alpha}, blend: #{blend}, angle: #{angle}, mask: #{mask}"}
-      Squib.logger.warn 'Both an SVG file and SVG data were specified' unless file.to_s.empty? || svg_args.data.to_s.empty?
-      return if (file.nil? or file.eql? '') and svg_args.data.nil? # nothing specified TODO Move this out to arg validator
-      svg_args.data = File.read(file) if svg_args.data.to_s.empty?
-      begin
-        svg = Rsvg::Handle.new_from_data(svg_args.data)
-      rescue Rsvg::Error::Failed
-        Squib.logger.error "Invalid SVG data. Is '#{file}' a valid svg file?"
-        return
-      end
-      box.width    = svg.width  if box.width == :native
-      box.height   = svg.height if box.height == :native
-      box.width  = svg.width.to_f * box.height.to_f / svg.height.to_f if box.width == :scale
-      box.height = svg.height.to_f * box.width.to_f / svg.width.to_f  if box.height == :scale
-      scale_width  = box.width.to_f / svg.width.to_f
-      scale_height = box.height.to_f / svg.height.to_f
-      use_cairo do |cc|
-        cc.translate(box.x, box.y)
-        cc.flip(trans.flip_vertical, trans.flip_horizontal, box.width / 2, box.height / 2)
-        cc.rotate(trans.angle)
-        cc.scale(scale_width, scale_height)
-
-        trans.crop_width  = box.width  if trans.crop_width  == :native
-        trans.crop_height = box.height if trans.crop_height == :native
-        cc.rounded_rectangle(0, 0, trans.crop_width / scale_width, trans.crop_height / scale_height, trans.crop_corner_x_radius, trans.crop_corner_y_radius)
-        cc.clip
-        cc.translate(-trans.crop_x, -trans.crop_y)
-
-        cc.operator = paint.blend unless paint.blend == :none
-        if paint.mask.to_s.empty?
-          cc.render_rsvg_handle(svg, id: svg_args.id)
-        else
-          tmp = Cairo::ImageSurface.new(box.width / scale_width, box.height / scale_height)
-          tmp_cc = Cairo::Context.new(tmp)
-          tmp_cc.render_rsvg_handle(svg, id: svg_args.id)
-          cc.set_source_squibcolor(paint.mask)
-          cc.mask(tmp, 0, 0)
-        end
-      end
-    end
-
-  end
-end
+module Squib
+
+  # Cache all pngs we've already loaded
+  #
+  # :nodoc:
+  # @api private
+  def cache_load_image(file)
+    @img_cache ||= {}
+    @img_cache[file] ||= open_png file
+  end
+  module_function :cache_load_image
+
+  # Open a PNG file, checking magic bytes if it's a real PNG
+  # Magic bytes taken from:
+  # https://en.wikipedia.org/wiki/List_of_file_signatures
+  # :nodoc:
+  # @api private
+  PNG_MAGIC = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]
+  def open_png(file)
+    if PNG_MAGIC == File.read(file, 8).bytes
+      return Cairo::ImageSurface.from_png(file)
+    else
+      raise ArgumentError.new("ERROR: #{file} is not a PNG file")
+    end
+  end
+  module_function :open_png
+
+  class Card
+
+    # :nodoc:
+    # @api private
+    def png(file, box, paint, trans)
+      Squib.logger.debug {"RENDERING PNG: \n  file: #{file}\n  box: #{box}\n  paint: #{paint}\n  trans: #{trans}"}
+      return if file.nil? or file.eql? ''
+      png = Squib.cache_load_image(file)
+      use_cairo do |cc|
+        cc.translate(box.x, box.y)
+        box.width    = png.width.to_f  if box.width  == :native
+        box.height   = png.height.to_f if box.height == :native
+        box.width    = png.width.to_f * box.height.to_f / png.height.to_f if box.width == :scale
+        box.height   = png.height.to_f * box.width.to_f / png.width.to_f  if box.height == :scale
+
+        scale_width  = box.width.to_f / png.width.to_f
+        scale_height = box.height.to_f / png.height.to_f
+        warn_png_scale(file, scale_width, scale_height)
+        cc.scale(scale_width, scale_height)
+
+        cc.rotate(trans.angle)
+        cc.flip(trans.flip_vertical, trans.flip_horizontal, box.width / 2, box.height / 2)
+        cc.translate(-box.x, -box.y)
+
+        trans.crop_width  = png.width.to_f  if trans.crop_width  == :native
+        trans.crop_height = png.height.to_f if trans.crop_height == :native
+        cc.rounded_rectangle(box.x, box.y, trans.crop_width, trans.crop_height, trans.crop_corner_x_radius, trans.crop_corner_y_radius)
+        cc.clip
+        cc.translate(-trans.crop_x, -trans.crop_y)
+
+
+        cc.set_source(png, box.x, box.y)
+        cc.operator = paint.blend unless paint.blend == :none
+        if paint.mask.empty?
+          cc.paint(paint.alpha)
+        else
+          cc.set_source_squibcolor(paint.mask)
+          cc.mask(png, box.x, box.y)
+        end
+      end
+    end
+
+    # :nodoc:
+    # @api private
+    def warn_png_scale(file, scale_width, scale_height)
+      if @deck.conf.warn_png_scale? && (scale_width > 1.0 || scale_height > 1.0)
+        Squib.logger.warn "PNG is being upscaled - antialiasing could result: #{file}"
+      end
+    end
+
+    # :nodoc:
+    # @api private
+    def svg(file, svg_args, box, paint, trans)
+      Squib.logger.debug {"Rendering: #{file}, id: #{id} @#{x},#{y} #{width}x#{height}, alpha: #{alpha}, blend: #{blend}, angle: #{angle}, mask: #{mask}"}
+      Squib.logger.warn 'Both an SVG file and SVG data were specified' unless file.to_s.empty? || svg_args.data.to_s.empty?
+      return if (file.nil? or file.eql? '') and svg_args.data.nil? # nothing specified TODO Move this out to arg validator
+      svg_args.data = File.read(file) if svg_args.data.to_s.empty?
+      begin
+        svg = Rsvg::Handle.new_from_data(svg_args.data)
+      rescue Rsvg::Error::Failed
+        Squib.logger.error "Invalid SVG data. Is '#{file}' a valid svg file?"
+        return
+      end
+      box.width    = svg.width  if box.width == :native
+      box.height   = svg.height if box.height == :native
+      box.width  = svg.width.to_f * box.height.to_f / svg.height.to_f if box.width == :scale
+      box.height = svg.height.to_f * box.width.to_f / svg.width.to_f  if box.height == :scale
+      scale_width  = box.width.to_f / svg.width.to_f
+      scale_height = box.height.to_f / svg.height.to_f
+      use_cairo do |cc|
+        cc.translate(box.x, box.y)
+        cc.flip(trans.flip_vertical, trans.flip_horizontal, box.width / 2, box.height / 2)
+        cc.rotate(trans.angle)
+        cc.scale(scale_width, scale_height)
+
+        trans.crop_width  = box.width  if trans.crop_width  == :native
+        trans.crop_height = box.height if trans.crop_height == :native
+        cc.rounded_rectangle(0, 0, trans.crop_width / scale_width, trans.crop_height / scale_height, trans.crop_corner_x_radius, trans.crop_corner_y_radius)
+        cc.clip
+        cc.translate(-trans.crop_x, -trans.crop_y)
+
+        cc.operator = paint.blend unless paint.blend == :none
+        if paint.mask.to_s.empty?
+          cc.render_rsvg_handle(svg, id: svg_args.id)
+        else
+          tmp = Cairo::ImageSurface.new(box.width / scale_width, box.height / scale_height)
+          tmp_cc = Cairo::Context.new(tmp)
+          tmp_cc.render_rsvg_handle(svg, id: svg_args.id)
+          cc.set_source_squibcolor(paint.mask)
+          cc.mask(tmp, 0, 0)
+        end
+      end
+    end
+
+  end
+end

data/lib/squib/graphics/save_doc.rb

@@ -1,61 +1,61 @@
-module Squib
-  class Deck
-
-    # :nodoc:
-    # @api private
-    def render_sheet(range, batch, sheet)
-      sheet_width = (sheet.columns * (@width + 2 * sheet.gap - 2 * sheet.trim)) + (2 * sheet.margin)
-      sheet_height = (sheet.rows * (@height + 2 * sheet.gap - 2 * sheet.trim)) + (2 * sheet.margin)
-      cc = Cairo::Context.new(Cairo::ImageSurface.new(sheet_width, sheet_height))
-      num_this_sheet = 0
-      sheet_num = 0
-      y = sheet.margin
-      x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
-      @progress_bar.start("Saving PNG sheet to #{batch.summary}", @cards.size + 1) do |bar|
-        range.each do |i|
-          if num_this_sheet >= (sheet.columns * sheet.rows) # new sheet
-            filename = batch.full_filename(sheet_num)
-            cc.target.write_to_png(filename)
-            new_sheet = false
-            num_this_sheet = 0
-            sheet_num += 1
-            y = sheet.margin
-            x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
-            cc = Cairo::Context.new(Cairo::ImageSurface.new(sheet_width, sheet_height))
-          end
-          surface = trim(@cards[i].cairo_surface, sheet.trim, @width, @height)
-          cc.set_source(surface, x, y)
-          cc.paint
-          num_this_sheet += 1
-          x += (surface.width + sheet.gap) * (sheet.rtl ? -1 : 1)
-          if num_this_sheet % sheet.columns == 0 # new row
-            x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
-            y += surface.height + sheet.gap
-          end
-          bar.increment
-        end
-        cc.target.write_to_png(batch.full_filename(sheet_num))
-      end
-    end
-
-    # Return a new Cairo::ImageSurface that is trimmed from the original
-    #
-    # @param surface The surface to trim
-    # @param trim The number of pixels around the edge to trim
-    # @param width The width of the surface prior to the trim
-    # @param height The height of the surface prior to the trim
-    # :nodoc:
-    # @api private
-    def trim(surface, trim, width, height)
-      if trim > 0
-        tmp = Cairo::ImageSurface.new(width - 2 * trim, height - 2 * trim)
-        cc = Cairo::Context.new(tmp)
-        cc.set_source(surface, -1 * trim, -1 * trim)
-        cc.paint
-        surface = tmp
-      end
-      surface
-    end
-
-  end
-end
+module Squib
+  class Deck
+
+    # :nodoc:
+    # @api private
+    def render_sheet(range, batch, sheet)
+      sheet_width = (sheet.columns * (@width + 2 * sheet.gap - 2 * sheet.trim)) + (2 * sheet.margin)
+      sheet_height = (sheet.rows * (@height + 2 * sheet.gap - 2 * sheet.trim)) + (2 * sheet.margin)
+      cc = Cairo::Context.new(Cairo::ImageSurface.new(sheet_width, sheet_height))
+      num_this_sheet = 0
+      sheet_num = 0
+      y = sheet.margin
+      x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
+      @progress_bar.start("Saving PNG sheet to #{batch.summary}", @cards.size + 1) do |bar|
+        range.each do |i|
+          if num_this_sheet >= (sheet.columns * sheet.rows) # new sheet
+            filename = batch.full_filename(sheet_num)
+            cc.target.write_to_png(filename)
+            new_sheet = false
+            num_this_sheet = 0
+            sheet_num += 1
+            y = sheet.margin
+            x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
+            cc = Cairo::Context.new(Cairo::ImageSurface.new(sheet_width, sheet_height))
+          end
+          surface = trim(@cards[i].cairo_surface, sheet.trim, @width, @height)
+          cc.set_source(surface, x, y)
+          cc.paint
+          num_this_sheet += 1
+          x += (surface.width + sheet.gap) * (sheet.rtl ? -1 : 1)
+          if num_this_sheet % sheet.columns == 0 # new row
+            x = sheet.rtl ? (sheet_width - sheet.margin - sheet.gap - @width) : sheet.margin
+            y += surface.height + sheet.gap
+          end
+          bar.increment
+        end
+        cc.target.write_to_png(batch.full_filename(sheet_num))
+      end
+    end
+
+    # Return a new Cairo::ImageSurface that is trimmed from the original
+    #
+    # @param surface The surface to trim
+    # @param trim The number of pixels around the edge to trim
+    # @param width The width of the surface prior to the trim
+    # @param height The height of the surface prior to the trim
+    # :nodoc:
+    # @api private
+    def trim(surface, trim, width, height)
+      if trim > 0
+        tmp = Cairo::ImageSurface.new(width - 2 * trim, height - 2 * trim)
+        cc = Cairo::Context.new(tmp)
+        cc.set_source(surface, -1 * trim, -1 * trim)
+        cc.paint
+        surface = tmp
+      end
+      surface
+    end
+
+  end
+end