squib 0.18.0 → 0.19.0a

data/lib/squib/args/draw.rb

@@ -1,93 +1,93 @@
-require 'cairo'
-require_relative 'arg_loader'
-require_relative 'color_validator'
-
-module Squib::Args
-
-  module_function def extract_draw(opts, deck, dsl_method_defaults = {})
-    Draw.new(deck.custom_colors, dsl_method_defaults).extract!(opts, deck)
-  end
-
-  class Draw
-    include ArgLoader
-    include ColorValidator
-
-    def initialize(custom_colors, dsl_method_defaults = {})
-      @custom_colors = custom_colors
-      @dsl_method_defaults = dsl_method_defaults
-    end
-
-    def self.parameters
-      { color: :black,
-        fill_color: '#0000',
-        stroke_color: :black,
-        stroke_width: 2.0,
-        stroke_strategy: :fill_first,
-        join: :miter,
-        cap: 'butt',
-        dash: ''
-      }
-    end
-
-    def self.expanding_parameters
-      parameters.keys # all of them are expandable
-    end
-
-    def self.params_with_units
-      [:stroke_width]
-    end
-
-    def validate_join(arg, _i)
-      case arg.to_s.strip.downcase
-      when 'miter'
-        Cairo::LINE_JOIN_MITER
-      when 'round'
-        Cairo::LINE_JOIN_ROUND
-      when 'bevel'
-        Cairo::LINE_JOIN_BEVEL
-      end
-    end
-
-    def validate_cap(arg, _i)
-      case arg.to_s.strip.downcase
-      when 'butt'
-        Cairo::LINE_CAP_BUTT
-      when 'round'
-        Cairo::LINE_CAP_ROUND
-      when 'square'
-        Cairo::LINE_CAP_SQUARE
-      end
-    end
-
-    def validate_dash(arg, _i)
-      arg.to_s.split.collect do |x|
-        UnitConversion.parse(x, @dpi, @cell_px).to_f
-      end
-    end
-
-    def validate_fill_color(arg, _i)
-      colorify(arg, @custom_colors)
-    end
-
-    def validate_stroke_color(arg, _i)
-      colorify(arg, @custom_colors)
-    end
-
-    def validate_color(arg, _i)
-      colorify(arg, @custom_colors)
-    end
-
-    def validate_stroke_strategy(arg, _i)
-      case arg.to_s.downcase.strip
-      when 'fill_first'
-        :fill_first
-      when 'stroke_first'
-        :stroke_first
-      else
-        raise "Only 'stroke_first' or 'fill_first' allowed"
-      end
-    end
-
-  end
-
-end
+require 'cairo'
+require_relative 'arg_loader'
+require_relative 'color_validator'
+
+module Squib::Args
+
+  module_function def extract_draw(opts, deck, dsl_method_defaults = {})
+    Draw.new(deck.custom_colors, dsl_method_defaults).extract!(opts, deck)
+  end
+
+  class Draw
+    include ArgLoader
+    include ColorValidator
+
+    def initialize(custom_colors, dsl_method_defaults = {})
+      @custom_colors = custom_colors
+      @dsl_method_defaults = dsl_method_defaults
+    end
+
+    def self.parameters
+      { color: :black,
+        fill_color: '#0000',
+        stroke_color: :black,
+        stroke_width: 2.0,
+        stroke_strategy: :fill_first,
+        join: :miter,
+        cap: 'butt',
+        dash: ''
+      }
+    end
+
+    def self.expanding_parameters
+      parameters.keys # all of them are expandable
+    end
+
+    def self.params_with_units
+      [:stroke_width]
+    end
+
+    def validate_join(arg, _i)
+      case arg.to_s.strip.downcase
+      when 'miter'
+        Cairo::LINE_JOIN_MITER
+      when 'round'
+        Cairo::LINE_JOIN_ROUND
+      when 'bevel'
+        Cairo::LINE_JOIN_BEVEL
+      end
+    end
+
+    def validate_cap(arg, _i)
+      case arg.to_s.strip.downcase
+      when 'butt'
+        Cairo::LINE_CAP_BUTT
+      when 'round'
+        Cairo::LINE_CAP_ROUND
+      when 'square'
+        Cairo::LINE_CAP_SQUARE
+      end
+    end
+
+    def validate_dash(arg, _i)
+      arg.to_s.split.collect do |x|
+        UnitConversion.parse(x, @dpi, @cell_px).to_f
+      end
+    end
+
+    def validate_fill_color(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+    def validate_stroke_color(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+    def validate_color(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+    def validate_stroke_strategy(arg, _i)
+      case arg.to_s.downcase.strip
+      when 'fill_first'
+        :fill_first
+      when 'stroke_first'
+        :stroke_first
+      else
+        raise "Only 'stroke_first' or 'fill_first' allowed"
+      end
+    end
+
+  end
+
+end

data/lib/squib/args/drop_shadow.rb

@@ -1,39 +1,39 @@
-require_relative 'color_validator'
-
-module Squib::Args
-  module_function def extract_drop_shadow(opts, deck)
-    DropShadow.new(deck.custom_colors).extract! opts, deck
-  end
-
-  class DropShadow
-    include ArgLoader
-    include ColorValidator
-
-    def initialize(custom_colors)
-      @custom_colors = custom_colors
-    end
-
-    def self.parameters
-      {
-        shadow_color: :black,
-        shadow_offset_x: 3,
-        shadow_offset_y: 3,
-        shadow_radius: nil,
-        shadow_trim: 0,
-      }
-    end
-
-    def self.expanding_parameters
-      self.parameters.keys # all of them
-    end
-
-    def self.params_with_units
-      [:shadow_offset_x, :shadow_offset_y, :shadow_radius, :shadow_trim]
-    end
-
-    def validate_shadow_color(arg, _i)
-      colorify(arg, @custom_colors)
-    end
-
-  end
-end
+require_relative 'color_validator'
+
+module Squib::Args
+  module_function def extract_drop_shadow(opts, deck)
+    DropShadow.new(deck.custom_colors).extract! opts, deck
+  end
+
+  class DropShadow
+    include ArgLoader
+    include ColorValidator
+
+    def initialize(custom_colors)
+      @custom_colors = custom_colors
+    end
+
+    def self.parameters
+      {
+        shadow_color: :black,
+        shadow_offset_x: 3,
+        shadow_offset_y: 3,
+        shadow_radius: nil,
+        shadow_trim: 0,
+      }
+    end
+
+    def self.expanding_parameters
+      self.parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      [:shadow_offset_x, :shadow_offset_y, :shadow_radius, :shadow_trim]
+    end
+
+    def validate_shadow_color(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+  end
+end

data/lib/squib/args/embed_adjust.rb

@@ -1,22 +1,22 @@
-require_relative 'arg_loader'
-
-module Squib::Args
-
-  class EmbedAdjust
-    include ArgLoader
-
-    def self.parameters
-      { dx: 0, dy: 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_relative 'arg_loader'
+
+module Squib::Args
+
+  class EmbedAdjust
+    include ArgLoader
+
+    def self.parameters
+      { dx: 0, dy: 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

data/lib/squib/args/embed_key.rb

@@ -1,12 +1,12 @@
-require_relative 'arg_loader'
-
-module Squib::Args
-  class EmbedKey
-
-    # Validate the embed lookup key
-    def validate_key(str)
-      str.to_s
-    end
-    
-  end
-end
+require_relative 'arg_loader'
+
+module Squib::Args
+  class EmbedKey
+
+    # Validate the embed lookup key
+    def validate_key(str)
+      str.to_s
+    end
+    
+  end
+end

data/lib/squib/args/hand_special.rb

@@ -1,37 +1,37 @@
-require 'cairo'
-
-module Squib::Args
-  module_function def extract_hand_special(opts, deck)
-    HandSpecial.new(deck.height).extract! opts, deck
-  end
-
-  class HandSpecial
-    include ArgLoader
-
-    def initialize(card_height)
-      @card_height = card_height
-    end
-
-    def self.parameters
-      {
-        angle_range: (Math::PI / -4.0)..(Math::PI / 4),
-        radius: :auto
-      }
-    end
-
-    def self.expanding_parameters
-      [] # none of them
-    end
-
-    def self.params_with_units
-      [ :radius ]
-    end
-
-    def validate_radius(arg)
-      return 0.3 * @card_height if arg.to_s.downcase.strip == 'auto'
-      arg
-    end
-
-  end
-
-end
+require 'cairo'
+
+module Squib::Args
+  module_function def extract_hand_special(opts, deck)
+    HandSpecial.new(deck.height).extract! opts, deck
+  end
+
+  class HandSpecial
+    include ArgLoader
+
+    def initialize(card_height)
+      @card_height = card_height
+    end
+
+    def self.parameters
+      {
+        angle_range: (Math::PI / -4.0)..(Math::PI / 4),
+        radius: :auto
+      }
+    end
+
+    def self.expanding_parameters
+      [] # none of them
+    end
+
+    def self.params_with_units
+      [ :radius ]
+    end
+
+    def validate_radius(arg)
+      return 0.3 * @card_height if arg.to_s.downcase.strip == 'auto'
+      arg
+    end
+
+  end
+
+end

data/lib/squib/args/import.rb

@@ -1,67 +1,67 @@
-module Squib::Args
-  module_function def extract_import(opts)
-    # note how we don't use ArgLoader here because it's way more complex than
-    # what we need here. Don't need layouts or singleton expansion, so...
-    # ...let's just do it ourselves.
-    Import.parameters.each  { |p, value| opts[p] = value unless opts.key? p }
-    return Import.new.load! opts
-  end
-
-  class Import
-    
-    def self.parameters
-      { 
-        data: nil,
-        explode: 'qty',
-        file: nil,
-        sheet: 0,
-        strip: true,
-      }
-    end
-
-    attr_accessor *(self.parameters.keys)
-
-    def self.expanding_parameters
-      [] # none of them
-    end
-
-    def self.params_with_units
-      [] # none of them
-    end
-
-    def load!(opts)
-      @strip   = validate_strip   opts[:strip]
-      @explode = validate_explode opts[:explode]
-      @file    = validate_file    opts[:file]
-      @data    = validate_data    opts[:data]
-      @sheet   = opts[:sheet]
-      return self
-    end
-
-    def validate_strip(arg)
-      raise 'Strip must be true or false' unless arg == true || arg == false
-      arg
-    end
-
-    def validate_explode(arg)
-      arg.to_s
-    end
-
-    def validate_file(arg)
-      return nil if arg.nil?
-      raise "File #{File.expand_path(arg)} does not exist!" unless File.exists?(arg)
-      File.expand_path(arg)
-    end
-
-    def strip?
-      strip
-    end
-
-    def validate_data(arg)
-      return nil if arg.nil?
-      arg.to_s
-    end
-
-  end
-
-end
+module Squib::Args
+  module_function def extract_import(opts)
+    # note how we don't use ArgLoader here because it's way more complex than
+    # what we need here. Don't need layouts or singleton expansion, so...
+    # ...let's just do it ourselves.
+    Import.parameters.each  { |p, value| opts[p] = value unless opts.key? p }
+    return Import.new.load! opts
+  end
+
+  class Import
+
+    def self.parameters
+      {
+        data: nil,
+        explode: 'qty',
+        file: nil,
+        sheet: 0,
+        strip: true,
+      }
+    end
+
+    attr_accessor *(self.parameters.keys)
+
+    def self.expanding_parameters
+      [] # none of them
+    end
+
+    def self.params_with_units
+      [] # none of them
+    end
+
+    def load!(opts)
+      @strip   = validate_strip   opts[:strip]
+      @explode = validate_explode opts[:explode]
+      @file    = validate_file    opts[:file]
+      @data    = validate_data    opts[:data]
+      @sheet   = opts[:sheet]
+      return self
+    end
+
+    def validate_strip(arg)
+      raise 'Strip must be true or false' unless arg == true || arg == false
+      arg
+    end
+
+    def validate_explode(arg)
+      arg.to_s
+    end
+
+    def validate_file(arg)
+      return nil if arg.nil?
+      raise "File #{File.expand_path(arg)} does not exist!" unless File.exist?(arg)
+      File.expand_path(arg)
+    end
+
+    def strip?
+      strip
+    end
+
+    def validate_data(arg)
+      return nil if arg.nil?
+      arg.to_s
+    end
+
+  end
+
+end

data/lib/squib/args/input_file.rb

@@ -1,55 +1,55 @@
-require_relative 'arg_loader'
-
-module Squib::Args
-  module_function def extract_input_file(opts, deck, dsl_method_default = {})
-    InputFile.new(dsl_method_default).extract!(opts, deck)
-  end
-
-  class InputFile
-    include ArgLoader
-
-    def initialize(dsl_method_default = {})
-      @dsl_method_default = dsl_method_default
-    end
-
-    def self.parameters
-      {
-        file: nil,
-        placeholder: nil
-      }
-    end
-
-    def self.expanding_parameters
-      parameters.keys # all of them
-    end
-
-    def self.params_with_units
-      [] # none of them
-    end
-
-    def validate_file(arg, i)
-      return nil if arg.nil?
-      return File.expand_path(arg) if File.exists?(arg)
-      return File.expand_path(placeholder[i]) if File.exists?(placeholder[i].to_s)
-
-      case deck_conf.img_missing.to_sym
-      when :error
-        raise "File #{File.expand_path(arg)} does not exist!"
-      when :warn
-        Squib.logger.warn "File #{File.expand_path(arg)} does not exist!"
-      end
-      return nil # the silent option - as if nil in the first place
-    end
-
-    def validate_placeholder(arg, _i)
-      # What if they specify placeholder, but it doesn't exist?
-      # ...always warn... that's probably a mistake they made
-      unless arg.nil? || File.exists?(arg)
-        msg = "Image placeholder #{File.expand_path(arg)} does not exist!"
-        Squib.logger.warn msg
-        return nil
-      end
-      return arg
-    end
-  end
-end
+require_relative 'arg_loader'
+
+module Squib::Args
+  module_function def extract_input_file(opts, deck, dsl_method_default = {})
+    InputFile.new(dsl_method_default).extract!(opts, deck)
+  end
+
+  class InputFile
+    include ArgLoader
+
+    def initialize(dsl_method_default = {})
+      @dsl_method_default = dsl_method_default
+    end
+
+    def self.parameters
+      {
+        file: nil,
+        placeholder: nil
+      }
+    end
+
+    def self.expanding_parameters
+      parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      [] # none of them
+    end
+
+    def validate_file(arg, i)
+      return nil if arg.nil?
+      return File.expand_path(arg) if File.exist?(arg)
+      return File.expand_path(placeholder[i]) if File.exist?(placeholder[i].to_s)
+
+      case deck_conf.img_missing.to_sym
+      when :error
+        raise "File #{File.expand_path(arg)} does not exist!"
+      when :warn
+        Squib.logger.warn "File #{File.expand_path(arg)} does not exist!"
+      end
+      return nil # the silent option - as if nil in the first place
+    end
+
+    def validate_placeholder(arg, _i)
+      # What if they specify placeholder, but it doesn't exist?
+      # ...always warn... that's probably a mistake they made
+      unless arg.nil? || File.exist?(arg)
+        msg = "Image placeholder #{File.expand_path(arg)} does not exist!"
+        Squib.logger.warn msg
+        return nil
+      end
+      return arg
+    end
+  end
+end