ruby-ole 1.2.8.1 → 1.2.8.2

data/ChangeLog

@@ -1,3 +1,7 @@
+== 1.2.8.2 / 2009-01-01
+
+- Update code to support ruby 1.9.1
+
 == 1.2.8.1 / 2008-10-22
 
 - Fix a couple of breakages when using $KCODE = 'UTF8'

data/Rakefile

@@ -38,7 +38,7 @@ end
 Rake::RDocTask.new do |t|
 	t.rdoc_dir = 'doc'
 	t.rdoc_files.include 'lib/**/*.rb'
-	t.rdoc_files.include 'README'
+	t.rdoc_files.include 'README', 'ChangeLog'
 	t.title    = "#{PKG_NAME} documentation"
 	t.options += %w[--line-numbers --inline-source --tab-width 2]
 	t.main	   = 'README'
@@ -63,7 +63,7 @@ spec = Gem::Specification.new do |s|
 	s.test_files = FileList['test/test_*.rb']
 
 	s.has_rdoc = true
-	s.extra_rdoc_files = ['README']
+	s.extra_rdoc_files = ['README', 'ChangeLog']
 	s.rdoc_options += [
 		'--main', 'README',
 		'--title', "#{PKG_NAME} documentation",
@@ -73,7 +73,7 @@ end
 
 Rake::GemPackageTask.new(spec) do |t|
 	t.gem_spec = spec
-	t.need_tar = false
+	t.need_tar = true
 	t.need_zip = false
 	t.package_dir = 'build'
 end

data/lib/ole/ranges_io.rb

@@ -192,6 +192,8 @@ class RangesIO
 		end
 		data_pos
 	end
+	
+	alias << write
 
 	# i can wrap it in a buffered io stream that
 	# provides gets, and appropriately handle pos,

data/lib/ole/storage/base.rb

@@ -21,7 +21,7 @@ module Ole # :nodoc:
 		class FormatError < StandardError # :nodoc:
 		end
 
-		VERSION = '1.2.8.1'
+		VERSION = '1.2.8.2'
 
 		# options used at creation time
 		attr_reader :params
@@ -60,6 +60,8 @@ module Ole # :nodoc:
 					IO::Mode.new(mode).writeable?
 				else
 					@io.flush
+					# this is for the benefit of ruby-1.9
+					@io.syswrite('') if @io.respond_to?(:syswrite)
 					true
 				end
 			rescue IOError
@@ -305,7 +307,7 @@ module Ole # :nodoc:
 					io.binmode
 					repack_using_io io
 				end
-			when :mem;  StringIO.open(&method(:repack_using_io))
+			when :mem;  StringIO.open('', &method(:repack_using_io))
 			else raise ArgumentError, "unknown temp backing #{temp.inspect}"
 			end
 		end

data/lib/ole/types/base.rb

@@ -46,7 +46,11 @@ module Ole # :nodoc:
 			
 			def self.dump str
 				# need to append nulls?
-				TO_UTF16.iconv str
+				data = TO_UTF16.iconv str
+				# not sure if this is the recommended way to do it, but I want to treat
+				# the resulting utf16 data as regular bytes, not characters.
+				data.force_encoding Encoding::US_ASCII if data.respond_to? :encoding
+				data
 			end
 		end
 

data/test/test_storage.rb

@@ -8,19 +8,7 @@ require 'digest/sha1'
 require 'stringio'
 require 'tempfile'
 require 'zlib'
-
-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
+require 'base64'
 
 #
 # = TODO
@@ -60,26 +48,20 @@ class TestStorageRead < Test::Unit::TestCase
 		@warn = []
 		outer_warn = @warn
 		old_log = Ole::Log
+		old_verbose = $VERBOSE
 		begin
-			old_verbose = $VERBOSE
-			begin
-				$VERBOSE = nil
-				Ole.const_set :Log, Object.new
-			ensure
-				$VERBOSE = old_verbose
-			end
+			$VERBOSE = nil
+			Ole.const_set :Log, Object.new
+			# restore for the yield
+			$VERBOSE = old_verbose
 			(class << Ole::Log; self; end).send :define_method, :warn do |message|
 				outer_warn << message
 			end
 			yield
 		ensure
-			old_verbose = $VERBOSE
-			begin
-				$VERBOSE = nil
-				Ole.const_set :Log, Object.new
-			ensure
-				$VERBOSE = old_verbose
-			end
+			$VERBOSE = nil
+			Ole.const_set :Log, old_log
+			$VERBOSE = old_verbose
 		end
 	end
 
@@ -124,8 +106,8 @@ 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.
+		# the regular String#hash was different on the mac, so asserting
+		# against full strings. switch this to sha1 instead of this fugly blob
 		data = <<-end
 			eJxjZGBgYkADAABKAAQ=
 
@@ -248,7 +230,7 @@ class TestStorageWrite < Test::Unit::TestCase
 	end
 
 	def test_create_from_scratch_hash
-		io = StringIO.new
+		io = StringIO.new('')
 		Ole::Storage.open(io) { }
 		assert_equal '6bb9d6c1cdf1656375e30991948d70c5fff63d57', sha1(io.string)
 		# more repack test, note invariance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  version: 1.2.8.1
+  version: 1.2.8.2
 platform: ruby
 authors: 
 - Charles Lowe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-22 00:00:00 +11:00
+date: 2009-01-01 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -21,6 +21,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README
+- ChangeLog
 files: 
 - README
 - Rakefile