easy_mail 1.2.0 → 1.3.0

data/lib/easy_mail/mailer.rb

@@ -5,7 +5,7 @@ module EasyMail
 
     mattr_accessor :default_to, :default_bcc, :default_from, :default_subject
 
-    attr_accessor :name, :to, :bcc, :from, :subject, :template_name, :namespace
+    attr_accessor :name, :to, :bcc, :from, :subject, :template_name, :namespace, :attachments
 
     def initialize(name, attributes = {})
       @name = name.to_s.split("/").pop
@@ -28,6 +28,8 @@ module EasyMail
                      name.to_s.split("/").slice(0..-2).map(&:classify).join("::")
                    end
 
+      @attachments = attributes[:attachments] || []
+
       generate_mailer
       generate_controller
 
@@ -69,11 +71,12 @@ module EasyMail
     end
 
     def mail_controller
-      @mail_controller ||= begin
-                             (namespace_array + ["Mail"] + [mail_controller_name]).join("::").constantize
-                           rescue NameError
-                             controller_namespace.const_set(mail_controller_name, Class.new(mail_parent_controller))
-                           end
+      @mail_controller ||= controller_namespace.const_set(mail_controller_name, Class.new(mail_parent_controller))
+        #begin
+          #(namespace_array + ["Mail::#{mail_controller_name}"]).join("::").constantize
+        #rescue NameError
+          #controller_namespace.const_set(mail_controller_name, Class.new(mail_parent_controller))
+        #end
     end
 
     def mail_controller_name
@@ -110,15 +113,13 @@ module EasyMail
           if instance_variable_get("@#{mailer.name}").valid?
             mailer.mailer_class.send_mail(instance_variable_get("@#{mailer.name}")).deliver
 
-            redirect_to action: :confirmation
+            instance_variable_set("@#{mailer.name}", mailer.model_class.new)
+
+            redirect_to send("#{mailer.route_as}_url") , notice: "Mail send successful"
           else
             render :show
           end
         end
-
-        define_method :confirmation do
-          render "shared/mail/confirmation"
-        end
       end
     end
 
@@ -132,6 +133,9 @@ module EasyMail
         define_method :send_mail do |column|
           instance_variable_set("@#{column.class.name.demodulize.underscore}", column)
 
+          mailer.attachments.each do |attachment|
+            attachments[column.send(attachment).original_filename] = File.read(column.send("#{attachment}").send(:path))
+          end
           mail(to: mailer.to, bcc: mailer.bcc, from: mailer.from, subject: mailer.subject, template_path: mailer.template_path, template_name: mailer.template_name)
         end
       end
@@ -200,7 +204,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.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.2.0"
+  VERSION = "1.3.0"
 end

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

@@ -5,7 +5,7 @@ module EasyMail
 
       def generate_init_file
         copy_file "easy_mail.rb", "config/initializers/easy_mail.rb"
-        copy_file "confirmation.html.erb", "app/views/shared/mail/confirmation.html.erb"
+        #copy_file "confirmation.html.erb", "app/views/shared/mail/confirmation.html.erb"
       end
     end
   end

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

@@ -6,4 +6,5 @@ EasyMail::Mailer.setup(to: "", from: "", bcc: "", subject: "Please Read") do
   #    bcc: "test@mail.com",
   #    subject: "Subject",
   #    template_name: "template"
+  #    attachments: [:resume]
 end

data/spec/easy_mail_spec.rb

@@ -95,7 +95,7 @@ describe EasyMail::Mailer do
       @mailer.namespace.should == ""
 
       @mailer.form_key.should == :mail_contact
-      @mailer.template_path.should == "mail_template"
+      @mailer.template_path.should == "mail/contacts"
       @mailer.route_url.should == "/contact"
       @mailer.route_to_controller_part.should == "mail/contacts"
       @mailer.route_as.should == "mail_contact"
@@ -150,7 +150,7 @@ describe EasyMail::Mailer do
 
           @mailer.name.should == "contact"
           @mailer.form_key.should == :namespace_one_namespace_two_mail_contact
-          @mailer.template_path.should == "mail_template/namespace_one/namespace_two"
+          @mailer.template_path.should == "namespace_one/namespace_two/mail/contacts"
           @mailer.route_url.should == "/namespace_one/namespace_two/contact"
           @mailer.route_to_controller_part.should == "namespace_one/namespace_two/mail/contacts"
           @mailer.route_as.should == "namespace_one_namespace_two_mail_contact"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_mail
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors: