CSV-datagen 0.1.0 → 0.1.1

data/lib/defines.rb

@@ -0,0 +1,7 @@
+#This file contain all commonly used defines
+
+module GenCSV
+	DEFAULT_OUT_FILE = "out-data.csv"
+	DEFAULT_LINES_COUNT = 100
+	DEFAULT_HEADERS = false
+end

data/lib/gen-data.rb

@@ -51,7 +51,6 @@ class DataGenerator
 		 end
 		 if fa.size == 1 
 			raise 'date has unrecognized format'
-			return ''
 		end
 		res = ''
 		fa.each do | var |
@@ -67,7 +66,6 @@ class DataGenerator
 					res += ( gen_int( 150 ) + 1900).to_s
 				else
 					raise 'date has unrecognized format'
-					return ''
 			end
 			res += del
 		end
@@ -78,7 +76,6 @@ class DataGenerator
 		fa = format.split(':')
 		if fa.size == 1
 			raise 'time has unrecognized format'
-			return ''
 		end
 		is24 = true
 		if fa[0] == '12'
@@ -90,6 +87,7 @@ class DataGenerator
 		res = ''		
 		del = ':'
 		h = 0
+		shTime = " AM"		
 		fa.each do | var |
 			var = var.downcase
 			case var
@@ -97,7 +95,11 @@ class DataGenerator
 					if is24
 						res += gen_int(24).to_s
 					else
-						h = gen_int(12)
+						h = gen_int(24000) / 1000
+						if h > 12
+							h = h - 12
+							shTime = " PM"
+						end
 						res += h.to_s
 					end
 				when 'm'
@@ -106,17 +108,12 @@ class DataGenerator
 					res += gen_int(1000).to_s
 			else
 				raise 'time has unrecognized format'
-				return ''
 			end
 			res += del
 		end		
 		res = res[0..-2]
 		if not is24 
-			if h > 12
-				res += ' PM'
-			else
-				res += ' AM'
-			end
+			res += shTime
 		end
 		return res
 	end

data/lib/read-params.rb

@@ -1,11 +1,8 @@
 #Class that read params from settings file
+require '.\lib\defines'
 
 module GenCSV
 
-DEFAULT_OUT_FILE = "out-data.csv"
-DEFAULT_LINES_COUNT = 100
-DEFAULT_HEADERS = false
-
 class ParamsReader
 	attr_reader :out #out file name
 	attr_reader :lines #lines count for generated csv

data/test/default-2.ini

@@ -0,0 +1 @@
+int,id,1000

data/test/param.ini

@@ -0,0 +1,8 @@
+out,out-data.csv
+lines,1000
+headers,true
+int,id,1000
+string,name,80
+float,price,1000
+dtime,dtime,DD/MM/YY,12:h:m
+tdate,tdate,24:h:m,YYYY/MM/DD

data/test/param.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameters>
+	<out>out-data.csv</out>
+	<lines>1000</lines>
+	<headers>true</headers>
+	<fields>
+		<field>
+			<type max="1000">int</type>
+			<name>id</name>
+		</field>
+		<field>
+			<type length="80">string</type>
+			<name>name</name>
+		</field>
+		<field>
+			<type max="1000" decimal="2">float</type>
+			<name>price</name>
+		</field>
+		<field>
+			<type dformat="dd/mm/yyyy" tformat="h:m:ms" topt="12" wday="true" wdaypos="begin">dtime</type>
+			<name>dtime</name>
+		</field>
+		<field>
+			<type tformat="h:m" dformat="yy/mm/dd" topt="24" wday="false">tdate</type>
+			<name>tdate</name>
+		</field>	
+	</fields>
+</parameters>

data/test/test-gen.rb

@@ -10,6 +10,7 @@ class DataGeneratorTestCase < Test::Unit::TestCase
 		first = @gen.gen_int(1000)
 		second = @gen.gen_int(1000)
 		assert_not_equal(first, second)
+		assert_equal(1, @gen.gen_int(1))
 	end
 	
 	def test_string_generation
@@ -44,14 +45,14 @@ class DataGeneratorTestCase < Test::Unit::TestCase
 		assert_match(/[0-9]+\/[0-9]+\/[0-9][0-9][0-9][0-9]/,@gen.gen_date("DD/MM/YYYY"))
 		assert_match(/[0-9]+\:[0-9]+\:[0-9]+/,@gen.gen_date("DD:MM:YY"))
 		assert_match(/[0-9]+\:[0-9]+\:[0-9][0-9][0-9][0-9]/,@gen.gen_date("DD:MM:YYYY"))
-		assert_equal("",@gen.gen_date("h:m:ms"))
-		assert_equal("",@gen.gen_date("1;2;3"))
+		assert_raise(RuntimeError) {@gen.gen_date("h:m:ms")}
+		assert_raise(RuntimeError) {@gen.gen_date("1;2;3")}
 	end
 	
 	def test_time_generation
 		assert_match(/[0-9]+\:[0-9]+\:[0-9]+\s[AM,PM]/,@gen.gen_time("12:h:m:ms"))
 		assert_match(/[0-9]+\:[0-9]+\:[0-9]+/,@gen.gen_time("h:m:ms"))
-		assert_equal("",@gen.gen_time("hh:mm:ms"))
-		assert_equal("",@gen.gen_time("12/h/m/ms"))
+		assert_raise(RuntimeError) {@gen.gen_time("hh:mm:ms")}
+		assert_raise(RuntimeError) {@gen.gen_time("12/h/m/ms")}
 	end
 end

data/test/test-read-params.rb

@@ -6,7 +6,7 @@ require 'lib\read-params'
 class ParamsReadTestCase < Test::Unit::TestCase
 
 	def test_first # use for test including file 'param.ini'
-		reader = GenCSV::ParamsReader.new('.\param.ini')
+		reader = GenCSV::ParamsReader.new('.\test\param.ini')
 		assert_equal("out-data.csv", reader.out)
 		assert_equal(1000, reader.lines)
 		assert_equal(true, reader.headers)
@@ -14,7 +14,7 @@ class ParamsReadTestCase < Test::Unit::TestCase
 	end
 	
 	def test_default_1_params
-		reader = GenCSV::ParamsReader.new('.\default-1.ini')
+		reader = GenCSV::ParamsReader.new('.\test\default-1.ini')
 		assert_equal(GenCSV::DEFAULT_OUT_FILE, reader.out)
 		assert_equal(GenCSV::DEFAULT_LINES_COUNT, reader.lines)
 		assert_equal(GenCSV::DEFAULT_HEADERS, reader.headers)
@@ -22,7 +22,7 @@ class ParamsReadTestCase < Test::Unit::TestCase
 	end
 
 	def test_default_2_params
-		reader = GenCSV::ParamsReader.new('.\default-2.ini')
+		reader = GenCSV::ParamsReader.new('.\test\default-2.ini')
 		assert_equal(GenCSV::DEFAULT_OUT_FILE, reader.out)
 		assert_equal(GenCSV::DEFAULT_LINES_COUNT, reader.lines)
 		assert_equal(GenCSV::DEFAULT_HEADERS, reader.headers)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: CSV-datagen
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 date: 2007-04-02 00:00:00 +04:00
 summary: A free tool for generating random data for testing purposes.
 require_paths: 
@@ -30,11 +30,16 @@ authors:
 - Dmitry Maksimov
 files: 
 - bin/gen-csv.rb
+- lib/defines.rb
 - lib/gen-data.rb
 - lib/read-params.rb
 - lib/version.rb
 - README.txt
 test_files: 
+- test/default-1.ini
+- test/default-2.ini
+- test/param.ini
+- test/param.xml
 - test/test-gen.rb
 - test/test-read-params.rb
 rdoc_options: []