squib 0.9.0 → 0.10.0

data/lib/squib/args/svg_special.rb

@@ -1,4 +1,4 @@
-require 'squib/args/arg_loader'
+require_relative 'arg_loader'
 
 module Squib
   # @api private

data/lib/squib/args/transform.rb

@@ -1,4 +1,4 @@
-require 'squib/args/arg_loader'
+require_relative 'arg_loader'
 
 module Squib
   # @api private
@@ -58,4 +58,4 @@ module Squib
     end
 
   end
-end
+end

data/lib/squib/args/typographer.rb

@@ -1,9 +1,10 @@
-require 'squib/constants'
+require_relative '../constants'
+
 module Squib
-  #@api private
+  # @api private
   module Args
     # Internal class for handling arguments
-    #@api private
+    # @api private
     class Typographer
 
       def initialize(config = Conf::DEFAULTS)
@@ -115,4 +116,4 @@ module Squib
 
     end
   end
-end
+end

data/lib/squib/args/unit_conversion.rb

@@ -1,4 +1,4 @@
-require 'squib/constants'
+require_relative '../constants'
 
 module Squib
   module Args
@@ -11,9 +11,9 @@ module Squib
       module_function
       def parse(arg, dpi=300)
         case arg.to_s.rstrip
-        when /in$/ #ends with "in"
+        when /in$/ # ends with "in"
           arg.rstrip[0..-2].to_f * dpi
-        when /cm$/ #ends with "cm"
+        when /cm$/ # ends with "cm"
           arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM
         else
           arg
@@ -22,4 +22,4 @@ module Squib
 
     end
   end
-end
+end

data/lib/squib/card.rb

@@ -1,5 +1,5 @@
 require 'cairo'
-require 'squib/graphics/cairo_context_wrapper'
+require_relative 'graphics/cairo_context_wrapper'
 
 module Squib
   # Back end graphics. Private.
@@ -54,13 +54,13 @@ module Squib
     ########################
     ### BACKEND GRAPHICS ###
     ########################
-    require 'squib/graphics/background'
-    require 'squib/graphics/image'
-    require 'squib/graphics/save_doc'
-    require 'squib/graphics/save_images'
-    require 'squib/graphics/shapes'
-    require 'squib/graphics/showcase'
-    require 'squib/graphics/text'
+    require_relative 'graphics/background'
+    require_relative 'graphics/image'
+    require_relative 'graphics/save_doc'
+    require_relative 'graphics/save_images'
+    require_relative 'graphics/shapes'
+    require_relative 'graphics/showcase'
+    require_relative 'graphics/text'
 
   end
 end

data/lib/squib/conf.rb

@@ -1,7 +1,6 @@
 require 'forwardable'
-require 'squib'
-require 'squib/args/typographer'
 require 'yaml'
+require_relative 'args/typographer'
 
 module Squib
   # @api private
@@ -16,6 +15,7 @@ module Squib
       'hint'          => :none,
       'img_dir'       => '.',
       'progress_bars' => false,
+      'prefix'        => 'card_',
       'ldquote'       => "\u201C", # UTF8 chars
       'rdquote'       => "\u201D",
       'lsquote'       => "\u2018",
@@ -25,11 +25,11 @@ module Squib
       'ellipsis'      => "\u2026",
       'smart_quotes'  => true,
       'text_hint'     => 'off',
-      'warn_ellipsize'=> true,
-      'warn_png_scale'=> true,
+      'warn_ellipsize' => true,
+      'warn_png_scale' => true,
     }
 
-    #Translate the hints to the methods.
+    # Translate the hints to the methods.
     ANTIALIAS_OPTS = {
       nil        => 'subpixel',
       'best'     => 'subpixel',

data/lib/squib/deck.rb

@@ -1,14 +1,14 @@
 require 'forwardable'
 require 'pp'
-require 'squib'
-require 'squib/args/unit_conversion'
-require 'squib/card'
-require 'squib/conf'
-require 'squib/constants'
-require 'squib/graphics/hand'
-require 'squib/graphics/showcase'
-require 'squib/layout_parser'
-require 'squib/progress'
+require_relative '../squib'
+require_relative 'args/unit_conversion'
+require_relative 'card'
+require_relative 'conf'
+require_relative 'constants'
+require_relative 'graphics/hand'
+require_relative 'graphics/showcase'
+require_relative 'layout_parser'
+require_relative 'progress'
 
 
 # The project module
@@ -68,7 +68,8 @@ module Squib
       @width         = Args::UnitConversion.parse width, dpi
       @height        = Args::UnitConversion.parse height, dpi
       cards.times{ |i| @cards << Squib::Card.new(self, @width, @height, i) }
-      @layout        = LayoutParser.load_layout(layout)
+      @layout = LayoutParser.load_layout(layout)
+      enable_groups_from_env!
       if block_given?
         instance_eval(&block) # here we go. wheeeee!
       end
@@ -100,14 +101,15 @@ module Squib
     ##################
     ### PUBLIC API ###
     ##################
-    require 'squib/api/background'
-    require 'squib/api/data'
-    require 'squib/api/image'
-    require 'squib/api/save'
-    require 'squib/api/settings'
-    require 'squib/api/shapes'
-    require 'squib/api/text'
-    require 'squib/api/units'
+    require_relative 'api/background'
+    require_relative 'api/data'
+    require_relative 'api/groups'
+    require_relative 'api/image'
+    require_relative 'api/save'
+    require_relative 'api/settings'
+    require_relative 'api/shapes'
+    require_relative 'api/text'
+    require_relative 'api/units'
 
   end
 end

data/lib/squib/graphics/cairo_context_wrapper.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require 'squib/graphics/gradient_regex'
+require_relative 'gradient_regex'
 
 module Squib
   module Graphics
@@ -40,7 +40,7 @@ module Squib
           linear.matrix = matrix # match the coordinate systems - see bug 127
           @cairo_cxt.set_source(linear)
         elsif match = arg.match(RADIAL_GRADIENT)
-          x1, y1, r1, x2, y2, r2  = match.captures
+          x1, y1, r1, x2, y2, r2 = match.captures
           radial = Cairo::RadialPattern.new(x1.to_f, y1.to_f, r1.to_f,
                                             x2.to_f, y2.to_f, r2.to_f)
           radial.matrix = matrix # match the coordinate systems - see bug 127
@@ -105,7 +105,7 @@ module Squib
         v = vertical   ? -1.0 : 1.0
         h = horizontal ? -1.0 : 1.0
         transform Cairo::Matrix.new(v, 0.0,     0.0,
-                                    h, x*(1-v), y*(1-h))
+                                    h, x * (1 - v), y * (1 - h))
       end
 
     end

data/lib/squib/graphics/gradient_regex.rb

@@ -44,4 +44,4 @@ module Squib
       \s*         # trailing whitespace is ok
     /x
   end
-end
+end

data/lib/squib/graphics/hand.rb

@@ -1,4 +1,4 @@
-require 'squib/graphics/cairo_context_wrapper'
+require_relative 'cairo_context_wrapper'
 
 module Squib
   class Deck
@@ -30,7 +30,7 @@ module Squib
         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 = 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)

data/lib/squib/graphics/save_doc.rb

@@ -13,7 +13,7 @@ module Squib
       @progress_bar.start("Saving PDF to #{file}", range.size) do |bar|
         range.each do |i|
           card = @cards[i]
-          cc.translate(x,y)
+          cc.translate(x, y)
           cc.rectangle(sheet.trim, sheet.trim, card_width, card_height)
           cc.clip
           case card.backend.downcase.to_sym
@@ -23,7 +23,7 @@ module Squib
           when :svg
             card.cairo_surface.finish
             cc.save
-            cc.scale(0.8,0.8) # I really don't know why I needed to do this at all. But 0.8 is the magic number to get this to scale right
+            cc.scale(0.8, 0.8) # I really don't know why I needed to do this at all. But 0.8 is the magic number to get this to scale right
             cc.render_rsvg_handle(RSVG::Handle.new_from_file(card.svgfile), nil)
             cc.restore
           else
@@ -31,18 +31,19 @@ module Squib
           end
           bar.increment
           cc.reset_clip
-          cc.translate(-x,-y)
-          x += card.width + sheet.gap - 2*sheet.trim
+          cc.translate(-x, -y)
+          x += card.width + sheet.gap - 2 * sheet.trim
           if x > (sheet.width - card_width - sheet.margin)
             x = sheet.margin
-            y += card.height + sheet.gap - 2*sheet.trim
+            y += card.height + sheet.gap - 2 * sheet.trim
             if y > (sheet.height - card_height - sheet.margin)
               cc.show_page # next page
-              x,y = sheet.margin,sheet.margin
+              x, y = sheet.margin, sheet.margin
             end
           end
         end
       end
+      cc.target.finish
     end
 
     # :nodoc:
@@ -90,9 +91,9 @@ module Squib
     # @api private
     def trim(surface, trim, width, height)
       if trim > 0
-        tmp = Cairo::ImageSurface.new(width-2*trim, height-2*trim)
+        tmp = Cairo::ImageSurface.new(width - 2 * trim, height - 2 * trim)
         cc = Cairo::Context.new(tmp)
-        cc.set_source(surface,-1*trim, -1*trim)
+        cc.set_source(surface, -1 * trim, -1 * trim)
         cc.paint
         surface = tmp
       end

data/lib/squib/graphics/save_images.rb

@@ -5,7 +5,8 @@ module Squib
     # @api private
     def save_png(batch)
       surface = if preprocess_save?(batch)
-                  preprocessed_save(batch.angle, batch.trim, batch.trim_radius)
+                  w, h = compute_dimensions(batch.rotate, batch.trim)
+                  preprocessed_save(w, h, batch)
                 else
                   @cairo_surface
                 end
@@ -15,20 +16,32 @@ module Squib
     # :nodoc:
     # @api private
     def preprocess_save?(batch)
-      batch.rotate || batch.trim > 0
+      batch.rotate != false || batch.trim > 0
     end
 
-    def preprocessed_save(angle, trim, trim_radius)
-      new_width, new_height = @width - 2*trim, @height - 2*trim
-      new_cc = Cairo::Context.new(Cairo::ImageSurface.new(new_width, new_height))
-      new_cc.translate(new_width * 0.5, new_height * 0.5)
-      new_cc.rotate(angle)
-      new_cc.translate(new_width * -0.5, new_height * -0.5)
-      new_cc.set_source(@cairo_surface, -trim, -trim)
-      new_cc.rounded_rectangle(0, 0, new_width, new_height, trim_radius, trim_radius)
+    def compute_dimensions(rotate, trim)
+      if rotate
+        [ @height - 2 * trim, @width - 2 * trim ]
+      else
+        [ @width - 2 * trim, @height - 2 * trim ]
+      end
+    end
+
+    def preprocessed_save(width, height, batch)
+      new_cc = Cairo::Context.new(Cairo::ImageSurface.new(width, height))
+      trim_radius = batch.trim_radius
+      if batch.rotate != false
+        new_cc.translate(width * 0.5, height * 0.5)
+        new_cc.rotate(batch.angle)
+        new_cc.translate(height * -0.5, width * -0.5)
+        new_cc.rounded_rectangle(0, 0, height, width, trim_radius, trim_radius)
+      else
+        new_cc.rounded_rectangle(0, 0, width, height, trim_radius, trim_radius)
+      end
       new_cc.clip
+      new_cc.set_source(@cairo_surface, -batch.trim, -batch.trim)
       new_cc.paint
-      new_cc.target
+      return new_cc.target
     end
 
     def write_png(surface, i, dir, prefix, count_format)

data/lib/squib/graphics/shapes.rb

@@ -30,19 +30,19 @@ module Squib
     def ellipse(box, draw)
       x, y, w, h = box.x, box.y, box.width, box.height
       use_cairo do |cc|
-        cc.move_to(x, y + 0.5*h)       # start west
-        cc.curve_to(x, y + 0.25*h,     # west to north
-                    x + 0.25*w, y,
-                    x +  0.5*w, y)
-        cc.curve_to(x + 0.75*w, y,     # north to east
-                    x + w, y + 0.25*h,
-                    x + w, y + 0.5*h)
-        cc.curve_to(x + w, y + 0.75*h, # east to south
-                    x + 0.75*w, y + h,
-                    x + 0.5*w, y + h)
-        cc.curve_to(x + 0.25*w, y + h, # south to west
-                    x, y + 0.75*h,
-                    x, y + 0.5*h)
+        cc.move_to(x, y + 0.5 * h)       # start west
+        cc.curve_to(x, y + 0.25 * h,     # west to north
+                    x + 0.25 * w, y,
+                    x + 0.5 * w, y)
+        cc.curve_to(x + 0.75 * w, y,     # north to east
+                    x + w, y + 0.25 * h,
+                    x + w, y + 0.5 * h)
+        cc.curve_to(x + w, y + 0.75 * h, # east to south
+                    x + 0.75 * w, y + h,
+                    x + 0.5 * w, y + h)
+        cc.curve_to(x + 0.25 * w, y + h, # south to west
+                    x, y + 0.75 * h,
+                    x, y + 0.5 * h)
         cc.fill_n_stroke(draw)
       end
     end
@@ -52,8 +52,8 @@ module Squib
     def grid(box, draw)
       x, y, w, h = box.x, box.y, box.width, box.height
       use_cairo do |cc|
-        (x..@width + w).step(w)  { |ix| line_xy( ix, y - @height, ix, @height + y, draw) }
-        (y..@height + h).step(h) { |iy| line_xy( x - @width, iy, @width + x, iy, draw) }
+        (x..@width + w).step(w)  { |ix| line_xy(ix, y - @height, ix, @height + y, draw) }
+        (y..@height + h).step(h) { |iy| line_xy(x - @width, iy, @width + x, iy, draw) }
       end
     end
 
@@ -101,7 +101,7 @@ module Squib
       inner_radius, outer_radius = poly.inner_radius, poly.outer_radius
       use_cairo do |cc|
         cc.rotate_about(x, y, trans.angle)
-        cc.move_to(x + outer_radius, y) #i = 0, so cos(0)=1 and sin(0)=0
+        cc.move_to(x + outer_radius, y) # i = 0, so cos(0)=1 and sin(0)=0
         theta = Math::PI / n.to_f # i.e. (2*pi) / (2*n)
         0.upto(2 * n) do |i|
             radius = i.even? ? outer_radius : inner_radius
@@ -132,4 +132,3 @@ module Squib
 
   end
 end
-

data/lib/squib/graphics/showcase.rb

@@ -1,4 +1,4 @@
-require 'squib/graphics/cairo_context_wrapper'
+require_relative 'cairo_context_wrapper'
 
 module Squib
   class Deck
@@ -12,8 +12,8 @@ module Squib
     # :nodoc:
     # @api private
     def render_showcase(range, sheet, showcase)
-      out_width = range.size * ((@width - 2*sheet.trim) * showcase.scale * showcase.offset) + 2*sheet.margin
-      out_height = showcase.reflect_offset + (1.0 + showcase.reflect_percent) * (@height - 2*sheet.trim) + 2*sheet.margin
+      out_width = range.size * ((@width - 2 * sheet.trim) * showcase.scale * showcase.offset) + 2 * sheet.margin
+      out_height = showcase.reflect_offset + (1.0 + showcase.reflect_percent) * (@height - 2 * sheet.trim) + 2 * sheet.margin
       out_cc = Cairo::Context.new(Cairo::ImageSurface.new(out_width, out_height))
       wrapper = Squib::Graphics::CairoContextWrapper.new(out_cc)
       wrapper.set_source_squibcolor(sheet.fill_color)
@@ -33,7 +33,7 @@ module Squib
     # :nodoc:
     # @api private
     def trim_rounded(src, trim, radius)
-      trim_cc = Cairo::Context.new(Cairo::ImageSurface.new(src.width-2.0*trim, src.height-2.0*trim))
+      trim_cc = Cairo::Context.new(Cairo::ImageSurface.new(src.width - 2.0 * trim, src.height - 2.0 * trim))
       trim_cc.rounded_rectangle(0, 0, trim_cc.target.width, trim_cc.target.height, radius, radius)
       trim_cc.set_source(src, -1 * trim, -1 * trim)
       trim_cc.clip
@@ -52,9 +52,9 @@ module Squib
       tmp_cc.transform(matrix) # flips the coordinate system
       top_y    = src.height    # top of the reflection
       bottom_y = src.height * (1.0 - rpercent) + roffset # bottom of the reflection
-      gradient = Cairo::LinearPattern.new(0,top_y, 0,bottom_y)
-      gradient.add_color_stop_rgba(0.0, 0,0,0, rstrength) # start a little reflected
-      gradient.add_color_stop_rgba(1.0, 0,0,0, 0.0)       # fade to nothing
+      gradient = Cairo::LinearPattern.new(0, top_y, 0, bottom_y)
+      gradient.add_color_stop_rgba(0.0, 0, 0, 0, rstrength) # start a little reflected
+      gradient.add_color_stop_rgba(1.0, 0, 0, 0, 0.0)       # fade to nothing
       tmp_cc.set_source(src, 0, 0)
       tmp_cc.mask(gradient)
       return tmp_cc.target
@@ -69,12 +69,12 @@ module Squib
       (0..src.width).step(in_thickness) do |i|
         percentage = i / src.width.to_f
         i = src.width - i if face_right
-        factor = scale + (percentage * (1.0 - scale)) #linear interpolation
+        factor = scale + (percentage * (1.0 - scale)) # linear interpolation
         dest_cxt.save
         dest_cxt.translate 0, src.height / 2.0 * (1.0 - factor)
         dest_cxt.scale factor * scale, factor
         dest_cxt.set_source src, 0, 0
-        dest_cxt.rounded_rectangle i, 0, out_thickness, src.height, 0,0
+        dest_cxt.rounded_rectangle i, 0, out_thickness, src.height, 0, 0
         dest_cxt.fill
         dest_cxt.restore
       end