mbox 0.0.4 → 0.0.4.1

data/bin/mbox-daemon

@@ -42,28 +42,33 @@ end.parse!
 	end
 }
 
-class Connection < EventMachine::Protocols::LineAndTextProtocol
-	@@unread = {}
+$unread = {}
 
+class Connection < EventMachine::Protocols::LineAndTextProtocol
 	attr_accessor :boxes
 
 	def receive_line (line)
 		whole, target, command, rest = line.match(/^(.*?)\s+(.*?)(?:\s+(.+))?$/).to_a
 
-		boxes = target == '*' ? @boxes : @boxes.select { |box| target.include? box.name }
+		boxes = target == '*' ? $boxes : $boxes.select { |box| target.include? box.name }
 
 		if command == 'list'
 			command = rest
 
 			if command == 'unread'
-				send_response boxes.select { |box|
-					if @@unread[box] && @@unread[box].last_check < [File.ctime(box.path), File.mtime(box.path)].max
-						@@unread[box] = Struct.new(:status, :last_check).new(box.has_unread?, Time.new)
-					else
-						@@unread[box] ||= Struct.new(:status, :last_check).new(box.has_unread?, Time.new)
+				send_response boxes.select {|box|
+					if !$unread[box] || $unread[box].last_check < [File.ctime(box.path), File.mtime(box.path)].max
+						unless $unread[:checking]
+							$unread[:checking] = true
+
+							EM.defer {
+								$unread[box]       = Struct.new(:status, :last_check).new(box.has_unread?, Time.new)
+								$unread[:checking] = false
+							}
+						end
 					end
 
-					@@unread[box].status
+					$unread[box].status rescue false
 				}.map(&:name)
 			end
 		end
@@ -77,15 +82,13 @@ class Connection < EventMachine::Protocols::LineAndTextProtocol
 end
 
 EM.run {
-	boxes = options[:mail][:boxes].map {|name|
+	$boxes = options[:mail][:boxes].map {|name|
 		Mbox.open("#{options[:mail][:directory]}/#{name}")
 	}
 
-	EM.start_server options[:host], options[:port], Connection do |c|
-		c.boxes = boxes
-	end
+	EM.start_server options[:host], options[:port], Connection
 
 	EM.add_periodic_timer options[:every] do
-		`fetchmail`
+		EM.system 'fetchmail'
 	end
 }

data/bin/mbox-do

@@ -34,5 +34,3 @@ if command == 'list'
 		puts JSON.parse(socket.gets).join("\n")
 	end
 end
-
-socket.close

data/lib/mbox/mail/content.rb

@@ -35,7 +35,7 @@ class Content < Array
 		headers = @headers.merge(headers)
 		type    = headers[:content_type]
 
-		if matches = type.mime.match(%r{multipart/(\w+)})
+		if type && type.mime && matches = type.mime.match(%r{multipart/(\w+)})
 			text.sub(/^.*?--#{type.boundary}\n/m, '').sub(/--#{type.boundary}--$/m, '').split("--#{type.boundary}\n").each {|part|
 				stream = StringIO.new(part)
 

data/lib/mbox/mail/headers.rb

@@ -18,6 +18,7 @@
 #++
 
 require 'stringio'
+require 'call-me/memoize'
 
 require 'mbox/mail/headers/status'
 require 'mbox/mail/headers/content_type'
@@ -25,22 +26,45 @@ require 'mbox/mail/headers/content_type'
 class Mbox; class Mail
 
 class Headers
-	def self.name_to_symbol (name)
-		return name if name.is_a? Symbol
+	class Name
+		def self.parse (text)
+			return text if text.is_a? self
 
-		name = name.to_s.downcase.gsub('-', '_').to_sym
+			new(text)
+		end
+
+		def initialize (name)
+			name = name.to_s.downcase.gsub('-', '_').to_sym
 
-		if name.empty?
-			raise ArgumentError, 'cannot pass empty name'
+			if name.empty?
+				raise ArgumentError, 'cannot pass empty name'
+			end
+
+			@internal = name
 		end
 
-		name
-	end
+		def == (other)
+			to_sym == Name.parse(other).to_sym
+		end
 
-	def self.symbol_to_name (name)
-		name.to_s.downcase.gsub('_', '-').gsub(/(\A|-)(.)/) {|match|
-			match.upcase
-		}
+		alias eql? ==
+
+		def hash
+			to_sym.hash
+		end
+
+		def to_sym
+			@internal
+		end
+
+		memoize
+		def to_s
+			to_sym.to_s.downcase.gsub('_', '-').gsub(/(\A|-)(.)/) {|match|
+				match.upcase
+			}
+		end
+
+		alias to_str to_s
 	end
 
 	def self.parse (input)
@@ -60,16 +84,16 @@ class Headers
 	end
 
 	def [] (name)
-		@data[Headers.name_to_symbol(name)]
+		@data[Name.parse(name)]
 	end
 
 	def []= (name, value)
-		name = Headers.name_to_symbol(name)
+		name = Name.parse(name)
 
-		value = case name
-			when :status       then Status.parse(value)
-			when :content_type then ContentType.parse(value)
-			else                    value
+		if name == :status
+			value = Status.parse(value)
+		elsif name == :content_type
+			value  = ContentType.parse(value)
 		end
 
 		if tmp = @data[name] && !tmp.is_a?(Array)
@@ -112,7 +136,7 @@ class Headers
 
 		until input.eof? || (line = input.readline).chomp.empty?
 			if !line.match(/^\s/)
-				next unless matches = line.match(/^([^:]+):\s*(.+)$/)
+				next unless matches = line.match(/^([\w\-]+):\s*(.+)$/)
 
 				whole, name, value = matches.to_a
 
@@ -121,7 +145,7 @@ class Headers
 			elsif self[last]
 				if self[last].is_a?(String)
 					self[last] << " #{line}"
-				elsif self[last].is_a?(Array)
+				elsif self[last].is_a?(Array) && self[last].last.is_a?(String)
 					self[last].last << " #{line}"
 				end
 			end
@@ -135,12 +159,12 @@ class Headers
 
 		each {|name, values|
 			[values].flatten.each {|value|
-				result << "#{Headers.symbol_to_name(name)}: #{value}\n"
+				result << "#{name}: #{value}\n"
 			}
 		}
 
 		result
 	end
 end
-    end
-end
+
+end; end

data/lib/mbox/mbox.rb

@@ -67,9 +67,17 @@ class Mbox
 	def each (opts = {})
 		@input.seek 0
 
+		if @input.respond_to? :flock
+			@input.flock File::LOCK_SH
+		end
+
 		while mail = Mail.parse(@input, options.merge(opts))
 			yield mail
 		end
+
+		if @input.respond_to? :flock
+			@input.flock File::LOCK_UN
+		end
 	end
 
 	def [] (index, opts = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbox
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
-dependencies: []
+date: 2012-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: call-me
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple library to read mbox files.
 email: meh@paranoici.org
 executables:
@@ -50,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple library to read mbox files.