cleaner method sigs

lib/squib/args/box.rb

@@ -2,8 +2,7 @@ require_relative 'arg_loader'
 
 module Squib::Args
 
-  module_function
+  module_function def extract_box(opts, deck, dsl_method_defaults = {})
-  def extract_box(opts, deck, dsl_method_defaults = {})
     Box.new(deck, dsl_method_defaults).extract!(opts, deck)
   end
 

lib/squib/args/card_range.rb

@@ -1,6 +1,9 @@
-module Squib
+module Squib::Args
-  # @api private
+
-  module Args
+  module_function def extract_range(opts, deck)
+    CardRange.new(opts[:range], deck_size: deck.size)
+  end
+
   class CardRange
     include Enumerable
 
@@ -28,5 +31,4 @@ module Squib
     end
 
   end
-  end
 end

lib/squib/args/draw.rb

@@ -2,9 +2,11 @@ require 'cairo'
 require_relative 'arg_loader'
 require_relative 'color_validator'
 
-module Squib
+module Squib::Args
-  # @api private
+
-  module Args
+  module_function def extract_draw(opts, deck, dsl_method_defaults = {})
+    Draw.new(deck.custom_colors, dsl_method_defaults).extract!(opts, deck)
+  end
 
   class Draw
     include ArgLoader
@@ -88,5 +90,4 @@ module Squib
 
   end
 
-  end
 end

lib/squib/dsl/background.rb

@@ -26,8 +26,8 @@ module Squib
 
       def run(opts)
         warn_if_unexpected opts
-        range = Args::CardRange.new(opts[:range], deck_size: deck.size)
+        range = Args.extract_range opts, deck
-        draw  = Args::Draw.new(@deck.custom_colors).extract!(opts, deck)
+        draw  = Args.extract_draw opts, deck
         range.each { |i| @deck.cards[i].background(draw.color[i]) }
       end
     end

lib/squib/dsl/grid.rb

@@ -25,9 +25,9 @@ module Squib
 
       def run(opts)
         warn_if_unexpected opts
-        range = Args::CardRange.new(opts[:range], deck_size: deck.size)
+        range = Args.extract_range opts, deck
-        draw  = Args::Draw.new(@deck.custom_colors).extract!(opts, deck)
+        draw  = Args.extract_draw opts, deck
-        box   = Args.extract_box(opts, deck)
+        box   = Args.extract_box opts, deck
         range.each { |i| deck.cards[i].grid(box[i], draw[i]) }
       end
     end