mail_spy 0.0.4 → 0.0.5

data/test/functional/mail_spy/core_mailer_test.rb

@@ -1,10 +1,9 @@
 require 'test_helper'
 
 module MailSpy
-  class CoreMailerTest < ActionMailer::TestCase
+  class CoreMailerTest < ActiveSupport::TestCase #ActionMailer::TestCase
 
     def teardown
-      MailSpy::EmailTemplate.delete_all
       MailSpy::Email.delete_all
     end
 
@@ -12,17 +11,25 @@ module MailSpy
       assert true
     end
 
-    def test_template_email_helpers
-      initialize_mail_spy_test_esp
+    def test_subject_evaluation
+      emails = create_emails(:campaign => "tests", :stream => "a-stream", :component => "a-helper_test")
+
 
-      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 = {}
+      email = emails.first
+      email.template_values = {:user_name => "bob"}
+      email.subject = "hi <%= @template_values[:user_name] %>"
+
+      mail = MailSpy::CoreMailer.template(emails.first)
+      assert(mail.subject == "hi bob", "subject lines should be interpreted")
+    end
+
+
+    def test_template_email_helpers
+      create_emails(:campaign => "tests", :stream => "a-stream", :component => "a-helper_test")
 
-      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)
+      mail.deliver
 
       assert(mail.present?, "Mail should render without error")
       assert(mail.html_part.body.present?, "Mail should have a html part")

data/test/functional/mail_spy/tracking_controller_test.rb

@@ -4,19 +4,11 @@ module MailSpy
   class TrackingControllerTest < ActionController::TestCase
 
     def setup
-      initialize_mail_spy_test_esp
-
-      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 = {}
-
-      template = MailSpy.create_template("a test template", html_erb, text_erb, template_values_definition)
-      create_emails(template)
+      create_emails(:campaign => "tests", :stream => "a-stream", :component => "a-helper_test")
       @email = MailSpy::Email.first
     end
 
     def teardown
-      MailSpy::EmailTemplate.delete_all
       MailSpy::Email.delete_all
     end
 

data/test/test_email_credentials.yml

@@ -2,8 +2,8 @@ name: sendgrid
 address: smtp.sendgrid.net
 port: 587
 domain: herokuapp.com
-user_name: app2546146@heroku.com
-password: g4eiapwq
+user_name: app2602840@heroku.com
+password: qb6qnim0
 authentication: plain
 enable_starttls_auto: 1
 test_email_address: trcarden@gmail.com

data/test/test_email_credentials.yml.sample

@@ -1,9 +1 @@
-name: sendgrid
-address: smtp.sendgrid.net
-port: 587
-domain: herokuapp.com
-user_name: username
-password: pass
-authentication: plain
-enable_starttls_auto: 1
 test_email_address: test@test.com

data/test/test_helper.rb

@@ -33,23 +33,6 @@ class ActiveSupport::TestCase
   # Add more helper methods to be used by all tests here...
 
 
-
-  # Adds the ESP settings for a test email
-  def initialize_mail_spy_test_esp
-    path = File.expand_path ".././test_email_credentials.yml", __FILE__
-    credentials = YAML.load(File.open(path)).to_options
-    MailSpy.add_email_service_provider do |esp|
-      esp.name = credentials[:name]
-      esp.address = credentials[:address]
-      esp.port = credentials[:port]
-      esp.domain = credentials[:domain]
-      esp.user_name = credentials[:user_name]
-      esp.password = credentials[:password]
-      esp.authentication = credentials[:authentication]
-      esp.enable_starttls_auto = (credentials[:enable_starttls_auto].to_i == 1)
-    end
-  end
-
   # Gets the test email address from the setup file
   def email_address_for_test
     path = File.expand_path ".././test_email_credentials.yml", __FILE__
@@ -57,36 +40,26 @@ class ActiveSupport::TestCase
     credentials[:test_email_address]
   end
 
-  # Provides a template to operate on
-  def do_with_template(&block)
-    template_name = "test"
-    html_erb = "Hello World"
-    text_erb = "Hello World"
-    template_values_definition = {}
-
-    template = MailSpy.create_template(template_name, html_erb, text_erb, template_values_definition)
-    block.call(template)
-  end
+  # Creates a test email
+  def create_emails( options={}, num_emails=1)
+    options.to_options!
 
-  # Creates a test email from a given template
-  def create_emails(template, num_emails=1)
+    emails = []
     num_emails.times do
-      to = email_address_for_test
-      from = "test@test.com"
-      reply_to = "testGuy"
-      subject = "test subject"
-      template_name = template.name
-      campaign = "test campaign"
-      stream = "test stream"
-      component = "test component"
-      schedule_at = DateTime.now
-
-      MailSpy.create_email(
+      to = options[:to] || email_address_for_test
+      from = options[:from]|| "test@test.com"
+      reply_to = options[:reply_to] || "testGuy"
+      subject = options[:subject] || "test subject"
+      campaign = options[:campaign] || "test campaign"
+      stream = options[:stream] || "test stream"
+      component = options[:component] || "test component"
+      schedule_at = options[:schedule_at] || DateTime.now
+
+      emails << MailSpy.create_email(
         :to => to,
         :from => from,
         :reply_to => reply_to,
         :subject => subject,
-        :template_name => template_name,
         :template_values => {},
         :campaign => campaign,
         :stream => stream,
@@ -94,6 +67,7 @@ class ActiveSupport::TestCase
         :schedule_at => schedule_at
       )
     end
+    return emails
   end
 
 

data/test/unit/mail_spy/manager_test.rb

@@ -7,158 +7,124 @@ module MailSpy
     end
 
     def setup
-      MailSpy::EmailTemplate.delete_all
       MailSpy::Email.delete_all
     end
 
-    # ------------------------------------------- ADD_TEMPLATE
-    def test_create_template
-      template_name = "test"
-      html_erb = "Hello World"
-      text_erb = "Hello World"
-      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")
-      assert(template.template_values_definition == template_values_definition, "values should be written")
-      assert(template.name == template_name, "values should be written")
-    end
 
     # ------------------------------------------- CREATE EMAIL
     def test_create_email
-      do_with_template do |template|
-        to = "test@test.com"
-        from = "test@test.com"
-        reply_to = "testGuy"
-        subject = "test subject"
-        template_name = template.name
-        campaign = "test campaign"
-        stream = "test stream"
-        component = "test component"
-        schedule_at = DateTime.now
-
-        email = MailSpy.create_email(
-          :to => to,
+      to = "test@test.com"
+      from = "test@test.com"
+      reply_to = "testGuy"
+      subject = "test subject"
+      campaign = "test campaign"
+      stream = "test stream"
+      component = "test component"
+      schedule_at = DateTime.now
+
+      email = MailSpy.create_email(
+        :to => to,
+        :from => from,
+        :reply_to => reply_to,
+        :subject => subject,
+        :template_values => {},
+        :campaign => campaign,
+        :stream => stream,
+        :component => component,
+        :schedule_at => schedule_at
+      )
+
+      assert(email.to == to, "email subject must be set")
+      assert(email.subject == subject, "email subject must be set")
+      assert(email.campaign == campaign, "email campaign must be set")
+      assert(email.stream == stream, "email stream must be set")
+      assert(email.component == component, "email component must be set")
+      assert(email.schedule_at.to_i == schedule_at.to_i, "email schedule_at must be set")
+    end
+
+    def test_missing_sender
+      from = "test@test.com"
+      reply_to = "testGuy"
+      subject = "test subject"
+      campaign = "test campaign"
+      stream = "test stream"
+      component = "test component"
+      schedule_at = DateTime.now
+
+      assert_raise RuntimeError do
+        MailSpy.create_email(
           :from => from,
           :reply_to => reply_to,
           :subject => subject,
-          :template_name => template_name,
           :template_values => {},
           :campaign => campaign,
           :stream => stream,
           :component => component,
           :schedule_at => schedule_at
         )
-
-        assert(email.to == to, "email subject must be set")
-        assert(email.subject == subject, "email subject must be set")
-        assert(email.template_name == template_name, "email template_name must be set")
-        assert(email.campaign == campaign, "email campaign must be set")
-        assert(email.stream == stream, "email stream must be set")
-        assert(email.component == component, "email component must be set")
-        assert(email.schedule_at.to_i == schedule_at.to_i, "email schedule_at must be set")
-      end
-    end
-
-    def test_missing_sender
-      do_with_template do |template|
-        from = "test@test.com"
-        reply_to = "testGuy"
-        subject = "test subject"
-        template_name = template.name
-        campaign = "test campaign"
-        stream = "test stream"
-        component = "test component"
-        schedule_at = DateTime.now
-
-        assert_raise RuntimeError do
-          MailSpy.create_email(
-            :from => from,
-            :reply_to => reply_to,
-            :subject => subject,
-            :template_name => template_name,
-            :template_values => {},
-            :campaign => campaign,
-            :stream => stream,
-            :component => component,
-            :schedule_at => schedule_at
-          )
-        end
       end
     end
 
     def test_missing_required_field
 
-      do_with_template do |template|
-        to = "test@test.com"
-        from = "test@test.com"
-        reply_to = "testGuy"
-        template_name = template.name
-        campaign = "test campaign"
-        stream = "test stream"
-        component = "test component"
-        schedule_at = DateTime.now
-
-        assert_raise RuntimeError do
-          MailSpy.create_email(
-            :to => to,
-            :from => from,
-            :reply_to => reply_to,
-            :template_name => template_name,
-            :template_values => {},
-            :campaign => campaign,
-            :stream => stream,
-            :component => component,
-            :schedule_at => schedule_at
-          )
-        end
-      end
-
-    end
+      to = "test@test.com"
+      from = "test@test.com"
+      reply_to = "testGuy"
+      campaign = "test campaign"
+      stream = "test stream"
+      component = "test component"
+      schedule_at = DateTime.now
 
-    def test_referencing_missing_template
-      do_with_template do |template|
-        to = "test@test.com"
-        from = "test@test.com"
-        reply_to = "testGuy"
-        subject = "test subject"
-        campaign = "test campaign"
-        stream = "test stream"
-        component = "test component"
-        schedule_at = DateTime.now
-
-        assert_raise RuntimeError do
-          MailSpy.create_email(
-            :to => to,
-            :subject => subject,
-            :from => from,
-            :reply_to => reply_to,
-            :template_name => "NOT HERE",
-            :template_values => {},
-            :campaign => campaign,
-            :stream => stream,
-            :component => component,
-            :schedule_at => schedule_at
-          )
-        end
+      assert_raise RuntimeError do
+        MailSpy.create_email(
+          :to => to,
+          :from => from,
+          :reply_to => reply_to,
+          :template_values => {},
+          :campaign => campaign,
+          :stream => stream,
+          :component => component,
+          :schedule_at => schedule_at
+        )
       end
     end
 
-    # ------------------------------------------- SEND_OUTSTANDING_EMAILS
+  end
 
-    #TODO need to document the testing methods for setting up the test_email
-    def test_send_outstanding_emails
-      initialize_mail_spy_test_esp
+  def test_referencing_missing_template
+    to = "test@test.com"
+    from = "test@test.com"
+    reply_to = "testGuy"
+    subject = "test subject"
+    campaign = "NO SUCH CAMPAIGN"
+    stream = "NO SUCH STREAM"
+    component = "NO SUCH COMPONENT"
+    schedule_at = DateTime.now
+
+    assert_raise RuntimeError do
+      MailSpy.create_email(
+        :to => to,
+        :subject => subject,
+        :from => from,
+        :reply_to => reply_to,
+        :template_values => {},
+        :campaign => campaign,
+        :stream => stream,
+        :component => component,
+        :schedule_at => schedule_at
+      )
+    end
+  end
 
-      do_with_template do |template|
-        create_emails(template)
-      end
+  # ------------------------------------------- SEND_OUTSTANDING_EMAILS
+
+  #TODO need to document the testing methods for setting up the test_email
+  def test_send_outstanding_emails
+    create_emails(:campaign => "tests", :stream => "a-stream", :component => "a-helper_test")
 
-      num_sent = MailSpy.send_outstanding_emails
-      assert(num_sent == 1, "We should have sent a email")
-    end
 
+    num_sent = MailSpy.send_outstanding_emails
+    assert(num_sent == 1, "We should have sent a email")
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: mail_spy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Timothy Cardenas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -57,18 +57,18 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: aws-sdk
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 1.3.2
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: turn
+  name: sqlite3
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: turn
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
+  name: rr
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -101,7 +101,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: factory_girl_rails
+  name: factory_girl
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -112,29 +112,29 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: spork
+  name: factory_girl_rails
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0.rc
+        version: "0"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: spork-testunit
+  name: spork
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.0.rc
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: ruby-prof
+  name: spork-testunit
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -145,7 +145,7 @@ dependencies:
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: ruby-prof
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -156,7 +156,7 @@ dependencies:
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: minitest
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -166,6 +166,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id015
 description: Mailspy allows for quick and easy creation, sending and tracking of email campaigns
 email: 
 - trcarden@gmail.com
@@ -189,7 +200,6 @@ files:
 - app/models/mail_spy/campaign_report.rb
 - app/models/mail_spy/component_report.rb
 - app/models/mail_spy/email.rb
-- app/models/mail_spy/email_template.rb
 - app/models/mail_spy/stream_report.rb
 - app/views/layouts/mail_spy/application.html.erb
 - config/routes.rb
@@ -207,6 +217,8 @@ files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/email_templates/helper_test.html.erb
+- test/dummy/app/views/email_templates/helper_test.text.erb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -217,6 +229,7 @@ files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mail_spy.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
@@ -228,6 +241,7 @@ files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/lib/tasks/emails.rake
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
@@ -240,7 +254,6 @@ files:
 - test/fixtures/mail_spy/actions.yml
 - test/fixtures/mail_spy/campaign_reports.yml
 - test/fixtures/mail_spy/component_reports.yml
-- test/fixtures/mail_spy/email_templates.yml
 - test/fixtures/mail_spy/emails.yml
 - test/fixtures/mail_spy/stream_reports.yml
 - test/functional/mail_spy/core_mailer_test.rb
@@ -254,7 +267,6 @@ files:
 - test/unit/mail_spy/action_test.rb
 - test/unit/mail_spy/campaign_report_test.rb
 - test/unit/mail_spy/component_report_test.rb
-- test/unit/mail_spy/email_template_test.rb
 - test/unit/mail_spy/email_test.rb
 - test/unit/mail_spy/manager_test.rb
 - test/unit/mail_spy/stream_report_test.rb
@@ -290,6 +302,8 @@ test_files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/email_templates/helper_test.html.erb
+- test/dummy/app/views/email_templates/helper_test.text.erb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -300,6 +314,7 @@ test_files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mail_spy.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
@@ -311,6 +326,7 @@ test_files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/lib/tasks/emails.rake
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
@@ -323,7 +339,6 @@ test_files:
 - test/fixtures/mail_spy/actions.yml
 - test/fixtures/mail_spy/campaign_reports.yml
 - test/fixtures/mail_spy/component_reports.yml
-- test/fixtures/mail_spy/email_templates.yml
 - test/fixtures/mail_spy/emails.yml
 - test/fixtures/mail_spy/stream_reports.yml
 - test/functional/mail_spy/core_mailer_test.rb
@@ -337,7 +352,6 @@ test_files:
 - test/unit/mail_spy/action_test.rb
 - test/unit/mail_spy/campaign_report_test.rb
 - test/unit/mail_spy/component_report_test.rb
-- test/unit/mail_spy/email_template_test.rb
 - test/unit/mail_spy/email_test.rb
 - test/unit/mail_spy/manager_test.rb
 - test/unit/mail_spy/stream_report_test.rb

data/app/models/mail_spy/email_template.rb

@@ -1,17 +0,0 @@
-module MailSpy
-  class EmailTemplate
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    field :name, :type => String
-    field :html_erb, :type => String
-    field :text_erb, :type => String
-    field :template_values_definition, :type => Hash
-
-    index :name, :unique => true
-
-    has_many :emails, :class_name => 'MailSpy::Email'
-
-    validates_presence_of :name
-
-  end
-end

data/test/fixtures/mail_spy/email_templates.yml

@@ -1,9 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-one:
-  html_erb: MyText
-  options: 
-
-two:
-  html_erb: MyText
-  options: