text-data-tools 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/text-data-tools.rb

@@ -153,12 +153,12 @@ module TextDataTools
 		column_header = index_array.index(index_array.compact[0])
 	end
 
-	# This is a simple class which can interface with the methods of TextFileTools
+	# This is a simple class which can interface with the methods of TextDataTools
 	# to prevent the user having to specify the file name and other properties of the 
 	# data file for every call. In a
 	# nutshell, create a new instance of this class giving it the filename, and any
 	# appropriate options,
-	# then call methods from TextFileTools omitting the appropriate arguments.
+	# then call methods from TextDataTools omitting the appropriate arguments.
 	class TextDataFile
 		def initialize(filename, has_header_line = false, match = /\S+/, header_match = /\S+/)
 			@filename = filename
@@ -168,32 +168,32 @@ module TextDataTools
 			self
 		end
 		def get_1d_array(column_header)
-			TextFileTools.get_1d_array(@filename, @has_header_line, column_header, @match, @header_match)
+			TextDataTools.get_1d_array(@filename, @has_header_line, column_header, @match, @header_match)
 		end
 		def get_1d_array_float(column_header)
-			TextFileTools.get_1d_array_float(@filename, @has_header_line, column_header, @match, @header_match)
+			TextDataTools.get_1d_array_float(@filename, @has_header_line, column_header, @match, @header_match)
 		end
 		def get_1d_array_integer(column_header)
-			TextFileTools.get_1d_array_integer(@filename, @has_header_line, column_header, @match, @header_match)
+			TextDataTools.get_1d_array_integer(@filename, @has_header_line, column_header, @match, @header_match)
 		end
 		def get_2d_array(column_header, index_header)
-			TextFileTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
+			TextDataTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
 		end
 		def get_2d_array_float(column_header, index_header)
-			TextFileTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
+			TextDataTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
 		end
 		def get_2d_array_integer(column_header, index_header)
-			TextFileTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
+			TextDataTools.get_2d_array(@filename, @has_header_line, column_header, index_header, @match, @header_match)
 		end
 		def get_variable_value(name, sep)
-			TextFileTools.get_variable_value(@filename, name, sep)
+			TextDataTools.get_variable_value(@filename, name, sep)
 		end
 		#def method_missing(meth, *args)
-			#if TextFileTools.methods.include? meth
-				#TextFileTools.send(meth, @filename, *args) 
+			#if TextDataTools.methods.include? meth
+				#TextDataTools.send(meth, @filename, *args) 
 			#else
 				#super
 			#end
 		#end
 	end
-end # module TextFileTools
+end # module TextDataTools

data/test/test_text-data-tools.rb

@@ -1,22 +1,22 @@
 require 'helper'
 
-class TestTextFileTools < Test::Unit::TestCase
+class TestTextDataTools < Test::Unit::TestCase
 	def test_1d
-		assert_raise(ArgumentError){TextFileTools.get_1d_array('test/test_dat.dat', true, 2.2)} 
-		assert_raise(ArgumentError){TextFileTools.get_1d_array('test/test_dat.dat',true, /ii\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)} 
-		array = TextFileTools.get_1d_array('test/test_dat.dat', true, /i\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
+		assert_raise(ArgumentError){TextDataTools.get_1d_array('test/test_dat.dat', true, 2.2)} 
+		assert_raise(ArgumentError){TextDataTools.get_1d_array('test/test_dat.dat',true, /ii\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)} 
+		array = TextDataTools.get_1d_array('test/test_dat.dat', true, /i\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
 		#puts array
 		assert_equal(array.size, 18)
 		assert_equal(array[9].to_f, 0.9753E+09)
-		array = TextFileTools.get_1d_array_float('test/test_dat.dat', true, /i\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
+		array = TextDataTools.get_1d_array_float('test/test_dat.dat', true, /i\+ temp/, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
 		assert_equal(array[9], 0.9753E+09)
 	end
 	def test_2d
-		array = TextFileTools.get_2d_array('test/test_dat.dat', true, /i\+ temp/, 0, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
+		array = TextDataTools.get_2d_array('test/test_dat.dat', true, /i\+ temp/, 0, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
 		assert_equal(array.size, 2)
-		array = TextFileTools.get_2d_array('test/test_dat.dat', true, /i\+ temp/, 1, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
+		array = TextDataTools.get_2d_array('test/test_dat.dat', true, /i\+ temp/, 1, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
 		assert_equal(array.size, 18)
-		array = TextFileTools.get_2d_array_float('test/test_dat.dat', true, /i\+ temp/, 0, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
+		array = TextDataTools.get_2d_array_float('test/test_dat.dat', true, /i\+ temp/, 0, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
 		assert_equal(array[0].size, 9)
 		assert_equal(array[1][0], 0.9753E+09)
 
@@ -24,15 +24,15 @@ class TestTextFileTools < Test::Unit::TestCase
 
 	end
 	def test_get_variable
-		variable = TextFileTools.get_variable_value('test/test_dat_2.dat', 'Q', ':')
+		variable = TextDataTools.get_variable_value('test/test_dat_2.dat', 'Q', ':')
 		assert_equal(variable.to_f, 11.989644168449118)
-		variable = TextFileTools.get_variable_value('test/test_dat_2.dat', 'Fusion power', ':')
+		variable = TextDataTools.get_variable_value('test/test_dat_2.dat', 'Fusion power', ':')
 		assert_equal(variable.to_f, 484.34196189744871)
 	end
 	def test_texdatafile_class
-		file = TextFileTools::TextDataFile.new('test/test_dat_2.dat')
+		file = TextDataTools::TextDataFile.new('test/test_dat_2.dat')
 		assert_equal(file.get_variable_value('Alpha power', ':').to_f, 116.90499891894469 )
-		file = TextFileTools::TextDataFile.new('test/test_dat.dat', true, /\S+/,  /(?:\#\s+)?\d:.*?(?=\d:)/)
+		file = TextDataTools::TextDataFile.new('test/test_dat.dat', true, /\S+/,  /(?:\#\s+)?\d:.*?(?=\d:)/)
 		array = file.get_2d_array(/i\+ temp/, /1.*time/)
 		assert_equal(array.size, 2)
 	end

data/text-data-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "text-data-tools"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-06-14"
+  s.date = "2013-06-17"
   s.description = "A small set of tools for reading text based data files into arrays. Works ee.g. for simple columnar data with or without headings."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-data-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2216339992991240693
+      hash: 728842535758122685
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: