ruby-ole 1.2.11.4 → 1.2.11.5

data/ChangeLog

@@ -1,3 +1,10 @@
+== 1.2.11.5 / 2012-11-06
+
+- Fix breakage of IO.parse_mode on Rubinius (issue #10).
+- Make tests pass on rubinius (issue #11).
+- Improve RangesIO test coverage.
+- Don't warn when mbat_start is AVAIL instead of EOC (github #9).
+
 == 1.2.11.4 / 2012-07-03
 
 - Embed PropertySet meta data GUIDs and field lists, to avoid hitting the

data/lib/ole/ranges_io.rb

@@ -1,6 +1,6 @@
 # encoding: ASCII-8BIT
 
-# need IO::Mode
+# need Ole::IOMode
 require 'ole/support'
 
 #
@@ -57,7 +57,7 @@ class RangesIO
 		mode, params = 'r', mode if Hash === mode
 		ranges = params[:ranges]
 		@params = {:close_parent => false}.merge params
-		@mode = IO::Mode.new mode
+		@mode = Ole::IOMode.new mode
 		@io = io
 		# initial position in the file
 		@pos = 0
@@ -255,7 +255,7 @@ end
 class RangesIONonResizeable < RangesIO # :nodoc:
 	def initialize io, mode='r', params={}
 		mode, params = 'r', mode if Hash === mode
-		flags = IO::Mode.new(mode).flags & ~IO::TRUNC
+		flags = Ole::IOMode.new(mode).flags & ~IO::TRUNC
 		super io, flags, params
 	end
 end

data/lib/ole/storage/base.rb

@@ -50,21 +50,16 @@ module Ole # :nodoc:
 				raise ArgumentError, 'unable to specify mode string with io object' if mode
 				[false, arg]
 			end
-			# do we have this file opened for writing? don't know of a better way to tell
-			# (unless we parse the mode string in the open case)
-			# hmmm, note that in ruby 1.9 this doesn't work anymore. which is all the more
-			# reason to use mode string parsing when available, and fall back to something like
-			# io.writeable? otherwise.
+			# 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
 				if mode
-					IO::Mode.new(mode).writeable?
+					IOMode.new(mode).writeable?
 				else
+					# works on mri 1.8 & jruby
 					@io.flush
-					# this is for the benefit of ruby-1.9
-					# generates warnings on jruby though... :/
-					if RUBY_PLATFORM != 'java' and @io.respond_to?(:syswrite)
-						@io.syswrite('')
-					end
+					# works on mri 1.9 & rubinius
+					@io.write_nonblock('') if @io.respond_to?(:write_nonblock)
 					true
 				end
 			rescue IOError
@@ -390,7 +385,7 @@ module Ole # :nodoc:
 				# 3 for this value. 
 				# transacting_signature != "\x00" * 4 or
 				if threshold != 4096 or
-					 num_mbat == 0 && mbat_start != AllocationTable::EOC or
+					 num_mbat == 0 && ![AllocationTable::EOC, AllocationTable::AVAIL].include?(mbat_start) or
 					 reserved != "\x00" * 6
 					Log.warn "may not be a valid OLE2 structured storage file"
 				end

data/lib/ole/storage/file_system.rb

@@ -151,7 +151,7 @@ module Ole # :nodoc:
 			end
 
 			def open path, mode='r', &block
-				if IO::Mode.new(mode).create?
+				if IOMode.new(mode).create?
 					begin
 						dirent = dirent_from_path path
 					rescue Errno::ENOENT

data/lib/ole/storage/version.rb

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

data/lib/ole/support.rb

@@ -11,14 +11,6 @@ require 'stringio'
 require 'enumerator'
 
 class String # :nodoc:
-	# plural of String#index. returns all offsets of +string+. rename to indices?
-	#
-	# note that it doesn't check for overlapping values.
-	def indexes string
-		# in some ways i'm surprised that $~ works properly in this case...
-		to_enum(:scan, /#{Regexp.quote string}/m).map { $~.begin 0 }
-	end
-
 	def each_chunk size
 		(length / size.to_f).ceil.times { |i| yield self[i * size, size] }
 	end
@@ -165,34 +157,8 @@ module RecursivelyEnumerable # :nodoc:
 	end
 end
 
-# can include File::Constants
-class IO
-	# this is for jruby
-	include File::Constants unless defined?(RDONLY)
-
-	# nabbed from rubinius, and modified
-	def self.parse_mode mode
-		ret = 0
-
-		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, 1]
-			when '+'; ret = (ret & ~(RDONLY | WRONLY)) | RDWR
-			when 'b'; ret |= Mode::BINARY
-			else raise ArgumentError, "illegal access mode #{mode}"
-			end
-		end
-	
-		ret
-	end
-
-	class Mode
+module Ole
+	class IOMode
 		# ruby 1.9 defines binary as 0, which isn't very helpful.
 		# its 4 in rubinius. no longer using
 		#
@@ -207,9 +173,31 @@ class IO
 		include Constants
 		NAMES = %w[rdonly wronly rdwr creat trunc append binary]
 
+		# nabbed from rubinius, and modified
+		def self.parse_mode mode
+			ret = 0
+
+			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, 1]
+				when '+'; ret = (ret & ~(RDONLY | WRONLY)) | RDWR
+				when 'b'; ret |= BINARY
+				else raise ArgumentError, "illegal access mode #{mode}"
+				end
+			end
+
+			ret
+		end
+
 		attr_reader :flags
 		def initialize flags
-			flags = IO.parse_mode flags.to_str if flags.respond_to? :to_str
+			flags = self.class.parse_mode flags.to_str if flags.respond_to? :to_str
 			raise ArgumentError, "invalid flags - #{flags.inspect}" unless Fixnum === flags
 			@flags = flags
 		end
@@ -251,7 +239,7 @@ class IO
 =end
 
 		def inspect
-			names = NAMES.map { |name| name if (flags & Mode.const_get(name.upcase)) != 0 }
+			names = NAMES.map { |name| name if (flags & IOMode.const_get(name.upcase)) != 0 }
 			names.unshift 'rdonly' if (flags & 0x3) == 0
 			"#<#{self.class} #{names.compact * '|'}>"
 		end

data/test/test_ranges_io.rb

@@ -29,6 +29,14 @@ class TestRangesIO < Test::Unit::TestCase
 		assert_equal true, f.closed?
 	end
 
+	def test_combine
+		ranges = [[0, 100], 100...200, [200, 100]]
+		io = RangesIO.new STDOUT, 'r+', :ranges => ranges
+		assert_equal [[0, 300]], io.ranges
+		io = RangesIO.new STDOUT, 'r+', :ranges => ranges, :combine => false
+		assert_equal [[0, 100], [100, 100], [200, 100]], io.ranges
+	end
+
 	def test_basics
 		assert_equal 160, @io.size
 		assert_match %r{size=160}, @io.inspect
@@ -44,6 +52,8 @@ class TestRangesIO < Test::Unit::TestCase
 		@io.seek(-10, IO::SEEK_CUR)
 		@io.pos += 20
 		assert_equal 70, @io.pos
+		@io.rewind
+		assert_equal 0, @io.pos
 		# seeking past the end doesn't throw an exception for normal
 		# files, even in read mode, but RangesIO does
 		assert_raises(Errno::EINVAL) { @io.seek 500 }
@@ -97,7 +107,7 @@ class TestRangesIO < Test::Unit::TestCase
 		end
 		# will be fine
 		@io = RangesIONonResizeable.new(StringIO.new, 'w', :ranges => [])
-		assert_equal '#<IO::Mode wronly|creat>', @io.instance_variable_get(:@mode).inspect
+		assert_equal '#<Ole::IOMode wronly|creat>', @io.instance_variable_get(:@mode).inspect
 	end
 end
 

data/test/test_support.rb

@@ -36,15 +36,6 @@ class TestSupport < Test::Unit::TestCase
 		assert_equal str, dst.string
 	end
 
-	def test_string
-		str = "aa aa ||| aa aa"
-		assert_equal [0, 3, 10, 13], str.indexes('aa')
-		# this is mostly a check that regexp quote is used.
-		assert_equal [6, 7, 8], str.indexes('|')
-		# note not [6, 7] - no overlaps
-		assert_equal [6], str.indexes('||')
-	end
-
 	def test_symbol
 		array = (1..10).to_a
 		assert_equal 55, array.inject(&:+)
@@ -53,7 +44,7 @@ end
 
 class TestIOMode < Test::Unit::TestCase
 	def mode s
-		IO::Mode.new s
+		Ole::IOMode.new s
 	end
 
 	def test_parse
@@ -83,9 +74,9 @@ class TestIOMode < Test::Unit::TestCase
 	end
 	
 	def test_inspect
-		assert_equal '#<IO::Mode rdonly>', IO::Mode.new('r').inspect
-		assert_equal '#<IO::Mode rdwr|creat|trunc|binary>', IO::Mode.new('wb+').inspect
-		assert_equal '#<IO::Mode wronly|creat|append>', IO::Mode.new('a').inspect
+		assert_equal '#<Ole::IOMode rdonly>', mode('r').inspect
+		assert_equal '#<Ole::IOMode rdwr|creat|trunc|binary>', mode('wb+').inspect
+		assert_equal '#<Ole::IOMode wronly|creat|append>', mode('a').inspect
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: false
   segments: 
   - 1
   - 2
   - 11
-  - 4
-  version: 1.2.11.4
+  - 5
+  version: 1.2.11.5
 platform: ruby
 authors: 
 - Charles Lowe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 +10:00
+date: 2012-11-06 00:00:00 +11:00
 default_executable: 
 dependencies: []