queryable_pstore 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed900a27718914479aaea9502f5d7dcb01aa4aa6
-  data.tar.gz: c2b26e0ef5b614f96b9534fe00e3026b3b3bf87a
+  metadata.gz: 3b23893d697cf9c96836e24472b374949340eeb8
+  data.tar.gz: 8413c0ab01438990d730789c768226a9c298e6a3
 SHA512:
-  metadata.gz: b614f00f32213a2a8d2ff2c89706c4b0b624538321713680e4c3c6440e8d1ac1be30b04dc73b02dbb98b32bcd0b03580601906f3921a2cefdc9bb39151dd5372
-  data.tar.gz: 20a6a804585c402dd6b8c46568ed68ca6a73aa07bc6c839490f8a4d7690371079464713b44210c2102ac4b5812908bb7c52df7780e1782ae2cf333e39054bd1b
+  metadata.gz: 586899fbb166d695f06c48e93896c1db697f9d57ce3465ae5a9be60def4963219708c019b0af183ffb8cdbc20ea95da567bb5d4de4b8130ff86a870d21fd97f7
+  data.tar.gz: 7c6530e9745705aaf10fd772b95d29f3cd19e5bb2e348d51d54fd19693b5ff6597e46e8b26eebf247ff18ec844b0419296134785b4460e87f3741d092e6eb5b2

data/lib/csv_converter.rb

@@ -10,6 +10,8 @@ class CSVConverter
       hash[@key] = hash[@key].to_i
     when :float
       hash[@key] = hash[@key].to_f
+    when :string
+      # nop, default
     else
       raise ArgumentError.new("Unknown converter: `#{@conversion}`")
     end

data/lib/csv_importer.rb

@@ -1,28 +1,33 @@
+require 'pry'
+
 class CSVImporter
   CURRENT_DIRECTORY = "./".freeze
 
   attr_reader :original_headers, :headers_and_type
 
   def import_csv(filename, opts = {})
-    csv = CSV.read(File.open(filename), headers: true, header_converters: -> (header) { convert_header_to_methodable_name(header) })
+    csv = CSV.read(File.open(filename), headers: true, header_converters: -> (header) { convert_header_to_methodable_name(header, track_original: true) })
     store = create_pstore(csv, opts, filename)
     store.csv_importer = self
-    set_headers_and_type(@original_headers, store)
 
     store
   end
 
   def import_csv_from_string(string, opts = {})
-    csv = CSV.parse(string, headers: true, header_converters: -> (header) { convert_header_to_methodable_name(header) })
+    csv = CSV.parse(string, headers: true, header_converters: -> (header) { convert_header_to_methodable_name(header, track_original: true) })
     store = create_pstore(csv, opts)
     store.csv_importer = self
-    set_headers_and_type(@original_headers, store)
 
     store
   end
 
   def create_pstore(csv, opts = {}, filename = SecureRandom.uuid)
-    csv_converters = opts.fetch(:convert, []).map { |conversion| CSVConverter.new(conversion) }
+    conversion_required = opts.fetch(:convert, [])
+    if opts.fetch(:convert, nil) == :best_guess
+      conversion_required = guess_conversion_types(csv)
+    end
+
+    csv_converters = conversion_required.map { |header, desired_format| CSVConverter.new(header => desired_format) }
     file_save_location = opts[:save_to_location] || CURRENT_DIRECTORY
 
     store = QueryablePStore.new("#{file_save_location}#{filename}.pstore")
@@ -32,12 +37,61 @@ class CSVImporter
       end
     end
 
+    if opts.fetch(:convert, nil) == :best_guess
+      original_headers = @original_headers.clone
+
+      original_headers.each do |original_header|
+        @headers_and_type ||= {}
+        @headers_and_type[original_header] = symbol_to_class(
+          conversion_required[
+            convert_header_to_methodable_name(original_header)
+          ]
+        )
+      end
+    else
+      set_headers_and_type(@original_headers, store)
+    end
+
     store
   end
 
-  def convert_header_to_methodable_name(header)
-    @original_headers ||= []
-    @original_headers << header
+  def symbol_to_class(symbol)
+    case symbol
+    when :integer
+      Integer
+    when :float
+      Float
+    when :string
+      String
+    else
+      raise "Unknown symbol: #{symbol}"
+    end
+  end
+
+  def guess_conversion_types(csv)
+    headers = csv.headers
+    headers_and_type = {}
+
+    csv.each do |row|
+      headers.each do |header|
+        if row[header].match(/\A(\d)+\z/) && (headers_and_type[header].nil? || headers_and_type[header] == :integer)
+          headers_and_type[header] = :integer
+        elsif row[header].match(/^\d*\.\d+$/) && (headers_and_type[header].nil? || headers_and_type[header] == :float)
+          headers_and_type[header] = :float
+        else
+          headers_and_type[header] = :string
+        end
+      end
+    end
+
+    headers_and_type
+  end
+
+  def convert_header_to_methodable_name(header, track_original: false)
+    if track_original
+      @original_headers ||= []
+      @original_headers << header
+    end
 
     header.downcase.gsub(/[^a-z]/, "_").to_sym
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queryable_pstore
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jacob Smith