squib 0.15.0 → 0.16.0.pre.preview2

data/lib/squib/args/embed_adjust.rb

@@ -1,25 +1,22 @@
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
+module Squib::Args
 
-    class EmbedAdjust
-      include ArgLoader
+  class EmbedAdjust
+    include ArgLoader
 
-      def self.parameters
-        { dx: 0, dy: 0 }
-      end
-
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
+    def self.parameters
+      { dx: 0, dy: 0 }
+    end
 
-      def self.params_with_units
-        parameters.keys # all of them
-      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,17 +1,12 @@
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
-
-    class EmbedKey
-
-      # Validate the embed lookup key
-      def validate_key(str)
-        str.to_s
-      end
+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
-  # @api private
-  module Args
-
-    class HandSpecial
-      include ArgLoader
+module Squib::Args
+  module_function def extract_hand_special(opts, deck)
+    HandSpecial.new(deck.height).extract! opts, deck
+  end
 
-      def initialize(card_height)
-        @card_height = card_height
-      end
+  class HandSpecial
+    include ArgLoader
 
-      def self.parameters
-        {
-          angle_range: (Math::PI / -4.0)..(Math::PI / 4),
-          radius: :auto
-        }
-      end
+    def initialize(card_height)
+      @card_height = card_height
+    end
 
-      def self.expanding_parameters
-        [] # none of them
-      end
+    def self.parameters
+      {
+        angle_range: (Math::PI / -4.0)..(Math::PI / 4),
+        radius: :auto
+      }
+    end
 
-      def self.params_with_units
-        [ :radius ]
-      end
+    def self.expanding_parameters
+      [] # none of them
+    end
 
-      def validate_radius(arg)
-        return 0.3 * @card_height if arg.to_s.downcase.strip == 'auto'
-        arg
-      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,40 +1,67 @@
-require_relative 'arg_loader'
+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
 
-module Squib
-  # @api private
-  module Args
+  class Import
+    
+    def self.parameters
+      { 
+        data: nil,
+        explode: 'qty',
+        file: nil,
+        sheet: 0,
+        strip: true,
+      }
+    end
 
-    class Import
-      include ArgLoader
+    attr_accessor *(self.parameters.keys)
 
-      def self.parameters
-        { strip: true,
-          explode: 'qty'
-        }
-      end
+    def self.expanding_parameters
+      [] # none of them
+    end
 
-      def self.expanding_parameters
-        [] # none of them
-      end
+    def self.params_with_units
+      [] # 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_strip(arg)
+      raise 'Strip must be true or false' unless arg == true || arg == false
+      arg
+    end
 
-      def validate_explode(arg)
-        arg
-      end
+    def validate_explode(arg)
+      arg.to_s
+    end
 
-      def strip?
-        strip
-      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

data/lib/squib/args/input_file.rb

@@ -1,37 +1,33 @@
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
-
-    class InputFile
-      include ArgLoader
-
-      def initialize(dsl_method_default = {})
-        @dsl_method_default = dsl_method_default
-      end
+module Squib::Args
+  module_function def extract_input_file(opts, deck, dsl_method_default = {})
+    InputFile.new(dsl_method_default).extract!(opts, deck)
+  end
 
-      def self.parameters
-        { file: nil,
-          sheet: 0,
-        }
-      end
+  class InputFile
+    include ArgLoader
 
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
+    def initialize(dsl_method_default = {})
+      @dsl_method_default = dsl_method_default
+    end
 
-      def self.params_with_units
-        [] # none of them
-      end
+    def self.parameters
+      { file: nil }
+    end
 
-      def validate_file(arg, _i)
-        return nil if arg.nil?
-        raise "File #{File.expand_path(arg)} does not exist!" unless File.exists?(arg)
-        File.expand_path(arg)
-      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?
+      raise "File #{File.expand_path(arg)} does not exist!" unless File.exists?(arg)
+      File.expand_path(arg)
+    end
   end
 end

data/lib/squib/args/paint.rb

@@ -2,43 +2,42 @@ require 'cairo'
 require_relative 'arg_loader'
 require_relative 'color_validator'
 
-module Squib
-  # @api private
-  module Args
-    class Paint
-      include ArgLoader
-      include ColorValidator
-
-      def self.parameters
-        { alpha: 1.0,
-          blend: :none,
-          mask:  nil,
-        }
-      end
-
-
-      def self.expanding_parameters
-        parameters.keys # all of them are expandable
-      end
+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 self.params_with_units
-        []
-      end
+    def initialize(custom_colors)
+      @custom_colors = custom_colors
+    end
 
-      def initialize(custom_colors)
-        @custom_colors = custom_colors
-      end
+    def self.parameters
+      { alpha: 1.0,
+        blend: :none,
+        mask:  nil,
+      }
+    end
 
-      def validate_alpha(arg, _i)
-        raise 'alpha must respond to to_f' unless arg.respond_to? :to_f
-        arg.to_f
-      end
+    def self.expanding_parameters
+      parameters.keys # all of them are expandable
+    end
 
-      def validate_mask(arg, _i)
-        colorify(arg, @custom_colors)
-      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,116 +1,118 @@
 require_relative '../constants'
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
-
-    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
+module Squib::Args
 
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
+  module_function def extract_para(opts, deck, dsl_method_defaults = {})
+    Paragraph.new(deck.font).extract!(opts, deck)
+  end
 
-      def self.params_with_units
-        [] # none of them
-      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 initialize(deck_font)
-        @deck_font = deck_font
-      end
+    def self.expanding_parameters
+      parameters.keys # all of them
+    end
 
-      def validate_str(arg, _i)
-        arg.to_s
-      end
+    def self.params_with_units
+      [] # none of them
+    end
 
-      def validate_font(arg, _i)
-        arg = @deck_font if arg == :use_set
-        arg = DEFAULT_FONT if arg == :default
-        arg
-      end
+    def initialize(deck_font)
+      @deck_font = deck_font
+    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_str(arg, _i)
+      arg.to_s
+    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_font(arg, _i)
+      arg = @deck_font if arg == :use_set
+      arg = Squib::DEFAULT_FONT if arg == :default
+      arg
+    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
-        else
-          raise ArgumentError, 'ellipsize must be one of: none, start, middle, end, true, or false'
-        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_justify(arg, _i)
-        case arg
-        when nil, true, false
-          arg
-        else
-          raise ArgumentError, 'justify must be one of: nil, true, or false'
-        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_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
+    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_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
+    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