palm 0.0.3 → 0.0.4

data/CHANGELOG.txt

@@ -1 +1,7 @@
-0.0.1 - Initial Release
+0.0.1 - Initial Release
+
+0.0.3 - Minor bug fixes
+
+0.0.4 - Fixed some really silly binary issues, 
+        where I was using platform specific endian encoding.
+      - Added some more unit tests to make myself feel better.

data/Manifest.txt

@@ -17,4 +17,5 @@ test/HovData.pdb
 test/pdb_test.rb
 test/test_helper.rb
 test/waba_db_test.rb
+test/waba_io_test.rb
 test/waba_records_test.rb

data/lib/palm/version.rb

@@ -2,7 +2,7 @@ module Palm #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/palm/waba_io.rb

@@ -8,7 +8,8 @@ module Palm
 		end
 		
 		def get_short
-			read(2).unpack('s').first
+            s = read(2)
+            ((s[0] & 0xFF) << 8) | (s[1] & 0xFF)
 		end
 		
 		def get_byte
@@ -33,17 +34,19 @@ module Palm
 		end
 		
 		def write_short(short)
-			write([short].pack('s'))
+	    putc( (short >> 8) & 0xFF )
+	    putc( (short >> 0) & 0xFF )
 		end
 		
 		def write_byte(byte)
 			putc byte
 		end
 		
-		def write_int(i)
-			[(i >> 24 & 0xFF), (i >> 16 & 0xFF), (i >> 8 & 0xFF) ,(i & 0xFF)].each do |v|
-				putc v
-			end
+		def write_int(integer)
+	    putc( (integer >> 24) & 0xFF )
+	    putc( (integer >> 16) & 0xFF )
+	    putc( (integer >> 8) & 0xFF )
+	    putc( (integer >> 0) & 0xFF )
 		end
 		
 		def write_bool(b)

data/test/pdb_test.rb

@@ -25,20 +25,6 @@ class TC_PdbTest < Test::Unit::TestCase
 		assert_instance_of(Time, @pdb.backed_up_at)
 	end
 	
-	def test_that_data_looks_right
-		records = @pdb.data
-		io = Palm::WabaStringIO.new(records.first.data)
-		assert_equal 072           	,io.get_byte
-		assert_equal 'Downtown I-5'	,io.get_string
-		assert_equal 'Albro Pl'    	,io.get_string 	
-		assert_equal 1           		,io.get_byte	  
-		assert_equal 5           		,io.get_byte	  
-		assert_equal 5           		,io.get_byte	  
-		assert_equal 'none'      		,io.get_string 	
-		assert_equal false       		,io.get_bool	  
-		assert_equal 21          		,io.get_int	
-	end
-	
 	def test_writing_data
 		@pdb.write_file(@temp_path)
 		

data/test/waba_db_test.rb

@@ -74,4 +74,66 @@ class TC_WabaDBTest < Test::Unit::TestCase
 		assert_equal IO.read(@path), IO.read(@temp_path)
 	end
 	
+	def test_creating_from_scratch
+		@created = Palm::WabaDB.new(TestCollectionPointRecord)
+		@created.name = "HovData"
+		@created.type = "HovD"
+		@created.creator = "Trac"
+		@created.created_at = @pdb.created_at
+		@created.modified_at = @pdb.modified_at
+		@created.backed_up_at = @pdb.backed_up_at
+		
+		# These are two picky bits.  They don't really need to be equal
+		@created.version = 1
+		@created.modnum = 420
+		
+		@pdb.data.each do |r|
+			n = TestCollectionPointRecord.new
+			# Copy each field
+			r.class.fields.map{|f| f.name}.each do |name|
+				n.send("#{name}=", r.send(name))
+			end
+			@created.data << n
+		end
+		@created.attributes = @pdb.attributes
+		@created.write_file(@temp_path)
+		
+		# Ensure the files are the same size
+		assert_equal File.size(@path), File.size(@temp_path)
+		
+		# First assert the headers are the same
+		expected_header = IO.read(@path, Palm::PDB::HEADER_LENGTH).unpack("a32 n n N N N N N N a4 a4 N")
+		actual_header = IO.read(@temp_path, Palm::PDB::HEADER_LENGTH).unpack("a32 n n N N N N N N a4 a4 N")
+		
+		fields = [:name, :bin_attributes, :version, :created_at, :modified_at, :backed_up_at,
+		:modnum, :appinfo_offset, :sort_offset, :type, :creator,
+		:unique_id_seed]
+		
+		fields.each_with_index do |field, i|
+			assert_equal expected_header[i], actual_header[i], "Header field #{field} should be equal"
+		end
+		
+		# Ensure the files are identical
+		expected = IO.read(@path)
+		actual = IO.read(@temp_path)
+		expected.split('').zip(actual.split('')).each_with_index do |pair, i|
+			e,a = pair
+			assert_equal e,a, "At #{i}: expected '#{e}', actual'#{a}'"
+		end
+		
+		assert_equal IO.read(@path), IO.read(@temp_path), "Bytes should be identical"
+	end
+	
+	def test_written_records_are_binary_equivalent
+		@raw = Palm::PDB.new
+		@raw.load_file(@path)
+		
+		@pdb.data.each_with_index do |r,i|
+			io = Palm::WabaStringIO.new(s='', "w")
+			r.write(io)
+			# The actual db will handle writing the first byte
+			assert_equal @raw.data[i].data[1..-1], s, "Data portion should be idential"
+		end
+	end
+	
 end

data/test/waba_io_test.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TC_WabaIOTest < Test::Unit::TestCase
+	def setup
+		setup_paths
+		@pdb = Palm::PDB.new
+		@pdb.load_file(@path)
+	end
+
+	def teardown
+		File.delete(@temp_path) if File.exist? @temp_path
+	end
+	
+	def test_that_data_looks_right
+		records = @pdb.data
+		io = Palm::WabaStringIO.new(records.first.data)
+		assert_equal 072           	,io.get_byte
+		assert_equal 'Downtown I-5'	,io.get_string
+		assert_equal 'Albro Pl'    	,io.get_string 	
+		assert_equal 1           		,io.get_byte	  
+		assert_equal 5           		,io.get_byte	  
+		assert_equal 5           		,io.get_byte	  
+		assert_equal 'none'      		,io.get_string 	
+		assert_equal false       		,io.get_bool	  
+		assert_equal 21          		,io.get_int	
+	end
+	
+	def test_reading_shorts
+		records = @pdb.data
+		io = Palm::WabaStringIO.new(records.first.data)
+		assert_equal 072           	,io.get_byte
+		# next is a string which begins with a short
+		# indicating the string length
+		assert_equal 'Downtown I-5'.length	,io.get_short
+	end
+	
+	def test_round_tripping
+		io = Palm::WabaStringIO.new
+		# Write my data out
+		io.write_string "Hello"
+		io.write_int 42
+		io.write_short 7
+		io.write_bool true
+		io.write_bool nil
+		
+		# Assert my position is: 
+		# 2(short) + 5(string) + 4(int) + 2(short) +1(bool) +1(bool) = 13
+		assert_equal 15, io.pos
+		
+		# Reset
+		io.seek 0
+		
+		# Read back the results
+		assert_equal "Hello", io.get_string
+		assert_equal 42, io.get_int
+		assert_equal 7, io.get_short
+		assert_equal true, io.get_bool
+		assert_equal false, io.get_bool
+	end
+	
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: palm
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-01-04 00:00:00 -08:00
+  version: 0.0.4
+date: 2007-01-05 00:00:00 -08:00
 summary: Pure Ruby library for reading and writing Palm PDB databases.
 require_paths: 
 - lib
@@ -47,10 +47,12 @@ files:
 - test/pdb_test.rb
 - test/test_helper.rb
 - test/waba_db_test.rb
+- test/waba_io_test.rb
 - test/waba_records_test.rb
 test_files: 
 - test/pdb_test.rb
 - test/waba_db_test.rb
+- test/waba_io_test.rb
 - test/waba_records_test.rb
 rdoc_options: []