squib 0.0.2 → 0.0.3

data/lib/squib/graphics/background.rb

@@ -1,13 +1,14 @@
-module Squib
-  class Card
-
-    # :nodoc:
-    # @api private 
-    def background(color)
-      cc = cairo_context
-      cc.set_source_color(color)
-      cc.paint
-    end
-      
-  end
+module Squib
+  class Card
+
+    # :nodoc:
+    # @api private 
+    def background(color)
+      use_cairo do |cc|
+        cc.set_source_color(color)
+        cc.paint
+      end
+    end
+      
+  end
 end

data/lib/squib/graphics/image.rb

@@ -1,28 +1,47 @@
-module Squib
-  class Card
-
-    # :nodoc:
-    # @api private 
-    def png(file, x, y, alpha)
-      cc = cairo_context
-      png = Cairo::ImageSurface.from_png(file)
-      cc.set_source(png, x, y)
-      cc.paint(alpha)
-    end
-
-    # :nodoc:
-    # @api private 
-    def svg(file, id, x, y, width, height)
-      svg = RSVG::Handle.new_from_file(file)
-      width = svg.width if width == :native
-      height = svg.height if height == :native
-      tmp = Cairo::ImageSurface.new(width, height)
-      tmp_cc = Cairo::Context.new(tmp)
-      tmp_cc.scale(width.to_f / svg.width.to_f, height.to_f / svg.height.to_f)
-      tmp_cc.render_rsvg_handle(svg, id)
-      cairo_context.set_source(tmp, x, y)
-      cairo_context.paint
-    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] || @img_cache[file] = Cairo::ImageSurface.from_png(file)
+  end
+  module_function :cache_load_image
+
+  class Card
+
+    # :nodoc:
+    # @api private 
+    def png(file, x, y, alpha, blend)
+      return if file.nil? or file.eql? ''
+      png = Squib.cache_load_image(file)
+      use_cairo do |cc|
+        cc.set_source(png, x, y)
+        cc.operator = blend unless blend == :none
+        cc.paint(alpha)
+      end
+    end
+
+    # :nodoc:
+    # @api private 
+    def svg(file, id, x, y, width, height, alpha, blend)
+      Squib.logger.debug {"Rendering: #{file}, #{id} #{x}, #{y}, #{width}, #{height}, #{alpha}, #{blend}"}
+      return if file.nil? or file.eql? ''
+      svg = RSVG::Handle.new_from_file(file)
+      width = svg.width if width == :native
+      height = svg.height if height == :native
+      tmp = Cairo::ImageSurface.new(width, height)
+      tmp_cc = Cairo::Context.new(tmp)
+      tmp_cc.scale(width.to_f / svg.width.to_f, height.to_f / svg.height.to_f)
+      tmp_cc.render_rsvg_handle(svg, id)
+      use_cairo do |cc|
+        cc.set_source(tmp, x, y)
+        cc.operator = blend unless blend == :none
+        cc.paint(alpha)
+      end
+    end
+
+  end
+end

data/lib/squib/graphics/save_doc.rb

@@ -1,51 +1,55 @@
-module Squib
-  class Deck
-
-    # Lays out the cards in range and renders a PDF
-    #
-    # @example
-    #   save_pdf file: 'deck.pdf', margin: 75, gap: 5, trim: 37
-    #
-    # @option opts file [String] the name of the PDF file to save. 
-    # @option opts dir [String] (_output) the directory to save to. Created if it doesn't exist.
-    # @option opts margin [Integer] (75) the margin around the outside of the page
-    # @option opts gap [Integer] (0) the space in pixels between the cards 
-    # @option opts trim [Integer] (0) the space around the edge of each card to trim (e.g. to cut off the bleed margin for print-and-play)
-    # @return [nil]
-    # @api public
-    def save_pdf(opts = {})
-      p = needs(opts, [:file_to_save, :creatable_dir, :margin, :gap, :trim])
-      width = 11 * @dpi ; height = 8.5 * @dpi #TODO: allow this to be specified too
-      cc = Cairo::Context.new(Cairo::PDFSurface.new("#{p[:dir]}/#{p[:file]}", width, height))
-      x = p[:margin] ; y = p[:margin]
-      @cards.each_with_index do |card, i|
-        surface = trim(card.cairo_surface, p[:trim], @width, @height)
-        cc.set_source(surface, x, y)
-        cc.paint
-        x += surface.width + p[:gap]
-        if x > (width - surface.width - p[:margin])
-          x = p[:margin]
-          y += surface.height + p[:gap]
-          if y > (height - surface.height - p[:margin])
-            x = p[:margin] ; y = p[:margin]
-            cc.show_page #next page
-          end
-        end
-      end
-    end
-
-    # :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
+module Squib
+  class Deck
+
+    # Lays out the cards in range and renders a PDF
+    #
+    # @example
+    #   save_pdf file: 'deck.pdf', margin: 75, gap: 5, trim: 37
+    #
+    # @option opts file [String] the name of the PDF file to save. See {file:README.md#Specifying_Files Specifying Files}
+    # @option opts dir [String] (_output) the directory to save to. Created if it doesn't exist.
+    # @option opts margin [Integer] (75) the margin around the outside of the page
+    # @option opts gap [Integer] (0) the space in pixels between the cards 
+    # @option opts trim [Integer] (0) the space around the edge of each card to trim (e.g. to cut off the bleed margin for print-and-play)
+    # @return [nil]
+    # @api public
+    def save_pdf(opts = {})
+      p = needs(opts, [:file_to_save, :creatable_dir, :margin, :gap, :trim])
+      width = 11 * @dpi ; height = 8.5 * @dpi #TODO: allow this to be specified too
+      cc = Cairo::Context.new(Cairo::PDFSurface.new("#{p[:dir]}/#{p[:file]}", width, height))
+      x = p[:margin] ; y = p[:margin]
+
+      @progress_bar.start("Saving PDF to #{p[:dir]}/#{p[:file]}", p[:range].size) do |bar|
+        @cards.each_with_index do |card, i|
+          surface = trim(card.cairo_surface, p[:trim], @width, @height)
+          cc.set_source(surface, x, y)
+          cc.paint
+          bar.increment
+          x += surface.width + p[:gap]
+          if x > (width - surface.width - p[:margin])
+            x = p[:margin]
+            y += surface.height + p[:gap]
+            if y > (height - surface.height - p[:margin])
+              x = p[:margin] ; y = p[:margin]
+              cc.show_page #next page
+            end
+          end
+        end
+    end
+    end
+
+    # :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

data/lib/squib/graphics/save_images.rb

@@ -1,11 +1,33 @@
-module Squib
-  class Card
-
-    # :nodoc:
-    # @api private 
-    def save_png(i, dir, prefix)
-      cairo_context.target.write_to_png("#{dir}/#{prefix}#{i}.png")
-    end
-
-  end
+module Squib
+  class Card
+
+    # :nodoc:
+    # @api private 
+    def save_png(i, dir, prefix, do_rotate, angle)
+      if [true, :clockwise, :counterclockwise].include?(do_rotate)
+        surface = rotated_image(angle)
+      else
+        surface = @cairo_surface
+      end
+      write_png(surface, i, dir, prefix)
+    end
+
+    # :nodoc:
+    # @api private
+    def rotated_image(angle)
+      rotated_cc = Cairo::Context.new(Cairo::ImageSurface.new(@height, @width) )
+      rotated_cc.translate(@height * 0.5, @width * 0.5)
+      rotated_cc.rotate(angle)
+      rotated_cc.translate(@width * -0.5, @height * -0.5)
+      rotated_cc.set_source(@cairo_surface)
+      rotated_cc.paint
+      rotated_cc.target
+    end
+    # :nodoc:
+    # @api private 
+    def write_png(surface, i, dir, prefix)
+      surface.write_to_png("#{dir}/#{prefix}#{i}.png")
+    end
+
+  end
 end

data/lib/squib/graphics/shapes.rb

@@ -1,56 +1,60 @@
-module Squib
-  class Card
-      
-    # :nodoc:
-    # @api private 
-    def rect(x, y, width, height, x_radius, y_radius, fill_color, stroke_color, stroke_width)
-      width=@width if width==:native; height=@height if height==:native
-      cc = cairo_context
-      cc.rounded_rectangle(x, y, width, height, x_radius, y_radius)
-      cc.set_source_color(stroke_color)
-      cc.set_line_width(stroke_width)
-      cc.stroke
-      cc.rounded_rectangle(x, y, width, height, x_radius, y_radius)
-      cc.set_source_color(fill_color)
-      cc.fill
-    end
-
-    # :nodoc:
-    # @api private 
-    def circle(x, y, radius, fill_color, stroke_color, stroke_width)
-      cc = cairo_context
-      cc.circle(x, y, radius)
-      cc.set_source_color(stroke_color)
-      cc.set_line_width(stroke_width)
-      cc.stroke
-      cc.circle(x, y, radius)
-      cc.set_source_color(fill_color)
-      cc.fill
-    end
-
-    # :nodoc:
-    # @api private 
-    def triangle(x1, y1, x2, y2, x3, y3, fill_color, stroke_color, stroke_width)
-      cc = cairo_context
-      cc.triangle(x1, y1, x2, y2, x3, y3)
-      cc.set_source_color(stroke_color)
-      cc.set_line_width(stroke_width)
-      cc.stroke
-      cc.triangle(x1, y1, x2, y2, x3, y3)
-      cc.set_source_color(fill_color)
-      cc.fill
-    end
-
-    # :nodoc:
-    # @api private 
-    def line(x1, y1, x2, y2, stroke_color, stroke_width)
-      cc = cairo_context
-      cc.move_to(x1, y1)
-      cc.line_to(x2, y2)
-      cc.set_source_color(stroke_color)
-      cc.set_line_width(stroke_width)
-      cc.stroke
-    end
-      
-  end
+module Squib
+  class Card
+      
+    # :nodoc:
+    # @api private 
+    def rect(x, y, width, height, x_radius, y_radius, fill_color, stroke_color, stroke_width)
+      width=@width if width==:native; height=@height if height==:native
+      use_cairo do |cc|
+        cc.rounded_rectangle(x, y, width, height, x_radius, y_radius)
+        cc.set_source_color(stroke_color)
+        cc.set_line_width(stroke_width)
+        cc.stroke
+        cc.rounded_rectangle(x, y, width, height, x_radius, y_radius)
+        cc.set_source_color(fill_color)
+        cc.fill
+      end
+    end
+
+    # :nodoc:
+    # @api private 
+    def circle(x, y, radius, fill_color, stroke_color, stroke_width)
+      use_cairo do |cc|
+        cc.circle(x, y, radius)
+        cc.set_source_color(stroke_color)
+        cc.set_line_width(stroke_width)
+        cc.stroke
+        cc.circle(x, y, radius)
+        cc.set_source_color(fill_color)
+        cc.fill
+      end
+    end
+
+    # :nodoc:
+    # @api private 
+    def triangle(x1, y1, x2, y2, x3, y3, fill_color, stroke_color, stroke_width)
+      use_cairo do |cc|
+        cc.triangle(x1, y1, x2, y2, x3, y3)
+        cc.set_source_color(stroke_color)
+        cc.set_line_width(stroke_width)
+        cc.stroke
+        cc.triangle(x1, y1, x2, y2, x3, y3)
+        cc.set_source_color(fill_color)
+        cc.fill
+      end
+    end
+
+    # :nodoc:
+    # @api private 
+    def line(x1, y1, x2, y2, stroke_color, stroke_width)
+      use_cairo do |cc|
+        cc.move_to(x1, y1)
+        cc.line_to(x2, y2)
+        cc.set_source_color(stroke_color)
+        cc.set_line_width(stroke_width)
+        cc.stroke
+      end
+    end
+      
+  end
 end

data/lib/squib/graphics/text.rb

@@ -1,108 +1,114 @@
-require 'pango'
-
-module Squib
-  class Card
-
-    # :nodoc:
-    # @api private 
-    def draw_text_hint(x,y,layout, color)
-      return if color.nil? && @deck.text_hint.nil? 
-      color ||= @deck.text_hint
-      # when w,h < 0, it was never set. extents[0] are ink extents
-      w = layout.width / Pango::SCALE
-      w = layout.extents[1].width / Pango::SCALE if w < 0
-      h = layout.height / Pango::SCALE
-      h = layout.extents[1].height / Pango::SCALE if h < 0
-      rect(x,y,w,h,0,0,'#0000',color, 2.0)
-    end
-
-    # :nodoc:
-    # @api private 
-    def ellipsize(layout, options)
-      unless options[:ellipsize].nil?
-        h = { :none   => Pango::Layout::ELLIPSIZE_NONE,
-              :start  => Pango::Layout::ELLIPSIZE_START,
-              :middle => Pango::Layout::ELLIPSIZE_MIDDLE,
-              :end    => Pango::Layout::ELLIPSIZE_END,
-              true    => Pango::Layout::ELLIPSIZE_END,
-              false   => Pango::Layout::ELLIPSIZE_NONE
-            }
-        layout.ellipsize = h[options[:ellipsize]]
-      end
-      layout
-    end
-
-    # :nodoc:
-    # @api private 
-    def wrap(layout, options)
-      unless options[:wrap].nil?
-        h = { :word  => Pango::Layout::WRAP_WORD,
-              :char => Pango::Layout::WRAP_CHAR,
-              :word_char    => Pango::Layout::WRAP_WORD_CHAR,
-              true    => Pango::Layout::WRAP_WORD_CHAR,
-              false => nil,
-              :none => nil
-            }
-        layout.wrap = h[options[:wrap]]
-      end
-      layout
-    end
-
-    # :nodoc:
-    # @api private 
-    def align(layout, options)
-      unless options[:align].nil?
-          h = { :left => Pango::ALIGN_LEFT,
-                :right => Pango::ALIGN_RIGHT,
-                :center => Pango::ALIGN_CENTER
-              }
-          layout.alignment = h[options[:align]]
-      end
-      layout
-    end
-
-    # :nodoc:
-    # @api private 
-    def valign(cc, layout, x, y, valign)
-      if layout.height > 0 
-        ink_extents = layout.extents[1]
-        case valign
-        when :middle
-          cc.move_to(x, y + (layout.height - ink_extents.height) / (2 * Pango::SCALE))
-        when :bottom
-          cc.move_to(x, y + (layout.height - ink_extents.height) / Pango::SCALE)
-        end
-      end
-    end
-
-    # :nodoc:
-    # @api private 
-    def setwh(layout, options)
-      layout.width = options[:width] * Pango::SCALE unless options[:width].nil? || options[:width] == :native
-      layout.height = options[:height] * Pango::SCALE unless options[:height].nil? || options[:height] == :native
-      layout
-    end
-
-    # :nodoc:
-    # @api private 
-    def text(str, font, x, y, color, options)
-      cc = cairo_context
-      cc.set_source_color(color)
-      cc.move_to(x,y)
-      layout = cc.create_pango_layout
-      layout.font_description = Pango::FontDescription.new(font)
-      layout.text = str.to_s
-      layout.markup = str.to_s if options[:markup]
-      layout = setwh(layout, options)
-      layout = wrap(layout, options)
-      layout = ellipsize(layout, options)
-      layout = align(layout, options)
-      layout.justify = options[:justify] unless options[:justify].nil?
-      cc.update_pango_layout(layout) 
-      valign(cc, layout, x,y, options[:valign])
-      cc.update_pango_layout(layout) ; cc.show_pango_layout(layout)
-      draw_text_hint(x,y,layout,options[:hint])
-    end
-
-  end
+require 'pango'
+
+module Squib
+  class Card
+
+    # :nodoc:
+    # @api private 
+    def draw_text_hint(x,y,layout, color)
+      color ||= @deck.text_hint
+      return if color.to_s.eql? 'off'
+      # when w,h < 0, it was never set. extents[1] are ink extents
+      w = layout.width / Pango::SCALE
+      w = layout.extents[1].width / Pango::SCALE if w < 0
+      h = layout.height / Pango::SCALE
+      h = layout.extents[1].height / Pango::SCALE if h < 0
+      rect(x,y,w,h,0,0,'#0000',color, 2.0)
+    end
+
+    # :nodoc:
+    # @api private 
+    def ellipsize(layout, ellipsize)
+      unless ellipsize.nil?
+        h = { :none   => Pango::Layout::ELLIPSIZE_NONE,
+              :start  => Pango::Layout::ELLIPSIZE_START,
+              :middle => Pango::Layout::ELLIPSIZE_MIDDLE,
+              :end    => Pango::Layout::ELLIPSIZE_END,
+              true    => Pango::Layout::ELLIPSIZE_END,
+              false   => Pango::Layout::ELLIPSIZE_NONE
+            }
+        layout.ellipsize = h[ellipsize]
+      end
+      layout
+    end
+
+    # :nodoc:
+    # @api private 
+    def wrap(layout, wrap)
+      unless wrap.nil?
+        h = { :word  => Pango::Layout::WRAP_WORD,
+              :char => Pango::Layout::WRAP_CHAR,
+              :word_char    => Pango::Layout::WRAP_WORD_CHAR,
+              true    => Pango::Layout::WRAP_WORD_CHAR,
+              false => nil,
+              :none => nil
+            }
+        layout.wrap = h[wrap]
+      end
+      layout
+    end
+
+    # :nodoc:
+    # @api private 
+    def align(layout, align)
+      unless align.nil?
+          h = { :left => Pango::ALIGN_LEFT,
+                :right => Pango::ALIGN_RIGHT,
+                :center => Pango::ALIGN_CENTER
+              }
+          layout.alignment = h[align]
+      end
+      layout
+    end
+
+    # :nodoc:
+    # @api private 
+    def valign(cc, layout, x, y, valign)
+      if layout.height > 0 
+        ink_extents = layout.extents[1]
+        case valign
+        when :middle
+          cc.move_to(x, y + (layout.height - ink_extents.height) / (2 * Pango::SCALE))
+        when :bottom
+          cc.move_to(x, y + (layout.height - ink_extents.height) / Pango::SCALE)
+        end
+      end
+    end
+
+    # :nodoc:
+    # @api private 
+    def setwh(layout, width, height)
+      layout.width = width * Pango::SCALE unless width.nil? || width == :native
+      layout.height = height * Pango::SCALE unless height.nil? || height == :native
+      layout
+    end
+
+    # :nodoc:
+    # @api private 
+    def text(str, font, color, 
+             x, y, width, height,
+             markup, justify, wrap, ellipsize, 
+             spacing, align, valign, hint)
+      Squib.logger.debug {"Placing '#{str}'' with font '#{font}' @ #{x}, #{y}, color: #{color}, etc."}
+      use_cairo do |cc|
+        cc.set_source_color(color)
+        cc.move_to(x,y)
+        layout = cc.create_pango_layout
+        layout.font_description = Pango::FontDescription.new(font)
+        layout.text = str.to_s
+        layout.markup = str.to_s if markup
+        layout = setwh(layout, width, height)
+        layout = wrap(layout, wrap)
+        layout = ellipsize(layout, ellipsize)
+        layout = align(layout, align)
+        layout.justify = justify unless justify.nil?
+        layout.spacing = spacing * Pango::SCALE unless spacing.nil? 
+        cc.update_pango_layout(layout) 
+        valign(cc, layout, x,y, valign)
+        cc.update_pango_layout(layout) ; cc.show_pango_layout(layout)
+        draw_text_hint(x,y,layout,hint)
+      end
+    end
+
+  end
 end