mailhopper 0.1.1 → 0.2.0

data/app/models/mailhopper/email.rb

@@ -15,5 +15,31 @@ module Mailhopper
       self.sent_at = Time.now
       self.save!
     end
+
+    class << self
+      def create_from_mail(mail)
+        create({
+          :to_address       => address_to_s(mail.to),
+          :from_address     => address_to_s(mail.from),
+          :cc_address       => address_to_s(mail.cc),
+          :bcc_address      => address_to_s(mail.bcc),
+          :reply_to_address => address_to_s(mail.reply_to),
+          :subject          => mail.subject,
+          :content          => mail.to_s
+        })
+      end
+
+    private
+
+      def address_to_s(field)
+        if field
+          if field.is_a?(Array)
+            field.join(',') unless field.empty?
+          else
+            field
+          end
+        end
+      end
+    end
   end
 end

data/lib/mailhopper/queue.rb

@@ -4,27 +4,7 @@ module Mailhopper
     end
 
     def deliver!(mail)
-      Base.email_class.create({
-        :to_address       => address_to_s(mail.to),
-        :from_address     => address_to_s(mail.from),
-        :cc_address       => address_to_s(mail.cc),
-        :bcc_address      => address_to_s(mail.bcc),
-        :reply_to_address => address_to_s(mail.reply_to),
-        :subject          => mail.subject,
-        :content          => mail.to_s
-      })
+      Base.email_class.create_from_mail(mail)
     end
-
-    private
-
-      def address_to_s(field)
-        if field
-          if field.is_a?(Array)
-            field.join(',') unless field.empty?
-          else
-            field
-          end
-        end
-      end
   end
 end

data/lib/mailhopper/version.rb

@@ -1,3 +1,3 @@
 module Mailhopper
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/dummy/log/test.log

@@ -629,3 +629,195 @@ Papaya
    (0.1ms)  SELECT COUNT(*) FROM "emails" 
   Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
    (0.5ms)  rollback transaction
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (24.5ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (22.5ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", "bcc@example.com"], ["cc_address", "cc@example.com"], ["content", "Date: Mon, 07 May 2012 22:01:07 -0400\r\nFrom: from@example.com\r\nReply-To: reply_to@example.com\r\nTo: to@example.com\r\nCc: cc@example.com\r\nMessage-ID: <4fa87e636cb2a_11fdf3fc045c34cdc317a7@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:01:07 UTC +00:00], ["from_address", "from@example.com"], ["reply_to_address", "reply_to@example.com"], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to@example.com"], ["updated_at", Tue, 08 May 2012 02:01:07 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to@example.com (75ms)
+Date: Mon, 07 May 2012 22:01:07 -0400
+From: from@example.com
+Reply-To: reply_to@example.com
+To: to@example.com
+Cc: cc@example.com
+Message-ID: <4fa87e636cb2a_11fdf3fc045c34cdc317a7@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", "bcc1@example.com,bcc2@example.com"], ["cc_address", "cc1@example.com,cc2@example.com"], ["content", "Date: Mon, 07 May 2012 22:01:07 -0400\r\nFrom: from1@example.com\r\nReply-To: reply_to@example.com\r\nTo: to1@example.com, \r\n to2@example.com\r\nCc: cc1@example.com, \r\n cc2@example.com\r\nMessage-ID: <4fa87e6379368_11fdf3fc045c34cdc31889@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:01:07 UTC +00:00], ["from_address", "from1@example.com"], ["reply_to_address", "reply_to@example.com"], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to1@example.com,to2@example.com"], ["updated_at", Tue, 08 May 2012 02:01:07 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to1@example.com, to2@example.com (12ms)
+Date: Mon, 07 May 2012 22:01:07 -0400
+From: from1@example.com
+Reply-To: reply_to@example.com
+To: to1@example.com, 
+ to2@example.com
+Cc: cc1@example.com, 
+ cc2@example.com
+Message-ID: <4fa87e6379368_11fdf3fc045c34cdc31889@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", nil], ["cc_address", nil], ["content", "Date: Mon, 07 May 2012 22:01:07 -0400\r\nFrom: from@example.com\r\nTo: to@example.com\r\nMessage-ID: <4fa87e637dc85_11fdf3fc045c34cdc31955@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:01:07 UTC +00:00], ["from_address", "from@example.com"], ["reply_to_address", nil], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to@example.com"], ["updated_at", Tue, 08 May 2012 02:01:07 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to@example.com (10ms)
+Date: Mon, 07 May 2012 22:01:07 -0400
+From: from@example.com
+To: to@example.com
+Message-ID: <4fa87e637dc85_11fdf3fc045c34cdc31955@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", nil], ["cc_address", nil], ["content", "Date: Mon, 07 May 2012 22:01:07 -0400\r\nfrom: from.@example.com\r\nto: to.@example.com\r\nMessage-ID: <4fa87e6382491_11fdf3fc045c34cdc32045@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:01:07 UTC +00:00], ["from_address", "from.@example.com"], ["reply_to_address", nil], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to.@example.com"], ["updated_at", Tue, 08 May 2012 02:01:07 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to.@example.com (7ms)
+Date: Mon, 07 May 2012 22:01:07 -0400
+from: from.@example.com
+to: to.@example.com
+Message-ID: <4fa87e6382491_11fdf3fc045c34cdc32045@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (2.0ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (31.1ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", "bcc@example.com"], ["cc_address", "cc@example.com"], ["content", "Date: Mon, 07 May 2012 22:22:42 -0400\r\nFrom: from@example.com\r\nReply-To: reply_to@example.com\r\nTo: to@example.com\r\nCc: cc@example.com\r\nMessage-ID: <4fa883727e9b_120dc3fdc91834cdc40222@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:22:42 UTC +00:00], ["from_address", "from@example.com"], ["reply_to_address", "reply_to@example.com"], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to@example.com"], ["updated_at", Tue, 08 May 2012 02:22:42 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to@example.com (80ms)
+Date: Mon, 07 May 2012 22:22:42 -0400
+From: from@example.com
+Reply-To: reply_to@example.com
+To: to@example.com
+Cc: cc@example.com
+Message-ID: <4fa883727e9b_120dc3fdc91834cdc40222@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", "bcc1@example.com,bcc2@example.com"], ["cc_address", "cc1@example.com,cc2@example.com"], ["content", "Date: Mon, 07 May 2012 22:22:42 -0400\r\nFrom: from1@example.com\r\nReply-To: reply_to@example.com\r\nTo: to1@example.com, \r\n to2@example.com\r\nCc: cc1@example.com, \r\n cc2@example.com\r\nMessage-ID: <4fa88372165c1_120dc3fdc91834cdc403a@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:22:42 UTC +00:00], ["from_address", "from1@example.com"], ["reply_to_address", "reply_to@example.com"], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to1@example.com,to2@example.com"], ["updated_at", Tue, 08 May 2012 02:22:42 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to1@example.com, to2@example.com (12ms)
+Date: Mon, 07 May 2012 22:22:42 -0400
+From: from1@example.com
+Reply-To: reply_to@example.com
+To: to1@example.com, 
+ to2@example.com
+Cc: cc1@example.com, 
+ cc2@example.com
+Message-ID: <4fa88372165c1_120dc3fdc91834cdc403a@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.5ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", nil], ["cc_address", nil], ["content", "Date: Mon, 07 May 2012 22:22:42 -0400\r\nFrom: from@example.com\r\nTo: to@example.com\r\nMessage-ID: <4fa883721afc3_120dc3fdc91834cdc4041a@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:22:42 UTC +00:00], ["from_address", "from@example.com"], ["reply_to_address", nil], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to@example.com"], ["updated_at", Tue, 08 May 2012 02:22:42 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to@example.com (7ms)
+Date: Mon, 07 May 2012 22:22:42 -0400
+From: from@example.com
+To: to@example.com
+Message-ID: <4fa883721afc3_120dc3fdc91834cdc4041a@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.2ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (0.4ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Rendered sample_mailer/hello.text.erb (0.1ms)
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "emails" ("bcc_address", "cc_address", "content", "created_at", "from_address", "reply_to_address", "sent_at", "subject", "to_address", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["bcc_address", nil], ["cc_address", nil], ["content", "Date: Mon, 07 May 2012 22:22:42 -0400\r\nfrom: from.@example.com\r\nto: to.@example.com\r\nMessage-ID: <4fa883721eae8_120dc3fdc91834cdc405bc@dgmpro.local.mail>\r\nSubject: Hiya!\r\nMime-Version: 1.0\r\nContent-Type: text/plain;\r\n charset=UTF-8\r\nContent-Transfer-Encoding: 7bit\r\n\r\nPapaya"], ["created_at", Tue, 08 May 2012 02:22:42 UTC +00:00], ["from_address", "from.@example.com"], ["reply_to_address", nil], ["sent_at", nil], ["subject", "Hiya!"], ["to_address", "to.@example.com"], ["updated_at", Tue, 08 May 2012 02:22:42 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+
+Sent mail to to.@example.com (6ms)
+Date: Mon, 07 May 2012 22:22:42 -0400
+from: from.@example.com
+to: to.@example.com
+Message-ID: <4fa883721eae8_120dc3fdc91834cdc405bc@dgmpro.local.mail>
+Subject: Hiya!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Papaya
+   (0.1ms)  SELECT COUNT(*) FROM "emails" 
+  Mailhopper::Email Load (0.1ms)  SELECT "emails".* FROM "emails" ORDER BY created_at DESC LIMIT 1
+   (13.6ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailhopper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70149330109600 !ruby/object:Gem::Requirement
+  requirement: &70327828773120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70149330109600
+  version_requirements: *70327828773120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70149330109100 !ruby/object:Gem::Requirement
+  requirement: &70327828772620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70149330109100
+  version_requirements: *70327828772620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70149330108720 !ruby/object:Gem::Requirement
+  requirement: &70327828772240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149330108720
+  version_requirements: *70327828772240
 description: Mailhopper stores your application's emails in an ActiveRecord queue
   for asynchronous delivery. Use Mailhopper in combination with a delivery agent such
   as DelayedMailhopper.