squib 0.18.0 → 0.19.0a

data/lib/squib/args/paint.rb

@@ -1,43 +1,43 @@
-require 'cairo'
-require_relative 'arg_loader'
-require_relative 'color_validator'
-
-module Squib::Args
-  module_function def extract_paint(opts, deck)
-    Paint.new(deck.custom_colors).extract!(opts, deck)
-  end
-  
-  class Paint
-    include ArgLoader
-    include ColorValidator
-
-    def initialize(custom_colors)
-      @custom_colors = custom_colors
-    end
-
-    def self.parameters
-      { alpha: 1.0,
-        blend: :none,
-        mask:  nil,
-      }
-    end
-
-    def self.expanding_parameters
-      parameters.keys # all of them are expandable
-    end
-
-    def self.params_with_units
-      []
-    end
-
-    def validate_alpha(arg, _i)
-      raise 'alpha must respond to to_f' unless arg.respond_to? :to_f
-      arg.to_f
-    end
-
-    def validate_mask(arg, _i)
-      colorify(arg, @custom_colors)
-    end
-
-  end
-end
+require 'cairo'
+require_relative 'arg_loader'
+require_relative 'color_validator'
+
+module Squib::Args
+  module_function def extract_paint(opts, deck)
+    Paint.new(deck.custom_colors).extract!(opts, deck)
+  end
+  
+  class Paint
+    include ArgLoader
+    include ColorValidator
+
+    def initialize(custom_colors)
+      @custom_colors = custom_colors
+    end
+
+    def self.parameters
+      { alpha: 1.0,
+        blend: :none,
+        mask:  nil,
+      }
+    end
+
+    def self.expanding_parameters
+      parameters.keys # all of them are expandable
+    end
+
+    def self.params_with_units
+      []
+    end
+
+    def validate_alpha(arg, _i)
+      raise 'alpha must respond to to_f' unless arg.respond_to? :to_f
+      arg.to_f
+    end
+
+    def validate_mask(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+  end
+end

data/lib/squib/args/paragraph.rb

@@ -1,118 +1,118 @@
-require_relative '../constants'
-require_relative 'arg_loader'
-
-module Squib::Args
-
-  module_function def extract_para(opts, deck, dsl_method_defaults = {})
-    Paragraph.new(deck.font).extract!(opts, deck)
-  end
-
-  class Paragraph
-    include ArgLoader
-
-    def self.parameters
-      { align:     :left,
-        str:       'Hello, World!',
-        font:      :use_set,
-        font_size: nil,
-        markup:    false,
-        justify:   false,
-        wrap:      true,
-        ellipsize: :end,
-        spacing:   nil,
-        valign:    :top,
-        hint:      :off
-      }
-    end
-
-    def self.expanding_parameters
-      parameters.keys # all of them
-    end
-
-    def self.params_with_units
-      [] # none of them
-    end
-
-    def initialize(deck_font)
-      @deck_font = deck_font
-    end
-
-    def validate_str(arg, _i)
-      arg.to_s
-    end
-
-    def validate_font(arg, _i)
-      arg = @deck_font if arg == :use_set
-      arg = Squib::DEFAULT_FONT if arg == :default
-      arg
-    end
-
-    def validate_align(arg, _i)
-      case arg.to_s.downcase.strip
-      when 'left'
-        Pango::Alignment::LEFT
-      when 'right'
-        Pango::Alignment::RIGHT
-      when 'center'
-        Pango::Alignment::CENTER
-      else
-        raise ArgumentError, 'align must be one of: center, left, right'
-      end
-    end
-
-    def validate_wrap(arg, _i)
-      case arg.to_s.downcase.strip
-      when 'word'
-        Pango::WrapMode::WORD
-      when 'char', 'false'
-        Pango::WrapMode::CHAR
-      when 'word_char', 'true'
-        Pango::WrapMode::WORD_CHAR
-      else
-        raise ArgumentError, 'wrap must be one of: word, char, word_char, true, or false'
-      end
-    end
-
-    def validate_ellipsize(arg, _i)
-      case arg.to_s.downcase.strip
-      when 'none', 'false'
-        Pango::EllipsizeMode::NONE
-      when 'start'
-        Pango::EllipsizeMode::START
-      when 'middle'
-        Pango::EllipsizeMode::MIDDLE
-      when 'end', 'true'
-        Pango::EllipsizeMode::END
-      when 'autoscale'
-        :autoscale
-      else
-        raise ArgumentError, 'ellipsize must be one of: none, start, middle, end, true, false or autoscale'
-      end
-    end
-
-    def validate_justify(arg, _i)
-      case arg
-      when nil, true, false
-        arg
-      else
-        raise ArgumentError, 'justify must be one of: nil, true, or false'
-      end
-    end
-
-    def validate_spacing(arg, _i)
-      return nil if arg.nil?
-      raise ArgumentError, 'spacing must be a number or nil' unless arg.respond_to? :to_f
-      arg.to_f * Pango::SCALE
-    end
-
-    def validate_valign(arg, _i)
-      if %w(top middle bottom).include? arg.to_s.downcase
-        arg.to_s.downcase
-      else
-        raise ArgumentError, 'valign must be one of: top, middle, bottom'
-      end
-    end
-
-  end
-
-end
+require_relative '../constants'
+require_relative 'arg_loader'
+
+module Squib::Args
+
+  module_function def extract_para(opts, deck, dsl_method_defaults = {})
+    Paragraph.new(deck.font).extract!(opts, deck)
+  end
+
+  class Paragraph
+    include ArgLoader
+
+    def self.parameters
+      { align:     :left,
+        str:       'Hello, World!',
+        font:      :use_set,
+        font_size: nil,
+        markup:    false,
+        justify:   false,
+        wrap:      true,
+        ellipsize: :end,
+        spacing:   nil,
+        valign:    :top,
+        hint:      :off
+      }
+    end
+
+    def self.expanding_parameters
+      parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      [] # none of them
+    end
+
+    def initialize(deck_font)
+      @deck_font = deck_font
+    end
+
+    def validate_str(arg, _i)
+      arg.to_s
+    end
+
+    def validate_font(arg, _i)
+      arg = @deck_font if arg == :use_set
+      arg = Squib::DEFAULT_FONT if arg == :default
+      arg
+    end
+
+    def validate_align(arg, _i)
+      case arg.to_s.downcase.strip
+      when 'left'
+        Pango::Alignment::LEFT
+      when 'right'
+        Pango::Alignment::RIGHT
+      when 'center'
+        Pango::Alignment::CENTER
+      else
+        raise ArgumentError, 'align must be one of: center, left, right'
+      end
+    end
+
+    def validate_wrap(arg, _i)
+      case arg.to_s.downcase.strip
+      when 'word'
+        Pango::WrapMode::WORD
+      when 'char', 'false'
+        Pango::WrapMode::CHAR
+      when 'word_char', 'true'
+        Pango::WrapMode::WORD_CHAR
+      else
+        raise ArgumentError, 'wrap must be one of: word, char, word_char, true, or false'
+      end
+    end
+
+    def validate_ellipsize(arg, _i)
+      case arg.to_s.downcase.strip
+      when 'none', 'false'
+        Pango::EllipsizeMode::NONE
+      when 'start'
+        Pango::EllipsizeMode::START
+      when 'middle'
+        Pango::EllipsizeMode::MIDDLE
+      when 'end', 'true'
+        Pango::EllipsizeMode::END
+      when 'autoscale'
+        :autoscale
+      else
+        raise ArgumentError, 'ellipsize must be one of: none, start, middle, end, true, false or autoscale'
+      end
+    end
+
+    def validate_justify(arg, _i)
+      case arg
+      when nil, true, false
+        arg
+      else
+        raise ArgumentError, 'justify must be one of: nil, true, or false'
+      end
+    end
+
+    def validate_spacing(arg, _i)
+      return nil if arg.nil?
+      raise ArgumentError, 'spacing must be a number or nil' unless arg.respond_to? :to_f
+      arg.to_f * Pango::SCALE
+    end
+
+    def validate_valign(arg, _i)
+      if %w(top middle bottom).include? arg.to_s.downcase
+        arg.to_s.downcase
+      else
+        raise ArgumentError, 'valign must be one of: top, middle, bottom'
+      end
+    end
+
+  end
+
+end

data/lib/squib/args/save_batch.rb

@@ -1,65 +1,65 @@
-require_relative 'arg_loader'
-require_relative 'dir_validator'
-
-module Squib::Args
-  module_function def extract_save_batch(opts, deck)
-    SaveBatch.new.extract! opts, deck
-  end
-
-  class SaveBatch
-    include ArgLoader
-    include DirValidator
-
-    def initialize
-    end
-
-    def self.parameters
-      {
-        angle: 0,
-        count_format: '%02d',
-        dir: '_output',
-        prefix: 'card_',
-        rotate: false,
-        suffix: '',
-        trim_radius: 0,
-        trim: 0,
-      }
-    end
-
-    def self.expanding_parameters
-      self.parameters.keys # all of them
-    end
-
-    def self.params_with_units
-      [:trim, :trim_radius]
-    end
-
-    def validate_dir(arg, _i)
-      ensure_dir_created(arg)
-    end
-
-    def validate_rotate(arg, i)
-      case arg
-      when true, :clockwise
-        angle[i] = 0.5 * Math::PI
-        return true
-      when :counterclockwise
-        angle[i] = 1.5 * Math::PI
-        return true
-      when false
-        false
-      else
-        raise 'invalid option to rotate: only [true, false, :clockwise, :counterclockwise]'
-      end
-    end
-
-    def full_filename(i)
-      "#{dir[i]}/#{prefix[i]}#{count_format[i] % i}#{suffix[i]}.png"
-    end
-
-    def summary
-      "#{dir[0]}/#{prefix[0]}_*#{suffix[0]}"
-    end
-
-  end
-end
+require_relative 'arg_loader'
+require_relative 'dir_validator'
+
+module Squib::Args
+  module_function def extract_save_batch(opts, deck)
+    SaveBatch.new.extract! opts, deck
+  end
+
+  class SaveBatch
+    include ArgLoader
+    include DirValidator
+
+    def initialize
+    end
+
+    def self.parameters
+      {
+        angle: 0,
+        count_format: '%02d',
+        dir: '_output',
+        prefix: 'card_',
+        rotate: false,
+        suffix: '',
+        trim_radius: 0,
+        trim: 0,
+      }
+    end
+
+    def self.expanding_parameters
+      self.parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      [:trim, :trim_radius]
+    end
+
+    def validate_dir(arg, _i)
+      ensure_dir_created(arg)
+    end
+
+    def validate_rotate(arg, i)
+      case arg
+      when true, :clockwise
+        angle[i] = 0.5 * Math::PI
+        return true
+      when :counterclockwise
+        angle[i] = 1.5 * Math::PI
+        return true
+      when false
+        false
+      else
+        raise 'invalid option to rotate: only [true, false, :clockwise, :counterclockwise]'
+      end
+    end
+
+    def full_filename(i)
+      "#{dir[i]}/#{prefix[i]}#{count_format[i] % i}#{suffix[i]}.png"
+    end
+
+    def summary
+      "#{dir[0]}/#{prefix[0]}_*#{suffix[0]}"
+    end
+
+  end
+end

data/lib/squib/args/scale_box.rb

@@ -1,57 +1,57 @@
-require_relative 'arg_loader'
-require_relative 'xywh_shorthands'
-
-module Squib::Args
-  module_function def extract_scale_box(opts, deck)
-    ScaleBox.new.extract!(opts, deck)
-  end
-
-  class ScaleBox
-    include ArgLoader
-    include XYWHShorthands
-
-    def self.parameters
-      {
-        x: 0, y: 0,
-        width: :native, height: :native
-      }
-    end
-
-    def self.expanding_parameters
-      parameters.keys # all of them
-    end
-
-    def self.params_with_units
-      parameters.keys # all of them
-    end
-
-    def validate_x(arg, i) apply_shorthands(arg, @deck, axis: :x) end
-    def validate_y(arg,_i) apply_shorthands(arg, @deck, axis: :y) end
-
-    def validate_width(arg, i)
-      return @deck.width if arg.to_s == 'deck'
-      return :native     if arg.to_s == 'native'
-      arg = apply_shorthands(arg, @deck, axis: :x)
-      return arg         if arg.respond_to? :to_f
-      if arg.to_s == 'scale'
-        raise 'if width is :scale, height must be a number' unless height[i].respond_to? :to_f
-        return arg
-      end
-      raise 'width must be a number, :scale, :native, or :deck'
-    end
-
-    def validate_height(arg, i)
-      return @deck.height if arg.to_s == 'deck'
-      return :native      if arg.to_s == 'native'
-      arg = apply_shorthands(arg, @deck, axis: :y)
-      return arg          if arg.respond_to? :to_f
-      if arg.to_s == 'scale'
-        raise 'if height is \'scale\', width must be a number' unless width[i].respond_to? :to_f
-        return arg
-      end
-      raise 'height must be a number, :scale, :native, or :deck'
-    end
-
-  end
-
-end
+require_relative 'arg_loader'
+require_relative 'xywh_shorthands'
+
+module Squib::Args
+  module_function def extract_scale_box(opts, deck)
+    ScaleBox.new.extract!(opts, deck)
+  end
+
+  class ScaleBox
+    include ArgLoader
+    include XYWHShorthands
+
+    def self.parameters
+      {
+        x: 0, y: 0,
+        width: :native, height: :native
+      }
+    end
+
+    def self.expanding_parameters
+      parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      parameters.keys # all of them
+    end
+
+    def validate_x(arg, i) apply_shorthands(arg, @deck, axis: :x) end
+    def validate_y(arg,_i) apply_shorthands(arg, @deck, axis: :y) end
+
+    def validate_width(arg, i)
+      return @deck.width if arg.to_s == 'deck'
+      return :native     if arg.to_s == 'native'
+      arg = apply_shorthands(arg, @deck, axis: :x)
+      return arg         if arg.respond_to? :to_f
+      if arg.to_s == 'scale'
+        raise 'if width is :scale, height must be a number' unless height[i].respond_to? :to_f
+        return arg
+      end
+      raise 'width must be a number, :scale, :native, or :deck'
+    end
+
+    def validate_height(arg, i)
+      return @deck.height if arg.to_s == 'deck'
+      return :native      if arg.to_s == 'native'
+      arg = apply_shorthands(arg, @deck, axis: :y)
+      return arg          if arg.respond_to? :to_f
+      if arg.to_s == 'scale'
+        raise 'if height is \'scale\', width must be a number' unless width[i].respond_to? :to_f
+        return arg
+      end
+      raise 'height must be a number, :scale, :native, or :deck'
+    end
+
+  end
+
+end