import.rb in squib-0.16.0.pre.preview1

- old
+ new
@@ -1,40 +1,67 @@
-require_relative 'arg_loader'
+module Squib::Args
+  module_function def extract_import(opts)
+    # note how we don't use ArgLoader here because it's way more complex than
+    # what we need here. Don't need layouts or singleton expansion, so...
+    # ...let's just do it ourselves.
+    Import.parameters.each  { |p, value| opts[p] = value unless opts.key? p }
+    return Import.new.load! opts
+  end
 
-module Squib
-  # @api private
-  module Args
+  class Import
+    
+    def self.parameters
+      { 
+        data: nil,
+        explode: 'qty',
+        file: nil,
+        sheet: 0,
+        strip: true,
+      }
+    end
 
-    class Import
-      include ArgLoader
+    attr_accessor *(self.parameters.keys)
 
-      def self.parameters
-        { strip: true,
-          explode: 'qty'
-        }
-      end
+    def self.expanding_parameters
+      [] # none of them
+    end
 
-      def self.expanding_parameters
-        [] # none of them
-      end
+    def self.params_with_units
+      [] # none of them
+    end
 
-      def self.params_with_units
-        [] # none of them
-      end
+    def load!(opts)
+      @strip   = validate_strip   opts[:strip]
+      @explode = validate_explode opts[:explode]
+      @file    = validate_file    opts[:file]
+      @data    = validate_data    opts[:data]
+      @sheet   = opts[:sheet]
+      return self
+    end
 
-      def validate_strip(arg)
-        raise 'Strip must be true or false' unless arg == true || arg == false
-        arg
-      end
+    def validate_strip(arg)
+      raise 'Strip must be true or false' unless arg == true || arg == false
+      arg
+    end
 
-      def validate_explode(arg)
-        arg
-      end
+    def validate_explode(arg)
+      arg.to_s
+    end
 
-      def strip?
-        strip
-      end
+    def validate_file(arg)
+      return nil if arg.nil?
+      raise "File #{File.expand_path(arg)} does not exist!" unless File.exists?(arg)
+      File.expand_path(arg)
+    end
 
+    def strip?
+      strip
     end
 
+    def validate_data(arg)
+      return nil if arg.nil?
+      arg.to_s
+    end
+
   end
+
 end