ruby-ole 1.2.11.2 → 1.2.11.3

data/ChangeLog

@@ -1,3 +1,9 @@
+== 1.2.11.3 / 2012-02-25
+
+- Various fixes for ruby 1.9.3 - handle iconv deprecation and
+  fix FileTime.from_time (github #7, brawnski).
+- Avoid constant redefinition warning in gemspec.
+
 == 1.2.11.2 / 2011-09-07
 
 - Remove empty dirents after constructing tree (fixes non-contiguous

data/lib/ole/storage/base.rb

@@ -786,8 +786,11 @@ 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
 

data/lib/ole/storage/version.rb

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

data/lib/ole/types/base.rb

@@ -1,6 +1,5 @@
 # encoding: ASCII-8BIT
 
-require 'iconv'
 require 'date'
 
 require 'ole/base'
@@ -37,22 +36,53 @@ module Ole # :nodoc:
 			end
 		end
 
-		# for VT_LPWSTR
-		class Lpwstr < String
-			FROM_UTF16 = Iconv.new 'utf-8', 'utf-16le'
-			TO_UTF16   = Iconv.new 'utf-16le', 'utf-8'
+		if ''.respond_to? :encode
+			# NOTE: only here in the interim to preserve behaviour of
+			# FROM/TO_UTF16 constants for ruby-msg. 
+			class Iconv # :nodoc:
+				def initialize(to, from)
+					@to, @from = to, from
+				end
 
-			def self.load str
-				new FROM_UTF16.iconv(str).chomp(0.chr)
+				def iconv(str)
+					str.encode(@to, @from)
+				end
 			end
 
-			def self.dump str
-				# need to append nulls?
-				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::ASCII_8BIT if data.respond_to? :encoding
-				data
+			# for VT_LPWSTR
+			class Lpwstr < String
+				FROM_UTF16 = Iconv.new 'utf-8', 'utf-16le'
+				TO_UTF16   = Iconv.new 'utf-16le', 'utf-8'
+
+				def self.load str
+					new str.encode(Encoding::UTF_8, Encoding::UTF_16LE).chomp(0.chr)
+				end
+
+				def self.dump str
+					# need to append nulls?
+					data = str.encode(Encoding::UTF_16LE)
+					# 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::ASCII_8BIT
+					data
+				end
+			end
+		else
+			require 'iconv'
+
+			# for VT_LPWSTR
+			class Lpwstr < String
+				FROM_UTF16 = Iconv.new 'utf-8', 'utf-16le'
+				TO_UTF16   = Iconv.new 'utf-16le', 'utf-8'
+
+				def self.load str
+					new FROM_UTF16.iconv(str).chomp(0.chr)
+				end
+
+				def self.dump str
+					# need to append nulls?
+					TO_UTF16.iconv str
+				end
 			end
 		end
 
@@ -61,7 +91,7 @@ module Ole # :nodoc:
 			SIZE = 8
 
 			# DateTime.new is slow... faster version for FileTime
-			def self.new year, month, day, hour=0, min=0, sec=0, usec=0
+			def self.new year, month, day, hour=0, min=0, sec=0
 				# DateTime will remove leap and leap-leap seconds
 				sec = 59 if sec > 59
 				if month <= 2
@@ -79,7 +109,7 @@ module Ole # :nodoc:
 			end if respond_to?(:new!) || respond_to?(:new0)
 
 			def self.from_time time
-				new(*(time.to_a[0, 6].reverse + [time.usec]))
+				new(*time.to_a[0, 6].reverse)
 			end
 
 			def self.now

data/ruby-ole.gemspec

@@ -1,4 +1,5 @@
-Kernel.load File.dirname(__FILE__) + '/lib/ole/storage/version.rb'
+$:.unshift (File.dirname(__FILE__) + '/lib')
+require 'ole/storage/version'
 
 PKG_NAME = 'ruby-ole'
 PKG_VERSION = Ole::Storage::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ole
 version: !ruby/object:Gem::Version 
-  hash: 103
+  hash: 101
   prerelease: false
   segments: 
   - 1
   - 2
   - 11
-  - 2
-  version: 1.2.11.2
+  - 3
+  version: 1.2.11.3
 platform: ruby
 authors: 
 - Charles Lowe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -04:00
+date: 2012-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: []