rseed 1.0.15 → 1.0.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmMyMDk3YjZjZWEzNzdkNGU4OTdhNDU4ODFlYzE3MmQ4ZmJjNGMyYg==
+    Zjg1NmMzYWRkZWYxMzgzMTNkNjE2NWU3ZDk0ZGRlNWFjMDg1YmY5OA==
   data.tar.gz: !binary |-
-    ZTMzYzVlM2NmYjMxOTk5Mjc0YWNlNmUxMjc0NzIzZDc2ZDFkNmUwYQ==
+    NjAyZWQ4ODkzYzBjMmQzMWQ4Njk2MDZhNzUwMWEzN2ZlMjUwMTYyNw==
 SHA512:
   metadata.gz: !binary |-
-    M2MxYjc2ZTQ5MTVhZjQ3MjU4YTJlMDAzMzk0MWE3ZjA1MzJlZDc5MWY3OTNj
-    NmRkNGMzNGQzNTZjMGY5NTU4NzQ3MWNlNjIyOTI2ZWFhMzBiNjgwODFmNjg3
-    YTUwZmI3ZjAwNjFiZjIyM2E3ODBkODNlMDRiMjI0MjYzNTg0YjE=
+    NTdkYTk3ZmU2NTI5MmRlNzY5MTZiYmI2OGQyZDlkMDBhNzEzMjg3NGQwMWFh
+    MGIyMzlhMjdjZDljYTc4MTFjMDc5NjAyNGM0M2RlMGU0Yjc4NDBjNGVhNDZj
+    YTIyZDFhMTQ5N2E3Yzg3YzhlODg4YmFmZThhZDRkODc2MzExNmM=
   data.tar.gz: !binary |-
-    ODJkNTAxMTRkMDJmYWQ2YzhiOTE4NDY4OTY1OGY3YjFjZmE0MGQ2YzYyODEx
-    Yjk4ZjJlNWFmMmNiNDc0NWU2OTFhYjViNzI2ZmFiMzhlOGY4NTM4ODBhNjMw
-    OTgwODQzOWVmNmEwZWQxYWQ5YWQ0OWQ1YzBkZDk0OGIwMTdiMGI=
+    MjVlNjQ0MjRhMjJjOTM3NGU4NzAzYjU3MDM2YTg2MjUxYTA1MzhmNWJhZmJm
+    OWJhZmU5YmYzNzZlMTFhNjkwNmIzNmMzNmFhZmY1ZTYyYjQzM2Q3NzI0Njcy
+    YWY2ZTBmNzI1ODZiM2MyMzFmNmNkNTNjOWU5OGM2NzQwY2U5YWI=

data/lib/rseed/csv_adapter.rb

@@ -7,36 +7,56 @@ module Rseed
     def preprocess
       return false unless file
       logger.info "Preprocessing CSV file: #{file.to_s.yellow}"
-      @estimated_rows = CSV.read(file).length - 1
+      @estimated_rows = CSV.read(file).length
+      @estimated_rows -=1 unless options[:headers]
       logger.info "Estimated Rows: #{@estimated_rows}".magenta
       true
     end
 
+    def match_headers input
+      headers = {}
+
+      input.each_with_index do |column_value, index|
+        column = index + 1
+        converter_attributes.each do |attribute|
+          if attribute.matches? column_value.strip
+            logger.debug "Found header for #{attribute.name} at column #{column}".green
+            if (headers[attribute.name].nil?)
+              headers[attribute.name] = column
+            else
+              logger.error "Found duplicate header '#{attribute.name}' on columns #{column} and #{headers[attribute.name]}.".red
+            end
+          end
+        end
+      end
+
+      return headers
+    end
+
     def process &block
+      self.options = self.options.to_hash.symbolize_keys
+
       headers = {}
       header = true
+
+      if options[:headers]
+        headers = match_headers(options[:headers].split(','))
+        header = false
+        unless all_headers_found(headers)
+          logger.error "The supplied headers did not match all attributes".red
+          return
+        end
+      end
+
       data_count = 0
       row_number = 0
 
       # Get an estimate of the number of rows in the file
-      csv_options = {:encoding => 'windows-1251:utf-8'}.merge(self.options.symbolize_keys)
+      csv_options = {:encoding => 'windows-1251:utf-8'}.merge(self.options)
       CSV.foreach(file, csv_options) do |row|
         row_number += 1
         if (header)
-          column = 0
-          row.each do |column_value|
-            column += 1
-            converter_attributes.each do |attribute|
-              if attribute.matches? column_value
-                logger.debug "Found header for #{attribute.name} at column #{column}".green
-                if (headers[attribute.name].nil?)
-                  headers[attribute.name] = column
-                else
-                  logger.error "Found duplicate header '#{attribute.name}' on columns #{column} and #{headers[attribute.name]}.".red
-                end
-              end
-            end
-          end
+          headers = match_headers(row)
           unless all_headers_found(headers)
             logger.error "Missing headers".red
             break

data/lib/rseed/version.rb

@@ -1,3 +1,3 @@
 module Rseed
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rseed
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - David Monagle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize