Return our own Message object from the repository, not a Mail object

lib/message_repository.rb

@@ -1,6 +1,19 @@
 require 'mail'
 
 class MessageRepository
+  class Message
+    attr_reader :mail
+    delegate :subject, :date, :from, to: :mail
+
+    def initialize(body)
+      @mail = Mail.new(body)
+    end
+
+    def ==(message)
+      message.is_a?(Message) && message.mail == mail
+    end
+  end
+
   class << self
     attr_writer :instance
 
@@ -27,7 +40,7 @@ def exists?(key)
 
   def messages
     message_store.values.map do |message|
-      Mail.new message
+      Message.new message
     end
   end
 end

test/unit/message_repository_test.rb

@@ -28,6 +28,6 @@ class MessageRepositoryTest < ActiveSupport::TestCase
     store = stub('message-store')
     repository = MessageRepository.new(store)
     store.stubs(:values).returns(["Subject: One", "Subject: Two"])
-    assert_equal [Mail.new("Subject: One"), Mail.new("Subject: Two")], repository.messages
+    assert_equal [MessageRepository::Message.new("Subject: One"), MessageRepository::Message.new("Subject: Two")], repository.messages
   end
 end