ruby-ole 1.2.3 → 1.2.4

data/ChangeLog

@@ -1,3 +1,8 @@
+== 1.2.4 / ...
+
+- Make all tests pass on windows (issue #1).
+- Make all tests pass on a power pc (running ubuntu).
+
 == 1.2.3 / 2007-12-28
 
 - MBAT write support re-implmented. Can now write files over ~8mb again.

data/Rakefile

@@ -53,7 +53,7 @@ spec = Gem::Specification.new do |s|
 	s.rubyforge_project = %q{ruby-ole}
 
 	s.executables = ['oletool']
-	s.files  = ['Rakefile', 'ChangeLog']
+	s.files  = ['Rakefile', 'ChangeLog', 'data/propids.yaml']
 	s.files += FileList['lib/**/*.rb']
 	s.files += FileList['test/test_*.rb', 'test/*.doc']
 	s.files += FileList['test/oleWithDirs.ole', 'test/test_SummaryInformation']

data/data/propids.yaml

@@ -0,0 +1,56 @@
+"{f29f85e0-4ff9-1068-ab91-08002b27b3d9}":
+  - FMTID_SummaryInformation
+  - 2:  doc_title
+    3:  doc_subject
+    4:  doc_author
+    5:  doc_keywords
+    6:  doc_comments
+    7:  doc_template
+    8:  doc_last_author
+    9:  doc_rev_number
+    10: doc_edit_time
+    11: doc_last_printed
+    12: doc_created_time
+    13: doc_last_saved_time
+    14: doc_page_count
+    15: doc_word_count
+    16: doc_char_count
+    18: doc_app_name
+    19: security
+
+"{d5cdd502-2e9c-101b-9397-08002b2cf9ae}":
+  - FMTID_DocSummaryInfo
+  - 2:  doc_category
+    3:  doc_presentation_target
+    4:  doc_byte_count
+    5:  doc_line_count
+    6:  doc_para_count
+    7:  doc_slide_count
+    8:  doc_note_count
+    9:  doc_hidden_count
+    10: mmclips
+    11: scale_crop
+    12: heading_pairs
+    13: doc_part_titles
+    14: doc_manager
+    15: doc_company
+    16: links_up_to_date
+
+"{d5cdd505-2e9c-101b-9397-08002b2cf9ae}":
+  - FMTID_UserDefinedProperties
+  - {}
+
+# just dumped these all here. if i can confirm any of these
+# better, i can update this file so they're recognized.
+#0b63e343-9ccc-11d0-bcdb-00805fccce04
+#0b63e350-9ccc-11d0-bcdb-00805fccce04 NetLibrary propset?
+#31f400a0-fd07-11cf-b9bd-00aa003db18e ScriptInfo propset?
+#49691c90-7e17-101a-a91c-08002b2ecda9 Query propset?
+#560c36c0-503a-11cf-baa1-00004c752a9a
+#70eb7a10-55d9-11cf-b75b-00aa0051fe20 HTMLInfo propset
+#85ac0960-1819-11d1-896f-00805f053bab message propset?
+#aa568eec-e0e5-11cf-8fda-00aa00a14f93 NNTP SummaryInformation propset?
+#b725f130-47ef-101a-a5f1-02608c9eebac Storage propset
+#c82bf596-b831-11d0-b733-00aa00a1ebd2 NetLibraryInfo propset
+#c82bf597-b831-11d0-b733-00aa00a1ebd2 LinkInformation propset?
+#d1b5d3f0-c0b3-11cf-9a92-00a0c908dbf1 LinkInformation propset?

data/lib/ole/file_system.rb

@@ -132,7 +132,11 @@ module Ole # :nodoc:
 				# just for the .. and . handling
 				# Hmmm, FIXME: won't work on windows i think. on windows it will prepend
 				# the current drive i believe. may just need to strip the first 2 chars.
-				File.expand_path path
+				if RUBY_PLATFORM =~ /win/o
+					File.expand_path(path)[2..-1]
+				else
+					File.expand_path path
+				end
 			end
 
 			# +orig_path+ is just so that we can use the requested path

data/lib/ole/property_set.rb

@@ -1,4 +1,5 @@
 require 'ole/types'
+require 'yaml'
 
 module Ole
 	module Types
@@ -13,30 +14,41 @@ module Ole
 		#
 		class PropertySet
 			HEADER_SIZE = 28
-			HEADER_UNPACK = "vvVa#{Clsid::SIZE}V"
+			HEADER_PACK = "vvVa#{Clsid::SIZE}V"
 			OS_MAP = {
 				0 => :win16,
 				1 => :mac,
-				2 => :win32
+				2 => :win32,
+				0x20001 => :ooffice, # open office on linux...
 			}
 
 			# define a smattering of the property set guids. 
-			FMTID_SummaryInformation		= Clsid.parse '{f29f85e0-4ff9-1068-ab91-08002b27b3d9}'
-			FMTID_DocSummaryInformation	= Clsid.parse '{d5cdd502-2e9c-101b-9397-08002b2cf9ae}'
-			FMTID_UserDefinedProperties	= Clsid.parse '{d5cdd505-2e9c-101b-9397-08002b2cf9ae}'
+			#FMTID_SummaryInformation		= Clsid.parse '{f29f85e0-4ff9-1068-ab91-08002b27b3d9}'
+			#FMTID_DocSummaryInformation	= Clsid.parse '{d5cdd502-2e9c-101b-9397-08002b2cf9ae}'
+			#FMTID_UserDefinedProperties	= Clsid.parse '{d5cdd505-2e9c-101b-9397-08002b2cf9ae}'
+
+			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../data/propids.yaml').
+				inject({}) { |hash, (key, value)| hash.update Clsid.parse(key) => value }
+
+			module Constants
+				DATA.each { |guid, (name, map)| const_set name, guid }
+			end
+
+			include Constants
 
 			class Section < Struct.new(:guid, :offset)
 				include Variant::Constants
 				include Enumerable
 
 				SIZE = Clsid::SIZE + 4
-				UNPACK_STR = "a#{Clsid::SIZE}v"
+				PACK = "a#{Clsid::SIZE}v"
 
 				attr_reader :length
 				def initialize str, property_set
 					@property_set = property_set
-					super(*str.unpack(UNPACK_STR))
+					super(*str.unpack(PACK))
 					self.guid = Clsid.load guid
+					@map = DATA[guid] ? DATA[guid][1] : nil
 					load_header
 				end
 
@@ -66,9 +78,30 @@ module Ole
 					self
 				end
 
+				def [] key
+					unless Integer === key
+						return unless @map and key = @map.invert[key]
+					end
+					return unless result = properties.assoc(key)
+					result.last
+				end
+
+				def method_missing name, *args
+					if args.empty? and @map and @map.values.include? name.to_s
+						self[name.to_s]
+					else
+						super
+					end
+				end
+
 				def properties
-					to_enum.to_a
+					@properties ||= to_enum.to_a
 				end
+
+				#def to_h
+				#	properties.inject({}) do |hash, (key, type, value)|
+				#		hash.update 
+				#end
 			end
 
 			attr_reader :io, :signature, :unknown, :os, :guid, :sections
@@ -81,7 +114,7 @@ module Ole
 			end
 
 			def load_header str
-				@signature, @unknown, @os_id, @guid, @num_sections = str.unpack HEADER_UNPACK
+				@signature, @unknown, @os_id, @guid, @num_sections = str.unpack HEADER_PACK
 				# should i check that unknown == 0? it usually is. so is the guid actually
 				@guid = Clsid.load @guid
 				@os = OS_MAP[@os_id] || Log.warn("unknown operating system id #{@os_id}")
@@ -92,5 +125,48 @@ module Ole
 			end
 		end
 	end
+	
+	class Storage
+		# i'm thinking - search for a property set in +filenames+ containing a
+		# section with guid +guid+. then yield it. can read/write to it in the
+		# block.
+		# propsets themselves can have guids, but they are often all null.
+		def with_property_set guid, filenames=nil
+		end
+
+		class PropertySetSectionProxy
+			attr_reader :obj, :section_num
+			def initialize obj, section_num
+				@obj, @section_num = obj, section_num
+			end
+			
+			def method_missing name, *args, &block
+				obj.open do |io|
+					section = Types::PropertySet.new(io).sections[section_num]
+					section.send name, *args, &block
+				end
+			end
+		end
+
+		# this will be changed to use with_property_set
+		def summary_information
+			dirent = root["\005SummaryInformation"]
+			dirent.open do |io|
+				propset = Types::PropertySet.new(io)
+				sections = propset.sections
+				# this will maybe get wrapped up as
+				# section = propset[guid]
+				# maybe taking it one step further, i'd hide the section thing,
+				# and let you use composite keys, like
+				# propset[4, guid] eg in MAPI, and just propset.doc_author.
+				section = sections.find do |section|
+					section.guid == Types::PropertySet::FMTID_SummaryInformation
+				end
+				return PropertySetSectionProxy.new(dirent, sections.index(section))
+			end
+		end
+		
+		alias summary_info :summary_information
+	end
 end
 

data/lib/ole/storage.rb

@@ -67,7 +67,7 @@ module Ole # :nodoc:
 		class FormatError < StandardError # :nodoc:
 		end
 
-		VERSION = '1.2.3'
+		VERSION = '1.2.4'
 
 		# options used at creation time
 		attr_reader :params
@@ -151,7 +151,7 @@ module Ole # :nodoc:
 			# create an empty bbat.
 			@bbat = AllocationTable::Big.new self
 			mbat_blocks = (0...@header.num_mbat).map { |i| i + @header.mbat_start }
-			bbat_chain = (header_block[Header::SIZE..-1] + @bbat.read(mbat_blocks)).unpack 'L*'
+			bbat_chain = (header_block[Header::SIZE..-1] + @bbat.read(mbat_blocks)).unpack 'V*'
 			# am i using num_bat in the right way?
 			@bbat.load @bbat.read(bbat_chain[0, @header.num_bat])
 	
@@ -308,12 +308,12 @@ module Ole # :nodoc:
 				q = @bbat.block_size / 4
 				mbat_data += [AllocationTable::AVAIL] *((mbat_data.length / q.to_f).ceil * q - mbat_data.length)
 				ranges = @bbat.ranges((0...num_mbat_blocks).map { |i| @header.mbat_start + i })
-				RangesIO.open(@io, :ranges => ranges) { |io| io.write mbat_data.pack('L*') }
+				RangesIO.open(@io, :ranges => ranges) { |io| io.write mbat_data.pack('V*') }
 			end
 
 			# now seek back and write the header out
 			@io.seek 0
-			@io.write @header.to_s + bbat_chain[0, 109].pack('L*')
+			@io.write @header.to_s + bbat_chain[0, 109].pack('V*')
 			@io.flush
 		end
 
@@ -333,10 +333,13 @@ module Ole # :nodoc:
 		end
 
 		# could be useful with mis-behaving ole documents. or to just clean them up.
-		# FIXME: heard Tempfile is not binary on windows. check
 		def repack temp=:file
 			case temp
-			when :file; Tempfile.open 'ole-repack', &method(:repack_using_io)
+			when :file
+				Tempfile.open 'ole-repack' do |io|
+					io.binmode
+					repack_using_io io
+				end
 			when :mem;  StringIO.open(&method(:repack_using_io))
 			else raise ArgumentError, "unknown temp backing #{temp.inspect}"
 			end
@@ -372,7 +375,7 @@ module Ole # :nodoc:
 				:reserved, :csectdir, :num_bat, :dirent_start, :transacting_signature, :threshold,
 				:sbat_start, :num_sbat, :mbat_start, :num_mbat
 			)
-			PACK = 'a8 a16 S2 a2 S2 a6 L3 a4 L5'
+			PACK = 'a8 a16 v2 a2 v2 a6 V3 a4 V5'
 			SIZE = 0x4c
 			# i have seen it pointed out that the first 4 bytes of hex,
 			# 0xd0cf11e0, is supposed to spell out docfile. hmmm :)
@@ -462,7 +465,7 @@ module Ole # :nodoc:
 			end
 
 			def load data
-				replace data.unpack('L*')
+				replace data.unpack('V*')
 			end
 
 			def truncate
@@ -486,7 +489,7 @@ module Ole # :nodoc:
 				# do you really use AVAIL? they probably extend past end of file, and may shortly
 				# be used for the bat. not really good.
 				table += [AVAIL] * (num - (table.length % num)) if (table.length % num) != 0
-				table.pack 'L*'
+				table.pack 'V*'
 			end
 
 			# rewrote this to be non-recursive as it broke on a large attachment
@@ -716,7 +719,7 @@ module Ole # :nodoc:
 			)
 			include RecursivelyEnumerable
 
-			PACK = 'a64 S C C L3 a16 L a8 a8 L2 a4'
+			PACK = 'a64 v C C V3 a16 V a8 a8 V2 a4'
 			SIZE = 128
 			TYPE_MAP = {
 				# this is temporary
@@ -754,7 +757,7 @@ module Ole # :nodoc:
 				super(*values)
 
 				# extra parsing from the actual struct values
-				@name = params[:name] || Types::Variant.load(Types::VT_LPWSTR, name_utf16[0...name_len].sub(/\x00\x00$/, ''))
+				@name = params[:name] || Types::Variant.load(Types::VT_LPWSTR, name_utf16[0...name_len])
 				@type = if params[:type]
 					unless TYPE_MAP.values.include?(params[:type])
 						raise ArgumentError, "unknown type #{params[:type].inspect}"

data/lib/ole/types.rb

@@ -22,7 +22,17 @@ module Ole # :nodoc:
 			end
 		end
 
-		class Lpstr < Data
+		class Lpstr < String
+			def self.load str
+				# not sure if its always there, but there is often a trailing
+				# null byte.
+				new str.chomp(0.chr)
+			end
+
+			def self.dump str
+				# do i need to append the null byte?
+				str.to_s
+			end
 		end
 
 		# for VT_LPWSTR
@@ -31,10 +41,11 @@ module Ole # :nodoc:
 			TO_UTF16   = Iconv.new 'utf-16le', 'utf-8'
 			
 			def self.load str
-				new FROM_UTF16.iconv(str)
+				new FROM_UTF16.iconv(str).chomp(0.chr)
 			end
 			
 			def self.dump str
+				# need to append nulls?
 				TO_UTF16.iconv str
 			end
 		end
@@ -50,7 +61,7 @@ module Ole # :nodoc:
 			# Converts +str+ to two 32 bit time values, comprising the high and low 32 bits of
 			# the 100's of nanoseconds since 1st january 1601 (Epoch).
 			def self.load str
-				low, high = str.to_s.unpack 'L2'
+				low, high = str.to_s.unpack 'V2'
 				# we ignore these, without even warning about it
 				return nil if low == 0 and high == 0
 				# switched to rational, and fixed the off by 1 second error i sometimes got.
@@ -74,7 +85,7 @@ module Ole # :nodoc:
 				# don't bother to use const_get here
 				bignum = (time - EPOCH) * 86400 * 1e7.to_i
 				high, low = bignum.divmod 1 << 32
-				[low, high].pack 'L2'
+				[low, high].pack 'V2'
 			end
 		end
 
@@ -85,7 +96,7 @@ module Ole # :nodoc:
 		# helper method for creating a Guid from that readable form (#format).
 		class Clsid < String
 			SIZE = 16
-			UNPACK = 'L S S CC C6'
+			PACK = 'V v v CC C6'
 
 			def self.load str
 				new str.to_s
@@ -103,14 +114,14 @@ module Ole # :nodoc:
 					# this is pretty ugly
 					vals[3] = ('%04x' % vals[3]).scan(/../).map(&:hex)
 					vals[4] = ('%012x' % vals[4]).scan(/../).map(&:hex)
-					guid = new vals.flatten.pack(UNPACK)
+					guid = new vals.flatten.pack(PACK)
 					return guid unless guid.delete('{}') == str.downcase.delete('{}')
 				end
 				raise ArgumentError, 'invalid guid - %p' % str
 			end
 
 			def format
-				"%08x-%04x-%04x-%02x%02x-#{'%02x' * 6}" % unpack(UNPACK)
+				"%08x-%04x-%04x-%02x%02x-#{'%02x' * 6}" % unpack(PACK)
 			end
 			
 			def inspect

data/test/test_filesystem.rb

@@ -49,7 +49,7 @@ end
 
 class OleFsNonmutatingTest < Test::Unit::TestCase
 	def setup
-		@ole = Ole::Storage.open TEST_DIR + '/oleWithDirs.ole'
+		@ole = Ole::Storage.open TEST_DIR + '/oleWithDirs.ole', 'rb'
 	end
 
 	def teardown
@@ -502,7 +502,7 @@ end
 class OleFsFileStatTest < Test::Unit::TestCase
 
 	def setup
-		@ole = Ole::Storage.open TEST_DIR + '/oleWithDirs.ole'
+		@ole = Ole::Storage.open TEST_DIR + '/oleWithDirs.ole', 'rb'
 	end
 
 	def teardown
@@ -569,7 +569,7 @@ class OleFsFileMutatingTest < Test::Unit::TestCase
 	def setup
 		# we use an in memory copy of the file instead of the original
 		# file based.
-		@io = StringIO.new File.read(TEST_DIR + '/oleWithDirs.ole')
+		@io = StringIO.new open(TEST_DIR + '/oleWithDirs.ole', 'rb', &:read)
 	end
 
 	def teardown
@@ -660,12 +660,10 @@ class OleFsFileMutatingTest < Test::Unit::TestCase
 end
 
 class ZipFsDirectoryTest < Test::Unit::TestCase
-	TEST_ZIP = "zipWithDirs_copy.zip"
-
 	def setup
 		# we use an in memory copy of the file instead of the original
 		# file based.
-		@io = StringIO.new File.read(TEST_DIR + '/oleWithDirs.ole')
+		@io = StringIO.new open(TEST_DIR + '/oleWithDirs.ole', 'rb', &:read)
 	end
 
 	def teardown

data/test/test_mbat.rb

@@ -10,6 +10,8 @@ require 'tempfile'
 class TestWriteMbat < Test::Unit::TestCase
 	def test_write_mbat
 		Tempfile.open 'myolefile' do |temp|
+			temp.binmode
+
 			# this used to raise an error at flush time, due to failure to write the mbat
 			Ole::Storage.open temp do |ole|
 				# create a 10mb file

data/test/test_property_set.rb

@@ -3,13 +3,14 @@
 $: << File.dirname(__FILE__) + '/../lib'
 
 require 'test/unit'
+require 'ole/storage'
 require 'ole/property_set'
 
 class TestTypes < Test::Unit::TestCase
 	include Ole::Types
 
 	def setup
-		@io = open File.dirname(__FILE__) + '/test_SummaryInformation'
+		@io = open File.dirname(__FILE__) + '/test_SummaryInformation', 'rb'
 	end
 
 	def teardown
@@ -18,13 +19,22 @@ class TestTypes < Test::Unit::TestCase
 
 	def test_property_set
 		propset = PropertySet.new @io
+		assert_equal :mac, propset.os
 		assert_equal 1, propset.sections.length
 		section = propset.sections.first
 		assert_equal 14, section.length
 		assert_equal 'f29f85e0-4ff9-1068-ab91-08002b27b3d9', section.guid.format
 		assert_equal PropertySet::FMTID_SummaryInformation, section.guid
-		# i expect this null byte should have be stripped. need to fix the encoding functions.
-		assert_equal "Charles Lowe\000", section.properties.assoc(4).last
+		assert_equal 'Charles Lowe', section.properties.assoc(4).last
+		# new named support
+		assert_equal 'Charles Lowe', section.doc_author
+	end
+	
+	def test_ole_storage_integration
+		Ole::Storage.open File.dirname(__FILE__) + '/test.doc', 'rb' do |ole|
+			assert_equal 'Charles Lowe', ole.summary_info.doc_author
+			assert_equal 'Title', ole.summary_info.doc_title
+		end
 	end
 end
 

data/test/test_storage.rb

@@ -7,6 +7,8 @@ require 'ole/storage'
 require 'digest/sha1'
 require 'stringio'
 require 'tempfile'
+require 'zlib'
+require 'base64'
 
 #
 # = TODO
@@ -60,12 +62,51 @@ class TestStorageRead < Test::Unit::TestCase
 	end
 
 	def test_read
+		# this data should probably be put elsewhere. not asserting
+		# using hashes anymore, cause they were different on the mac.
+		data = <<-end
+			eJxjZGBgYkADAABKAAQ=
+
+			eJxjZPj3n5mLgeE/EDBwMjGAwAEwyeAmAyR8M5OL8ovz00oUwvOLUhTM9Ax0
+			XfKzS3NT80oYuEDywSBxl/xkBgEgD8TWA3LA8npmYGMAKWQZqA==
+
+			eJztVs9rE0EU/mZ32m5smyZtUlKQunhIezAV6knwYGoRxRLQBG89zCabdiE7
+			K9kJpt7Es1DwLxCsP+jJqycv/S/8I9SrmPgmuy0pK1ilNZd8MPt233zz7dud
+			H+99OXBR+pziILgYgglkqaUvIYFs0pWEBSyzIfsHLKeA3Fl0Y6wTX4d2K7bH
+			uEvP6i90zhuf6P21fxpp0C9nOMOvGuMcUQ1811ZuqOjSVWuzszm8eb52cFR+
+			K/k7yd9L/kHyV6OO8gJBezwT7/UVaj/xY9QRjXHhMDoM5rapZ39o/ntRZ2+0
+			sY3xv0C5xkhT1rXo7gHmBr5VWg7f+gbZqU23KTotSqaT5L+Ba2waDmjR1AsQ
+			qZnf6BVRvv29/5rsUtkJhXpWqiohG6LdCOu7ba+pRFud5veuMBisiKl7rmh4
+			ckfn8jnkv2KxC4tNYpujfhk2NjKaZyNVo0PadoLGni4sMshDM3XlcD3D2DzL
+			gW95oaJcmj3Rv6r174gnyguk1p9HvqtHpdmE/pTHDIUBb50VMHFfNlwS5Fig
+			/ihKrcQH+wPoExCflMZJjWRSxZFf3Cd+zfPd0K64T+1HgS8kZshroLrnO0EL
+			00VNKbc90cKqpi9UPN/phBHXrgQ37a2EwpIelI6JVSFD4kQSGxQVs14WgCMK
+			ZXcQ7WHtYxPWw5JupyuJqLLgeLHPEt5jz4r5CxXWcbY=
+
+			eJzt0z1oU2EcRvE3rR+tWtGtOBQ3hS4tODgWKnQRlM5dHAoZCuIHaLcsBaGT
+			hIBksQmlQ1wCTgF3Q+Z0cHN1lZBQQhL/N60fUEEKh5bK+cHleXlJw+2hHY5S
+			yqXjsruvW++/HzzK3/jwdirN3/n4ZSHu2vspXY+9Gc/ro88txN107P3YK7EP
+			Yq/GPo6diV2LvRabj52KfRl7IbYQeyn2Xezl2N3Yi7H12MnYT7ETsc3Yley+
+			ndIoZN9xN55n8eyM32F2/M6F9vHfYyTa3lm/wH/Ipjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzK
+			synPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPpjyb8mzKsynPprx/NO33
+			+7VaLQ6VSqVUKpXL5cFg0Gq1Go1GtVptNpvFYrFer8dNp9M5lRc+B078dzoc
+			Dnu93uGh2+3G+deNDvm/z7Mpz6Y8m/JsyrMpz6Y8m/JsyrMpz6a8vYmU0rdB
+			SnOx2XkxnqX02/j8ZnXzb+fCrcr09r3Puexnc0efz84z8SznnzzfWH9x++HT
+			V+s/7//8zEnOPwDhN6kw
+		end
+		expect = data.split(/\n\s*\n/).map { |chunk| Zlib::Inflate.inflate Base64.decode64(chunk) }
+
 		# test the ole storage type
 		type = 'Microsoft Word 6.0-Dokument'
 		assert_equal type, (@ole.root/"\001CompObj").read[/^.{32}([^\x00]+)/m, 1]
 		# i was actually not loading data correctly before, so carefully check everything here
-		hashes = [-482597081, 285782478, 134862598, -863988921]
-		assert_equal hashes, @ole.root.children.map { |child| child.read.hash }
+		assert_equal expect, @ole.root.children.map { |child| child.read }
 	end
 end
 
@@ -86,7 +127,7 @@ class TestStorageWrite < Test::Unit::TestCase
 	# of checks involving writes that resize their file bigger/smaller, that resize
 	# the bats to more blocks, that resizes the sb_blocks, that has migration etc.
 	def test_write_hash
-		io = StringIO.open File.read("#{TEST_DIR}/test_word_6.doc")
+		io = StringIO.open open("#{TEST_DIR}/test_word_6.doc", 'rb', &:read)
 		assert_equal '9974e354def8471225f548f82b8d81c701221af7', sha1(io.string)
 		Ole::Storage.open(io, :update_timestamps => false) { }
 		# hash changed. used to be efa8cfaf833b30b1d1d9381771ddaafdfc95305c
@@ -99,7 +140,7 @@ class TestStorageWrite < Test::Unit::TestCase
 	end
 
 	def test_plain_repack
-		io = StringIO.open File.read("#{TEST_DIR}/test_word_6.doc")
+		io = StringIO.open open("#{TEST_DIR}/test_word_6.doc", 'rb', &:read)
 		assert_equal '9974e354def8471225f548f82b8d81c701221af7', sha1(io.string)
 		Ole::Storage.open io, :update_timestamps => false, &:repack
 		# note equivalence to the above flush, repack, flush

data/test/test_support.rb

@@ -11,7 +11,7 @@ class TestSupport < Test::Unit::TestCase
 	def test_file
 		assert_equal 4096, open("#{TEST_DIR}/oleWithDirs.ole") { |f| f.size }
 		# point is to have same interface as:
-		assert_equal 4096, StringIO.open(File.read("#{TEST_DIR}/oleWithDirs.ole")).size
+		assert_equal 4096, StringIO.open(open("#{TEST_DIR}/oleWithDirs.ole", 'rb', &:read)).size
 	end
 
 	def test_enumerable

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
-date: 2007-12-28 00:00:00 +11:00
+  version: 1.2.4
+date: 2008-01-10 00:00:00 +11:00
 summary: Ruby OLE library.
 require_paths: 
 - lib
@@ -31,6 +31,7 @@ authors:
 files: 
 - Rakefile
 - ChangeLog
+- data/propids.yaml
 - bin/oletool
 - lib/ole/ranges_io.rb
 - lib/ole/property_set.rb
@@ -48,6 +49,7 @@ files:
 - test/test_filesystem.rb
 - test/test_word_6.doc
 - test/test_word_95.doc
+- test/test.doc
 - test/test_word_97.doc
 - test/oleWithDirs.ole
 - test/test_SummaryInformation