no_notifier_needed 2.3.6 → 2.3.7

data/VERSION

@@ -1 +1 @@
-2.3.6
+2.3.7

data/initializers/notifier.rb

@@ -15,6 +15,9 @@ class Notifier < ActionMailer::Base
     @template = EmailTemplate.find_by_name(email_name)
     raise "Email Template name not found" if @template.nil?
 
+
+    #configure this to only run as one block depending on what the template responds to
+
     if @template.respond_to?(:send_via_mandrill) && @template.send_via_mandrill?
       Notifier.smtp_settings = {
         :address   => "smtp.mandrillapp.com",
@@ -24,12 +27,12 @@ class Notifier < ActionMailer::Base
         :password  => NoNotifierNeeded.mandrill_password,
         :authentication => 'login' # Mandrill supports 'plain' or 'login'
       }
-    else
+    elsif @template.respond_to?(:send_via_gmail) && @template.send_via_gmail?
       pwd = NoNotifierNeeded.gmail_password.first
       Notifier.smtp_settings = {
         :address    => 'smtp.gmail.com',
         :port       =>  587,
-        :domain     => NoNotifierNeeded.domain,
+        :domain     => NoNotifierNeeded.gmail_domain,
         :user_name  => NoNotifierNeeded.gmail_user_name,
         :password   => pwd,
         :authentication => 'login',

data/lib/generators/no_notifier_needed/templates/email_template.rb

@@ -2,7 +2,8 @@ class EmailTemplate < ActiveRecord::Base
   before_save :clean_inputs
 
   attr_accessible :body, :subject, :name, :template_type, :sent_to, :when_sent,
-    :email_template_comments_attributes, :from_name, :from_email, :reply_to, :send_via_mandrill
+    :email_template_comments_attributes, :from_name, :from_email, :reply_to, :send_via_mandrill,
+    :send_via_gmail
 
   def clean_inputs
     body.strip!

data/lib/generators/no_notifier_needed/templates/install.rb

@@ -9,6 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.string :body
       t.string :template_type
       t.boolean :send_via_mandrill, :default => false, :null => false
+      t.boolean :send_via_gmail, :default => false, :null => false
       t.integer :email_template_type_id
     end
 

data/lib/no_notifier_needed/config.rb

@@ -2,21 +2,30 @@ module NoNotifierNeeded
   module Config
 
     VALID_OPTIONS_KEYS = [
+      #Defaults
       :from_email,
       :from_name,
       :bcc,
       :reply_to,
+
+      #Url Options
       :host,
       :controller,
       :action,
+
+      #mandrill options
       :mandrill_user_name,
       :mandrill_password,
       :mandrill_port,
+
+      #current User options
       :current_user_model,
       :current_user_id_method,
+
+      #Gmail options
       :gmail_user_name,
       :gmail_password,
-      :domain
+      :gmail_domain
     ].freeze
 
     # @private

data/no_notifier_needed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "no_notifier_needed"
-  s.version = "2.3.6"
+  s.version = "2.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
-  s.date = "2013-05-03"
+  s.date = "2013-05-05"
   s.description = "A work in progress: Replace ActionMailer::Base class redundency. Temlating using haml or erb."
   s.email = "Blue.Dog.Archolite@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: no_notifier_needed
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml