squib 0.6.0 → 0.7.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andy Meneely
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.14.3
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ extra_rdoc_files:
 - samples/basic.rb
 - samples/cairo_access.rb
 - samples/colors.rb
+- samples/color_shortcuts.rb
 - samples/config_text_markup.rb
 - samples/csv_import.rb
 - samples/custom_config.rb
@@ -242,6 +243,7 @@ extra_rdoc_files:
 - samples/hand.rb
 - samples/hello_world.rb
 - samples/layouts.rb
+- samples/layouts_builtin.rb
 - samples/load_images.rb
 - samples/portrait-landscape.rb
 - samples/ranges.rb
@@ -285,6 +287,25 @@ files:
 - lib/squib/api/text.rb
 - lib/squib/api/text_embed.rb
 - lib/squib/api/units.rb
+- lib/squib/args/arg_loader.rb
+- lib/squib/args/box.rb
+- lib/squib/args/card_range.rb
+- lib/squib/args/color_validator.rb
+- lib/squib/args/coords.rb
+- lib/squib/args/dir_validator.rb
+- lib/squib/args/draw.rb
+- lib/squib/args/embed_adjust.rb
+- lib/squib/args/embed_key.rb
+- lib/squib/args/hand_special.rb
+- lib/squib/args/input_file.rb
+- lib/squib/args/paint.rb
+- lib/squib/args/paragraph.rb
+- lib/squib/args/save_batch.rb
+- lib/squib/args/scale_box.rb
+- lib/squib/args/sheet.rb
+- lib/squib/args/showcase_special.rb
+- lib/squib/args/svg_special.rb
+- lib/squib/args/transform.rb
 - lib/squib/args/typographer.rb
 - lib/squib/args/unit_conversion.rb
 - lib/squib/card.rb
@@ -302,8 +323,9 @@ files:
 - lib/squib/graphics/shapes.rb
 - lib/squib/graphics/showcase.rb
 - lib/squib/graphics/text.rb
-- lib/squib/input_helpers.rb
 - lib/squib/layout_parser.rb
+- lib/squib/layouts/economy.yml
+- lib/squib/layouts/fantasy.yml
 - lib/squib/layouts/hand.yml
 - lib/squib/layouts/playing-card.yml
 - lib/squib/progress.rb
@@ -324,6 +346,7 @@ files:
 - samples/ball.png
 - samples/basic.rb
 - samples/cairo_access.rb
+- samples/color_shortcuts.rb
 - samples/colors.rb
 - samples/config_disable_quotes.yml
 - samples/config_text_markup.rb
@@ -344,6 +367,7 @@ files:
 - samples/hand.rb
 - samples/hello_world.rb
 - samples/layouts.rb
+- samples/layouts_builtin.rb
 - samples/load_images.rb
 - samples/offset.svg
 - samples/pokercard.png
@@ -360,9 +384,18 @@ files:
 - samples/unicode.rb
 - samples/units.rb
 - spec/api/api_data_spec.rb
-- spec/api/api_image_spec.rb
 - spec/api/api_settings_spec.rb
-- spec/api/api_text_spec.rb
+- spec/args/box_spec.rb
+- spec/args/draw_spec.rb
+- spec/args/embed_key_spec.rb
+- spec/args/input_file_spec.rb
+- spec/args/paint_spec.rb
+- spec/args/paragraph_spec.rb
+- spec/args/range_spec.rb
+- spec/args/save_batch_spec.rb
+- spec/args/scale_box_spec.rb
+- spec/args/sheet_spec.rb
+- spec/args/showcase_special_spec.rb
 - spec/args/typographer_spec.rb
 - spec/args/unit_conversion_spec.rb
 - spec/commands/new_spec.rb
@@ -412,13 +445,11 @@ files:
 - spec/data/samples/units.rb.txt
 - spec/data/xlsx/basic.xlsx
 - spec/data/xlsx/formulas.xlsx
+- spec/data/xlsx/with_macros.xlsm
 - spec/deck_spec.rb
 - spec/graphics/cairo_context_wrapper_spec.rb
 - spec/graphics/graphics_images_spec.rb
 - spec/graphics/graphics_save_doc_spec.rb
-- spec/graphics/graphics_shapes_spec.rb
-- spec/graphics/graphics_text_spec.rb
-- spec/input_helpers_spec.rb
 - spec/layout_parser_spec.rb
 - spec/logger_spec.rb
 - spec/samples/_diffs/gitkeep.txt
@@ -441,9 +472,6 @@ files:
 - spec/samples/expected/config_text_00.png
 - spec/samples/expected/custom-config_00.png
 - spec/samples/expected/embed_00.png
-- spec/samples/expected/embed_multi_00.png
-- spec/samples/expected/embed_multi_01.png
-- spec/samples/expected/embed_multi_02.png
 - spec/samples/expected/embed_multisheet_00.png
 - spec/samples/expected/gitkeep.txt
 - spec/samples/expected/gradient_00.png
@@ -457,8 +485,6 @@ files:
 - spec/samples/expected/load_images_00.png
 - spec/samples/expected/portrait_00.png
 - spec/samples/expected/ranges_00.png
-- spec/samples/expected/ranges_01.png
-- spec/samples/expected/ranges_02.png
 - spec/samples/expected/sample_csv_00.png
 - spec/samples/expected/sample_csv_01.png
 - spec/samples/expected/sample_excel_00.png
@@ -515,9 +541,18 @@ specification_version: 2
 summary: A Ruby DSL for prototyping card games
 test_files:
 - spec/api/api_data_spec.rb
-- spec/api/api_image_spec.rb
 - spec/api/api_settings_spec.rb
-- spec/api/api_text_spec.rb
+- spec/args/box_spec.rb
+- spec/args/draw_spec.rb
+- spec/args/embed_key_spec.rb
+- spec/args/input_file_spec.rb
+- spec/args/paint_spec.rb
+- spec/args/paragraph_spec.rb
+- spec/args/range_spec.rb
+- spec/args/save_batch_spec.rb
+- spec/args/scale_box_spec.rb
+- spec/args/sheet_spec.rb
+- spec/args/showcase_special_spec.rb
 - spec/args/typographer_spec.rb
 - spec/args/unit_conversion_spec.rb
 - spec/commands/new_spec.rb
@@ -567,13 +602,11 @@ test_files:
 - spec/data/samples/units.rb.txt
 - spec/data/xlsx/basic.xlsx
 - spec/data/xlsx/formulas.xlsx
+- spec/data/xlsx/with_macros.xlsm
 - spec/deck_spec.rb
 - spec/graphics/cairo_context_wrapper_spec.rb
 - spec/graphics/graphics_images_spec.rb
 - spec/graphics/graphics_save_doc_spec.rb
-- spec/graphics/graphics_shapes_spec.rb
-- spec/graphics/graphics_text_spec.rb
-- spec/input_helpers_spec.rb
 - spec/layout_parser_spec.rb
 - spec/logger_spec.rb
 - spec/samples/_diffs/gitkeep.txt
@@ -596,9 +629,6 @@ test_files:
 - spec/samples/expected/config_text_00.png
 - spec/samples/expected/custom-config_00.png
 - spec/samples/expected/embed_00.png
-- spec/samples/expected/embed_multi_00.png
-- spec/samples/expected/embed_multi_01.png
-- spec/samples/expected/embed_multi_02.png
 - spec/samples/expected/embed_multisheet_00.png
 - spec/samples/expected/gitkeep.txt
 - spec/samples/expected/gradient_00.png
@@ -612,8 +642,6 @@ test_files:
 - spec/samples/expected/load_images_00.png
 - spec/samples/expected/portrait_00.png
 - spec/samples/expected/ranges_00.png
-- spec/samples/expected/ranges_01.png
-- spec/samples/expected/ranges_02.png
 - spec/samples/expected/sample_csv_00.png
 - spec/samples/expected/sample_csv_01.png
 - spec/samples/expected/sample_excel_00.png

data/lib/squib/input_helpers.rb

@@ -1,238 +0,0 @@
-require 'squib/constants'
-require 'squib/args/unit_conversion'
-
-module Squib
-  # :nodoc:
-  # @api private
-  module InputHelpers
-
-    # :nodoc:
-    # @api private
-    def needs(opts, params)
-      Squib.logger.debug {"Method #{caller(1,1)} was given the following opts: #{opts}"}
-      opts = layoutify(opts) if params.include? :layout
-      opts = Squib::SYSTEM_DEFAULTS.merge(opts)
-      opts = expand_singletons(opts, params)
-      opts = rangeify(opts) if params.include? :range
-      opts = fileify(opts) if params.include? :file
-      opts = fileify(opts, false) if params.include? :file_to_save
-      opts = colorify(opts, true) if params.include? :nillable_color
-      opts = dirify(opts, :dir, true) if params.include? :creatable_dir
-      opts = dirify(opts, :img_dir, false) if params.include? :img_dir
-      opts = fileify(opts, false) if params.include? :files
-      opts = colorify(opts) if params.include? :color
-      opts = colorify(opts, false, :fill_color) if params.include? :fill_color
-      opts = colorify(opts, false, :stroke_color) if params.include? :stroke_color
-      opts = fontify(opts) if params.include? :font
-      opts = radiusify(opts) if params.include? :rect_radius
-      opts = svgidify(opts) if params.include? :svgid
-      opts = formatify(opts) if params.include? :formats
-      opts = rotateify(opts) if params.include? :rotate
-      opts = rowify(opts) if params.include? :rows
-      opts = faceify(opts) if params.include? :face
-      opts = convert_units(opts, params)
-      opts
-    end
-    module_function :needs
-
-    # :nodoc:
-    # @api private
-    def expand_singletons(opts, needed_params)
-      Squib::EXPANDING_PARAMS.each_pair do |param_name, api_param|
-        if needed_params.include? param_name
-          unless opts[api_param].respond_to?(:each)
-            opts[api_param] = [opts[api_param]] * @cards.size
-          end
-        end
-      end
-      Squib.logger.debug {"After expand_singletons: #{opts}"}
-      opts
-    end
-    module_function :expand_singletons
-
-    # Layouts have to come before, so we repeat expand_singletons here
-    # :nodoc:
-    # @api private
-    def layoutify(opts)
-      unless opts[:layout].respond_to?(:each)
-        opts[:layout] = [opts[:layout]] * @cards.size
-      end
-      opts[:layout].each_with_index do |layout, i|
-        unless layout.nil?
-          entry = @layout[layout.to_s]
-          unless entry.nil?
-            entry.each do |key, value|
-              opts[key.to_sym] = [] if opts[key.to_sym].nil?
-              opts[key.to_sym][i] ||= entry[key] #don't override if it's already there
-            end
-          else
-            Squib.logger.warn ("Layout entry '#{layout}' does not exist." )
-          end
-        end
-      end
-      Squib.logger.debug {"After layoutify: #{opts}"}
-      opts
-    end
-    module_function :layoutify
-
-    # :nodoc:
-    # @api private
-    def formatify(opts)
-      opts[:format] = [opts[:format]].flatten
-      opts
-    end
-    module_function :formatify
-
-    # :nodoc:
-    # @api private
-    def rangeify (opts)
-      range = opts[:range]
-      raise 'Range cannot be nil' if range.nil?
-      range = 0..(@cards.size-1) if range == :all
-      range = range..range if range.is_a? Integer
-      if range.max > (@cards.size-1)
-        raise ArgumentError.new("#{range} is outside of deck range of 0..#{@cards.size-1}")
-      end
-      opts[:range] = range
-      Squib.logger.debug {"After rangeify: #{opts}"}
-      opts
-    end
-    module_function :rangeify
-
-    # :nodoc:
-    # @api private
-    def fileify(opts, file_must_exist=true)
-      [opts[:file]].flatten.each do |file|
-        if file_must_exist and !File.exists?(file)
-          raise "File #{File.expand_path(file)} does not exist!"
-        end
-      end
-      opts
-    end
-    module_function :fileify
-
-    # :nodoc:
-    # @api private
-    def dirify(opts, key, allow_create=false)
-      return opts if Dir.exists?(opts[key])
-      if allow_create
-        Squib.logger.warn("Dir '#{opts[key]}' does not exist, creating it.")
-        Dir.mkdir opts[key]
-        return opts
-      else
-        raise "'#{opts[key]}' does not exist!"
-      end
-    end
-    module_function :dirify
-
-    # :nodoc:
-    # @api private
-    def colorify(opts, nillable=false, key=:color)
-      opts[key].each_with_index do |color, i|
-        unless nillable && color.nil?
-          if custom_colors.key? color.to_s
-            color = custom_colors[color.to_s]
-          end
-          opts[key][i] = color
-        end
-      end
-      Squib.logger.debug {"After colorify: #{opts}"}
-      opts
-    end
-    module_function :colorify
-
-    # :nodoc:
-    # @api private
-    def fontify (opts)
-      opts[:font].each_with_index do |font, i|
-        opts[:font][i] = @font if font==:use_set
-        opts[:font][i] = Squib::SYSTEM_DEFAULTS[:default_font] if font == :default
-      end
-      Squib.logger.debug {"After fontify: #{opts}"}
-      opts
-    end
-    module_function :fontify
-
-    # :nodoc:
-    # @api private
-    def radiusify(opts)
-      opts[:radius].each_with_index do |radius, i|
-        unless radius.nil?
-          opts[:x_radius][i] = radius
-          opts[:y_radius][i] = radius
-        end
-      end
-      Squib.logger.debug {"After radiusify: #{opts}"}
-      opts
-    end
-    module_function :radiusify
-
-    # :nodoc:
-    # @api private
-    def svgidify(opts)
-      opts[:id].each_with_index do |id, i|
-        unless id.nil?
-          opts[:id][i] = '#' << id unless id.start_with? '#'
-        end
-      end
-      Squib.logger.debug {"After svgidify: #{opts}"}
-      opts
-    end
-    module_function :svgidify
-
-    # :nodoc:
-    # @api private
-    def rotateify(opts)
-      case opts[:rotate]
-      when true, :clockwise
-        opts[:angle] = 0.5 * Math::PI
-      when :counterclockwise
-        opts[:angle] = 1.5 * Math::PI
-      end
-      Squib.logger.debug {"After rotateify: #{opts}"}
-      opts
-    end
-    module_function :rotateify
-
-    # Convert units
-    # :nodoc:
-    # @api private
-    def convert_units(opts, needed_params)
-      UNIT_CONVERSION_PARAMS.each_pair do |param_name, api_param|
-        if needed_params.include? param_name
-          if EXPANDING_PARAMS.include? param_name
-            opts[api_param].each_with_index do |arg, i|
-              opts[api_param][i] = Args::UnitConversion.parse(arg, @dpi)
-            end
-          else #not an expanding param
-            opts[api_param] = Args::UnitConversion.parse(opts[api_param], @dpi)
-          end
-        end
-      end
-      Squib.logger.debug {"After convert_units: #{opts}"}
-      return opts
-    end
-    module_function :convert_units
-
-     # Handles expanding rows. If the "rows" does not respond to to_i (e.g. :infinite),
-    # then compute what we need based on number of cards and number of columns.
-    # :nodoc:
-    # @api private
-    def rowify(opts)
-      unless opts[:rows].respond_to? :to_i
-        raise "Columns must be an integer" unless opts[:columns].respond_to? :to_i
-        opts[:rows] = (@cards.size / opts[:columns].to_i).ceil
-      end
-      opts
-    end
-
-    # Used for showcase - face right if it's :right
-    # :nodoc:
-    # @api private
-    def faceify(opts)
-      opts[:face] = (opts[:face].to_s.downcase == 'right')
-      opts
-    end
-
-  end
-end