tofulcrum 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdmZWE4NTQyNzllOTM0NDkzMDJlOGY0NGY1ZDEzZGM0MTc1MDlkMg==
+    MGFiOTNkNTQ2YmJmYzQ4OTQ4YzI4NDdkNWRiM2EwNTk0ZDgyZjFlOA==
   data.tar.gz: !binary |-
-    MjM0NzI2MTBlYjQ4ZjU5ZTVkYWFkNjZjY2QxNWNmNjhiNTg3MWRlNg==
+    Y2E2NjE2MmZhNjM4NTM0OTgyMDZlYzYzODU4ZjZjMTdjM2M1OThhYg==
 SHA512:
   metadata.gz: !binary |-
-    YWEwMGRlOGIzZGU1OTZmZTkzZjI2YWNmMjcyYmZjMjc0M2QxMDBhMGZjYzll
-    NGIzYTgyYWVlZWUxNWZiOTRmMWE5YjVhMDE3YzRiNTE2YTUwMGFjYjI2MTU1
-    OTI5NDRmZTQxMTM4YjdhOWIyNTJjMTQ0MWVhZDgzN2MzMmE2ZmQ=
+    NzZkNjlkOTJiYWIxYThhNTVlZGVkMDkwZDg0ZjFmMGIyNjQzMmE2ZWMxMmY1
+    OWUxNjI1ZTkxYWI0NWM2NGEyNzU1MzM0ZGNhZGJkYTJjOGQwYzUyZTNjMmJl
+    MTMwOTg3NmViYWU3NmM2ZDEyZGJkYTBjMTIyMDYxN2E4ZWU2NzQ=
   data.tar.gz: !binary |-
-    MGIwMjQzYTUwYmJkZGU5MGZmYzY5M2EyMjc3MGU5YTA1MmUwMTVjZmI2YTNm
-    MmI0M2VhMzNkMzg1MWUyNzgwNWY4ZWZmNGI2OTkyODk3NzU5YmRlZDU3ZDFh
-    MTc3ODVmODU0ZjZlNTIzMDg2MjgzYjZmMTljYmY2YzY1N2Y5MDU=
+    MDU3ZGZlMjNmMDg5NDJkMzZlNGVjZjdkOTcyMGZjMmMxYWNiNzkzZTc4NDVl
+    MjJhNGYyMWRiMTIyM2QyMDBjMjc4MDQ2MGI5MTRmMGZiNmY3N2QzZjU2NWU4
+    MzBkYjZlYTVjMmM2NDg5MThjMmU4M2QwNWU2Yjk2MTAxMDI0MDg=

data/lib/tofulcrum.rb

@@ -16,25 +16,20 @@ module Tofulcrum
       row_index = 0
       upload_index = 0
 
-      lat_index = nil
-      lon_index = nil
       column_mapping = []
       records = []
+      system_columns = {}
 
       CSV.foreach(file) do |row|
         is_header = row_index == 0
 
         if is_header
-          lat_index, lon_index = *find_geo_columns(row).compact
-          raise 'Unable to find latitude/longitude columns' unless lat_index && lon_index
+          system_columns = find_system_columns(row)
+          raise 'Unable to find latitude/longitude columns' unless system_columns[:latitude] && system_columns[:longitude]
 
-          lat_name = row[lat_index]
-          lon_name = row[lon_index]
+          user_cols = user_columns(row, system_columns)
 
-          headers = row.clone
-          headers.delete_if {|v| [lat_name, lon_name].include?(v)}
-
-          column_mapping = find_mapping_columns(form_id, headers, row, mapping)
+          column_mapping = find_mapping_columns(form_id, user_cols, row, mapping)
         else
           form_values = {}
 
@@ -54,12 +49,14 @@ module Tofulcrum
           record = {
             record: {
               form_id: form_id,
-              latitude: row[lat_index].to_f,
-              longitude: row[lon_index].to_f,
               form_values: form_values
             }
           }
 
+          system_columns.each do |attr, index|
+            record[:record][attr] = row[index]
+          end
+
           records << record
         end
 
@@ -116,6 +113,30 @@ module Tofulcrum
         end
       end
 
+      def user_columns(row, system_columns)
+        system_column_names = system_columns.keys.map {|k| row[system_columns[k]]}
+
+        row.clone.tap do |user_columns|
+          system_columns.each do |column, index|
+            user_columns.delete_if {|v| system_column_names.include?(v)}
+          end
+        end
+      end
+
+      def find_system_columns(headers)
+        lat_columns = ['lat', 'latitude', 'y']
+        lon_columns = ['lon', 'long', 'longitude', 'x']
+
+        {
+          latitude: headers.index          {|h| lat_columns.include?(h.downcase) },
+          longitude: headers.index         {|h| lon_columns.include?(h.downcase) },
+          project: headers.index           {|h| h == 'project' },
+          status: headers.index            {|h| h == 'status' },
+          client_created_at: headers.index {|h| h == 'created_at' },
+          client_updated_at: headers.index {|h| h == 'updated_at' },
+        }.delete_if {|k, v| v.nil?}
+      end
+
       def find_geo_columns(headers)
         lat_columns = ['lat', 'latitude', 'y']
         lon_columns = ['lon', 'long', 'longitude', 'x']

data/lib/tofulcrum/version.rb

@@ -1,3 +1,3 @@
 module Tofulcrum
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tofulcrum
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Zac McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor