lib/smilodon.rb in smilodon-0.0.2 vs lib/smilodon.rb in smilodon-0.2.2

@@ -1,9 +1,7 @@
-require 'bundler/setup'
-
 require 'smilodon/errors'
-require 'smilodon/railtie' if defined?(Rails)
+require 'smilodon/logger'
 
 # Smilodon includes helper methods to ease parsing data files.
 # Assigning a header and iterating over rows is handled by the
 # module via a simple configuration.
 # 
@@ -30,76 +28,62 @@
     DIRECTORY = 'files'
 
     # Default data file type is CSV.
     TYPE = 'csv'
 
-    # Attribute accessors for the directory, file name, header, rows and before hook.
-    attr_accessor :logger, :directory, :files, :type, :header, :rows, :before
+    # Attribute accessors for the directory, file name, header, count, rows and before hook.
+    attr_accessor :logger, :directory, :file, :type, :header, :count, :rows, :before
 
     # Configuration helper.
     #
-    # @param [Array] args an array of strings with an optional options hash
+    # @param [String] file The data file name.
     # @option options [String] :directory ('db/populate/data_files') The location of the data file.
     # @option options [String] :type ('csv') The data file type.
     # @option options [Boolean] :header Set true if the file has a header.
     # @option options [String] :before The method to call before the run.
-    def populates(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
+    def populates(file, options = {})
+      # Setup the logger to log populator warnings and messages.
+      self.logger = PopulateLogger.setup
 
-      self.directory = if defined?(Rails) 
-        "#{Rails.root}/#{options[:directory] || DIRECTORY}"
-      else
-        options[:directory] || DIRECTORY
-      end
-
+      self.directory = options[:directory] || DIRECTORY
+      self.file = file
       self.type = options[:type] || TYPE
       self.header = options[:header]
       self.before = options[:before]
-      self.files = args.empty? ? grab_files : args
     end
 
     # Parses the data file content and processes each row.
     #
     # @return [Boolean] Returns true if all rows are processed successfully.
     def run
-      files.each do |f|
-        # Call the before hook if defined.
-        #
-        # @usage
-        #   populates 'TestFile', :before => :inactivate
-        send(before) if before
-        rows = parser.parse(read(f))
-        rows.each_with_index do |row, index|
-          if index == 0 && header
-            self.header = row
-          else
-            process(row)
-          end
-        end
-      end
 
+      # Call the before hook if defined.
+      #
+      # @usage
+      #   populates 'TestFile', :before => :inactivate
+      send(before) if before
+
+      rows = parser.parse(read)
+      self.count = header ? rows.count - 1 : rows.count
+      self.header = rows.shift if header
+      count.times { process(rows.shift) }
+
       # Return true when all rows are processed.
-      true
+      return true
     end
 
     # Stub method to be defined in the extended module.
     # 
     # @raise [Exception] Raises an exception if the extended module does not override the method.
     def process(row = nil)
       raise MethodNotOverridden
     end
 
     private
-    def grab_files
-      Dir.glob("#{directory}/*").map do |file|
-        File.basename(file, File.extname(file))
-      end
-    end
-
+    
     # The parser to use based on the type of data file.
     #
-    # @param [String] Name of file to be read
     # @return [Parser, #parse] Returns the parser class to use.
     def parser
       if type == 'csv'
         require 'csv'
         return CSV::Reader
@@ -107,22 +91,21 @@
     end
 
     # Absolute path for the data file.
     # 
     # @return [String] The absolute path.
-    def path(file)
-      "#{directory}/#{file}.#{type}"
+    def path
+      "#{Rails.root}/#{directory}/#{file}.#{type}"
     end
 
     # Reads the data file.
     #
-    # @param [String] Name of file to be read
     # @return [File] The data file contents.
     # @raise [DataFileNotConfigured] Raises an exception when the file is not configured.
     # @raise [MissingDataFile] Raises an exception when the configured file is missing.
-    def read(file)
+    def read
       raise DataFileNotConfigured unless file
-      raise MissingDataFile unless File.exist?(path(file))
-      File.read path(file)
+      raise MissingDataFile unless File.exist?(path)
+      File.read path
     end
   end
 end