squib 0.15.0 → 0.15.1

data/lib/squib/api/text.rb

@@ -1,25 +1,25 @@
-require_relative 'text_embed'
-require_relative '../args/box'
-require_relative '../args/card_range'
-require_relative '../args/draw'
-require_relative '../args/paragraph'
-
-module Squib
-  class Deck
-
-    # DSL method. See http://squib.readthedocs.io
-    def text(opts = {})
-      range = Args::CardRange.new(opts[:range], deck_size: size)
-      para  = Args::Paragraph.new(font).load!(opts, expand_by: size, layout: layout)
-      box   = Args::Box.new(self, { width: :auto, height: :auto }).load!(opts, expand_by: size, layout: layout, dpi: dpi)
-      trans = Args::Transform.new.load!(opts, expand_by: size, layout: layout, dpi: dpi)
-      draw  = Args::Draw.new(custom_colors, { stroke_width: 0.0 }).load!(opts, expand_by: size, layout: layout, dpi: dpi)
-      embed = TextEmbed.new(size, custom_colors, layout, dpi, img_dir)
-      yield(embed) if block_given? # store the opts for later use
-      extents = Array.new(@cards.size)
-      range.each { |i| extents[i] = @cards[i].text(embed, para[i], box[i], trans[i], draw[i], dpi) }
-      return extents
-    end
-
-  end
-end
+require_relative 'text_embed'
+require_relative '../args/box'
+require_relative '../args/card_range'
+require_relative '../args/draw'
+require_relative '../args/paragraph'
+
+module Squib
+  class Deck
+
+    # DSL method. See http://squib.readthedocs.io
+    def text(opts = {})
+      range = Args::CardRange.new(opts[:range], deck_size: size)
+      para  = Args::Paragraph.new(font).load!(opts, expand_by: size, layout: layout)
+      box   = Args::Box.new(self, { width: :auto, height: :auto }).load!(opts, expand_by: size, layout: layout, dpi: dpi)
+      trans = Args::Transform.new.load!(opts, expand_by: size, layout: layout, dpi: dpi)
+      draw  = Args::Draw.new(custom_colors, { stroke_width: 0.0 }).load!(opts, expand_by: size, layout: layout, dpi: dpi)
+      embed = TextEmbed.new(size, custom_colors, layout, dpi, img_dir)
+      yield(embed) if block_given? # store the opts for later use
+      extents = Array.new(@cards.size)
+      range.each { |i| extents[i] = @cards[i].text(embed, para[i], box[i], trans[i], draw[i], dpi) }
+      return extents
+    end
+
+  end
+end

data/lib/squib/api/text_embed.rb

@@ -1,71 +1,71 @@
-require_relative '../args/box'
-require_relative '../args/card_range'
-require_relative '../args/embed_adjust'
-require_relative '../args/embed_key'
-require_relative '../args/input_file'
-require_relative '../args/paint'
-require_relative '../args/transform'
-
-module Squib
-  class TextEmbed
-    # :nodoc:
-    # @api private
-    attr_reader :rules
-
-    # :nodoc:
-    # @api private
-    def initialize(deck_size, custom_colors, layout, dpi, img_dir)
-      @deck_size     = deck_size
-      @custom_colors = custom_colors
-      @layout        = layout
-      @dpi           = dpi
-      @img_dir       = img_dir
-      @rules = {} # store an array of options for later usage
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def svg(opts = {})
-      key   = Args::EmbedKey.new.validate_key(opts[:key])
-      range = Args::CardRange.new(opts[:range], deck_size: @deck_size)
-      paint = Args::Paint.new(@custom_colors).load!(opts, expand_by: @deck_size, layout: @layout)
-      box   = Args::Box.new(self, { width: :native, height: :native }).load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      adjust = Args::EmbedAdjust.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      trans = Args::Transform.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      ifile = Args::InputFile.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      svg_args = Args::SvgSpecial.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      rule = { type: :svg, file: ifile, box: box, paint: paint, trans: trans,
-               adjust: adjust, svg_args: svg_args }
-      rule[:draw] = Proc.new do |card, x, y|
-        i = card.index
-        b = box[i]
-        b.x, b.y = x, y
-        Dir.chdir(@img_dir) do
-          card.svg(ifile[i].file, svg_args[i], b, paint[i], trans[i])
-        end
-      end
-      @rules[key] = rule
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def png(opts = {})
-      key   = Args::EmbedKey.new.validate_key(opts[:key])
-      range = Args::CardRange.new(opts[:range], deck_size: @deck_size)
-      paint = Args::Paint.new(@custom_colors).load!(opts, expand_by: @deck_size, layout: @layout)
-      box   = Args::Box.new(self, { width: :native, height: :native }).load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      adjust = Args::EmbedAdjust.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      trans = Args::Transform.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      ifile = Args::InputFile.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
-      rule  = { type: :png, file: ifile, box: box, paint: paint, trans: trans, adjust: adjust }
-      rule[:draw] = Proc.new do |card, x, y|
-        i = card.index
-        b = box[i]
-        b.x, b.y = x, y
-        Dir.chdir(@img_dir) do
-          card.png(ifile[i].file, b, paint[i], trans[i])
-        end
-      end
-      @rules[key] = rule
-    end
-
-  end
-end
+require_relative '../args/box'
+require_relative '../args/card_range'
+require_relative '../args/embed_adjust'
+require_relative '../args/embed_key'
+require_relative '../args/input_file'
+require_relative '../args/paint'
+require_relative '../args/transform'
+
+module Squib
+  class TextEmbed
+    # :nodoc:
+    # @api private
+    attr_reader :rules
+
+    # :nodoc:
+    # @api private
+    def initialize(deck_size, custom_colors, layout, dpi, img_dir)
+      @deck_size     = deck_size
+      @custom_colors = custom_colors
+      @layout        = layout
+      @dpi           = dpi
+      @img_dir       = img_dir
+      @rules = {} # store an array of options for later usage
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def svg(opts = {})
+      key   = Args::EmbedKey.new.validate_key(opts[:key])
+      range = Args::CardRange.new(opts[:range], deck_size: @deck_size)
+      paint = Args::Paint.new(@custom_colors).load!(opts, expand_by: @deck_size, layout: @layout)
+      box   = Args::Box.new(self, { width: :native, height: :native }).load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      adjust = Args::EmbedAdjust.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      trans = Args::Transform.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      ifile = Args::InputFile.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      svg_args = Args::SvgSpecial.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      rule = { type: :svg, file: ifile, box: box, paint: paint, trans: trans,
+               adjust: adjust, svg_args: svg_args }
+      rule[:draw] = Proc.new do |card, x, y|
+        i = card.index
+        b = box[i]
+        b.x, b.y = x, y
+        Dir.chdir(@img_dir) do
+          card.svg(ifile[i].file, svg_args[i], b, paint[i], trans[i])
+        end
+      end
+      @rules[key] = rule
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def png(opts = {})
+      key   = Args::EmbedKey.new.validate_key(opts[:key])
+      range = Args::CardRange.new(opts[:range], deck_size: @deck_size)
+      paint = Args::Paint.new(@custom_colors).load!(opts, expand_by: @deck_size, layout: @layout)
+      box   = Args::Box.new(self, { width: :native, height: :native }).load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      adjust = Args::EmbedAdjust.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      trans = Args::Transform.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      ifile = Args::InputFile.new.load!(opts, expand_by: @deck_size, layout: @layout, dpi: @dpi)
+      rule  = { type: :png, file: ifile, box: box, paint: paint, trans: trans, adjust: adjust }
+      rule[:draw] = Proc.new do |card, x, y|
+        i = card.index
+        b = box[i]
+        b.x, b.y = x, y
+        Dir.chdir(@img_dir) do
+          card.png(ifile[i].file, b, paint[i], trans[i])
+        end
+      end
+      @rules[key] = rule
+    end
+
+  end
+end

data/lib/squib/api/units.rb

@@ -1,27 +1,27 @@
-require_relative '../constants'
-
-module Squib
-  class Deck
-
-    # DSL method. See http://squib.readthedocs.io
-    def inches(n)
-      @dpi * n.to_f
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def points(n)
-      @dpi / Squib::POINTS_PER_IN * n.to_f
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def cm(n)
-      @dpi * Squib::INCHES_IN_CM * n.to_f
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def mm(n)
-      @dpi * Squib::INCHES_IN_CM * n.to_f / 10.0
-    end
-
-  end
-end
+require_relative '../constants'
+
+module Squib
+  class Deck
+
+    # DSL method. See http://squib.readthedocs.io
+    def inches(n)
+      @dpi * n.to_f
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def points(n)
+      @dpi / Squib::POINTS_PER_IN * n.to_f
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def cm(n)
+      @dpi * Squib::INCHES_IN_CM * n.to_f
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def mm(n)
+      @dpi * Squib::INCHES_IN_CM * n.to_f / 10.0
+    end
+
+  end
+end

data/lib/squib/args/arg_loader.rb

@@ -1,126 +1,126 @@
-require_relative '../constants'
-require_relative '../conf'
-require 'ostruct'
-
-module Squib
-  # @api private
-  module Args
-
-    # Intended to be used a a mix-in,
-    # For example use see Box as an example
-    module ArgLoader
-
-      # Main class invoked by the client (i.e. api/ methods)
-      def load!(args, expand_by: 1, layout: {}, dpi: 300)
-        Squib.logger.debug { "ARG LOADER: load! for #{self.class}, args: #{args}" }
-        @dpi = dpi
-        args[:layout] = prep_layout_args(args[:layout], expand_by: expand_by)
-        expand_and_set_and_defaultify(args: args, by: expand_by, layout: layout)
-        validate
-        convert_units dpi: dpi
-        self
-      end
-
-      def expand_and_set_and_defaultify(args: {}, by: 1, layout: {})
-        attributes = self.class.parameters.keys
-        attributes.each do |p|
-          args[p] = defaultify(p, args, layout)
-          val = if expandable_singleton?(p, args[p])
-                  [args[p]] * by
-                else
-                  args[p] # not an expanding parameter
-                end
-          instance_variable_set "@#{p}", val
-        end
-        self.class.class_eval { attr_reader *(attributes) }
-      end
-
-      # Must be:
-      #  (a) an expanding parameter, and
-      #  (b) a singleton already (i.e. doesn't respond to :each)
-      def expandable_singleton?(p, arg)
-        self.class.expanding_parameters.include?(p) && !arg.respond_to?(:each)
-      end
-
-      # Incorporate defaults and layouts
-      #  (1) Use whatever is specified if it is
-      #  (2) Go over all layout specifications (if any) and look them up
-      #     - Use layout when it's specified for that card
-      #     - Use "default" if no layout was specified, or the layout itself did not specify
-      #           Defaut can be overriden for a given dsl method (@dsl_method_defaults)
-      #           (e.g stroke width is 0.0 for text, non-zero everywhere else)
-      #
-      def defaultify(p, args, layout)
-        return args[p] if args.key? p # arg was specified, no defaults used
-        defaults = self.class.parameters.merge(@dsl_method_defaults || {})
-        args[:layout].map do |layout_arg|
-          return defaults[p] if layout_arg.nil?  # no layout specified, use default
-          unless layout.key? layout_arg.to_s     # specified a layout, but it doesn't exist in layout. Oops!
-            Squib.logger.warn("Layout \"#{layout_arg.to_s}\" does not exist in layout file - using default instead")
-            return defaults[p]
-          end
-          if layout[layout_arg.to_s].key?(p.to_s)
-            layout[layout_arg.to_s][p.to_s]     # param specified in layout
-          else
-            defaults[p]                         # layout specified, but not this param
-          end
-        end
-      end
-
-      # Do singleton expansion on the layout argument as well
-      # Treated differently since layout is not always specified
-      def prep_layout_args(layout_args, expand_by: 1)
-        unless layout_args.respond_to?(:each)
-          layout_args = [layout_args] * expand_by
-        end
-        layout_args || []
-      end
-
-      # For each parameter/attribute foo we try to invoke a validate_foo
-      def validate
-        self.class.parameters.each do |param, default|
-          method = "validate_#{param}"
-          if self.respond_to? method
-            attribute = "@#{param}"
-            val = instance_variable_get(attribute)
-            if val.respond_to? :each
-              new_val = val.map.with_index{ |v, i| send(method, v, i) }
-              instance_variable_set(attribute, new_val)
-            else
-              instance_variable_set(attribute, send(method, val))
-            end
-          end
-        end
-      end
-
-      # Access an individual arg for a given card
-      # @return an OpenStruct that looks just like the mixed-in class
-      # @api private
-      def [](i)
-        card_arg = OpenStruct.new
-        self.class.expanding_parameters.each do |p|
-          p_val = instance_variable_get("@#{p}")
-          card_arg[p] = p_val[i]
-        end
-        card_arg
-      end
-
-      # Convert units
-      def convert_units(dpi: 300)
-        self.class.params_with_units.each do |p|
-          p_str = "@#{p}"
-          p_val = instance_variable_get(p_str)
-          if p_val.respond_to? :each
-            arr = p_val.map { |x| UnitConversion.parse(x, dpi) }
-            instance_variable_set p_str, arr
-          else
-            instance_variable_set p_str, UnitConversion.parse(p_val, dpi)
-          end
-        end
-        self
-      end
-
-    end
-
-  end
-end
+require_relative '../constants'
+require_relative '../conf'
+require 'ostruct'
+
+module Squib
+  # @api private
+  module Args
+
+    # Intended to be used a a mix-in,
+    # For example use see Box as an example
+    module ArgLoader
+
+      # Main class invoked by the client (i.e. api/ methods)
+      def load!(args, expand_by: 1, layout: {}, dpi: 300)
+        Squib.logger.debug { "ARG LOADER: load! for #{self.class}, args: #{args}" }
+        @dpi = dpi
+        args[:layout] = prep_layout_args(args[:layout], expand_by: expand_by)
+        expand_and_set_and_defaultify(args: args, by: expand_by, layout: layout)
+        validate
+        convert_units dpi: dpi
+        self
+      end
+
+      def expand_and_set_and_defaultify(args: {}, by: 1, layout: {})
+        attributes = self.class.parameters.keys
+        attributes.each do |p|
+          args[p] = defaultify(p, args, layout)
+          val = if expandable_singleton?(p, args[p])
+                  [args[p]] * by
+                else
+                  args[p] # not an expanding parameter
+                end
+          instance_variable_set "@#{p}", val
+        end
+        self.class.class_eval { attr_reader *(attributes) }
+      end
+
+      # Must be:
+      #  (a) an expanding parameter, and
+      #  (b) a singleton already (i.e. doesn't respond to :each)
+      def expandable_singleton?(p, arg)
+        self.class.expanding_parameters.include?(p) && !arg.respond_to?(:each)
+      end
+
+      # Incorporate defaults and layouts
+      #  (1) Use whatever is specified if it is
+      #  (2) Go over all layout specifications (if any) and look them up
+      #     - Use layout when it's specified for that card
+      #     - Use "default" if no layout was specified, or the layout itself did not specify
+      #           Defaut can be overriden for a given dsl method (@dsl_method_defaults)
+      #           (e.g stroke width is 0.0 for text, non-zero everywhere else)
+      #
+      def defaultify(p, args, layout)
+        return args[p] if args.key? p # arg was specified, no defaults used
+        defaults = self.class.parameters.merge(@dsl_method_defaults || {})
+        args[:layout].map do |layout_arg|
+          return defaults[p] if layout_arg.nil?  # no layout specified, use default
+          unless layout.key? layout_arg.to_s     # specified a layout, but it doesn't exist in layout. Oops!
+            Squib.logger.warn("Layout \"#{layout_arg.to_s}\" does not exist in layout file - using default instead")
+            return defaults[p]
+          end
+          if layout[layout_arg.to_s].key?(p.to_s)
+            layout[layout_arg.to_s][p.to_s]     # param specified in layout
+          else
+            defaults[p]                         # layout specified, but not this param
+          end
+        end
+      end
+
+      # Do singleton expansion on the layout argument as well
+      # Treated differently since layout is not always specified
+      def prep_layout_args(layout_args, expand_by: 1)
+        unless layout_args.respond_to?(:each)
+          layout_args = [layout_args] * expand_by
+        end
+        layout_args || []
+      end
+
+      # For each parameter/attribute foo we try to invoke a validate_foo
+      def validate
+        self.class.parameters.each do |param, default|
+          method = "validate_#{param}"
+          if self.respond_to? method
+            attribute = "@#{param}"
+            val = instance_variable_get(attribute)
+            if val.respond_to? :each
+              new_val = val.map.with_index{ |v, i| send(method, v, i) }
+              instance_variable_set(attribute, new_val)
+            else
+              instance_variable_set(attribute, send(method, val))
+            end
+          end
+        end
+      end
+
+      # Access an individual arg for a given card
+      # @return an OpenStruct that looks just like the mixed-in class
+      # @api private
+      def [](i)
+        card_arg = OpenStruct.new
+        self.class.expanding_parameters.each do |p|
+          p_val = instance_variable_get("@#{p}")
+          card_arg[p] = p_val[i]
+        end
+        card_arg
+      end
+
+      # Convert units
+      def convert_units(dpi: 300)
+        self.class.params_with_units.each do |p|
+          p_str = "@#{p}"
+          p_val = instance_variable_get(p_str)
+          if p_val.respond_to? :each
+            arr = p_val.map { |x| UnitConversion.parse(x, dpi) }
+            instance_variable_set p_str, arr
+          else
+            instance_variable_set p_str, UnitConversion.parse(p_val, dpi)
+          end
+        end
+        self
+      end
+
+    end
+
+  end
+end