easy_mail 1.1.0 → 1.2.0

data/lib/easy_mail/mailer.rb

@@ -9,6 +9,7 @@ module EasyMail
 
     def initialize(name, attributes = {})
       @name = name.to_s.split("/").pop
+      @template_name = attributes[:template_name] || "template"
 
       if Rails.env.production?
         @to = attributes[:to] || self.class.send_to
@@ -21,7 +22,6 @@ module EasyMail
       end
 
       @subject = attributes[:subject] || self.class.send_subject || "Please Read"
-      @template_name = attributes[:name]
       @namespace = if self.class.namespaces.any?
                      (self.class.namespaces.last.name.split("/") + name.to_s.split("/").slice(0..-2)).map(&:classify).join("::")
                    else
@@ -65,7 +65,7 @@ module EasyMail
 
 
     def template_path
-      ["mail_template", "#{namespace.underscore}"].select(&:present?).join("/")
+      ["#{namespace.underscore}", "mail/#{name.tableize}"].select(&:present?).join("/")
     end
 
     def mail_controller
@@ -99,6 +99,8 @@ module EasyMail
     def generate_controller
       mailer = self
       mail_controller.class_eval do
+        layout nil
+
         define_method :show do
           instance_variable_set("@#{mailer.name}", mailer.model_class.new)
         end
@@ -107,11 +109,16 @@ module EasyMail
           instance_variable_set("@#{mailer.name}", mailer.model_class.new(params[mailer.form_key]))
           if instance_variable_get("@#{mailer.name}").valid?
             mailer.mailer_class.send_mail(instance_variable_get("@#{mailer.name}")).deliver
-            render "shared/mail/confirmation"
+
+            redirect_to action: :confirmation
           else
             render :show
           end
         end
+
+        define_method :confirmation do
+          render "shared/mail/confirmation"
+        end
       end
     end
 
@@ -193,6 +200,7 @@ module EasyMail
       def routes(router)
         EasyMail::Mailer.all.each do |mailer|
           router.get mailer.route_url, to: "#{mailer.route_to_controller_part}#show", as: mailer.route_as
+          router.get "#{mailer.route_url}/confirmation", to: "#{mailer.route_to_controller_part}#confirmation"
           router.post mailer.route_url, to: "#{mailer.route_to_controller_part}#create"
         end
       end

data/lib/easy_mail/version.rb

@@ -1,3 +1,3 @@
 module EasyMail
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

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

@@ -1,4 +1,9 @@
-EasyMail::Mailer.setup(to: "", from: "", bcc: "", subject: "") do
+EasyMail::Mailer.setup(to: "", from: "", bcc: "", subject: "Please Read") do
   #  new :contact
-  #  new "store/contact", to: "test@mail.com", from: "test@mail.com", bcc: "test@mail.com", subject: "Subject"
+  #  new "store/contact",
+  #    to: "test@mail.com",
+  #    from: "test@mail.com",
+  #    bcc: "test@mail.com",
+  #    subject: "Subject",
+  #    template_name: "template"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_mail
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_validator