squib 0.17.2 → 0.19.0a

data/lib/squib/dsl/cut_zone.rb

@@ -1,47 +1,47 @@
-require_relative '../errors_warnings/warn_unexpected_params'
-
-module Squib
-  class Deck
-    def cut_zone(opts = {})
-      DSL::CutZone.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class CutZone
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-      end
-
-      def self.accepted_params
-        %i(x y width height margin angle
-           x_radius y_radius radius
-           fill_color stroke_color stroke_width stroke_strategy join dash cap
-           range layout)
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        cut_defaults = {
-          margin: '0.125in',
-          radius: '0.125in',
-          stroke_color: :red,
-          fill_color: '#0000',
-          stroke_width: 2.0,
-        }
-        new_opts = cut_defaults.merge(opts)
-        margin = Args::UnitConversion.parse new_opts[:margin], @deck.dpi, @deck.cell_px
-        new_opts[:x] = margin
-        new_opts[:y] = margin
-        new_opts[:width] = deck.width - (2 * margin)
-        new_opts[:height] = deck.height - (2 * margin)
-        new_opts.delete :margin
-        deck.rect new_opts
-      end
-    end
-  end
-end
+require_relative '../errors_warnings/warn_unexpected_params'
+
+module Squib
+  class Deck
+    def cut_zone(opts = {})
+      DSL::CutZone.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class CutZone
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+      end
+
+      def self.accepted_params
+        %i(x y width height margin angle
+           x_radius y_radius radius
+           fill_color stroke_color stroke_width stroke_strategy join dash cap
+           range layout)
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        cut_defaults = {
+          margin: '0.125in',
+          radius: '0.125in',
+          stroke_color: :red,
+          fill_color: '#0000',
+          stroke_width: 2.0,
+        }
+        new_opts = cut_defaults.merge(opts)
+        margin = Args::UnitConversion.parse new_opts[:margin], @deck.dpi, @deck.cell_px
+        new_opts[:x] = margin
+        new_opts[:y] = margin
+        new_opts[:width] = deck.width - (2 * margin)
+        new_opts[:height] = deck.height - (2 * margin)
+        new_opts.delete :margin
+        deck.rect new_opts
+      end
+    end
+  end
+end

data/lib/squib/dsl/ellipse.rb

@@ -1,37 +1,37 @@
-require_relative '../errors_warnings/warn_unexpected_params'
-
-module Squib
-  class Deck
-    def ellipse(opts = {})
-      DSL::Ellipse.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class Ellipse
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-      end
-
-      def self.accepted_params
-        %i(x y width height
-           fill_color stroke_color stroke_width stroke_strategy join dash cap
-           angle
-           range layout)
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        range = Args.extract_range opts, deck
-        draw  = Args.extract_draw opts, deck
-        box   = Args.extract_box opts, deck
-        trans = Args.extract_transform opts, deck
-        range.each { |i| deck.cards[i].ellipse(box[i], draw[i], trans[i]) }
-      end
-    end
-  end
-end
+require_relative '../errors_warnings/warn_unexpected_params'
+
+module Squib
+  class Deck
+    def ellipse(opts = {})
+      DSL::Ellipse.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class Ellipse
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+      end
+
+      def self.accepted_params
+        %i(x y width height
+           fill_color stroke_color stroke_width stroke_strategy join dash cap
+           angle
+           range layout)
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        range = Args.extract_range opts, deck
+        draw  = Args.extract_draw opts, deck
+        box   = Args.extract_box opts, deck
+        trans = Args.extract_transform opts, deck
+        range.each { |i| deck.cards[i].ellipse(box[i], draw[i], trans[i]) }
+      end
+    end
+  end
+end

data/lib/squib/dsl/grid.rb

@@ -1,35 +1,35 @@
-require_relative '../errors_warnings/warn_unexpected_params'
-
-module Squib
-  class Deck
-    def grid(opts = {})
-      DSL::Grid.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class Grid
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-      end
-
-      def self.accepted_params
-        %i(x y width height
-           fill_color stroke_color stroke_width stroke_strategy join dash cap
-           range layout)
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        range = Args.extract_range opts, deck
-        draw  = Args.extract_draw opts, deck
-        box   = Args.extract_box opts, deck
-        range.each { |i| deck.cards[i].grid(box[i], draw[i]) }
-      end
-    end
-  end
-end
+require_relative '../errors_warnings/warn_unexpected_params'
+
+module Squib
+  class Deck
+    def grid(opts = {})
+      DSL::Grid.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class Grid
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+      end
+
+      def self.accepted_params
+        %i(x y width height
+           fill_color stroke_color stroke_width stroke_strategy join dash cap
+           range layout)
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        range = Args.extract_range opts, deck
+        draw  = Args.extract_draw opts, deck
+        box   = Args.extract_box opts, deck
+        range.each { |i| deck.cards[i].grid(box[i], draw[i]) }
+      end
+    end
+  end
+end

data/lib/squib/dsl/groups.rb

@@ -1,54 +1,54 @@
-require 'set'
-
-module Squib
-
-  # DSL method. See http://squib.readthedocs.io
-  def enable_build_globally group
-    groups = (ENV['SQUIB_BUILD'] ||= '').split(',')
-    ENV['SQUIB_BUILD'] = (groups << group).uniq.join(',')
-  end
-  module_function :enable_build_globally
-
-  # DSL method. See http://squib.readthedocs.io
-  def disable_build_globally group
-    groups = (ENV['SQUIB_BUILD'] ||= '').split(',')
-    groups.delete(group.to_s)
-    ENV['SQUIB_BUILD'] = groups.uniq.join(',')
-  end
-  module_function :disable_build_globally
-
-  class Deck
-
-    # DSL method. See http://squib.readthedocs.io
-    def build grp = :all, &block
-      raise 'Please provide a block' unless block_given?
-      block.yield if build_groups.include? grp
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def enable_build grp
-      build_groups # make sure it's initialized
-      @build_groups << grp
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def disable_build grp
-      build_groups # make sure it's initialized
-      @build_groups.delete grp
-    end
-
-    # DSL method. See http://squib.readthedocs.io
-    def build_groups
-      @build_groups ||= Set.new.add(:all)
-    end
-
-    # Not a DSL method, but initialized from Deck.new
-    def enable_groups_from_env!
-      return if ENV['SQUIB_BUILD'].nil?
-      ENV['SQUIB_BUILD'].split(',').each do |grp|
-        enable_build grp.strip.to_sym
-      end
-    end
-
-  end
-end
+require 'set'
+
+module Squib
+
+  # DSL method. See http://squib.readthedocs.io
+  def enable_build_globally group
+    groups = (ENV['SQUIB_BUILD'] ||= '').split(',')
+    ENV['SQUIB_BUILD'] = (groups << group).uniq.join(',')
+  end
+  module_function :enable_build_globally
+
+  # DSL method. See http://squib.readthedocs.io
+  def disable_build_globally group
+    groups = (ENV['SQUIB_BUILD'] ||= '').split(',')
+    groups.delete(group.to_s)
+    ENV['SQUIB_BUILD'] = groups.uniq.join(',')
+  end
+  module_function :disable_build_globally
+
+  class Deck
+
+    # DSL method. See http://squib.readthedocs.io
+    def build grp = :all, &block
+      raise 'Please provide a block' unless block_given?
+      block.yield if build_groups.include? grp
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def enable_build grp
+      build_groups # make sure it's initialized
+      @build_groups << grp
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def disable_build grp
+      build_groups # make sure it's initialized
+      @build_groups.delete grp
+    end
+
+    # DSL method. See http://squib.readthedocs.io
+    def build_groups
+      @build_groups ||= Set.new.add(:all)
+    end
+
+    # Not a DSL method, but initialized from Deck.new
+    def enable_groups_from_env!
+      return if ENV['SQUIB_BUILD'].nil?
+      ENV['SQUIB_BUILD'].split(',').each do |grp|
+        enable_build grp.strip.to_sym
+      end
+    end
+
+  end
+end

data/lib/squib/dsl/hand.rb

@@ -1,42 +1,42 @@
-require_relative '../args/card_range'
-require_relative '../args/hand_special'
-require_relative '../args/sheet'
-require_relative '../errors_warnings/warn_unexpected_params'
-require_relative '../graphics/hand'
-
-module Squib
-  class Deck
-    def hand(opts = {})
-      DSL::Hand.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class Hand
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-        @bar = deck.progress_bar
-      end
-
-      def self.accepted_params
-        %i(
-          file dir range
-          radius angle_range margin fill_color
-          trim trim_radius
-         )
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        range = Args.extract_range opts, deck
-        sheet = Args.extract_sheet opts, deck, {file: 'hand.png'}
-        hand  = Args.extract_hand_special opts, deck
-        deck.render_hand(range, sheet, hand)
-      end
-    end
-  end
-end
+require_relative '../args/card_range'
+require_relative '../args/hand_special'
+require_relative '../args/sheet'
+require_relative '../errors_warnings/warn_unexpected_params'
+require_relative '../graphics/hand'
+
+module Squib
+  class Deck
+    def hand(opts = {})
+      DSL::Hand.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class Hand
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+        @bar = deck.progress_bar
+      end
+
+      def self.accepted_params
+        %i(
+          file dir range
+          radius angle_range margin fill_color
+          trim trim_radius
+         )
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        range = Args.extract_range opts, deck
+        sheet = Args.extract_sheet opts, deck, {file: 'hand.png'}
+        hand  = Args.extract_hand_special opts, deck
+        deck.render_hand(range, sheet, hand)
+      end
+    end
+  end
+end

data/lib/squib/dsl/line.rb

@@ -1,35 +1,35 @@
-require_relative '../errors_warnings/warn_unexpected_params'
-
-module Squib
-  class Deck
-    def line(opts = {})
-      DSL::Line.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class Line
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-      end
-
-      def self.accepted_params
-        %i(x1 y1 x2 y2
-           fill_color stroke_color stroke_width stroke_strategy join dash cap
-           range layout)
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        range = Args.extract_range opts, deck
-        draw  = Args.extract_draw opts, deck
-        coords   = Args.extract_coords opts, deck
-        range.each { |i| deck.cards[i].line(coords[i], draw[i]) }
-      end
-    end
-  end
-end
+require_relative '../errors_warnings/warn_unexpected_params'
+
+module Squib
+  class Deck
+    def line(opts = {})
+      DSL::Line.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class Line
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+      end
+
+      def self.accepted_params
+        %i(x1 y1 x2 y2
+           fill_color stroke_color stroke_width stroke_strategy join dash cap
+           range layout)
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        range = Args.extract_range opts, deck
+        draw  = Args.extract_draw opts, deck
+        coords   = Args.extract_coords opts, deck
+        range.each { |i| deck.cards[i].line(coords[i], draw[i]) }
+      end
+    end
+  end
+end

data/lib/squib/dsl/png.rb

@@ -1,56 +1,57 @@
-require_relative '../errors_warnings/warn_unexpected_params'
-require_relative '../args/card_range'
-require_relative '../args/paint'
-require_relative '../args/scale_box'
-require_relative '../args/transform'
-require_relative '../args/input_file'
-
-module Squib
-  class Deck
-    def png(opts = {})
-      DSL::PNG.new(self, __callee__).run(opts)
-    end
-  end
-
-  module DSL
-    class PNG
-      include WarnUnexpectedParams
-      attr_reader :dsl_method, :deck
-
-      def initialize(deck, dsl_method)
-        @deck = deck
-        @dsl_method = dsl_method
-      end
-
-      def self.accepted_params
-        %i(
-          file
-          x y width height
-          alpha blend mask angle
-          crop_x crop_y crop_width crop_height
-          crop_corner_radius crop_corner_x_radius crop_corner_y_radius
-          flip_horizontal flip_vertical
-          range layout
-         )
-      end
-
-      def run(opts)
-        warn_if_unexpected opts
-        Dir.chdir(deck.img_dir) do
-          range = Args.extract_range opts, deck
-          paint = Args.extract_paint opts, deck
-          box   = Args.extract_scale_box opts, deck
-          trans = Args.extract_transform opts, deck
-          ifile = Args.extract_input_file opts, deck
-          deck.progress_bar.start('Loading PNG(s)', range.size) do |bar|
-            range.each do |i|
-              deck.cards[i].png(ifile[i].file, box[i], paint[i], trans[i])
-              bar.increment
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
+require_relative '../errors_warnings/warn_unexpected_params'
+require_relative '../args/card_range'
+require_relative '../args/paint'
+require_relative '../args/scale_box'
+require_relative '../args/transform'
+require_relative '../args/input_file'
+
+module Squib
+  class Deck
+    def png(opts = {})
+      DSL::PNG.new(self, __callee__).run(opts)
+    end
+  end
+
+  module DSL
+    class PNG
+      include WarnUnexpectedParams
+      attr_reader :dsl_method, :deck
+
+      def initialize(deck, dsl_method)
+        @deck = deck
+        @dsl_method = dsl_method
+      end
+
+      def self.accepted_params
+        %i(
+          file
+          x y width height
+          alpha blend mask angle
+          crop_x crop_y crop_width crop_height
+          crop_corner_radius crop_corner_x_radius crop_corner_y_radius
+          flip_horizontal flip_vertical
+          range layout
+          placeholder
+         )
+      end
+
+      def run(opts)
+        warn_if_unexpected opts
+        Dir.chdir(deck.img_dir) do
+          range = Args.extract_range opts, deck
+          paint = Args.extract_paint opts, deck
+          box   = Args.extract_scale_box opts, deck
+          trans = Args.extract_transform opts, deck
+          ifile = Args.extract_input_file opts, deck
+          deck.progress_bar.start('Loading PNG(s)', range.size) do |bar|
+            range.each do |i|
+              deck.cards[i].png(ifile[i].file, box[i], paint[i], trans[i])
+              bar.increment
+            end
+          end
+        end
+
+      end
+    end
+  end
+end