mbox 0.0.4.2 → 0.0.4.3

data/lib/mbox/mail.rb

@@ -29,66 +29,39 @@ class Mail
 		headers  = Mbox::Mail::Headers.new
 		content  = Mbox::Mail::Content.new(headers)
 
-		inside = {
-			metadata: true,
-			headers:  false,
-			content:  false
-		}
-
-		last = {
-			line:  '',
-			stuff: ''
-		}
-
 		next until input.eof? || (line = input.readline).match(options[:separator])
 
 		return if !line || line.empty?
 
-		metadata.parse_from line
-
-		until input.eof? || ((line = input.readline).match(options[:separator]) && last[:line].empty?)
-			if inside[:metadata]
-				if line.match(/^>+/)
-					metadata.parse_from line
-				else
-					inside[:metadata]    = false
-					inside[:headers] = true
-
-					last[:line] = line.chomp
-
-					next
-				end
-			elsif inside[:headers]
-				if line.strip.empty?
-					inside[:headers] = false
-					inside[:content] = true
-
-					headers.parse(last[:stuff])
-
-					last[:line]  = line.chomp
-					last[:stuff] = ''
+		# metadata parsing
+		begin
+			break unless line.match(/^>+/)
 
-					next
-				end
+			metadata.parse_from line
+		end until input.eof? || (line = input.readline).match(options[:separator])
 
-				last[:stuff] << line
-			elsif inside[:content]
-				if options[:headers_only]
-					last[:line] = line.chomp
+		# headers parsing
+		current = ''
+		begin
+			break if line.strip.empty?
 
-					next
-				end
+			current << line
+		end until input.eof? || (line = input.readline).match(options[:separator])
+		headers.parse(current)
 
-				last[:stuff] << line
-			end
+		# content parsing
+		current = ''
+		until input.eof? || (line = input.readline).match(options[:separator])
+			next if options[:headers_only]
 
-			last[:line] = line.chomp
+			current << line
 		end
 
-		unless last[:stuff].empty?
-			content.parse(last[:stuff])
+		unless options[:headers_only]
+			content.parse(current.chomp)
 		end
 
+		# put the last separator back in its place
 		if !input.eof? && line
 			input.seek(-line.length, IO::SEEK_CUR)
 		end

data/lib/mbox/mail/content.rb

@@ -60,15 +60,7 @@ class Content < Array
 				end
 			}
 		else
-			stream = StringIO.new(text)
-
-			content = (!stream.eof?) ? stream.readline : ''
-			until stream.eof? || line = stream.readline
-				content << line
-			end
-			content.chomp!
-
-			self << File.new(Headers.new, content)
+			self << File.new(headers, text)
 		end
 
 		self

data/lib/mbox/mail/headers.rb

@@ -18,6 +18,7 @@
 #++
 
 require 'stringio'
+require 'forwardable'
 require 'call-me/memoize'
 
 require 'mbox/mail/headers/status'
@@ -71,18 +72,17 @@ class Headers
 		new.parse(input)
 	end
 
+	extend  Forwardable
 	include Enumerable
 
+	def_delegators :@data, :each, :length, :size
+
 	def initialize (start = {})
 		@data = {}
 
 		merge! start
 	end
 
-	def each (&block)
-		@data.each(&block)
-	end
-
 	def [] (name)
 		@data[Name.parse(name)]
 	end
@@ -96,7 +96,7 @@ class Headers
 			value  = ContentType.parse(value)
 		end
 
-		if tmp = @data[name] && !tmp.is_a?(Array)
+		if (tmp = @data[name]) && !tmp.is_a?(Array)
 			@data[name] = [tmp]
 		end
 
@@ -140,13 +140,13 @@ class Headers
 
 				whole, name, value = matches.to_a
 
-				self[name] = value
+				self[name] = value.strip
 				last       = name
 			elsif self[last]
 				if self[last].is_a?(String)
-					self[last] << " #{line}"
+					self[last] << " #{line.strip}"
 				elsif self[last].is_a?(Array) && self[last].last.is_a?(String)
-					self[last].last << " #{line}"
+					self[last].last << " #{line.strip}"
 				end
 			end
 		end

data/lib/mbox/mbox.rb

@@ -68,6 +68,14 @@ class Mbox
 		if @input.respond_to? :flock
 			@input.flock File::LOCK_SH
 		end
+
+		if block_given?
+			begin
+				yield self
+			ensure
+				unlock
+			end
+		end
 	end
 
 	def unlock
@@ -79,29 +87,23 @@ class Mbox
 	def each (opts = {})
 		@input.seek 0
 
-		lock
-
-		while mail = Mail.parse(@input, options.merge(opts))
-			yield mail
-		end
-
-		unlock
+		lock {
+			while mail = Mail.parse(@input, options.merge(opts))
+				yield mail
+			end
+		}
 	end
 
 	def [] (index, opts = {})
-		lock
-
-		seek index
-
-		if @input.eof?
-			raise IndexError, "#{index} is out of range"
-		end
+		lock {
+			seek index
 
-		mail = Mail.parse(@input, options.merge(opts))
-
-		unlock
+			if @input.eof?
+				raise IndexError, "#{index} is out of range"
+			end
 
-		mail
+			Mail.parse(@input, options.merge(opts))
+		}
 	end
 
 	def seek (to, whence = IO::SEEK_SET)
@@ -135,17 +137,15 @@ class Mbox
 		last   = ''
 		length = 0
 
-		lock
+		lock {
+			while line = @input.readline rescue nil
+				if line.match(options[:separator]) && last.chomp.empty?
+					length += 1
+				end
 
-		while line = @input.readline rescue nil
-			if line.match(options[:separator]) && last.chomp.empty?
-				length += 1
+				last = line
 			end
-
-			last = line
-		end
-
-		unlock
+		}
 
 		length
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbox
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: call-me