csvr 0.6.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9fb1eb6a9f70e01f636b04fad66ca2e1c0808f0
-  data.tar.gz: cc38a37a17b60c45f482df5575bfece1d6756474
+  metadata.gz: b6b03d9b873a4adb1045f2226a53c438c3ca92bb
+  data.tar.gz: 808c8e8f909e8c6affcd336a507078054940616f
 SHA512:
-  metadata.gz: 0a7df7e589014af3f7f192a0ba77df05853c3fecb124e1f51503f464a9747cd10aed64903cb381f76fc1a2c832183e75d88841ea39b9d0249a85d01c8f0279d6
-  data.tar.gz: b31d2bfe60e898a3950b556e815ebbe0aac75ed53a74ce9e4cdd682ed6dcff2217339b5ac5deebf3d3ba9784d0ae903d7c59ef0ee83ef607008c3f82439667cf
+  metadata.gz: 7377753f0bcce3c813834dcbe498cf7d8287450ca23bc58b0385456771ee8e12b1584d398c029e9432add6df77c1f476ad98238ecbc60250836bcbf479908419
+  data.tar.gz: ff22d7cb0e384e13b937fecf33e01e41e6eb754559c3c7b4a405e6f711ae6a24f1b460df2a2747cd0f7ee6fdd34e126868e323629137fc766b05a685a63b0d10

data/lib/csvr/format.rb

@@ -3,24 +3,19 @@ module Format
 
 	module_function
 
-	#TODO: Interpret data types from the second line of a csv file
-	#TODO: Headers should reflect the data types of their rows
-
-	def headers(headers)
-
-		headers = headers.map { |h| "#{h} TEXT" }.join(",")
+	def headers(headers, types)
+		headers = headers.map { |h| "#{h} #{type(h, types)}" }.join(",")
 		return headers
 	end
 
-	def type(types)
-
-		#Convert Fixnum to Int, etc
-		
-
+	def type(header, types)
+		#This can be done better I am sure
+		return "TEXT" unless types[header] == Fixnum || Float
+		return "INTEGER" unless types[header] == Float
+		return "REAL"
 	end
 
 	def row(row)
-
 		if row.is_a? Hash
 			values = row.values.map { |r| "'#{r}'"}.join(",")
 			keys = row.keys.join(",")

data/lib/csvr/parse.rb

@@ -82,7 +82,8 @@ module CSVR
 					types << hash
 				end
 			end
-			return types.uniq
+			#Remove duplicates and merge array of hashes into single hash
+			return types.uniq.inject(:merge)
 		end
 	end
 end

data/lib/csvr.rb

@@ -3,6 +3,8 @@ require_relative 'csvr/format'
 require_relative 'csvr/sqlitedb'
 require_relative 'csvr/cli'
 
+#TODO: COMMAND LINE OPTIONS?
+
 module CSVR
 
 	module_function
@@ -16,7 +18,7 @@ module CSVR
 		include CSVR::Parse
 		include Format
 
-		attr_reader :file, :rows
+		attr_reader :file, :rows, :types
 		attr_accessor :headers, :filters
 
 		def initialize(file)
@@ -26,11 +28,11 @@ module CSVR
 		def parse
 			@headers ||= CSVR::Parse.headers(@file)
 			@rows = CSVR::Parse.rows(@file, @headers, @filters)
-			@types = CSVR::Parse.type(@headers, @rows[2])
+			@types = CSVR::Parse.type(@headers, @rows[1])
 		end
 
 		def format
-			@headers = Format.headers(@headers)
+			@headers = Format.headers(@headers, @types)
 			@rows = @rows.map{ |row| Format.row(row) }
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csvr
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Smith