squib 0.15.0 → 0.16.0.pre.preview2

data/lib/squib/args/showcase_special.rb

@@ -2,40 +2,40 @@ require 'cairo'
 require_relative 'arg_loader'
 require_relative 'dir_validator'
 
-module Squib
-  # @api private
-  module Args
-
-    class ShowcaseSpecial
-      include ArgLoader
-      include DirValidator
-
-      def self.parameters
-        {
-          scale: 0.85,
-          trim: 0,
-          trim_radius: 38,
-          offset: 1.1,
-          reflect_offset: 15,
-          reflect_percent: 0.25,
-          reflect_strength: 0.2,
-          face: :left,
-        }
-      end
-
-      def self.expanding_parameters
-        [] # none of them
-      end
-
-      def self.params_with_units
-        [ :reflect_offset ]
-      end
-
-      def face_right?
-        @face.to_s.strip.downcase == 'right'
-      end
+module Squib::Args
+  module_function def extract_showcase_special(opts, deck)
+    ShowcaseSpecial.new.extract! opts, deck
+  end
+
+  class ShowcaseSpecial
+    include ArgLoader
+    include DirValidator
+
+    def self.parameters
+      {
+        scale: 0.85,
+        trim: 0,
+        trim_radius: 38,
+        offset: 1.1,
+        reflect_offset: 15,
+        reflect_percent: 0.25,
+        reflect_strength: 0.2,
+        face: :left,
+      }
+    end
+
+    def self.expanding_parameters
+      [] # none of them
+    end
+
+    def self.params_with_units
+      [ :reflect_offset ]
+    end
 
+    def face_right?
+      @face.to_s.strip.downcase == 'right'
     end
 
   end
+
 end

data/lib/squib/args/sprue_file.rb

@@ -1,44 +1,44 @@
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
-    class SprueFile
-      include ArgLoader
+module Squib::Args
+  module_function def extract_sprue_file(opts, deck, dsl_method_default = {})
+    SprueFile.new.extract! opts, deck
+  end
+  class SprueFile
+    include ArgLoader
 
-      def initialize(dsl_method_default = {})
-        @dsl_method_default = dsl_method_default
-      end
+    def initialize(dsl_method_default = {})
+      @dsl_method_default = dsl_method_default
+    end
 
-      def self.parameters
-        {
-          sprue: nil
-        }
-      end
+    def self.parameters
+      {
+        sprue: nil
+      }
+    end
 
-      def self.expanding_parameters
-        []
-      end
+    def self.expanding_parameters
+      []
+    end
 
-      def self.params_with_units
-        [] # none of them
-      end
+    def self.params_with_units
+      [] # none of them
+    end
 
-      def validate_template_file(arg)
-        return nil if arg.nil?
+    def validate_template_file(arg)
+      return nil if arg.nil?
 
-        thefile = File.exist?(arg) ? arg : builtin(arg)
-        raise "File #{File.expand_path(arg)} does not exist!" unless
-          File.exist? thefile
+      thefile = File.exist?(arg) ? arg : builtin(arg)
+      raise "File #{File.expand_path(arg)} does not exist!" unless
+        File.exist? thefile
 
-        File.expand_path(thefile)
-      end
+      File.expand_path(thefile)
+    end
 
-      private
+    private
 
-      def builtin(file)
-        "#{File.dirname(__FILE__)}/../builtin/sprues/#{file}"
-      end
+    def builtin(file)
+      "#{File.dirname(__FILE__)}/../builtin/sprues/#{file}"
     end
   end
 end

data/lib/squib/args/svg_special.rb

@@ -1,37 +1,37 @@
 require_relative 'arg_loader'
 
-module Squib
-  # @api private
-  module Args
-
-    class SvgSpecial
-      include ArgLoader
-
-      def self.parameters
-        { data: nil, id: nil, force_id: false }
-      end
+module Squib::Args
+  module_function def extract_svg_special(opts, deck)
+    SvgSpecial.new.extract! opts, deck
+  end
+  
+  class SvgSpecial
+    include ArgLoader
 
-      def self.expanding_parameters
-        parameters.keys # all of them
-      end
+    def self.parameters
+      { data: nil, id: nil, force_id: false }
+    end
 
-      def self.params_with_units
-        []
-      end
+    def self.expanding_parameters
+      parameters.keys # all of them
+    end
 
-      def validate_id(arg, _i)
-        return nil if arg.to_s.empty?
-        arg = '#' << arg unless arg.start_with? '#'
-        arg
-      end
+    def self.params_with_units
+      []
+    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
+    def validate_id(arg, _i)
+      return nil if arg.to_s.empty?
+      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

data/lib/squib/args/transform.rb

@@ -1,61 +1,55 @@
 require_relative '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
+module Squib::Args
+  module_function def extract_transform(opts, deck)
+    Transform.new.extract!(opts, deck)
+  end
+
+  class Transform
+    include ArgLoader
+
+    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

data/lib/squib/args/typographer.rb

@@ -1,119 +1,115 @@
 require_relative '../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
+module Squib::Args
+  # Internal class for handling arguments
+  class Typographer
 
-      def process(str)
-        str = explicit_replacements(str.to_s)
-        str = smart_quotes(str) if @smart_quotes
-        str
+    def initialize(config = Squib::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 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 process(str)
+      str = explicit_replacements(str.to_s)
+      str = smart_quotes(str) if @smart_quotes
+      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
+    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
-        str
       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
+    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
-        return full_str
       end
+      str
+    end
 
-      # Straightforward replace
-      def left_curly(str)
-        str.gsub('``', @ldquote)
+    # 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 right_curly(str)
-        str.gsub(%{''}, @rdquote)
-      end
+    # Straightforward replace
+    def left_curly(str)
+      str.gsub('``', @ldquote)
+    end
 
-      # A quote between two letters is an apostraphe
-      def apostraphize(str)
-        str.gsub(/(\w)(\')(\w)/, '\1' + @rsquote + '\3')
-      end
+    # Straightforward replace
+    def right_curly(str)
+      str.gsub(%{''}, @rdquote)
+    end
 
-      # Straightforward replace
-      def ellipsificate(str)
-        str.gsub('...', @ellipsis)
-      end
+    # A quote between two letters is an apostraphe
+    def apostraphize(str)
+      str.gsub(/(\w)(\')(\w)/, '\1' + @rsquote + '\3')
+    end
 
-      # Straightforward replace
-      def en_dash(str)
-        str.gsub('--', @en_dash)
-      end
+    # Straightforward replace
+    def ellipsificate(str)
+      str.gsub('...', @ellipsis)
+    end
 
-      # Straightforward replace
-      def em_dash(str)
-        str.gsub('---', @em_dash)
-      end
+    # Straightforward replace
+    def en_dash(str)
+      str.gsub('--', @en_dash)
+    end
 
-      # Quote next to non-whitespace curls
-      def right_double_quote(str)
-        str.gsub(/(\S)(\")/, '\1' + @rdquote)
-      end
+    # Straightforward replace
+    def em_dash(str)
+      str.gsub('---', @em_dash)
+    end
 
-      # Quote next to non-whitespace curls
-      def left_double_quote(str)
-        str.gsub(/(\")(\S)/, @ldquote + '\2')
-      end
+    # Quote next to non-whitespace curls
+    def right_double_quote(str)
+      str.gsub(/(\S)(\")/, '\1' + @rdquote)
+    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 left_double_quote(str)
+      str.gsub(/(\")(\S)/, @ldquote + '\2')
+    end
 
-      # Quote next to non-whitespace curls
-      def right_single_quote(str)
-        str.gsub(/(\S)(\')/, '\1' + @rsquote)
-      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 left_single_quote(str)
-        str.gsub(/(\')(\S)/, @lsquote + '\2')
-      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