ruby-ole 1.2.8 → 1.2.8.1

data/ChangeLog

@@ -1,7 +1,11 @@
+== 1.2.8.1 / 2008-10-22
+
+- Fix a couple of breakages when using $KCODE = 'UTF8'
+
 == 1.2.8 / 2008-10-08
 
-- check in the new fixes to the mbat support.
-- update README to be a bit more useful.
+- Check in the new fixes to the mbat support.
+- Update README to be a bit more useful.
 
 == 1.2.7 / 2008-08-12
 

data/README

@@ -91,6 +91,10 @@ See the documentation for each class for more details.
   'a+' modes etc. done?
 * make ranges io obey readable vs writeable modes.
 * more RangesIO completion. ie, doesn't support #<< at the moment.
+* maybe some oletool doc.
+* make sure `rake test' runs tests both with $KCODE='UTF8', and without,
+  and maybe ensure i don't regress on 1.9 and jruby either now that they're
+  fixed.
 
 == 1.3.1
 
@@ -99,6 +103,7 @@ See the documentation for each class for more details.
 * case insensitive mode for ole/file_system?
 * better tests for mbat support.
 * further doc cleanup
+* add in place testing for jruby and ruby1.9
 
 == Longer term
 

data/lib/ole/storage/base.rb

@@ -21,7 +21,7 @@ module Ole # :nodoc:
 		class FormatError < StandardError # :nodoc:
 		end
 
-		VERSION = '1.2.8'
+		VERSION = '1.2.8.1'
 
 		# options used at creation time
 		attr_reader :params
@@ -118,7 +118,7 @@ module Ole # :nodoc:
 	
 			# get block chain for directories, read it, then split it into chunks and load the
 			# directory entries. semantics changed - used to cut at first dir where dir.type == 0
-			@dirents = @bbat.read(@header.dirent_start).scan(/.{#{Dirent::SIZE}}/mo).
+			@dirents = @bbat.read(@header.dirent_start).to_enum(:each_chunk, Dirent::SIZE).
 				map { |str| Dirent.new self, str }.reject { |d| d.type_id == 0 }
 
 			# now reorder from flat into a tree

data/lib/ole/support.rb

@@ -16,6 +16,10 @@ class String # :nodoc:
 		# 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
 end
 
 class File # :nodoc:

data/lib/ole/types/property_set.rb

@@ -85,7 +85,7 @@ module Ole
 
 				def each_raw
 					io.seek offset + 8
-					io.read(length * 8).scan(/.{8}/m).each { |str| yield(*str.unpack('V2')) }
+					io.read(length * 8).each_chunk(8) { |str| yield(*str.unpack('V2')) }
 				end
 				
 				def read_property property_offset
@@ -119,7 +119,7 @@ module Ole
 			end
 
 			def load_section_list str
-				@sections = str.scan(/.{#{Section::SIZE}}/m).map { |s| Section.new s, self }
+				@sections = str.to_enum(:each_chunk, Section::SIZE).map { |s| Section.new s, self }
 			end
 			
 			def [] key

data/test/test_storage.rb

@@ -166,7 +166,7 @@ class TestStorageRead < Test::Unit::TestCase
 
 		# test the ole storage type
 		type = 'Microsoft Word 6.0-Dokument'
-		assert_equal type, (@ole.root/"\001CompObj").read[/^.{32}([^\x00]+)/m, 1]
+		assert_equal type, (@ole.root/"\001CompObj").read[32..-1][/([^\x00]+)/m, 1]
 		# i was actually not loading data correctly before, so carefully check everything here
 		assert_equal expect, @ole.root.children.map { |child| child.read }
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
+  version: 1.2.8.1
 platform: ruby
 authors: 
 - Charles Lowe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-08 00:00:00 +11:00
+date: 2008-10-22 00:00:00 +11:00
 default_executable: 
 dependencies: []