squib 0.0.4 → 0.0.5

data/lib/squib/api/shapes.rb

@@ -1,11 +1,11 @@
 module Squib
   class Deck
-    
+
     # Draw a rounded rectangle
-    # 
-    # @example 
+    #
+    # @example
     #   rect x: 0, y: 0, width: 825, height: 1125, radius: 25
-    # 
+    #
     # Options support Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     #
     # @option opts range [Enumerable, :all] (:all) the range of cards over which this will be rendered. See {file:README.md#Specifying_Ranges Specifying Ranges}
@@ -26,16 +26,16 @@ module Squib
       opts = needs(opts, [:range, :x, :y, :width, :height, :rect_radius, :x_radius, :y_radius,
                           :fill_color, :stroke_color, :stroke_width, :layout])
       opts[:range].each do |i|
-        @cards[i].rect(opts[:x][i], opts[:y][i], opts[:width][i], opts[:height][i], 
-                       opts[:x_radius][i], opts[:y_radius][i], 
-                       opts[:fill_color][i], opts[:stroke_color][i], 
+        @cards[i].rect(opts[:x][i], opts[:y][i], opts[:width][i], opts[:height][i],
+                       opts[:x_radius][i], opts[:y_radius][i],
+                       opts[:fill_color][i], opts[:stroke_color][i],
                        opts[:stroke_width][i])
       end
     end
 
     # Draw a circle centered at the given coordinates
-    # 
-    # @example 
+    #
+    # @example
     #   circle x: 0, y: 0, radius: 100
     #
     # Options support Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
@@ -54,14 +54,14 @@ module Squib
       opts = needs(opts, [:range, :x, :y, :circle_radius, :layout,
                           :fill_color, :stroke_color, :stroke_width])
       opts[:range].each do |i|
-        @cards[i].circle(opts[:x][i], opts[:y][i], opts[:radius][i], 
+        @cards[i].circle(opts[:x][i], opts[:y][i], opts[:radius][i],
           opts[:fill_color][i], opts[:stroke_color][i], opts[:stroke_width][i])
       end
     end
 
     # Draw a triangle using the given coordinates
-    # 
-    # @example 
+    #
+    # @example
     #   triangle :x1 => 0, :y1 => 0, :x2 => 50, :y2 => 50, :x3 => 0, :y3 => 50
     #
     # Options support Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
@@ -82,17 +82,17 @@ module Squib
       opts = needs(opts, [:range, :x1, :y1, :x2, :y2, :x3, :y3, :layout,
                           :fill_color, :stroke_color, :stroke_width])
       opts[:range].each do |i|
-        @cards[i].triangle(opts[:x1][i], opts[:y1][i], 
-                           opts[:x2][i], opts[:y2][i], 
-                           opts[:x3][i], opts[:y3][i], 
-                           opts[:fill_color][i], opts[:stroke_color][i], 
+        @cards[i].triangle(opts[:x1][i], opts[:y1][i],
+                           opts[:x2][i], opts[:y2][i],
+                           opts[:x3][i], opts[:y3][i],
+                           opts[:fill_color][i], opts[:stroke_color][i],
                            opts[:stroke_width][i])
       end
     end
 
     # Draw a line using the given coordinates
-    # 
-    # @example 
+    #
+    # @example
     #   triangle :x1 => 0, :y1 => 0, :x2 => 50, :y2 => 50
     #
     # @option opts range [Enumerable, :all] (:all) the range of cards over which this will be rendered. See {file:README.md#Specifying_Ranges Specifying Ranges}
@@ -112,6 +112,6 @@ module Squib
                        opts[:stroke_color][i], opts[:stroke_width][i])
       end
     end
-    
+
   end
-end
+end

data/lib/squib/api/text.rb

@@ -3,20 +3,20 @@ module Squib
 
     # Renders a string at a given location, width, alignment, font, etc.
     #
-    #   Unix-like newlines are interpreted even on Windows. 
+    #   Unix-like newlines are interpreted even on Windows.
     #   See the {file:samples/text-options.rb samples/text.rb} for a lengthy example.
     #
-    # @example 
+    # @example
     #   text str: 'hello'
     #   text str: 'hello', x: 50, y:50, align: center
-    # 
+    #
     # Options support Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     #
     # @option opts range [Enumerable, :all] (:all) the range of cards over which this will be rendered. See {file:README.md#Specifying_Ranges Specifying Ranges}
     # @option opts str [String, Array] ('')  the string to be rendered. Must support `#to_s`. If the card responds to `#each`, it's mapped out one at a time across the cards.
     # @option opts font [String] (Arial 36 or whatever was set with `set`) the Font description string, including family, styles, and size.
     #   (e.g. `'Arial bold italic 12'`)
-    #   For the official documentation, see the [Pango docs](http://ruby-gnome2.sourceforge.jp/hiki.cgi?Pango%3A%3AFontDescription#style). 
+    #   For the official documentation, see the [Pango docs](http://ruby-gnome2.sourceforge.jp/hiki.cgi?Pango%3A%3AFontDescription#style).
     #   This [description](http://www.pygtk.org/pygtk2reference/class-pangofontdescription.html) is also quite good.
     #   See the {file:samples/text-options.rb samples/text.rb} as well.
     # @option opts font_size [Integer] (nil) an override of font string description, for scaling the font according to the size of the string
@@ -27,15 +27,15 @@ module Squib
     # @option opts width [Integer, :native] (:native) the width of the box the string will be placed in. Stretches to the content by default.
     # @option opts height [Integer, :native] the height of the box the string will be placed in. Stretches to the content by default.
     # @option opts layout [String, Symbol] (nil) entry in the layout to use as defaults for this command. See {file:README.md#Custom_Layouts Custom Layouts}
-    # @option opts wrap [:none, :word, :char, :word_char, true, false] (:word_char) When height is set, determines the behavior of how the string wraps. The `:word_char` option will break at words, but then fall back to characters when the word cannot fit.    #   
+    # @option opts wrap [:none, :word, :char, :word_char, true, false] (:word_char) When height is set, determines the behavior of how the string wraps. The `:word_char` option will break at words, but then fall back to characters when the word cannot fit.    #
     #   Options are `:none, :word, :char, :word_char`. Also: `true` is the same as `:word_char`, `false` is the same as `:none`. Default `:word_char`
     # @option opts spacing [Integer] (0) Adjust the spacing when the text is multiple lines. No effect when the text does not wrap.
     # @option opts align [:left, right, :center] (:left) The alignment of the text
-    # @option opts justify [Boolean] (false) toggles whether or not the text is justified or not. 
+    # @option opts justify [Boolean] (false) toggles whether or not the text is justified or not.
     # @option opts valign [:top, :middle, :bottom] (:top) When width and height are set, align text vertically according to the ink extents of the text.
     # @option opts ellipsize [:none, :start, :middle, :end, true, false] (:end) When width and height are set, determines the behavior of overflowing text. Also: `true` maps to `:end` and `false` maps to `:none`. Default `:end`
-    # @option opts angle [FixNum] (0) Rotation of the text in radians. 
-    # @option opts hint [String] (:nil) draw a rectangle around the text with the given color. Overrides global hints (see {Deck#hint}). 
+    # @option opts angle [FixNum] (0) Rotation of the text in radians. Note that this rotates around the upper-left corner of the text box, making the placement of x-y coordinates slightly tricky.
+    # @option opts hint [String] (:nil) draw a rectangle around the text with the given color. Overrides global hints (see {Deck#hint}).
     # @return [nil] Returns nothing
     # @api public
     def text(opts = {})
@@ -44,11 +44,11 @@ module Squib
       opts[:range].each do |i|
         @cards[i].text(opts[:str][i], opts[:font][i], opts[:font_size][i], opts[:color][i],
                        opts[:x][i], opts[:y][i], opts[:width][i], opts[:height][i],
-                       opts[:markup][i], opts[:justify][i], opts[:wrap][i], 
-                       opts[:ellipsize][i], opts[:spacing][i], opts[:align][i], 
+                       opts[:markup][i], opts[:justify][i], opts[:wrap][i],
+                       opts[:ellipsize][i], opts[:spacing][i], opts[:align][i],
                        opts[:valign][i], opts[:hint][i], opts[:angle][i])
       end
     end
 
   end
-end
+end

data/lib/squib/api/units.rb

@@ -2,11 +2,11 @@ module Squib
   class Deck
 
     # Given inches, returns the number of pixels according to the deck's DPI.
-    # 
-    # @example 
+    #
+    # @example
     #   inches(2.5) # 750 (for default Deck::dpi of 300)
     #
-    # @param [Decimal] n, the number of inches
+    # @param n [Decimal], the number of inches
     # @return [Decimal] the number of pixels, according to the deck's DPI
     # @api public
     def inches(n)
@@ -14,4 +14,4 @@ module Squib
     end
 
   end
-end
+end

data/lib/squib/card.rb

@@ -7,15 +7,15 @@ module Squib
   include Squib::InputHelpers
 
   # :nodoc:
-  # @api private 
+  # @api private
   attr_reader :width, :height
 
   # :nodoc:
-  # @api private 
+  # @api private
   attr_accessor :cairo_surface, :cairo_context
 
   # :nodoc:
-  # @api private 
+  # @api private
   def initialize(deck, width, height)
     @deck=deck; @width=width; @height=height
     @cairo_surface = Cairo::ImageSurface.new(width,height)
@@ -37,6 +37,6 @@ module Squib
   require 'squib/graphics/save_images'
   require 'squib/graphics/shapes'
   require 'squib/graphics/text'
-      
+
   end
-end
+end

data/lib/squib/commands/new.rb

@@ -6,9 +6,9 @@ module Squib
 
     # Generate a new Squib project into a fresh directory.
     #
-    # Provides conventions for using Git (you are using version control, right??). 
+    # Provides conventions for using Git (you are using version control, right??).
     # Also provides some basic layout and config files to start from, along with templates for instructions and other notes you don't want to forget.
-    # 
+    #
     #
     # @example
     #   squib new foo-blasters
@@ -22,11 +22,11 @@ module Squib
     class New
 
       # :nodoc:
-      # @api private 
+      # @api private
       def process(args)
         raise ArgumentError.new('Please specify a path.') if args.empty?
 
-        new_project_path = File.expand_path(args.join(" "), Dir.pwd)
+        new_project_path = File.expand_path(args.join(' '), Dir.pwd)
         template_path = File.expand_path('../project_template', File.dirname(__FILE__))
 
         FileUtils.mkdir_p new_project_path
@@ -41,4 +41,4 @@ module Squib
 
     end
   end
-end
+end

data/lib/squib/constants.rb

@@ -1,15 +1,15 @@
 module Squib
     # Squib's defaults for when arguments are not specified in the command nor layouts.
-    # 
+    #
     # @api public
-    SYSTEM_DEFAULTS = { 
+    SYSTEM_DEFAULTS = {
       :align => :left,
       :alpha => 1.0,
       :angle => 0,
       :blend => :none,
       :color => :black,
       :default_font => 'Arial 36',
-      :dir => "_output",
+      :dir => '_output',
       :ellipsize => :end,
       :fill_color => '#0000',
       :force_id => false,
@@ -23,7 +23,7 @@ module Squib
       :justify => false,
       :margin => 75,
       :markup => false,
-      :prefix => "card_",
+      :prefix => 'card_',
       :progress_bar => false,
       :range => :all,
       :rotate => false,
@@ -40,7 +40,7 @@ module Squib
       :x1 => 100,
       :x2 => 150,
       :x3 => 100,
-      :x_radius => 0, 
+      :x_radius => 0,
       :y => 0,
       :y1 => 100,
       :y2 => 150,
@@ -49,9 +49,9 @@ module Squib
     }
 
     # Squib's configuration defaults
-    # 
+    #
     # @api public
-    CONFIG_DEFAULTS = { 
+    CONFIG_DEFAULTS = {
       'custom_colors' => {},
       'dpi' => 300,
       'hint' => :none,
@@ -59,8 +59,8 @@ module Squib
       'img_dir' => '.',
     }
 
-    # These are parameters that are intended to be "expanded" across 
-    # range if they are singletons. 
+    # These are parameters that are intended to be "expanded" across
+    # range if they are singletons.
     #
     # For example, using a different font for each card, using one `text`
     #
@@ -106,4 +106,4 @@ module Squib
           :y3 => :y3,
           :y_radius => :y_radius,
       }
-end
+end

data/lib/squib/deck.rb

@@ -19,37 +19,37 @@ module Squib
     include Squib::InputHelpers
 
     # :nodoc:
-    # @api private 
+    # @api private
     attr_reader :width, :height
-    
+
     # :nodoc:
-    # @api private 
+    # @api private
     attr_reader :cards
-    
+
     # :nodoc:
-    # @api private 
+    # @api private
     attr_reader :text_hint
 
     # :nodoc:
-    # @api private 
+    # @api private
     attr_reader :layout, :config
 
     # Squib's constructor that sets the immutable properties.
     #
-    # This is the starting point for Squib. In providing a block to the constructor, you have access to all of Deck's instance methods. 
-    # The documented methods in Deck are the ones intended for use by most users. 
+    # This is the starting point for Squib. In providing a block to the constructor, you have access to all of Deck's instance methods.
+    # The documented methods in Deck are the ones intended for use by most users.
     # If your game requires multiple different sizes or orientations, I recommend using multiple `Squib::Deck`s in your `deck.rb`. You can modify the internals of `Squib::Deck` (e.g. `@cards`), but that's not recommended.
-    # @example 
+    # @example
     #   require 'squib'
     #   Squib::Deck.new do
-    #     text str: 'Hello, World!'
+    #     text str: 'Hello, World!"
     #   end
-    # 
-    # @param width: [Integer] the width of each card in pixels
-    # @param height: [Integer] the height of each card in pixels
-    # @param cards: [Integer] the number of cards in the deck
-    # @param dpi: [Integer] the pixels per inch when rendering out to PDF or calculating using inches. 
-    # @param config: [String] the file used for global settings of this deck
+    #
+    # @param width [Integer] the width of each card in pixels
+    # @param height [Integer] the height of each card in pixels
+    # @param cards [Integer] the number of cards in the deck
+    # @param dpi [Integer] the pixels per inch when rendering out to PDF or calculating using inches.
+    # @param config [String] the file used for global settings of this deck
     # @param block [Block] the main body of the script.
     # @api public
     def initialize(width: 825, height: 1125, cards: 1, dpi: 300, config: 'config.yml', layout: nil, &block)
@@ -77,13 +77,15 @@ module Squib
     end
 
     # Iterates over each card in the deck
-    # 
+    #
     # @api private
     def each(&block)
       @cards.each { |card| block.call(card) }
     end
 
     # Shows a descriptive place of the location
+    #
+    # @api private
     def location(opts)
       opts[:layout] || (" @ #{opts[:x]},#{opts[:y]}")
     end
@@ -124,13 +126,13 @@ module Squib
       parent_keys.each do |parent_key|
         from_extends = yml[key].merge(recurse_extends(yml, parent_key, visited)) do |key, child_val, parent_val|
           if child_val.to_s.strip.start_with?('+=')
-            parent_val + child_val.sub("+=",'').strip.to_f
+            parent_val + child_val.sub('+=','').strip.to_f
           elsif child_val.to_s.strip.start_with?('-=')
-            parent_val - child_val.sub("-=",'').strip.to_f
-          else 
+            parent_val - child_val.sub('-=','').strip.to_f
+          else
             child_val #child overrides parent when merging, no +=
           end
-        end 
+        end
         h = h.merge(from_extends) do |key, older_sibling, younger_sibling|
           younger_sibling #when two siblings have the same entry, the "younger" (lower one) overrides
         end
@@ -168,4 +170,4 @@ module Squib
     require 'squib/api/units'
 
   end
-end
+end

data/lib/squib/graphics/background.rb

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

data/lib/squib/graphics/image.rb

@@ -1,7 +1,7 @@
 module Squib
 
   # Cache all pngs we've already loaded
-  # 
+  #
   # :nodoc:
   # @api private
   def cache_load_image(file)
@@ -13,11 +13,15 @@ module Squib
   class Card
 
     # :nodoc:
-    # @api private 
-    def png(file, x, y, alpha, blend)
+    # @api private
+    def png(file, x, y, alpha, blend, angle)
+      Squib.logger.debug {"Rendering: #{file} @#{x},#{y} #{width}x#{height}, alpha: #{alpha}, blend: #{blend}, angle: #{angle}"}
       return if file.nil? or file.eql? ''
       png = Squib.cache_load_image(file)
       use_cairo do |cc|
+        cc.translate(x, y)
+        cc.rotate(angle)
+        cc.translate(-1 * x, -1 * y)
         cc.set_source(png, x, y)
         cc.operator = blend unless blend == :none
         cc.paint(alpha)
@@ -25,9 +29,9 @@ module Squib
     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}"}
+    # @api private
+    def svg(file, id, x, y, width, height, alpha, blend, angle)
+      Squib.logger.debug {"Rendering: #{file}, id: #{id} @#{x},#{y} #{width}x#{height}, alpha: #{alpha}, blend: #{blend}, angle: #{angle}"}
       return if file.nil? or file.eql? ''
       svg = RSVG::Handle.new_from_file(file)
       width = svg.width if width == :native
@@ -37,6 +41,9 @@ module Squib
       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.translate(x, y)
+        cc.rotate(angle)
+        cc.translate(-1 * x, -1 * y)
         cc.set_source(tmp, x, y)
         cc.operator = blend unless blend == :none
         cc.paint(alpha)