ruby-ole 1.2.4 → 1.2.5

data/ChangeLog

@@ -1,7 +1,12 @@
-== 1.2.4 / ...
+== 1.2.5 / 2008-02-16
+
+- Make all tests pass on ruby 1.9.
+
+== 1.2.4 / 2008-01-09
 
 - Make all tests pass on windows (issue #1).
 - Make all tests pass on a power pc (running ubuntu).
+- Property set convenience access functions.
 
 == 1.2.3 / 2007-12-28
 

data/Rakefile

@@ -37,9 +37,11 @@ end
 
 Rake::RDocTask.new do |t|
 	t.rdoc_dir = 'doc'
+	t.rdoc_files.include 'lib/**/*.rb'
+	t.rdoc_files.include 'README'
 	t.title    = "#{PKG_NAME} documentation"
 	t.options += %w[--line-numbers --inline-source --tab-width 2]
-	t.rdoc_files.include 'lib/**/*.rb'
+	t.main	   = 'README'
 end
 
 spec = Gem::Specification.new do |s|
@@ -62,7 +64,7 @@ spec = Gem::Specification.new do |s|
 
 	s.has_rdoc = true
 	s.rdoc_options += [
-		'--main', 'Ole::Storage',
+		'--main', 'README',
 		'--title', "#{PKG_NAME} documentation",
 		'--tab-width', '2'
 	]

data/lib/ole/file_system.rb

@@ -27,7 +27,7 @@
 # need to implement some more IO functions on RangesIO, like #puts, #print
 # etc, like AbstractOutputStream from zipfile.
 #
-# TODO
+# = TODO
 # 
 # - check Dir.mkdir, and File.open, and File.rename, to add in filename 
 #   length checks (max 32 / 31 or something).

data/lib/ole/property_set.rb

@@ -121,7 +121,7 @@ module Ole
 			end
 
 			def load_section_list str
-				@sections = str.scan(/.{#{Section::SIZE}}/m).map { |str| Section.new str, self }
+				@sections = str.scan(/.{#{Section::SIZE}}/m).map { |s| Section.new s, self }
 			end
 		end
 	end
@@ -159,8 +159,8 @@ module Ole
 				# 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
+				section = sections.find do |s|
+					s.guid == Types::PropertySet::FMTID_SummaryInformation
 				end
 				return PropertySetSectionProxy.new(dirent, sections.index(section))
 			end

data/lib/ole/storage.rb

@@ -67,7 +67,7 @@ module Ole # :nodoc:
 		class FormatError < StandardError # :nodoc:
 		end
 
-		VERSION = '1.2.4'
+		VERSION = '1.2.5'
 
 		# options used at creation time
 		attr_reader :params
@@ -295,7 +295,7 @@ module Ole # :nodoc:
 
 			# now finally write the bbat, using a not resizable io.
 			# the mode here will be 'r', which allows write atm. 
-			RangesIO.open(@io, :ranges => ranges) { |io| io.write @bbat.to_s }
+			RangesIO.open(@io, :ranges => ranges) { |f| f.write @bbat.to_s }
 
 			# this is the mbat. pad it out.
 			bbat_chain += [AllocationTable::AVAIL] * [109 - bbat_chain.length, 0].max
@@ -308,7 +308,7 @@ 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('V*') }
+				RangesIO.open(@io, :ranges => ranges) { |f| f.write mbat_data.pack('V*') }
 			end
 
 			# now seek back and write the header out
@@ -781,6 +781,10 @@ module Ole # :nodoc:
 					self.size = 0 unless @type == :root
 					@children = []
 				end
+				
+				# to silence warnings. used for tree building at load time
+				# only.
+				@idx = nil
 			end
 
 			def open mode='r'

data/lib/ole/support.rb

@@ -27,17 +27,21 @@ class File # :nodoc:
 end
 
 class Symbol # :nodoc:
-	def to_proc
-		proc { |a| a.send self }
+	unless :x.respond_to? :to_proc
+		def to_proc
+			proc { |a| a.send self }
+		end
 	end
 end
 
 module Enumerable # :nodoc:
-	# 1.9 backport
-	def group_by
-		hash = Hash.new { |hash, key| hash[key] = [] }
-		each { |item| hash[yield(item)] << item }
-		hash
+	unless [].respond_to? :group_by
+		# 1.9 backport
+		def group_by
+			hash = Hash.new { |h, key| h[key] = [] }
+			each { |item| hash[yield(item)] << item }
+			hash
+		end
 	end
 
 	def sum initial=0
@@ -159,23 +163,21 @@ end
 
 # can include File::Constants
 class IO
-	BINARY = 0x4 unless defined?(BINARY)
-
 	# nabbed from rubinius, and modified
 	def self.parse_mode mode
 		ret = 0
 
-		case mode[0]
-		when ?r; ret |= RDONLY
-		when ?w; ret |= WRONLY | CREAT | TRUNC
-		when ?a; ret |= WRONLY | CREAT | APPEND
+		case mode[0, 1]
+		when 'r'; ret |= RDONLY
+		when 'w'; ret |= WRONLY | CREAT | TRUNC
+		when 'a'; ret |= WRONLY | CREAT | APPEND
 		else raise ArgumentError, "illegal access mode #{mode}"
 		end
 
 		(1...mode.length).each do |i|
-			case mode[i]
-			when ?+; ret = (ret & ~(RDONLY | WRONLY)) | RDWR
-			when ?b; ret |= BINARY
+			case mode[i, 1]
+			when '+'; ret = (ret & ~(RDONLY | WRONLY)) | RDWR
+			when 'b'; ret |= Mode::BINARY
 			else raise ArgumentError, "illegal access mode #{mode}"
 			end
 		end
@@ -184,6 +186,18 @@ class IO
 	end
 
 	class Mode
+		# ruby 1.9 defines binary as 0, which isn't very helpful.
+		# its 4 in rubinius. no longer using
+		#
+		#   BINARY = 0x4 unless defined?(BINARY)
+		#
+		# for that reason, have my own constants module here
+		module Constants
+			include File::Constants
+			BINARY = 0x4
+		end
+		
+		include Constants
 		NAMES = %w[rdonly wronly rdwr creat trunc append binary]
 
 		attr_reader :flags
@@ -194,28 +208,28 @@ class IO
 		end
 
 		def writeable?
-			#(@flags & IO::RDONLY) == 0
-			(@flags & 0x3) != IO::RDONLY
+			#(@flags & RDONLY) == 0
+			(@flags & 0x3) != RDONLY
 		end
 
 		def readable?
-			(@flags & IO::WRONLY) == 0
+			(@flags & WRONLY) == 0
 		end
 
 		def truncate?
-			(@flags & IO::TRUNC) != 0
+			(@flags & TRUNC) != 0
 		end
 
 		def append?
-			(@flags & IO::APPEND) != 0
+			(@flags & APPEND) != 0
 		end
 
 		def create?
-			(@flags & IO::CREAT) != 0
+			(@flags & CREAT) != 0
 		end
 
 		def binary?
-			(@flags & IO::BINARY) != 0
+			(@flags & BINARY) != 0
 		end
 
 =begin
@@ -230,7 +244,7 @@ class IO
 =end
 
 		def inspect
-			names = NAMES.map { |name| name if (flags & IO.const_get(name.upcase)) != 0 }
+			names = NAMES.map { |name| name if (flags & Mode.const_get(name.upcase)) != 0 }
 			names.unshift 'rdonly' if (flags & 0x3) == 0
 			"#<#{self.class} #{names.compact * '|'}>"
 		end

data/test/test_filesystem.rb

@@ -799,8 +799,8 @@ class ZipFsDirectoryTest < Test::Unit::TestCase
 			d.close
 
 			zf.dir.open("dir1") {
-				|d|
-				assert_equal(['.', '..', "dir11", "file11", "file12"].sort, d.entries.sort)
+				|d2|
+				assert_equal(['.', '..', "dir11", "file11", "file12"].sort, d2.entries.sort)
 			}
 		}
 	end

data/test/test_storage.rb

@@ -8,7 +8,19 @@ require 'digest/sha1'
 require 'stringio'
 require 'tempfile'
 require 'zlib'
-require 'base64'
+
+begin
+	require 'base64'
+rescue LoadError
+	# for 1.9 compatability - for now. not sure what
+	# advised migration is
+	module Base64
+		module_function
+		def decode64(str)
+			str.unpack("m")[0]
+		end
+	end
+end
 
 #
 # = TODO

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
-date: 2008-01-10 00:00:00 +11: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: 
+  version: 1.2.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Charles Lowe
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-16 00:00:00 +11: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: []
+
 files: 
 - Rakefile
 - ChangeLog
@@ -53,28 +46,42 @@ files:
 - test/test_word_97.doc
 - test/oleWithDirs.ole
 - test/test_SummaryInformation
-test_files: 
-- test/test_property_set.rb
-- test/test_ranges_io.rb
-- test/test_types.rb
-- test/test_mbat.rb
-- test/test_support.rb
-- test/test_storage.rb
-- test/test_filesystem.rb
+has_rdoc: true
+homepage: http://code.google.com/p/ruby-ole
+post_install_message: 
 rdoc_options: 
 - --main
-- Ole::Storage
+- README
 - --title
 - 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: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby OLE library.
+test_files: 
+- test/test_property_set.rb
+- test/test_ranges_io.rb
+- test/test_types.rb
+- test/test_mbat.rb
+- test/test_support.rb
+- test/test_storage.rb
+- test/test_filesystem.rb