csvr 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c504e551de84ae6f54fc9a8cf2320be373109af4
-  data.tar.gz: 619340904f794ae994406d8e778568eee3062d14
+  metadata.gz: e9fb1eb6a9f70e01f636b04fad66ca2e1c0808f0
+  data.tar.gz: cc38a37a17b60c45f482df5575bfece1d6756474
 SHA512:
-  metadata.gz: 3761793e745c6651278bcd55afa19e9717456bebe161958c3e83a2073ef6d54d7e65e9a14d123db9c145fc76dbcb1576796b7f13593e39acf1f8057a2cca92a6
-  data.tar.gz: c99de7129fcb86e59a1351e5c69a464c1bc56709d16b9baca2efd5ffbca8c72ac8b4d09bb1a9c12718303e80f21888c080d5a61f27040ea18f879a51d6960098
+  metadata.gz: 0a7df7e589014af3f7f192a0ba77df05853c3fecb124e1f51503f464a9747cd10aed64903cb381f76fc1a2c832183e75d88841ea39b9d0249a85d01c8f0279d6
+  data.tar.gz: b31d2bfe60e898a3950b556e815ebbe0aac75ed53a74ce9e4cdd682ed6dcff2217339b5ac5deebf3d3ba9784d0ae903d7c59ef0ee83ef607008c3f82439667cf

data/lib/csvr.rb

@@ -11,10 +11,10 @@ module CSVR
 		return App.new(file)
 	end
 
-	class App 
+	class App
 
 		include CSVR::Parse
-		include Format 
+		include Format
 
 		attr_reader :file, :rows
 		attr_accessor :headers, :filters
@@ -26,6 +26,7 @@ module CSVR
 		def parse
 			@headers ||= CSVR::Parse.headers(@file)
 			@rows = CSVR::Parse.rows(@file, @headers, @filters)
+			@types = CSVR::Parse.type(@headers, @rows[2])
 		end
 
 		def format
@@ -41,4 +42,3 @@ module CSVR
 		end
 	end
 end
-

data/lib/csvr/cli.rb

@@ -10,7 +10,7 @@ module CSVR
 			outputs = []
 			outputs << "\trequire 'csvr' "
  			outputs << "\tcsvr = CSVR.open('path/to/file')"
- 			outputs << "\t(optional) csvr.headers = ['array','of','custom', 'headers]"
+ 			outputs << "\t(optional) csvr.headers = ['array','of', 'headers]"
 			outputs << "\t(optional) csvr.filters = ['array', 'of' 'strings' 'to' 'parse']"
 			outputs << "\tcsvr.create('db_name', 'table_name')"
 

data/lib/csvr/format.rb

@@ -3,12 +3,20 @@ module Format
 
 	module_function
 
-	#TODO: Interpret data types from the second line of a csv file 
+	#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"}
-		return headers.join(",")
+
+		headers = headers.map { |h| "#{h} TEXT" }.join(",")
+		return headers
+	end
+
+	def type(types)
+
+		#Convert Fixnum to Int, etc
+		
+
 	end
 
 	def row(row)
@@ -19,4 +27,4 @@ module Format
 		end
 		return "(#{keys}) VALUES(#{values})"
 	end
-end
+end

data/lib/csvr/parse.rb

@@ -1,15 +1,15 @@
 require 'csv'
 
-module CSVR 
+module CSVR
 
-	module Parse 
+	module Parse
 
 		module_function
 
 		def headers(file)
 
-			File.open(file) do |fi| 
-				1.times do 
+			File.open(file) do |fi|
+				1.times do
 					return CSV.parse_line(fi.readline)
 				end
 			end
@@ -30,24 +30,24 @@ module CSVR
 
 			File.open(file) do |fi|
 
-				#TODO: Skip the first line. The code below creates an EOF Error
-
-				# lines = fi.each_line
-				# lines.next
+				#Skip the first line
+				lines = fi.each_line
+				lines.next
 
 				values = []
 				counter = 0
 
-				maximum(file).times do 
+				lines.each do |line|
 
 					counter += 1
 					puts "Parsing #{counter}"
 
-					row = CSV.parse_line(fi.readline)
+					row = CSV.parse_line(line, :converters => :all)
 
 					hash = {}
 
-					index.each do |k, v| 
+					#Remove ' punctation - this causes problems with the "INSERT INTO lines"
+					index.each do |k, v|
 						row[k].gsub!(/[']/, '') if row[k].respond_to? :gsub
 						hash[v] = row[k]
 					end
@@ -72,8 +72,17 @@ module CSVR
 			return nil
 		end
 
-		def maximum(file)
-			return %x{wc -l < "#{file}"}.to_i
+		def type(headers, row)
+
+			types = []
+			headers.each do |header|
+				hash = {}
+				row.each do |k, v|
+					hash[k] = v.class if header.include?(k)
+					types << hash
+				end
+			end
+			return types.uniq
 		end
 	end
 end

metadata

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