mail_spy 0.0.3 → 0.0.4

data/README.rdoc

@@ -33,7 +33,7 @@ Mailspy is centered around email templates and instances of those templates
 
 To create a template:
 
-MailSpy.add_template(template_name, html_erb, text_erb, template_values_definition)
+MailSpy.create_template(template_name, html_erb, text_erb, template_values_definition)
 
  * Template name must be unique to all templates
  * html, and text are the contents for a multipart email
@@ -43,7 +43,7 @@ MailSpy.add_template(template_name, html_erb, text_erb, template_values_definiti
 
 To create a instance:
 
-MailSpy.add_instance(options)
+MailSpy.create_email(options)
 
 required options include:
 

data/app/models/mail_spy/email.rb

@@ -32,7 +32,7 @@ module MailSpy
 
     # Scheduling and completion
     field :schedule_at, :type => DateTime
-    field :sent, :type => Boolean
+    field :sent, :type => Boolean, :default => false
     index :schedule_at
 
     # Record keeping of what happened

data/lib/mail_spy/manager.rb

@@ -5,7 +5,7 @@ module MailSpy
     # Programmatically add email templates with a schema of search and
     # replaceable text
     #
-    def add_template(name, html_erb, text_erb, template_values_definition)
+    def create_template(name, html_erb, text_erb, template_values_definition)
       MailSpy::EmailTemplate.create!(
         {
           :name => name,
@@ -18,7 +18,7 @@ module MailSpy
     # ------------------------------------------- ADD INSTANCE
     # Adds a instance of a email template to the queue to send
     #
-    def add_instance(options)
+    def create_email(options)
       options.to_options!
 
       required_options = [
@@ -27,7 +27,7 @@ module MailSpy
       to_options = [:to, :cc, :bcc]
 
       # Ensure that we have the required options
-      required_options.each { |ro| raise "add_instance call missing #{ro}" unless options.include? ro }
+      required_options.each { |ro| raise "create_email call missing #{ro}" unless options.include? ro }
 
       # Make sure we have someone to send to
       has_sender = options.keys.select { |option| to_options.include? option.intern }.present?
@@ -36,7 +36,7 @@ module MailSpy
       # Make sure we have a template
       options[:template_name]
       template = MailSpy::EmailTemplate.first(conditions: {name: options[:template_name]})
-      raise "No template: #{options[:template_name]} found, try add_template first" unless template
+      raise "No template: #{options[:template_name]} found, try create_template first" unless template
 
 
       # Make sure that

data/lib/mail_spy/version.rb

@@ -1,3 +1,3 @@
 module MailSpy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/dummy/log/test.log

@@ -6839,3 +6839,310 @@ MONGODB dummy_test['mail_spy_email_templates'].remove({})
 MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
 MONGODB dummy_test['mail_spy_emails'].remove({})
    (0.1ms)  rollback transaction
+MONGODB [WARNING] Please note that logging negatively impacts client-side performance. You should set your logging level no lower than :info in production.
+MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
+   (0.3ms)  begin transaction
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000001'), "name"=>"a test template", "html_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "text_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"a test template"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000002'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"a test template", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db90000002')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db90000001')}})
+MONGODB dummy_test['mail_spy_emails'].find({}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_email_templates'].find({:_id=>BSON::ObjectId('4f26fa05816134db90000001')}).limit(-1).sort([[:_id, :asc]])
+  Rendered inline template (19.7ms)
+  Rendered inline template (1.2ms)
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000003'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000004'), "to"=>"test@test.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db90000004')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db90000003')}})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000005'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000006'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000007'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000008'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"NOT HERE"}).limit(-1).sort([[:_id, :asc]])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000009'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db9000000a'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db9000000a')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db90000009')}})
+MONGODB dummy_test['mail_spy_emails'].find({:schedule_at=>{"$lte"=>2012-01-30 20:13:57 UTC}, :sent=>false}, {:_id=>1}).limit(-1)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db9000000b'), "name"=>"a test template", "html_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "text_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"a test template"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db9000000c'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"a test template", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db9000000c')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db9000000b')}})
+MONGODB dummy_test['mail_spy_emails'].find({}).limit(-1).sort([[:_id, :asc]])
+Processing by MailSpy::TrackingController#action as HTML
+  Parameters: {"eid"=>"4f26fa05816134db9000000c", "action_type"=>"Conversion", "count"=>"3"}
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db9000000c')}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db9000000c')}, {"$push"=>{"actions"=>{"count"=>3, "_id"=>BSON::ObjectId('4f26fa05816134db9000000d'), "action_type"=>"Conversion", "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}}})
+Completed 200 OK in 5ms (ActiveRecord: 0.0ms)
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db9000000c')}).limit(-1)
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db9000000e'), "name"=>"a test template", "html_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "text_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"a test template"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db9000000f'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"a test template", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db9000000f')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db9000000e')}})
+MONGODB dummy_test['mail_spy_emails'].find({}).limit(-1).sort([[:_id, :asc]])
+Processing by MailSpy::TrackingController#bug as HTML
+  Parameters: {"eid"=>"4f26fa05816134db9000000f"}
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db9000000f')}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db9000000f')}, {"$push"=>{"actions"=>{"count"=>1, "_id"=>BSON::ObjectId('4f26fa05816134db90000010'), "action_type"=>"open", "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}}})
+Completed 200 OK in 3ms (ActiveRecord: 0.0ms)
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db9000000f')}).limit(-1)
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000011'), "name"=>"a test template", "html_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "text_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"a test template"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000012'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"a test template", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db90000012')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db90000011')}})
+MONGODB dummy_test['mail_spy_emails'].find({}).limit(-1).sort([[:_id, :asc]])
+Processing by MailSpy::TrackingController#link as HTML
+  Parameters: {"eid"=>"4f26fa05816134db90000012", "url"=>"http://google.com", "n"=>"0"}
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db90000012')}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db90000012')}, {"$push"=>{"actions"=>{"count"=>1, "_id"=>BSON::ObjectId('4f26fa05816134db90000013'), "action_type"=>"click", "details"=>{:url=>"http://google.com", :link_number=>"0"}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}}})
+Redirected to http://google.com
+Completed 302 Found in 3ms (ActiveRecord: 0.0ms)
+MONGODB dummy_test['mail_spy_emails'].find({:_id=>BSON::ObjectId('4f26fa05816134db90000012')}).limit(-1)
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000014'), "name"=>"a test template", "html_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "text_erb"=>"A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"a test template"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa05816134db90000015'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"a test template", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:13:57 UTC, "updated_at"=>2012-01-30 20:13:57 UTC, "created_at"=>2012-01-30 20:13:57 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa05816134db90000015')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa05816134db90000014')}})
+MONGODB dummy_test['mail_spy_emails'].find({}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+MONGODB [WARNING] Please note that logging negatively impacts client-side performance. You should set your logging level no lower than :info in production.
+MONGODB admin['$cmd'].find({:ismaster=>1}).limit(-1)
+   (0.3ms)  begin transaction
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000001'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000002'), "to"=>"test@test.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:14:24 UTC, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa20816134db96000002')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa20816134db96000001')}})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000003'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000004'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000005'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000006'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"NOT HERE"}).limit(-1).sort([[:_id, :asc]])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000007'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"_id"=>BSON::ObjectId('4f26fa20816134db96000008'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:14:24 UTC, "updated_at"=>2012-01-30 20:14:24 UTC, "created_at"=>2012-01-30 20:14:24 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa20816134db96000008')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa20816134db96000007')}})
+MONGODB dummy_test['mail_spy_emails'].find({:schedule_at=>{"$lte"=>2012-01-30 20:14:24 UTC}, :sent=>false}, {:_id=>1}).limit(-1)
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['system.namespaces'].find({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000001'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"sent"=>false, "_id"=>BSON::ObjectId('4f26fa9d816134db9e000002'), "to"=>"test@test.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:16:29 UTC, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa9d816134db9e000002')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa9d816134db9e000001')}})
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000003'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000004'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000005'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000006'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"NOT HERE"}).limit(-1).sort([[:_id, :asc]])
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+MONGODB dummy_test['mail_spy_email_templates'].insert([{"_id"=>BSON::ObjectId('4f26fa9d816134db9e000007'), "name"=>"test", "html_erb"=>"Hello World", "text_erb"=>"Hello World", "template_values_definition"=>{}, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+MONGODB dummy_test['mail_spy_email_templates'].find({:name=>"test"}).limit(-1).sort([[:_id, :asc]])
+MONGODB dummy_test['mail_spy_emails'].insert([{"sent"=>false, "_id"=>BSON::ObjectId('4f26fa9d816134db9e000008'), "to"=>"trcarden@gmail.com", "from"=>"test@test.com", "reply_to"=>"testGuy", "subject"=>"test subject", "template_name"=>"test", "template_values"=>{}, "campaign"=>"test campaign", "stream"=>"test stream", "component"=>"test component", "schedule_at"=>2012-01-30 20:16:29 UTC, "updated_at"=>2012-01-30 20:16:29 UTC, "created_at"=>2012-01-30 20:16:29 UTC}])
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa9d816134db9e000008')}, {"$set"=>{"email_template_id"=>BSON::ObjectId('4f26fa9d816134db9e000007')}})
+MONGODB dummy_test['mail_spy_emails'].find({:schedule_at=>{"$lte"=>2012-01-30 20:16:29 UTC}, :sent=>false}, {:_id=>1}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].find({:schedule_at=>{"$lte"=>2012-01-30 20:16:29 UTC}, :sent=>false}).limit(100)
+MONGODB dummy_test['mail_spy_email_templates'].find({:_id=>BSON::ObjectId('4f26fa9d816134db9e000007')}).limit(-1).sort([[:_id, :asc]])
+  Rendered inline template (17.9ms)
+  Rendered inline template (0.3ms)
+
+Sent mail to trcarden@gmail.com (109ms)
+Date: Mon, 30 Jan 2012 12:16:31 -0800
+From: test@test.com
+Reply-To: testGuy
+To: trcarden@gmail.com
+Message-ID: <4f26fa9fce684_db9e80a7faa0642f0@timly.local.mail>
+Subject: test subject
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="--==_mimepart_4f26fa9fb34d4_db9e80a7faa06399f";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+
+----==_mimepart_4f26fa9fb34d4_db9e80a7faa06399f
+Date: Mon, 30 Jan 2012 12:16:31 -0800
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Content-ID: <4f26fa9fc1daf_db9e80a7faa064046@timly.local.mail>
+
+Hello World
+
+----==_mimepart_4f26fa9fb34d4_db9e80a7faa06399f
+Date: Mon, 30 Jan 2012 12:16:31 -0800
+Mime-Version: 1.0
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Content-ID: <4f26fa9fc9ade_db9e80a7faa0641b6@timly.local.mail>
+
+Hello World
+
+----==_mimepart_4f26fa9fb34d4_db9e80a7faa06399f--
+
+MONGODB dummy_test['mail_spy_emails'].update({"_id"=>BSON::ObjectId('4f26fa9d816134db9e000008')}, {"$set"=>{"sent"=>true, "updated_at"=>2012-01-30 20:16:31 UTC}})
+MONGODB dummy_test['mail_spy_emails'].find({:schedule_at=>{"$lte"=>2012-01-30 20:16:31 UTC}, :sent=>false}, {:_id=>1}).limit(-1)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_email_templates", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_email_templates'].remove({})
+MONGODB dummy_test['$cmd'].find({"count"=>"mail_spy_emails", "query"=>{}, "fields"=>nil}).limit(-1)
+MONGODB dummy_test['mail_spy_emails'].remove({})
+   (0.0ms)  rollback transaction

data/test/functional/mail_spy/core_mailer_test.rb

@@ -19,7 +19,7 @@ module MailSpy
       text_erb = "A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>"
       template_values_definition = {}
 
-      template = MailSpy.add_template("a test template", html_erb, text_erb, template_values_definition)
+      template = MailSpy.create_template("a test template", html_erb, text_erb, template_values_definition)
       create_emails(template)
       email = MailSpy::Email.first
       mail = MailSpy::CoreMailer.template(email)

data/test/functional/mail_spy/tracking_controller_test.rb

@@ -10,7 +10,7 @@ module MailSpy
       text_erb = "A link : <%= track_link 'My home', 'www.google.com' %> <br> A Bug <%= tracking_bug %>"
       template_values_definition = {}
 
-      template = MailSpy.add_template("a test template", html_erb, text_erb, template_values_definition)
+      template = MailSpy.create_template("a test template", html_erb, text_erb, template_values_definition)
       create_emails(template)
       @email = MailSpy::Email.first
     end

data/test/test_helper.rb

@@ -64,7 +64,7 @@ class ActiveSupport::TestCase
     text_erb = "Hello World"
     template_values_definition = {}
 
-    template = MailSpy.add_template(template_name, html_erb, text_erb, template_values_definition)
+    template = MailSpy.create_template(template_name, html_erb, text_erb, template_values_definition)
     block.call(template)
   end
 
@@ -81,7 +81,7 @@ class ActiveSupport::TestCase
       component = "test component"
       schedule_at = DateTime.now
 
-      MailSpy.add_instance(
+      MailSpy.create_email(
         :to => to,
         :from => from,
         :reply_to => reply_to,

data/test/unit/mail_spy/manager_test.rb

@@ -12,13 +12,13 @@ module MailSpy
     end
 
     # ------------------------------------------- ADD_TEMPLATE
-    def test_add_template
+    def test_create_template
       template_name = "test"
       html_erb = "Hello World"
       text_erb = "Hello World"
       template_values_definition = {}
 
-      template = MailSpy.add_template(template_name, html_erb, text_erb, template_values_definition)
+      template = MailSpy.create_template(template_name, html_erb, text_erb, template_values_definition)
 
       assert(template.html_erb == html_erb, "values should be written")
       assert(template.text_erb == text_erb, "values should be written")
@@ -26,8 +26,8 @@ module MailSpy
       assert(template.name == template_name, "values should be written")
     end
 
-    # ------------------------------------------- ADD_INSTANCE
-    def test_add_instance
+    # ------------------------------------------- CREATE EMAIL
+    def test_create_email
       do_with_template do |template|
         to = "test@test.com"
         from = "test@test.com"
@@ -39,7 +39,7 @@ module MailSpy
         component = "test component"
         schedule_at = DateTime.now
 
-        email = MailSpy.add_instance(
+        email = MailSpy.create_email(
           :to => to,
           :from => from,
           :reply_to => reply_to,
@@ -74,7 +74,7 @@ module MailSpy
         schedule_at = DateTime.now
 
         assert_raise RuntimeError do
-          MailSpy.add_instance(
+          MailSpy.create_email(
             :from => from,
             :reply_to => reply_to,
             :subject => subject,
@@ -102,7 +102,7 @@ module MailSpy
         schedule_at = DateTime.now
 
         assert_raise RuntimeError do
-          MailSpy.add_instance(
+          MailSpy.create_email(
             :to => to,
             :from => from,
             :reply_to => reply_to,
@@ -130,7 +130,7 @@ module MailSpy
         schedule_at = DateTime.now
 
         assert_raise RuntimeError do
-          MailSpy.add_instance(
+          MailSpy.create_email(
             :to => to,
             :subject => subject,
             :from => from,

metadata

@@ -2,7 +2,7 @@
 name: mail_spy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Timothy Cardenas