ruby-ole 1.2.11.3 → 1.2.11.4

data/ChangeLog

@@ -1,3 +1,11 @@
+== 1.2.11.4 / 2012-07-03
+
+- Embed PropertySet meta data GUIDs and field lists, to avoid hitting the
+  filesystem and remove dependency on YAML.
+- Update Rakefile to avoid warnings about both deprecated tasks and space
+  before parentheses.
+- Remove Dirent#children=.
+
 == 1.2.11.3 / 2012-02-25
 
 - Various fixes for ruby 1.9.3 - handle iconv deprecation and

data/Rakefile

@@ -1,8 +1,5 @@
 require 'rubygems'
-require 'rake/rdoctask'
 require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
 
 require 'rbconfig'
 require 'fileutils'
@@ -31,20 +28,29 @@ rescue LoadError
 	# Rcov not available
 end
 
-Rake::RDocTask.new do |t|
-	t.rdoc_dir = 'doc'
-	t.rdoc_files.include 'lib/**/*.rb'
-	t.rdoc_files.include 'README', 'ChangeLog'
-	t.title    = "#{PKG_NAME} documentation"
-	t.options += %w[--line-numbers --inline-source --tab-width 2]
-	t.main	   = 'README'
+begin
+	require 'rdoc/task'
+	RDoc::Task.new do |t|
+		t.rdoc_dir = 'doc'
+		t.rdoc_files.include 'lib/**/*.rb'
+		t.rdoc_files.include 'README', 'ChangeLog'
+		t.title    = "#{PKG_NAME} documentation"
+		t.options += %w[--line-numbers --inline-source --tab-width 2]
+		t.main	   = 'README'
+	end
+rescue LoadError
+	# RDoc not available or too old (<2.4.2)
 end
 
-Rake::GemPackageTask.new(spec) do |t|
-	t.gem_spec = spec
-	t.need_tar = true
-	t.need_zip = false
-	t.package_dir = 'build'
+begin
+	require 'rubygems/package_task'
+	Gem::PackageTask.new(spec) do |t|
+		t.need_tar = true
+		t.need_zip = false
+		t.package_dir = 'build'
+	end
+rescue LoadError
+	# RubyGems too old (<1.3.2)
 end
 
 desc 'Run various benchmarks'

data/lib/ole/storage/base.rb

@@ -135,7 +135,7 @@ module Ole # :nodoc:
 				def to_tree idx=0
 					return [] if idx == Dirent::EOT
 					d = self[idx]
-					d.children = to_tree d.child
+					to_tree(d.child).each { |child| d << child }
 					raise FormatError, "directory #{d.inspect} used twice" if d.idx
 					d.idx = idx
 					to_tree(d.prev) + [d] + to_tree(d.next)
@@ -786,14 +786,6 @@ module Ole # :nodoc:
 				@name = name
 			end
 
-			# needed to add reset of @name_lookup here. might be better to just
-			# remove this method as its only used in one place anyway.
-			def children= children
-				@children = []
-				@name_lookup = {}
-				children.each { |child| self << child }
-			end
-
 			def open mode='r'
 				raise Errno::EISDIR unless file?
 				io = RangesIOMigrateable.new self, mode

data/lib/ole/storage/version.rb

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

data/lib/ole/types/property_set.rb

@@ -1,7 +1,5 @@
 # encoding: ASCII-8BIT
 
-require 'yaml'
-
 module Ole
 	module Types
 		#
@@ -24,8 +22,45 @@ module Ole
 			}
 
 			# define a smattering of the property set guids. 
-			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../../data/propids.yaml').
-				inject({}) { |hash, (key, value)| hash.update Clsid.parse(key) => value }
+			DATA = {
+				Clsid.parse('{f29f85e0-4ff9-1068-ab91-08002b27b3d9}') => ['FMTID_SummaryInformation', {
+					2  => 'doc_title',
+					3  => 'doc_subject',
+					4  => 'doc_author',
+					5  => 'doc_keywords',
+					6  => 'doc_comments',
+					7  => 'doc_template',
+					8  => 'doc_last_author',
+					9  => 'doc_rev_number',
+					10 => 'doc_edit_time',
+					11 => 'doc_last_printed',
+					12 => 'doc_created_time',
+					13 => 'doc_last_saved_time',
+					14 => 'doc_page_count',
+					15 => 'doc_word_count',
+					16 => 'doc_char_count',
+					18 => 'doc_app_name',
+					19 => 'security'
+				}],
+				Clsid.parse('{d5cdd502-2e9c-101b-9397-08002b2cf9ae}') => ['FMTID_DocSummaryInfo', {
+					2  => 'doc_category',
+					3  => 'doc_presentation_target',
+					4  => 'doc_byte_count',
+					5  => 'doc_line_count',
+					6  => 'doc_para_count',
+					7  => 'doc_slide_count',
+					8  => 'doc_note_count',
+					9  => 'doc_hidden_count',
+					10 => 'mmclips',
+					11 => 'scale_crop',
+					12 => 'heading_pairs',
+					13 => 'doc_part_titles',
+					14 => 'doc_manager',
+					15 => 'doc_company',
+					16 => 'links_up_to_date'
+				}],
+				Clsid.parse('{d5cdd505-2e9c-101b-9397-08002b2cf9ae}') => ['FMTID_UserDefinedProperties', {}]
+			}
 
 			# create an inverted map of names to guid/key pairs
 			PROPERTY_MAP = DATA.inject({}) do |h1, (guid, data)|

data/ruby-ole.gemspec

@@ -1,4 +1,4 @@
-$:.unshift (File.dirname(__FILE__) + '/lib')
+$:.unshift File.dirname(__FILE__) + '/lib'
 require 'ole/storage/version'
 
 PKG_NAME = 'ruby-ole'
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 	s.rubyforge_project = %q{ruby-ole}
 
 	s.executables = ['oletool']
-	s.files  = ['README', 'COPYING', 'Rakefile', 'ChangeLog', 'ruby-ole.gemspec', 'data/propids.yaml']
+	s.files  = ['README', 'COPYING', 'Rakefile', 'ChangeLog', 'ruby-ole.gemspec']
 	s.files += Dir.glob('lib/**/*.rb')
 	s.files += Dir.glob('test/{test_*.rb,*.doc,oleWithDirs.ole,test_SummaryInformation}')
 	s.files += Dir.glob('bin/*')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 107
   prerelease: false
   segments: 
   - 1
   - 2
   - 11
-  - 3
-  version: 1.2.11.3
+  - 4
+  version: 1.2.11.4
 platform: ruby
 authors: 
 - Charles Lowe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-25 00:00:00 -05:00
+date: 2012-07-03 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,6 @@ files:
 - Rakefile
 - ChangeLog
 - ruby-ole.gemspec
-- data/propids.yaml
 - bin/oletool
 - lib/ole/storage.rb
 - lib/ole/storage/file_system.rb

data/data/propids.yaml

@@ -1,56 +0,0 @@
-"{f29f85e0-4ff9-1068-ab91-08002b27b3d9}":
-  - FMTID_SummaryInformation
-  - 2:  doc_title
-    3:  doc_subject
-    4:  doc_author
-    5:  doc_keywords
-    6:  doc_comments
-    7:  doc_template
-    8:  doc_last_author
-    9:  doc_rev_number
-    10: doc_edit_time
-    11: doc_last_printed
-    12: doc_created_time
-    13: doc_last_saved_time
-    14: doc_page_count
-    15: doc_word_count
-    16: doc_char_count
-    18: doc_app_name
-    19: security
-
-"{d5cdd502-2e9c-101b-9397-08002b2cf9ae}":
-  - FMTID_DocSummaryInfo
-  - 2:  doc_category
-    3:  doc_presentation_target
-    4:  doc_byte_count
-    5:  doc_line_count
-    6:  doc_para_count
-    7:  doc_slide_count
-    8:  doc_note_count
-    9:  doc_hidden_count
-    10: mmclips
-    11: scale_crop
-    12: heading_pairs
-    13: doc_part_titles
-    14: doc_manager
-    15: doc_company
-    16: links_up_to_date
-
-"{d5cdd505-2e9c-101b-9397-08002b2cf9ae}":
-  - FMTID_UserDefinedProperties
-  - {}
-
-# just dumped these all here. if i can confirm any of these
-# better, i can update this file so they're recognized.
-#0b63e343-9ccc-11d0-bcdb-00805fccce04
-#0b63e350-9ccc-11d0-bcdb-00805fccce04 NetLibrary propset?
-#31f400a0-fd07-11cf-b9bd-00aa003db18e ScriptInfo propset?
-#49691c90-7e17-101a-a91c-08002b2ecda9 Query propset?
-#560c36c0-503a-11cf-baa1-00004c752a9a
-#70eb7a10-55d9-11cf-b75b-00aa0051fe20 HTMLInfo propset
-#85ac0960-1819-11d1-896f-00805f053bab message propset?
-#aa568eec-e0e5-11cf-8fda-00aa00a14f93 NNTP SummaryInformation propset?
-#b725f130-47ef-101a-a5f1-02608c9eebac Storage propset
-#c82bf596-b831-11d0-b733-00aa00a1ebd2 NetLibraryInfo propset
-#c82bf597-b831-11d0-b733-00aa00a1ebd2 LinkInformation propset?
-#d1b5d3f0-c0b3-11cf-9a92-00a0c908dbf1 LinkInformation propset?