exjournal 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/exjournal.rb

@@ -52,7 +52,7 @@ module Exjournal
   # parse an address to a hash
   def parse_address(address)
     address = TMail::Address.parse(address) if address.is_a?(String)
-    {:name=>address.name, :address=>address.address}
+    {:name=>address.name, :email_address=>address.address}
   end
 
   # parse one or more addresses to hash. failures result in a warning logged
@@ -77,6 +77,7 @@ module Exjournal
     in_reply_to = strip_headers(mail.in_reply_to) if mail.in_reply_to
     references = strip_headers(mail.references) if mail.references
     from = parse_addresses(mail.from_addrs).first
+    sender = parse_addresses(mail.sender).first
     to = parse_addresses(mail.to_addrs)
     cc=parse_addresses(mail.cc_addrs)
     bcc=parse_addresses(mail.bcc_addrs)
@@ -87,6 +88,7 @@ module Exjournal
       :in_reply_to=>in_reply_to,
       :references=>references,
       :from=>from,
+      :sender=>sender,
       :to=>to,
       :cc=>cc,
       :bcc=>bcc

data/spec/exjournal_spec.rb

@@ -69,28 +69,28 @@ Subject: i can't tell you
   describe "parse_address" do
     it "should extract a hash from an address" do
       h = Exjournal.parse_address(TMail::Address.parse('"foo mcfoo" <foo@bar.com>'))
-      h.should == {:name=>"foo mcfoo", :address=>"foo@bar.com"}
+      h.should == {:name=>"foo mcfoo", :email_address=>"foo@bar.com"}
     end
   end
 
   describe "parse_addresses" do
     it "should extract a hash from a single address" do
       h = Exjournal.parse_addresses(TMail::Address.parse('"foo mcfoo" <foo@bar.com>'))
-      h.should == [{:name=>"foo mcfoo", :address=>"foo@bar.com"}]
+      h.should == [{:name=>"foo mcfoo", :email_address=>"foo@bar.com"}]
     end
 
     it "should extract hashes from more than one address" do
       h = Exjournal.parse_addresses([TMail::Address.parse('"foo mcfoo" <foo@bar.com>'),
                                      TMail::Address.parse('"baz mcbaz" <baz@boo.com>')])
-      h.should == [{:name=>"foo mcfoo", :address=>"foo@bar.com"},
-                   {:name=>"baz mcbaz", :address=>"baz@boo.com"}]
+      h.should == [{:name=>"foo mcfoo", :email_address=>"foo@bar.com"},
+                   {:name=>"baz mcbaz", :email_address=>"baz@boo.com"}]
     end
 
     it "should skip unparseable addresses and log a warning" do
       mock(Exjournal.logger).warn(anything).times(2)
       h = Exjournal.parse_addresses(['"foo mcfoo" <foo@bar.com>',
                                      '"baz mcbaz" <<baz@boo.com>'])
-      h.should == [{:name=>"foo mcfoo", :address=>"foo@bar.com"}]
+      h.should == [{:name=>"foo mcfoo", :email_address=>"foo@bar.com"}]
     end
   end
 
@@ -105,9 +105,10 @@ Subject: i can't tell you
       h[:references].should == ["B63CAA43-F378-4033-BA8B-foo@empire42.com", 
                                 "B63CAA43-F378-4033-BA8B-bar@empire42.com", 
                                 "B63CAA43-F378-4033-BA8B-baz@empire42.com"]
-      h[:from].should == {:name=>"Peter MacRobert", :address=>"peter.macrobert@empire42.com"}
-      h[:to].should == [{:name=>nil, :address=>"foo@bar.com"},
-                        {:name=>"bar mcbar", :address=>"bar.mcbar@bar.com"}]
+      h[:from].should == {:name=>"Peter MacRobert", :email_address=>"peter.macrobert@empire42.com"}
+      h[:sender].should == {:name=>nil, :email_address=>"foo@bar.com"}
+      h[:to].should == [{:name=>nil, :email_address=>"foo@bar.com"},
+                        {:name=>"bar mcbar", :email_address=>"bar.mcbar@bar.com"}]
       h[:cc].should == []
       h[:bcc].should == []
       h[:subject].should == nil
@@ -123,9 +124,9 @@ Subject: i can't tell you
       h[:references].should == ["B63CAA43-F378-4033-BA8B-foo@empire42.com", 
                                 "B63CAA43-F378-4033-BA8B-bar@empire42.com", 
                                 "B63CAA43-F378-4033-BA8B-baz@empire42.com"]
-      h[:from].should == {:name=>"Peter MacRobert", :address=>"peter.macrobert@empire42.com"}
-      h[:to].should == [{:name=>nil, :address=>"foo@bar.com"},
-                        {:name=>"bar mcbar", :address=>"bar.mcbar@bar.com"}]
+      h[:from].should == {:name=>"Peter MacRobert", :email_address=>"peter.macrobert@empire42.com"}
+      h[:to].should == [{:name=>nil, :email_address=>"foo@bar.com"},
+                        {:name=>"bar mcbar", :email_address=>"bar.mcbar@bar.com"}]
       h[:cc].should == []
       h[:bcc].should == []
       h[:subject].should == "Test email"

data/spec/fixtures/email_with_references.eml

@@ -6,6 +6,7 @@ X-Apple-Base-Url: x-msg://1/
 X-Universally-Unique-Identifier: c7cc15b2-7186-4f82-9936-894288fe9450
 X-Apple-Mail-Remote-Attachments: YES
 From: Peter MacRobert <peter.macrobert@empire42.com>
+Sender: foo@bar.com
 X-Apple-Windows-Friendly: 1
 Date: Wed, 21 Apr 2010 14:43:24 +0100
 Content-Transfer-Encoding: 7bit

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exjournal
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Trampoline Systems Ltd