squib 0.8.0 → 0.9.0

data/lib/squib/args/svg_special.rb

@@ -1,37 +1,37 @@
-require 'squib/args/arg_loader'
-
-module Squib
-  # @api private
-  module Args
-
-    class SvgSpecial
-      include ArgLoader
-
-      def self.parameters
-        { data: nil, id: nil, force_id: false }
-      end
-
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
-
-      def self.params_with_units
-        []
-      end
-
-      def validate_id(arg, _i)
-        return nil if arg.nil?
-        arg = '#' << arg unless arg.start_with? '#'
-        arg
-      end
-
-      # Only render if we have an ID specified, or we are forcing an ID
-      def render?(i)
-        return false if force_id[i] && id[i].to_s.empty?
-        return true
-      end
-
-    end
-
-  end
-end
+require 'squib/args/arg_loader'
+
+module Squib
+  # @api private
+  module Args
+
+    class SvgSpecial
+      include ArgLoader
+
+      def self.parameters
+        { data: nil, id: nil, force_id: false }
+      end
+
+      def self.expanding_parameters
+        parameters.keys # all of them
+      end
+
+      def self.params_with_units
+        []
+      end
+
+      def validate_id(arg, _i)
+        return nil if arg.nil?
+        arg = '#' << arg unless arg.start_with? '#'
+        arg
+      end
+
+      # Only render if we have an ID specified, or we are forcing an ID
+      def render?(i)
+        return false if force_id[i] && id[i].to_s.empty?
+        return true
+      end
+
+    end
+
+  end
+end

data/lib/squib/args/transform.rb

@@ -1,25 +1,61 @@
-require 'squib/args/arg_loader'
-
-module Squib
-  # @api private
-  module Args
-
-    class Transform
-      include ArgLoader
-
-      def self.parameters
-        { angle: 0 }
-      end
-
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
-
-      def self.params_with_units
-        parameters.keys # all of them
-      end
-
-    end
-
-  end
+require 'squib/args/arg_loader'
+
+module Squib
+  # @api private
+  module Args
+
+    class Transform
+      include ArgLoader
+
+      def initialize(deck = nil)
+        @deck = deck
+      end
+
+      def self.parameters
+        { angle: 0,
+          crop_x: 0,
+          crop_y: 0,
+          crop_width: :native,
+          crop_height: :native,
+          crop_corner_radius: nil,
+          crop_corner_x_radius: 0,
+          crop_corner_y_radius: 0,
+          flip_vertical: false,
+          flip_horizontal: false,
+        }
+      end
+
+      def self.expanding_parameters
+        parameters.keys # all of them
+      end
+
+      def self.params_with_units
+        parameters.keys - [:flip_vertical, :flip_horizontal]
+      end
+
+      def validate_crop_width(arg, _i)
+        return arg if @deck.nil?
+        return @deck.width if arg == :deck
+        arg
+      end
+
+      def validate_crop_height(arg, _i)
+        return arg if @deck.nil?
+        return @deck.height if arg == :deck
+        arg
+      end
+
+      def validate_crop_corner_x_radius(arg, i)
+        return crop_corner_radius[i] unless crop_corner_radius[i].nil?
+        arg
+      end
+
+      def validate_crop_corner_y_radius(arg, i)
+        return crop_corner_radius[i] unless crop_corner_radius[i].nil?
+        arg
+      end
+
+    end
+
+  end
 end

data/lib/squib/args/typographer.rb

@@ -1,118 +1,118 @@
-require 'squib/constants'
-module Squib
-  #@api private
-  module Args
-    # Internal class for handling arguments
-    #@api private
-    class Typographer
-
-      def initialize(config = Conf::DEFAULTS)
-      %w(lsquote ldquote rsquote rdquote smart_quotes
-         em_dash en_dash ellipsis).each do |var|
-          instance_variable_set("@#{var}", config[var])
-        end
-      end
-
-      def process(str)
-        str = explicit_replacements(str.to_s)
-        str = smart_quotes(str) if @smart_quotes
-        str
-      end
-
-      def explicit_replacements(str)
-        [ :left_curly, :right_curly, :apostraphize,
-          :ellipsificate, :em_dash, :en_dash ].each do |sym|
-          str = each_non_tag(str) do |token|
-            self.method(sym).call(token)
-          end
-        end
-        str
-      end
-
-      def smart_quotes(str)
-        [ :single_inside_double_quote,
-          :right_double_quote,
-          :left_double_quote,
-          :right_single_quote,
-          :left_single_quote].each do |sym|
-          str = each_non_tag(str) do |token|
-            self.method(sym).call(token)
-          end
-        end
-        str
-      end
-
-      # Iterate over each non-tag for processing
-      # Allows us to ignore anything inside < and >
-      def each_non_tag(str)
-        full_str = ''
-        tag_delimit = /(<(?:(?!<).)*>)/ # use non-capturing group w/ negative lookahead
-        str.split(tag_delimit).each do |token|
-          if token.start_with? '<'
-            full_str << token # don't process tags
-          else
-            full_str << yield(token)
-          end
-        end
-        return full_str
-      end
-
-      # Straightforward replace
-      def left_curly(str)
-        str.gsub('``', @ldquote)
-      end
-
-      # Straightforward replace
-      def right_curly(str)
-        str.gsub(%{''}, @rdquote)
-      end
-
-      # A quote between two letters is an apostraphe
-      def apostraphize(str)
-        str.gsub(/(\w)(\')(\w)/, '\1' + @rsquote + '\3')
-      end
-
-      # Straightforward replace
-      def ellipsificate(str)
-        str.gsub('...', @ellipsis)
-      end
-
-      # Straightforward replace
-      def en_dash(str)
-        str.gsub('--', @en_dash)
-      end
-
-      # Straightforward replace
-      def em_dash(str)
-        str.gsub('---', @em_dash)
-      end
-
-      # Quote next to non-whitespace curls
-      def right_double_quote(str)
-        str.gsub(/(\S)(\")/, '\1' + @rdquote)
-      end
-
-      # Quote next to non-whitespace curls
-      def left_double_quote(str)
-        str.gsub(/(\")(\S)/, @ldquote + '\2')
-      end
-
-      # Handle the cases where a double quote is next to a single quote
-      def single_inside_double_quote(str)
-        str.gsub(/(\")(\')(\S)/, @ldquote + @lsquote + '\3')
-           .gsub(/(\")(\')(\S)/, '\1' + @rsquote + @rdquote)
-      end
-
-      # Quote next to non-whitespace curls
-      def right_single_quote(str)
-        str.gsub(/(\S)(\')/, '\1' + @rsquote)
-      end
-
-      # Quote next to non-whitespace curls
-      def left_single_quote(str)
-        str.gsub(/(\')(\S)/, @lsquote + '\2')
-      end
-
-    end
-  end
+require 'squib/constants'
+module Squib
+  #@api private
+  module Args
+    # Internal class for handling arguments
+    #@api private
+    class Typographer
+
+      def initialize(config = Conf::DEFAULTS)
+      %w(lsquote ldquote rsquote rdquote smart_quotes
+         em_dash en_dash ellipsis).each do |var|
+          instance_variable_set("@#{var}", config[var])
+        end
+      end
+
+      def process(str)
+        str = explicit_replacements(str.to_s)
+        str = smart_quotes(str) if @smart_quotes
+        str
+      end
+
+      def explicit_replacements(str)
+        [ :left_curly, :right_curly, :apostraphize,
+          :ellipsificate, :em_dash, :en_dash ].each do |sym|
+          str = each_non_tag(str) do |token|
+            self.method(sym).call(token)
+          end
+        end
+        str
+      end
+
+      def smart_quotes(str)
+        [ :single_inside_double_quote,
+          :right_double_quote,
+          :left_double_quote,
+          :right_single_quote,
+          :left_single_quote].each do |sym|
+          str = each_non_tag(str) do |token|
+            self.method(sym).call(token)
+          end
+        end
+        str
+      end
+
+      # Iterate over each non-tag for processing
+      # Allows us to ignore anything inside < and >
+      def each_non_tag(str)
+        full_str = ''
+        tag_delimit = /(<(?:(?!<).)*>)/ # use non-capturing group w/ negative lookahead
+        str.split(tag_delimit).each do |token|
+          if token.start_with? '<'
+            full_str << token # don't process tags
+          else
+            full_str << yield(token)
+          end
+        end
+        return full_str
+      end
+
+      # Straightforward replace
+      def left_curly(str)
+        str.gsub('``', @ldquote)
+      end
+
+      # Straightforward replace
+      def right_curly(str)
+        str.gsub(%{''}, @rdquote)
+      end
+
+      # A quote between two letters is an apostraphe
+      def apostraphize(str)
+        str.gsub(/(\w)(\')(\w)/, '\1' + @rsquote + '\3')
+      end
+
+      # Straightforward replace
+      def ellipsificate(str)
+        str.gsub('...', @ellipsis)
+      end
+
+      # Straightforward replace
+      def en_dash(str)
+        str.gsub('--', @en_dash)
+      end
+
+      # Straightforward replace
+      def em_dash(str)
+        str.gsub('---', @em_dash)
+      end
+
+      # Quote next to non-whitespace curls
+      def right_double_quote(str)
+        str.gsub(/(\S)(\")/, '\1' + @rdquote)
+      end
+
+      # Quote next to non-whitespace curls
+      def left_double_quote(str)
+        str.gsub(/(\")(\S)/, @ldquote + '\2')
+      end
+
+      # Handle the cases where a double quote is next to a single quote
+      def single_inside_double_quote(str)
+        str.gsub(/(\")(\')(\S)/, @ldquote + @lsquote + '\3')
+           .gsub(/(\")(\')(\S)/, '\1' + @rsquote + @rdquote)
+      end
+
+      # Quote next to non-whitespace curls
+      def right_single_quote(str)
+        str.gsub(/(\S)(\')/, '\1' + @rsquote)
+      end
+
+      # Quote next to non-whitespace curls
+      def left_single_quote(str)
+        str.gsub(/(\')(\S)/, @lsquote + '\2')
+      end
+
+    end
+  end
 end

data/lib/squib/card.rb

@@ -1,67 +1,66 @@
-require 'cairo'
-require 'squib/graphics/cairo_context_wrapper'
-
-module Squib
-  # Back end graphics. Private.
-  class Card
-
-    # :nodoc:
-    # @api private
-    attr_reader :width, :height, :backend, :svgfile, :index
-
-    # :nodoc:
-    # @api private
-    attr_accessor :cairo_surface, :cairo_context
-
-    # :nodoc:
-    # @api private
-    def initialize(deck, width, height, index=-1)
-      @deck          = deck
-      @width         = width
-      @height        = height
-      @backend       = deck.backend
-      @index         = index
-      @svgfile       = "#{deck.dir}/#{deck.prefix}#{deck.count_format % index}.svg"
-      @cairo_surface = make_surface(@svgfile, @backend)
-      @cairo_context = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(@cairo_surface))
-      @cairo_context.antialias = deck.antialias
-    end
-
-    # :nodoc:
-    # @api private
-    def make_surface(svgfile, backend)
-      case backend.downcase.to_sym
-      when :memory
-        Cairo::ImageSurface.new(@width, @height)
-      when :svg
-        Dir.mkdir @deck.dir unless Dir.exists?(@deck.dir)
-        Cairo::SVGSurface.new(svgfile, @width, @height)
-      else
-        Squib.logger.fatal "Back end not recognized: '#{backend}'"
-        abort
-      end
-    end
-
-
-  # A save/restore wrapper for using Cairo
-  # :nodoc:
-  # @api private
-    def use_cairo(&block)
-      @cairo_context.save
-      block.yield(@cairo_context)
-      @cairo_context.restore
-    end
-
-    ########################
-    ### 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'
-
-  end
-end
+require 'cairo'
+require 'squib/graphics/cairo_context_wrapper'
+
+module Squib
+  # Back end graphics. Private.
+  class Card
+
+    # :nodoc:
+    # @api private
+    attr_reader :width, :height, :backend, :svgfile, :index
+
+    # :nodoc:
+    # @api private
+    attr_accessor :cairo_surface, :cairo_context
+
+    # :nodoc:
+    # @api private
+    def initialize(deck, width, height, index=-1)
+      @deck          = deck
+      @width         = width
+      @height        = height
+      @backend       = deck.backend
+      @index         = index
+      @svgfile       = "#{deck.dir}/#{deck.prefix}#{deck.count_format % index}.svg"
+      @cairo_surface = make_surface(@svgfile, @backend)
+      @cairo_context = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(@cairo_surface))
+      @cairo_context.antialias = deck.antialias
+    end
+
+    # :nodoc:
+    # @api private
+    def make_surface(svgfile, backend)
+      case backend.downcase.to_sym
+      when :memory
+        Cairo::ImageSurface.new(@width, @height)
+      when :svg
+        Dir.mkdir @deck.dir unless Dir.exists?(@deck.dir)
+        Cairo::SVGSurface.new(svgfile, @width, @height)
+      else
+        Squib.logger.fatal "Back end not recognized: '#{backend}'"
+        abort
+      end
+    end
+
+  # A save/restore wrapper for using Cairo
+  # :nodoc:
+  # @api private
+    def use_cairo(&block)
+      @cairo_context.save
+      block.yield(@cairo_context)
+      @cairo_context.restore
+    end
+
+    ########################
+    ### 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'
+
+  end
+end