squib 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eaf4fffac6ef2713fd716e57d2162ccbdae7bf1
-  data.tar.gz: 6b4356a3d3eed20f2ca31afc9c2c0d793d99f56d
+  metadata.gz: 88dc6fa44ed331fbc2a3985342f8643411150ccf
+  data.tar.gz: 53688a6d02c0f26ab0f80a0e6cad0c801e101305
 SHA512:
-  metadata.gz: 529ff608835a86dd65af5ff327d494ec26940077253d9f3d543fe1cff952f5f6cc7263879ab4a0e3a8dfd271c1803f61be54eef6ee9c8c55ac4eeba46a98e087
-  data.tar.gz: fc032c6d63a16ca605084793c8e44e10eae6973d239cf694e46f0e27e2df239a77ccd46cb2f45892a8f260a97d4acd65a3201ec0345b770a79d56aa88a96156c
+  metadata.gz: 45d3440c0f8e28a459d12a89a650ec30e0c6d3d8b1c22b1ca558927af336d4f9f0be562ce7b50c3e52a1bfd3c08cfd0973b7e8e15b405fee66727fd3c1f6002b
+  data.tar.gz: d2d258e94fdaf3be396de46dc3ffccd8ce55c87735b714657a2d60c42f063ca1a6ac0c7ad4cc8bb8fce1ac10c76865d266d656f91f0707c13d1aece99ad3a869

data/.gitignore

@@ -27,3 +27,4 @@ samples/_img
 samples/_output/*.png
 samples/_output/*.pdf
 samples/_output/foo
+rubocop.txt

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Squib CHANGELOG
 
+## v0.0.5
+* Image rotation for png and svg via `angle`
+* New sample for demonstrating direct cairo access
+* README now includes a snazzy screencast of the Sublime snippets
+* Rotation of text works more conventionally now, and works with text hints
+* Better code styles thanks to RuboCop
+* Better unit testing, now with mocking!
+* Various version bumps: rspec, yard
+
 ## v0.0.4
 * Added a font size override so you can vary the font size with the same style across strings more easily
 * Added text autoscale sample

data/README.md

@@ -9,20 +9,20 @@ Squib is a Ruby [DSL](http://en.wikipedia.org/wiki/Domain-specific_language) for
 * Rendering decks to PNGs and PDFs
 * Data-driven layouts
 * Unit conversion
-* Plus the full power of Ruby! 
+* Plus the full power of Ruby!
 
-Check this out. 
+Check this out.
 
 ```ruby
 require 'squib'
 
-Squib::Deck.new do
-  text str: 'Hello, World!'  
+Squib::Deck.new(cards: 2) do
+  text str: %w(Hello World!)
   save_png
 end
 ```
 
-We just created a deck with 1 card, 825x1125 pixels, with the string "Hello, World" in the upper-left corner, saved to a PNG.
+We just created a 2-card deck with "Hello" on the first card, and "World" on the second, and saved them out to PNGs.
 
 ## Installation
 
@@ -38,7 +38,7 @@ And then execute:
 
     $ bundle
 
-Note: Squib has some native dependencies, such as [Cairo](https://github.com/rcairo/rcairo), [Pango](http://ruby-gnome2.sourceforge.jp/hiki.cgi?Pango%3A%3ALayout), and [Nokogiri](http://nokogiri.org/), which all require DevKit to compile C code. This is usually not painful, but can cause headaches on some setups. For Windows users, I *strongly* recommend using the *non-64 bit* RubyInstaller at http://rubyinstaller.org. For Mac, I recommend using [rvm](https://rvm.io). 
+Note: Squib has some native dependencies, such as [Cairo](https://github.com/rcairo/rcairo), [Pango](http://ruby-gnome2.sourceforge.jp/hiki.cgi?Pango%3A%3ALayout), and [Nokogiri](http://nokogiri.org/), which all require DevKit to compile C code. This is usually not painful, but can cause headaches on some setups. For Windows users, I *strongly* recommend using the *non-64 bit* RubyInstaller at http://rubyinstaller.org. For Mac, I recommend using [rvm](https://rvm.io).
 
 Note: Squib requires Ruby 2.0 or later.
 
@@ -75,38 +75,36 @@ The central file here is `deck.rb`. Here's a [basic example](https://github.com/
 After going over this README, here are some other places to go learn Squib:
 
 * The YARD-generated API documentation [for the latest Squib gem](http://rubydoc.info/gems/squib/) is a method-by-method reference. The `Deck` class is the main class to look at. If you are following Squib master, see [the latest version](http://rubydoc.info/github/andymeneely/squib)
-* The `samples` directory in the [source repository](https://github.com/andymeneely/squib) has lots of examples. To run them, you will need to clone the repository and run them with Squib installed. 
+* The `samples` directory in the [source repository](https://github.com/andymeneely/squib) has lots of examples. To run them, you will need to clone the repository and run them with Squib installed.
 * [Junk Land](https://github.com/andymeneely/junk-land) is my own creation that's uses Squib for both black-and-white print-and-play and full color.
 
 ## Viewing this README
 
-If you're viewing this on Github, you might see some confusing tags like `{include:file:...}` - these are directives for YARD to show the embedded examples. The samples can be found on this repository, and are quite helpful. If you want to see this documentation in YARD, 
+The best place to read this documentation is on [our website](http://andymeneely.github.io/squib/doc).
 
-Sadly, RubyDoc.info is buggy and doesn't support `{include:file...}` directive properly, so these online links will still not show the samples inline:
-
- * The [latest Gem release](http://rubydoc.info/gems/squib/)
- * The [master branch](http://rubydoc.info/github/andymeneely/squib) of this repository 
-
-To view this locally, you can do the following
+If you want to view it offline, you can do the following
 
 ```sh
 $ gem install yard
 $ yard server --gems
 ```
-
 Then go to [http://localhost:8808/docs/squib/file/README.md](http://localhost:8808/docs/squib/file/README.md)
 
+If you're viewing this on Github, you might see some confusing tags like `{include:file:...}` - these are directives for YARD to show the embedded examples. Github doesn't render those and you might find them helpful.
+
+Also, RubyDoc.info linked from RubyGems is buggy and doesn't support `{include:file...}` directive properly, so the embedded samples will also not show up there.
+
 ## Squib API
 
 The Squib DSL is based on a collection of methods provided to the `Squib::Deck` class. The general philosophy of Squib is to specify as little as possible with layers of defaults, highly flexible input, and good ol' Ruby duck-typing. Ruby does a lot to make Squib useful.
 
-Squib essentially has two main classes: `Deck` and `Card`. `Deck` is the front-end, and `Card` is the back-end. The contract of `Deck` is to do the various manipulations of options and then delegate the operation to `Card` to do the low-level graphical operations. 
+Squib essentially has two main classes: `Deck` and `Card`. `Deck` is the front-end, and `Card` is the back-end. The contract of `Deck` is to do the various manipulations of options and then delegate the operation to `Card` to do the low-level graphical operations.
 
 For most users, I recommending solely using `Deck` methods. If you want to roll up your sleeves and get your hands messy, you can access the Cairo or Pango contexts the directly via the `Card` class. The API documentation doesn't really cover these, however, so you're on your own there.
 
 ## Specifying Parameters
 
-Squib is all about sane defaults and shorthand specification. Arguments are almost always using hashes, which look a lot like [Ruby 2.0's named parameters](http://www.ruby-doc.org/core-2.0.0/doc/syntax/calling_methods_rdoc.html#label-Keyword+Arguments). This means you can specify your parameters in any order you please. All parameters are optional. For example `x` and `y` default to 0 (i.e. the upper-left corner of the card). Any parameter that is specified in the command overrides any Squib defaults, `config.yml` settings, or layout rules. 
+Squib is all about sane defaults and shorthand specification. Arguments are almost always using hashes, which look a lot like [Ruby 2.0's named parameters](http://www.ruby-doc.org/core-2.0.0/doc/syntax/calling_methods_rdoc.html#label-Keyword+Arguments). This means you can specify your parameters in any order you please. All parameters are optional. For example `x` and `y` default to 0 (i.e. the upper-left corner of the card). Any parameter that is specified in the command overrides any Squib defaults, `config.yml` settings, or layout rules.
 
 Note: you MUST use named parameters rather than positional parameters. For example: `save :png` will lead to an error like this:
 
@@ -151,17 +149,17 @@ Colors can be specified in a wide variety of ways, mostly in a hex-string. Take
 
 {include:file:samples/colors.rb}
 
-Under the hood, Squib uses the `rcairo` [color parser](https://github.com/rcairo/rcairo/blob/master/lib/cairo/color.rb) to accept a variety of color specifications, along with over [300 pre-defined constants](https://github.com/rcairo/rcairo/blob/master/lib/cairo/colors.rb). 
+Under the hood, Squib uses the `rcairo` [color parser](https://github.com/rcairo/rcairo/blob/master/lib/cairo/color.rb) to accept a variety of color specifications, along with over [300 pre-defined constants](https://github.com/rcairo/rcairo/blob/master/lib/cairo/colors.rb).
 
 ## Specifying Files
 
-All files opened for reading or writing (e.g. for `png` and `xlsx`) are opened relative to the current directory. Files opened for writing (e.g. for `save_png`) will be overwritten without warning. 
+All files opened for reading or writing (e.g. for `png` and `xlsx`) are opened relative to the current directory. Files opened for writing (e.g. for `save_png`) will be overwritten without warning.
 
 ## Custom Layouts
 
-Working with x-y coordinates all the time can be tiresome, and ideally everything in a game prototype should be data-driven and easily changed. For this, many Squib methods allow for a `layout` to be set. In essence, layouts are a way of setting default values for any argument given to the command. 
+Working with x-y coordinates all the time can be tiresome, and ideally everything in a game prototype should be data-driven and easily changed. For this, many Squib methods allow for a `layout` to be set. In essence, layouts are a way of setting default values for any argument given to the command.
 
-To use a layout, set the `layout:` option on a `Deck.new` command to point to a YAML file. Any command that allows a `layout` option can be set with a Ruby symbol or String, and the command will then load the specified `x`, `y`, `width`, and `height`. The individual command can also override these options. 
+To use a layout, set the `layout:` option on a `Deck.new` command to point to a YAML file. Any command that allows a `layout` option can be set with a Ruby symbol or String, and the command will then load the specified `x`, `y`, `width`, and `height`. The individual command can also override these options.
 
 Note: YAML is very finnicky about having not allowing tabs. Use two spaces for indentation instead. If you get a `Psych` syntax error, this is likely the culprit. Indendation is also strongly enforced in Yaml too. See the [Yaml docs](http://www.yaml.org/YAML_for_ruby.html).
 
@@ -183,14 +181,14 @@ icon_left
 # The layout for icon_left will have the width/height from icon!
 ```
 
-Also!! Squib provides a more feature-rich way of merging: the `extends` key in layouts. When defining an extends key, we can merge in another key and modify data coming in if we want to. This allows us to do things like set an inner object that changes its location based on its parent. 
+Also!! Squib provides a more feature-rich way of merging: the `extends` key in layouts. When defining an extends key, we can merge in another key and modify data coming in if we want to. This allows us to do things like set an inner object that changes its location based on its parent.
 
 ```yaml
-yin: 
+yin:
   x: 100
   y: 100
   radius: 100
-yang: 
+yang:
   extends: yin
   x: += 50
 ```
@@ -203,7 +201,7 @@ See the `use_layout` sample found [here](https://github.com/andymeneely/squib/tr
 
 Squib supports various configuration properties that can be specified in an external file. The `config:` option in `Deck.new` can specify an optional configuration file in YML format. The properties there are intended to be immutable for the life of the Deck. The options include:
 
-* `progress_bars` (Boolean, default: false).  When set to `true`, long-running operations will show a progress bar on the command line. 
+* `progress_bars` (Boolean, default: false).  When set to `true`, long-running operations will show a progress bar on the command line.
 * `dpi` (Integer, default: 300). Used in calculations when units are used (e.g. for PDF rendering and unit conversion).
 * `hint` (ColorString, default: off). Text hints are used to show the boundaries of text boxes. Can be enabled/disabled for individual commands, or set globally with the `set` command. This setting is overriden by `set` and individual commands.
 * `custom_colors` (Hash of Colors, default: {}). Defines globally-available colors available to the deck that can be specified in commands.
@@ -214,29 +212,36 @@ See the `custom_config` sample found [here](https://github.com/andymeneely/squib
 
 {include:file:samples/custom_config.rb}
 
-## Staying DRY (Don't Repeat Yourself)
+## Staying DRY
 
-Squib tries to keep you DRY with the following features:
+Squib tries to keep you DRY (Don't Repeat Yourself) with the following features:
 
-* Custom layouts allow you to specify various arguments in a separate file. This is great for x-y coordinates and alignment properties that would otherwise clutter up perfectly readable code. Yaml's "merge keys" takes this a step further and lets you specify base styles that can then be extended by other styles.
+* Custom layouts allow you to specify various arguments in a separate file. This is great for x-y coordinates and alignment properties that would otherwise clutter up perfectly readable code. Yaml's "merge keys" takes this a step further and lets you specify base styles that can then be extended by other styles. Squib goes even further and has a special "extends" that works especially well for grouped-together styles.
 * Flexible ranges and array handling: the `range` parameter in Squib is very flexible, meaning that one `text` command can specify different text in different fonts, styles, colors, etc. for each card. If you find yourself doing multiple `text` command for the same field across different ranges of cards, there's probably a better way to condense.
-* Custom colors keep you from hardcoding magic color strings everywhere. Custom colors are entered into the `config.yml` file.
+* Custom colors keep you from hardcoding magic color strings everywhere. Custom colors go into `config.yml` file.
+* Plus, you know, Ruby.
 
 ## Source control
 
-You are using source control, right?? 
+You are using source control, right??
 
 By default, Squib assumes Git. But it's not dogmatic about it. Tracking your progress, backing up, sharing data, topic branches, release management, and reverting into history are just some of the many, many useful things you can do with source control. For me, I tend to ignore any auto-generated files in my output folder, but version control everything else. I also try to keep my graphics vector files, so the files stay small. Version control is intended for source code, so large binary files don't usually get checked in unless absolutely necessary. For big binaries with graphics I tend to keep those
 
+## SublimeText
+
+Using SublimeText? I like you already. I've written up some Squib snippets to ease remembering Squib commands. It's called `Squib Snippets` on Package Control. Compatible with SublimeText 3. Source code is also [on Github](https://github.com/andymeneely/sublime-squib) (contributions welcome!). Check it out:
+
+![Sublime Squib Snippets](https://raw.githubusercontent.com/andymeneely/squib/screencasts/sublime-squib-snippets.gif)
+
 ## Decks with multiple orientations or sizes
 
-If you want to make a deck that has some portrait and some landscape cards, I recommend you use multiple `Squib::Deck`s. The pixel size of a given card is designed to not change thorughout the life of a `Squib::Deck`. To work with landscape cards, there is a `rotate` option on `save_png` so you can render your print-on-demand PNGs in portrait but keep everything ekse oriented toward landscape. The following example demonstrates how to do this, found [here](https://github.com/andymeneely/squib/tree/master/samples/portrait-landscape.rb).
+If you want to make a deck that has some portrait and some landscape cards, I recommend you use multiple `Squib::Deck`s. The pixel size of a given card is designed to not change thorughout the life of a `Squib::Deck`. To work with landscape cards, there is a `rotate` option on `save_png` so you can render your print-on-demand PNGs in portrait but keep everything else oriented toward landscape. The following example demonstrates how to do this, found [here](https://github.com/andymeneely/squib/tree/master/samples/portrait-landscape.rb).
 
 {include:file:samples/portrait-landscape.rb}
 
 # Development
 
-Squib is currently in pre-release alpha, so the API is still maturing. If you are using Squib, however, I'd love to hear about it! Feel free to [file a bug or feature request](https://github.com/andymeneely/squib/issues).
+Squib is currently in pre-release alpha, so the API is still maturing. I do change my mind about the names and meaning of things at this stage. If you are using Squib, however, I'd love to hear about it! Feel free to [file a bug or feature request](https://github.com/andymeneely/squib/issues).
 
 # Contributing
 
@@ -254,4 +259,4 @@ Truthfully, I just thought it was a cool, simple word that was not used much in
 
 * Squibs are small explosive devices, much like Squib "explodes" your rules into a playable game
 * Squibs are often used in heist movies, leading to a sudden plot twist that often resembles the twists of good tabletop game
-* Squibs are also part of the Harry Potter world - they are people who are non-magical but wizard-born. Squib is aware of wizarding magic and comes from that heritage, but it's not magical itself. 
+* Squibs are also part of the Harry Potter world - they are people who are non-magical but wizard-born. Squib is aware of wizarding magic and comes from that heritage, but it's not magical itself.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rspec/core/rake_task'
 require 'yard'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => [:install, :spec]
+task default: [:install, :spec]
 
 YARD::Rake::YardocTask.new(:doc) do |t|
   t.files   = ['lib/**/*.rb', 'samples/**/*.rb']   # optional

data/bin/squib

@@ -4,16 +4,16 @@ require 'mercenary'
 
 Mercenary.program(:squib) do |p|
   p.version Squib::VERSION
-  p.description "A Ruby DSL for prototyping card games"
-  p.syntax "squib <subcommand> [options]"
+  p.description 'A Ruby DSL for prototyping card games'
+  p.syntax 'squib <subcommand> [options]'
 
   p.command(:new) do |c|
-    c.syntax "new PATH"
-    c.description "Creates a new Squib project scaffolding in PATH. Must be a new directory or already empty." 
+    c.syntax 'new PATH'
+    c.description 'Creates a new Squib project scaffolding in PATH. Must be a new directory or already empty.'
 
     c.action do |args, options|
       Squib::Commands::New.new.process(args)
     end
   end
-  
-end
+
+end

data/lib/squib.rb

@@ -8,25 +8,25 @@ require 'squib/deck'
 require 'squib/card'
 
 module Squib
-  
+
   # Access the internal logger that Squib uses. By default, Squib configure the logger to the WARN level
-  # Use this to suppress or increase output levels. 
+  # Use this to suppress or increase output levels.
   # @example
   #   Squib.logger.level = Logger::DEBUG #show waaaay more information than you probably need, unless you're a dev
   #   Squib.logger.level = Logger::ERROR #basically turns it off
-  # 
+  #
   # @return [Logger] the ruby logger
-  # @api public 
+  # @api public
   def logger
     if @logger.nil?
       @logger = Logger.new(STDOUT);
       @logger.level = Logger::WARN;
-      @logger.formatter = proc do |severity, datetime, progname, msg|
-        "#{severity} #{progname}: #{msg}\n"
+      @logger.formatter = proc do |severity, datetime, m_progname, msg|
+        "#{datetime} #{severity}: #{msg}\n"
       end
     end
     @logger
   end
   module_function :logger
-  
-end
+
+end

data/lib/squib/api/background.rb

@@ -1,6 +1,6 @@
 module Squib
   class Deck
-    # Fills the background with the given color 
+    # Fills the background with the given color
     # @example
     #   background color: :white
     #
@@ -14,6 +14,6 @@ module Squib
       opts = needs(opts,[:range, :color])
       opts[:range].each { |i| @cards[i].background(opts[:color][i]) }
     end
-      
+
   end
-end
+end

data/lib/squib/api/data.rb

@@ -4,13 +4,13 @@ module Squib
 
   # Pulls Excel data from `.xlsx` files into a column-based hash
   #
-  # Pulls the data into a Hash of arrays based on the columns. First row is assumed to be the header row. 
+  # Pulls the data into a Hash of arrays based on the columns. First row is assumed to be the header row.
   # See the example `samples/excel.rb` in the [source repository](https://github.com/andymeneely/squib/tree/master/samples)
   #
   # @example
   #   # Excel file looks like this:
   #   # | h1 | h2 |
-  #   # ------------ 
+  #   # ------------
   #   # | 1  | 2  |
   #   # | 3  | 4  |
   #   data = xlsx file: 'data.xlsx', sheet: 0
@@ -32,7 +32,7 @@ module Squib
       (s.first_row+1).upto(s.last_row) do |row|
         cell = s.cell(row,col)
         # Roo hack for avoiding unnecessary .0's on whole integers
-        cell = s.excelx_value(row,col) if s.excelx_type(row,col) == [:numeric_or_formula, "General"]
+        cell = s.excelx_value(row,col) if s.excelx_type(row,col) == [:numeric_or_formula, 'General']
         data[header] << cell
       end#row
     end#col
@@ -41,12 +41,11 @@ module Squib
   module_function :xlsx
 
   class Deck
-    
+
     # Convenience call for Squib.xlsx
     def xlsx(opts = {})
       Squib.xlsx(opts)
-    end    
+    end
 
   end
 end
-

data/lib/squib/api/image.rb

@@ -15,14 +15,16 @@ module Squib
     # @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}. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts alpha [Decimal] (1.0) the alpha-transparency percentage used to blend this image. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts blend [:none, :multiply, :screen, :overlay, :darken, :lighten, :color_dodge, :color_burn, :hard_light, :soft_light, :difference, :exclusion, :hsl_hue, :hsl_saturation, :hsl_color, :hsl_luminosity] (:none) the composite blend operator used when applying this image. See Blend Modes at http://cairographics.org/operators. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
+    # @option opts angle [FixNum] (0) Rotation of the in radians. Note that this rotates around the upper-left corner, making the placement of x-y coordinates slightly tricky. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @return [nil] Returns nil
     # @api public
     def png(opts = {})
-      opts = needs(opts, [:range, :files, :x, :y, :alpha, :layout, :blend])
+      opts = needs(opts, [:range, :files, :x, :y, :alpha, :layout, :blend, :angle])
       Dir.chdir(@img_dir) do
-        @progress_bar.start("Loading PNG(s)", opts[:range].size) do |bar|
-          opts[:range].each do |i| 
-            @cards[i].png(opts[:file][i], opts[:x][i], opts[:y][i], opts[:alpha][i], opts[:blend][i]) 
+        @progress_bar.start('Loading PNG(s)', opts[:range].size) do |bar|
+          opts[:range].each do |i|
+            @cards[i].png(opts[:file][i], opts[:x][i], opts[:y][i],
+                          opts[:alpha][i], opts[:blend][i], opts[:angle][i])
             bar.increment
           end
         end
@@ -32,7 +34,7 @@ module Squib
     # Renders an entire svg file at the given location. Uses the SVG-specified units and DPI to determine the pixel width and height.
     #
     # See {file:samples/load-images.rb samples/load-images.rb} and {file:samples/tgc-overlay.rb samples/tgc-overlay.rb} as examples.
-    # @example 
+    # @example
     #   svg 1..2, 'icon.svg', '#stone', x: 50, y: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}
@@ -46,16 +48,17 @@ module Squib
     # @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}. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts alpha [Decimal] (1.0) the alpha-transparency percentage used to blend this image. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts blend [:none, :multiply, :screen, :overlay, :darken, :lighten, :color_dodge, :color_burn, :hard_light, :soft_light, :difference, :exclusion, :hsl_hue, :hsl_saturation, :hsl_color, :hsl_luminosity] (:none) the composite blend operator used when applying this image. See Blend Modes at http://cairographics.org/operators. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
+    # @option opts angle [FixNum] (0) Rotation of the in radians. Note that this rotates around the upper-left corner, making the placement of x-y coordinates slightly tricky. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @return [nil] Returns nil
     # @api public
     def svg(opts = {})
-      p = needs(opts,[:range, :files, :svgid, :force_svgid, :x, :y, :width, :height, :layout, :alpha, :blend])
+      p = needs(opts,[:range, :files, :svgid, :force_svgid, :x, :y, :width, :height, :layout, :alpha, :blend, :angle])
       Dir.chdir(@img_dir) do
-        @progress_bar.start("Loading SVG(s)", p[:range].size) do |bar|
+        @progress_bar.start('Loading SVG(s)', p[:range].size) do |bar|
           p[:range].each do |i|
             unless p[:force_id][i] && p[:id][i].to_s.empty?
-              @cards[i].svg(p[:file][i], p[:id][i], p[:x][i], p[:y][i], 
-                            p[:width][i], p[:height][i], p[:alpha][i], p[:blend][i]) 
+              @cards[i].svg(p[:file][i], p[:id][i], p[:x][i], p[:y][i],
+                            p[:width][i], p[:height][i], p[:alpha][i], p[:blend][i], p[:angle][i])
             end
             bar.increment
           end
@@ -64,4 +67,4 @@ module Squib
     end
 
   end
-end
+end

data/lib/squib/api/save.rb

@@ -1,6 +1,6 @@
 module Squib
   class Deck
-  
+
     # Saves the given range of cards to either PNG or PDF
     #
     # @option opts [Enumerable] range (:all) the range of cards over which this will be rendered. See {file:README.md#Specifying_Ranges Specifying Ranges}
@@ -16,8 +16,8 @@ module Squib
       save_pdf(opts) if opts[:format].include? :pdf
       self
     end
-    
-    # Saves the given range of cards to a PNG 
+
+    # Saves the given range of cards to a PNG
     #
     # @example
     #   save range: 1..8, dir: '_pnp', prefix: 'bw_'
@@ -31,7 +31,7 @@ module Squib
     def save_png(opts = {})
       opts = needs(opts,[:range, :creatable_dir, :prefix, :rotate])
       @progress_bar.start("Saving PNGs to #{opts[:dir]}/#{opts[:prefix]}*", @cards.size) do |bar|
-        opts[:range].each do |i| 
+        opts[:range].each do |i|
           @cards[i].save_png(i, opts[:dir], opts[:prefix], opts[:rotate], opts[:angle])
           bar.increment
         end
@@ -40,4 +40,3 @@ module Squib
 
   end
 end
-

data/lib/squib/api/settings.rb

@@ -1,7 +1,7 @@
 module Squib
   class Deck
 
-    # Toggle hints globally. 
+    # Toggle hints globally.
     #
     # Text hints are rectangles around where the text will be laid out. They are intended to be temporary.
     # Setting a hint to nil or to :off will disable hints. @see samples/text.rb
@@ -9,7 +9,7 @@ module Squib
     #   hint text: :cyan
     #   hint text: :cyan
     #
-    # @param [String] text the color of the text hint. To turn off use :off. @see README.md 
+    # @param [String] text the color of the text hint. To turn off use :off. @see README.md
     # @return [nil] Returns nothing
     # @api public
     def hint(text: :off)
@@ -17,7 +17,7 @@ module Squib
     end
 
     # Sets various defaults for this deck. Defaults can be overriden by the commands themselves when that command supports it.
-    # @example 
+    # @example
     #   set font: 'Arial 26'
     #   text 'blah'                     # in Arial 26
     #   text 'blah24', font: 'Arial 24' # in Arial 24
@@ -31,7 +31,7 @@ module Squib
       opts = needs(opts, [:font, :img_dir])
       @font = opts[:font][0] #was expanded - just need the first
       @img_dir = opts[:img_dir]
-    end 
+    end
 
   end
 end