ruby-msg 1.2.17.2 → 1.2.17.3

data/Rakefile

@@ -59,7 +59,7 @@ end
 
 Rake::GemPackageTask.new(spec) do |p|
 	p.gem_spec = spec
-	p.need_tar = true
+#	p.need_tar = true
 	p.need_zip = false
 	p.package_dir = 'build'
 end

data/lib/msg.rb

@@ -20,7 +20,7 @@ require 'mime'
 #
 
 class Msg
-	VERSION = '1.2.17.2'
+	VERSION = '1.2.17.3'
 	# we look here for the yaml files in data/, and the exe files for support
 	# decoding at the moment.
 	SUPPORT_DIR = File.dirname(__FILE__) + '/..'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-msg
 version: !ruby/object:Gem::Version 
-  version: 1.2.17.2
-date: 2007-06-27 00:00:00 +10:00
+  version: 1.2.17.3
+date: 2007-07-12 00:00:00 +10:00
 summary: Ruby Msg library.
 require_paths: 
 - lib
@@ -38,8 +38,6 @@ files:
 - bin/msgtool
 - bin/oletool
 - lib/orderedhash.rb
-- lib/blah.rb
-- lib/mime-new.rb
 - lib/rtf.rb
 - lib/support.rb
 - lib/mime.rb

data/lib/blah.rb

@@ -1,106 +0,0 @@
-#! /usr/bin/ruby
-
-class SimpleGrammar
-    def initialize(grammar)
-        @grammar = grammar
-    end
-    def scan(cursor,buffer)
-        @grammar.scan(cursor,buffer)
-    end
-    def |(other); Code.new { |cursor,buffer|
-        scan(cursor,buffer) || other.scan(cursor,buffer)
-    } end
-    def +(other); Code.new { |cursor,buffer|
-        scan(cursor,buffer) && other.scan(cursor,buffer)
-    } end
-    def filter(buf0,&block); Code.new { |cursor,buffer|
-        buf = buf0.clone
-        scan(cursor,buf) && buffer.concat(block[buf])
-    } end
-    def discard; Code.new { |cursor,buffer|
-        scan(cursor,[])
-    } end
-    class Code < SimpleGrammar
-        def initialize(&block)
-            @block = block
-        end
-        def scan(cursor,buffer)
-            @block[cursor,buffer]
-        end
-    end
-    class Recurse < SimpleGrammar
-        def initialize(&block)
-            @grammar = block[self]
-        end
-        def scan(cursor,buffer)
-            @grammar.scan(cursor,buffer)
-        end
-    end
-    class Element < SimpleGrammar
-        def initialize(pattern)
-            @pattern = pattern
-        end
-        def scan(cursor,buffer)
-            c = cursor.read1after
-            if @pattern===c
-                buffer << c
-                cursor.skip1next
-                true
-            end
-        end
-    end
-    # Make methods for our classes that call new for us
-    constants.each { |klass|
-        eval("
-            def #{klass}(*args,&block)
-                #{klass}.new(*args,&block)
-            end
-            def self.#{klass}(*args,&block)
-                #{klass}.new(*args,&block)
-            end
-        ")
-    }
-    NULL = Code.new { true }
-end
-
-class IO
-    # implement just the methods we need to look like a cursor
-    def read1after;c=getc;ungetc(c);c;end
-    def skip1next;getc&&true;end
-end
-
-class Expression < SimpleGrammar::Recurse
-    def initialize; super() { |expr|
-        digit = Element(?0..?9)
-        int = Recurse { |int| digit+(int|NULL) }
-        number =
-            (int + (
-                Element(?.)+int |
-                NULL
-            )).filter("") { |n| [n.to_f] }
-        primary = Recurse { |primary|
-            number |
-            Element(?-).discard + primary + Code { |_,b| b[-1]=-b[-1] } |
-            Element(?().discard + expr + Element(?)).discard
-        }
-        product = Recurse { |product|
-            primary + (
-                Element(?*).discard + product + Code { |_,b|
-b[-2]*=b[-1];b.pop } |
-                Element(?/).discard + product + Code { |_,b|
-b[-2]/=b[-1];b.pop } |
-                NULL
-            )
-        }
-        sum = Recurse { |sum|
-            product + (
-                Element(?+).discard + sum + Code { |_,b| b[-2]+=b[-1];b.pop } |
-                Element(?-).discard + sum + Code { |_,b| b[-2]-=b[-1];b.pop } |
-                NULL
-            )
-        }
-    } end
-end
-
-Expression.new.scan(STDIN,buf=[]) && p(buf[0])
-

data/lib/mime-new.rb

@@ -1,210 +0,0 @@
-require 'stringio'
-require 'ole/storage'
-
-# the IO equivalent to StringScanner.
-# in fact its mostly scan and scan_until that are useful to me. maybe this can be
-# mixed in to the underlying io class, as providing a lot of stuff, like simple reads
-# and peeks seems redundant extra layer cruft.
-class IOScanner
-	# needs seekable +io+, as we may read more than we should, and don't
-	# have a way (that i know of?) to push back those bytes onto temporary
-	# buffer. (ungetc?)
-	attr_reader :io
-	def initialize io
-		@io = io
-	end
-
-	def pos
-		@io.pos
-	end
-
-	def pos= pos
-		@io.pos = pos
-	end
-
-	def scan rx
-		rx = Regexp.new rx
-		# now we have to see whether we match
-	end
-end
-
-#
-# = Introduction
-#
-# A *basic* mime class for _really_ _basic_ and probably non-standard parsing
-# and construction of MIME messages.
-#
-# Intended for two main purposes in this project:
-# 1. As the container that is used to build up the message for eventual
-#    serialization as an eml.
-# 2. For assistance in parsing the +transport_message_headers+ provided in .msg files,
-#    which are then kept through to the final eml.
-#
-# = TODO
-#
-# * Better streaming support, rather than an all-in-string approach.
-# * Add +OrderedHash+ optionally, to not lose ordering in headers.
-# * A fair bit remains to be done for this class, its fairly immature. But generally I'd like
-#   to see it be more generally useful.
-# * All sorts of correctness issues, encoding particular.
-# * Duplication of work in net/http.rb's +HTTPHeader+? Don't know if the overlap is sufficient.
-#   I don't want to lower case things, just for starters.
-# * Mime was the original place I wrote #to_tree, intended as a quick debug hack.
-#
-class Mime
-	Hash = begin
-		require 'orderedhash'
-		OrderedHash
-	rescue LoadError
-		Hash
-	end
-
-	attr_reader :headers, :body, :parts, :content_type, :preamble, :epilogue
-
-	# Create a Mime object from +io+ as an initial serialization, which must contain headers
-	# and a body (even if empty). Needs work.
-	attr_reader :io
-	def initialize io=nil
-		# use a string backed io if not specified
-		@io = io || StringIO.new('')
-		# read headers. flexible about new line endings here
-		headers = ''
-		while s = @io.gets
-			s.chomp!
-			break if s.empty?
-			headers << s + "\r\n"
-		end
-		# what remains is the body. maybe rangesio should support infinite ranges
-		@body = RangesIO.new @io, [@io.pos...(@io.stat.size rescue @io.size)]
-		#headers, @body = $~[1..-1] if str[/(.*?\r?\n)(?:\r?\n(.*))?\Z/m]
-
-		# don't like the way i'm creatinh on access.
-		@headers = Hash.new { |hash, key| hash[key] = [] }
-		#@body ||= ''
-		headers.to_s.scan(/^\S+:\s*.*(?:\n\t.*)*/).each do |header|
-			@headers[header[/(\S+):/, 1]] << header[/\S+:\s*(.*)/m, 1].gsub(/\s+/m, ' ').strip # this is kind of wrong
-		end
-
-		# don't have to have content type i suppose
-		@content_type, attrs = nil, {}
-		if @headers.include? 'Content-Type'
-			@content_type, attrs = Mime.split_header @headers['Content-Type'][0]
-		end
-
-		if multipart?
-			# special case
-			if body.size == 0
-				@preamble = ''
-				@epilogue = ''
-				@parts = []
-			else
-				# we need to split the message at the boundary
-				# instead of raising, it should just probably become a single part message.
-				boundary = attrs['boundary'] or raise "no boundary for multipart message"
-
-				# splitting the body:
-				# talk about crap. all that work to use io, and then i do this :)
-				# each multipart should become a sub-io, which gets passed to Mime.new
-				parts = body.read.split(/--#{Regexp.quote boundary}/m)
-				unless parts[-1] =~ /^--/; warn "bad multipart boundary (missing trailing --)"
-				else parts[-1][0..1] = ''
-				end
-				parts.each_with_index do |part, i|
-					part =~ /^(\r?\n)?(.*?)(\r?\n)?\Z/m
-					part.replace $2
-					warn "bad multipart boundary" if (1...parts.length-1) === i and !($1 && $3)
-				end
-				@preamble = parts.shift
-				@epilogue = parts.pop
-				@parts = parts.map { |part| Mime.new part }
-			end
-		end
-	end
-
-	def multipart?
-		@content_type && @content_type =~ /^multipart/ ? true : false
-	end
-
-	def inspect
-		# add some extra here.
-		"#<Mime content_type=#{@content_type.inspect}>"
-	end
-
-	def to_tree
-		if multipart?
-			str = "- #{inspect}\n"
-			parts.each_with_index do |part, i|
-				last = i == parts.length - 1
-				part.to_tree.split(/\n/).each_with_index do |line, j|
-					str << "  #{last ? (j == 0 ? "\\" : ' ') : '|'}" + line + "\n"
-				end
-			end
-			str
-		else
-			"- #{inspect}\n"
-		end
-	end
-
-	def to_s opts={}
-		opts = {:boundary_counter => 0}.merge opts
-		if multipart?
-			boundary = Mime.make_boundary opts[:boundary_counter] += 1, self
-			@body = [preamble, parts.map { |part| "\r\n" + part.to_s(opts) + "\r\n" }, "--\r\n" + epilogue].
-				flatten.join("\r\n--" + boundary)
-			content_type, attrs = Mime.split_header @headers['Content-Type'][0]
-			attrs['boundary'] = boundary
-			@headers['Content-Type'] = [([content_type] + attrs.map { |key, val| %{#{key}="#{val}"} }).join('; ')]
-		end
-
-		str = ''
-		@headers.each do |key, vals|
-			vals.each { |val| str << "#{key}: #{val}\r\n" }
-		end
-		str << "\r\n" + @body
-	end
-
-	def self.split_header header
-		# FIXME: haven't read standard. not sure what its supposed to do with " in the name, or if other
-		# escapes are allowed. can't test on windows as " isn't allowed anyway. can be fixed with more
-		# accurate parser later.
-		# maybe move to some sort of Header class. but not all headers should be of it i suppose.
-		# at least add a join_header then, taking name and {}. for use in Mime#to_s (for boundary
-		# rewrite), and Attachment#to_mime, among others...
-		attrs = {}
-		header.scan(/;\s*([^\s=]+)\s*=\s*("[^"]*"|[^\s;]*)\s*/m).each do |key, value|
-			if attrs[key]; warn "ignoring duplicate header attribute #{key.inspect}"
-			else attrs[key] = value[/^"/] ? value[1..-2] : value
-			end
-		end
-
-		[header[/^[^;]+/].strip, attrs]
-	end
-
-	# +i+ is some value that should be unique for all multipart boundaries for a given message
-	def self.make_boundary i, extra_obj = Mime
-		"----_=_NextPart_#{'%03d' % i}_#{'%08x' % extra_obj.object_id}.#{'%08x' % Time.now}"
-	end
-end
-
-=begin
-things to consider for header work.
-encoded words:
-Subject: =?iso-8859-1?q?p=F6stal?=
-
-and other mime funkyness:
-Content-Disposition: attachment;
-	filename*0*=UTF-8''09%20%D7%90%D7%A5;
-	filename*1*=%20%D7%A1%D7%91-;
-	filename*2*=%D7%A7%95%A5.wma
-Content-Transfer-Encoding: base64
-
-and another, doing a test with an embedded newline in an attachment name, I
-get this output from evolution. I get the feeling that this is probably a bug
-with their implementation though, they weren't expecting new lines in filenames.
-Content-Disposition: attachment; filename="asdf'b\"c
-d   efgh=i: ;\\j"
-d   efgh=i: ;\\j"; charset=us-ascii
-Content-Type: text/plain; name="asdf'b\"c"; charset=us-ascii
-
-=end
-