ruby-ole 1.2.6 → 1.2.7

data/test/test_types.rb

@@ -3,36 +3,42 @@
 $: << File.dirname(__FILE__) + '/../lib'
 
 require 'test/unit'
-require 'ole/types'
+require 'ole/types/base'
 
 class TestTypes < Test::Unit::TestCase
 	include Ole::Types
 
 	def test_lpwstr
-		# FIXME adhoc. the iconv-yness shouldn't be user's problem
 		assert_equal "t\000e\000s\000t\000", Lpwstr.dump('test')
 		str = Lpwstr.load "t\000e\000s\000t\000"
 		assert_equal 'test', str
 		assert_equal Lpwstr, str.class
 	end
 
+	def test_lpstr
+		# no null byte? probably wrong
+		assert_equal 'test', Lpstr.dump('test')
+		assert_equal 'test', Lpstr.load("test\000")
+	end
+
 	# in actual fact the same code path would be used for systime i expect
 	def test_filetime
 		# for saving, we can use Date, Time, or DateTime.
 		assert_equal "\000\000\260\3077-\307\001", FileTime.dump(Time.gm(2007, 1, 1))
 		time = FileTime.load "\000\000\260\3077-\307\001"
 		assert_equal FileTime, time.class
-		assert_equal "2007-01-01T00:00:00+00:00", time.to_s
+		assert_equal '2007-01-01T00:00:00+00:00', time.to_s
 		# note that if we'd used Time.local, instead of gm, we'd get a different value. eg
 		assert_equal "\000\370\331\336\r-\307\001", FileTime.dump(DateTime.parse('2007-01-01 00:00 +0500'))
 		# note that it still loads up as GMT, because there's no associated time zone.
 		# essentially, i'm storing and loading times as GMT. maybe i should add in conversion to local time
 		# zone when loading
-		assert_equal "2006-12-31T19:00:00+00:00", FileTime.load("\000\370\331\336\r-\307\001").to_s
+		assert_equal '2006-12-31T19:00:00+00:00', FileTime.load("\000\370\331\336\r-\307\001").to_s
 		# test loading a bogus time
 		assert_equal nil, FileTime.load(0.chr * 8)
 		# this used to be counted as an "unlikely time", and discarded. that has been removed
-		assert_equal "1700-01-01T00:00:00+00:00", FileTime.load(FileTime.dump(Date.new(1700, 1, 1))).to_s
+		assert_equal '1700-01-01T00:00:00+00:00', FileTime.load(FileTime.dump(Date.new(1700, 1, 1))).to_s
+		assert_equal '#<Ole::Types::FileTime 2006-12-31T19:00:00+00:00>', FileTime.load("\000\370\331\336\r-\307\001").inspect
 	end
 
 	def test_guid
@@ -50,5 +56,12 @@ class TestTypes < Test::Unit::TestCase
 		assert_equal Data, data.class
 		assert_equal 'blahblah', Variant.dump(VT_DATE, 'blahblah')
 	end
+	
+	# purely for the purposes of coverage, i'll test these old aliases:
+	def test_deprecated_aliases
+		assert_equal '#<Ole::Types::Clsid:{00020329-0880-4007-c001-123456789046}>',
+								 Ole::Types.load_guid("\x29\x03\x02\x00\x80\x08\x07\x40\xc0\x01\x12\x34\x56\x78\x90\x46").inspect
+		assert_equal '2006-12-31T19:00:00+00:00', Ole::Types.load_time("\000\370\331\336\r-\307\001").to_s
+	end
 end
 

metadata

@@ -1,47 +1,46 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
-date: 2008-07-21 00:00:00 -04:00
-summary: Ruby OLE library.
-require_paths: 
-- lib
-email: aquasync@gmail.com
-homepage: http://code.google.com/p/ruby-ole
-rubyforge_project: ruby-ole
-description: A library for easy read/write access to OLE compound documents for Ruby.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
+  version: 1.2.7
+platform: ""
 authors: 
 - Charles Lowe
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-08-12 00:00:00 +10:00
+default_executable: 
+dependencies: []
+
+description: A library for easy read/write access to OLE compound documents for Ruby.
+email: aquasync@gmail.com
+executables: 
+- oletool
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
+- README
 - Rakefile
 - ChangeLog
 - data/propids.yaml
 - bin/oletool
 - lib/ole/base.rb
 - lib/ole/file_system.rb
-- lib/ole/property_set.rb
 - lib/ole/ranges_io.rb
+- lib/ole/storage/base.rb
+- lib/ole/storage/file_system.rb
+- lib/ole/storage/meta_data.rb
 - lib/ole/storage.rb
 - lib/ole/support.rb
+- lib/ole/types/base.rb
+- lib/ole/types/property_set.rb
 - lib/ole/types.rb
 - test/test_filesystem.rb
 - test/test_mbat.rb
+- test/test_meta_data.rb
 - test/test_property_set.rb
 - test/test_ranges_io.rb
 - test/test_storage.rb
@@ -53,14 +52,9 @@ files:
 - test/test_word_97.doc
 - test/oleWithDirs.ole
 - test/test_SummaryInformation
-test_files: 
-- test/test_filesystem.rb
-- test/test_mbat.rb
-- test/test_property_set.rb
-- test/test_ranges_io.rb
-- test/test_storage.rb
-- test/test_support.rb
-- test/test_types.rb
+has_rdoc: true
+homepage: http://code.google.com/p/ruby-ole
+post_install_message: 
 rdoc_options: 
 - --main
 - README
@@ -68,13 +62,33 @@ rdoc_options:
 - ruby-ole documentation
 - --tab-width
 - "2"
-extra_rdoc_files: []
-
-executables: 
-- oletool
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-ole
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Ruby OLE library.
+test_files: 
+- test/test_filesystem.rb
+- test/test_mbat.rb
+- test/test_meta_data.rb
+- test/test_property_set.rb
+- test/test_ranges_io.rb
+- test/test_storage.rb
+- test/test_support.rb
+- test/test_types.rb

data/lib/ole/property_set.rb

@@ -1,172 +0,0 @@
-require 'ole/types'
-require 'yaml'
-
-module Ole
-	module Types
-		#
-		# The PropertySet class currently supports readonly access to the properties
-		# serialized in "property set" streams, such as the file "\005SummaryInformation",
-		# in OLE files.
-		#
-		# Think has its roots in MFC property set serialization.
-		#
-		# See http://poi.apache.org/hpsf/internals.html for details
-		#
-		class PropertySet
-			HEADER_SIZE = 28
-			HEADER_PACK = "vvVa#{Clsid::SIZE}V"
-			OS_MAP = {
-				0 => :win16,
-				1 => :mac,
-				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}'
-
-			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
-				PACK = "a#{Clsid::SIZE}v"
-
-				attr_reader :length
-				def initialize str, property_set
-					@property_set = property_set
-					super(*str.unpack(PACK))
-					self.guid = Clsid.load guid
-					@map = DATA[guid] ? DATA[guid][1] : nil
-					load_header
-				end
-
-				def io
-					@property_set.io
-				end
-
-				def load_header
-					io.seek offset
-					@byte_size, @length = io.read(8).unpack 'V2'
-				end
-
-				def each
-					io.seek offset + 8
-					io.read(length * 8).scan(/.{8}/m).each do |str|
-						id, property_offset = str.unpack 'V2'
-						io.seek offset + property_offset
-						type, value = io.read(8).unpack('V2')
-						# is the method of serialization here custom?
-						case type
-						when VT_LPSTR, VT_LPWSTR
-							value = Variant.load type, io.read(value)
-						# ....
-						end
-						yield id, type, value
-					end
-					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
-					@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
-			def initialize io
-				@io = io
-				load_header io.read(HEADER_SIZE)
-				load_section_list io.read(@num_sections * Section::SIZE)
-				# expect no gap between last section and start of data.
-				#Log.warn "gap between section list and property data" unless io.pos == @sections.map(&:offset).min
-			end
-
-			def load_header str
-				@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}")
-			end
-
-			def load_section_list str
-				@sections = str.scan(/.{#{Section::SIZE}}/m).map { |s| Section.new s, self }
-			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 |s|
-					s.guid == Types::PropertySet::FMTID_SummaryInformation
-				end
-				return PropertySetSectionProxy.new(dirent, sections.index(section))
-			end
-		end
-		
-		alias summary_info :summary_information
-	end
-end
-