ruby-ole 1.2.11.6 → 1.2.11.7

data/ChangeLog

@@ -1,3 +1,11 @@
+== 1.2.11.7 / 2013-06-24
+
+- Various encoding fixes to make tests pass on current rubies.
+- Fix RangesIO#write behaviour when passed an encoded string (github #14,
+  romuloceccon).
+- Fix Dirent#each_child attempting iteration on file children (github #13).
+- Unused variable fixes to avoid warnings (github #12, kachick).
+
 == 1.2.11.6 / 2012-12-10
 
 - Fix breakage of writable IO stream detection on Windows (github #11).

data/lib/ole/ranges_io.rb

@@ -195,6 +195,11 @@ class RangesIO
 	end
 
 	def write data
+		# duplicates object to avoid side effects for the caller, but do so only if
+		# encoding isn't already ASCII-8BIT (slight optimization)
+		if data.respond_to?(:encoding) and data.encoding != Encoding::ASCII_8BIT
+			data = data.dup.force_encoding(Encoding::ASCII_8BIT)
+		end
 		return 0 if data.empty?
 		data_pos = 0
 		# if we don't have room, we can use the truncate hook to make more space.

data/lib/ole/storage/base.rb

@@ -50,6 +50,8 @@ module Ole # :nodoc:
 				raise ArgumentError, 'unable to specify mode string with io object' if mode
 				[false, arg]
 			end
+			# force encoding, to avoid picking up source encoding with StringIO or files in text mode
+			@io.set_encoding Encoding::ASCII_8BIT if @io.respond_to?(:set_encoding)
 			# do we have this file opened for writing? use mode when provided,
 			# otherwise try no-op methods which will raise if read-only
 			@writeable = begin
@@ -229,7 +231,6 @@ module Ole # :nodoc:
 			# delete a lot of stuff, and free up trailing blocks, the file size never shrinks. this can
 			# be fixed easily, add an io truncate
 			@bbat.truncate!
-			before = @io.size
 			@io.truncate @bbat.block_size * (@bbat.length + 1)
 			while true
 				# get total bbat size. equivalent to @bbat.to_s.length, but for the factoring in of
@@ -832,7 +833,7 @@ module Ole # :nodoc:
 			end
 
 			def each_child(&block)
-				@children.each(&block)
+				@children.each(&block) if dir?
 			end
 
 			# flattens the tree starting from here into +dirents+. note it modifies its argument.

data/lib/ole/storage/meta_data.rb

@@ -76,8 +76,8 @@ module Ole
 				# byte_order: 0xffe
 				# windows_version: 0x00000a03 (win31 apparently)
 				# marker: 0xffffffff
-				compobj_version, byte_order, windows_version, marker, clsid =
-					data.unpack("vvVVa#{Types::Clsid::SIZE}")
+				# compobj_version, byte_order, windows_version, marker, clsid =
+				# 	data.unpack("vvVVa#{Types::Clsid::SIZE}")
 				strings = []
 				i = 28
 				while i < data.length
@@ -137,7 +137,7 @@ module Ole
 
 			def method_missing name, *args, &block
 				return super unless args.empty?
-				pair = Types::PropertySet::PROPERTY_MAP[name.to_s] or return super
+				return super unless Types::PropertySet::PROPERTY_MAP[name.to_s]
 				self[name]
 			end
 		end

data/lib/ole/storage/version.rb

@@ -2,7 +2,7 @@
 
 module Ole # :nodoc:
 	class Storage
-		VERSION = '1.2.11.6'
+		VERSION = '1.2.11.7'
 	end
 end
 

data/lib/ole/types/property_set.rb

@@ -68,7 +68,7 @@ module Ole
 			end
 
 			module Constants
-				DATA.each { |guid, (name, map)| const_set name, guid }
+				DATA.each { |guid, (name, _)| const_set name, guid }
 			end
 
 			include Constants

data/test/test_filesystem.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/ruby
+# encoding: ASCII-8BIT
 
 #
 # = NOTE
@@ -564,10 +565,9 @@ class OleFsFileStatTest < Test::Unit::TestCase
 	# an additional test i added for coverage. i've tried to make the inspect
 	# string on the ole stat match that of the regular one.
 	def test_inspect
-		expect = '#<Ole::Storage::FileClass::Stat ino=0, uid=0, size=72, rdev=0, nlink=1, dev=0, blocks=2, gid=0, ftype=file, blksize=64>'
-		# normalize them, as instance_variables order is undefined
+		# normalize, as instance_variables order is undefined
 		normalize = proc { |s| s[/ (.*)>$/, 1].split(', ').sort.join(', ') }
-		assert_equal normalize[expect], normalize[@ole.file.stat('file1').inspect]
+		assert_match %r{blocks=2.*ftype=file.*size=72}, normalize[@ole.file.stat('file1').inspect]
 	end
 end
 
@@ -594,20 +594,24 @@ class OleFsFileMutatingTest < Test::Unit::TestCase
 		Ole::Storage.open(@io) {
 			|zf|
 
+			blockCalled = nil
 			zf.file.open("test_open_write_entry", "w") {
 				|f|
 				blockCalled = true
 				f.write "This is what I'm writing"
 			}
+			assert(blockCalled)
 			assert_equal("This is what I'm writing",
 										zf.file.read("test_open_write_entry"))
 
+			blockCalled = nil
 			# Test with existing entry
 			zf.file.open("file1", "w") {
 				|f|
 				blockCalled = true
 				f.write "This is what I'm writing too"
 			}
+			assert(blockCalled)
 			assert_equal("This is what I'm writing too",
 										zf.file.read("file1"))
 		}
@@ -902,6 +906,24 @@ class OleUnicodeTest < Test::Unit::TestCase
 			end
 		end
 	end
+
+	def test_write_utf8_string
+		programmer = "programa\xC3\xA7\xC3\xA3o "
+		programmer.force_encoding Encoding::UTF_8 if programmer.respond_to? :encoding
+		Ole::Storage.open @io do |ole|
+			ole.file.open '1', 'w' do |writer|
+				writer.write(programmer)
+				writer.write('ruby')
+			end
+		end
+		Ole::Storage.open @io do |ole|
+			ole.file.open '1', 'r' do |reader|
+				s = reader.read
+				s = s.force_encoding('UTF-8') if s.respond_to?(:encoding)
+				assert_equal(programmer + 'ruby', s)
+			end
+		end
+	end
 end
 
 # Copyright (C) 2002, 2003 Thomas Sondergaard

data/test/test_storage.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/ruby
+# coding: utf-8
 
 $: << File.dirname(__FILE__) + '/../lib'
 #require 'rubygems'

data/test/test_types.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/ruby
+# encoding: ASCII-8BIT
 
 $: << File.dirname(__FILE__) + '/../lib'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  hash: 111
+  hash: 109
   prerelease: false
   segments: 
   - 1
   - 2
   - 11
-  - 6
-  version: 1.2.11.6
+  - 7
+  version: 1.2.11.7
 platform: ruby
 authors: 
 - Charles Lowe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-10 00:00:00 +11:00
+date: 2013-06-24 00:00:00 +10:00
 default_executable: 
 dependencies: []