easy_mail 1.0.0 → 1.1.0

data/lib/easy_mail/mailer.rb

@@ -11,18 +11,22 @@ module EasyMail
       @name = name.to_s.split("/").pop
 
       if Rails.env.production?
-        @to = attributes[:to] || self.class.default_to
-        @bcc = attributes[:bcc] || self.class.default_bcc
-        @from = attributes[:from] || self.class.default_from
+        @to = attributes[:to] || self.class.send_to
+        @bcc = attributes[:bcc] || self.class.send_bcc
+        @from = attributes[:from] || self.class.send_from
       else
         @to = "liang@andertec.ca"
         @bcc = "123924971@qq.com"
         @from = "test@gmail.com"
       end
 
-      @subject = attributes[:subject] || self.class.default_subject
+      @subject = attributes[:subject] || self.class.send_subject || "Please Read"
       @template_name = attributes[:name]
-      @namespace = name.to_s.split("/").slice(0..-2).map(&:classify).join("::")
+      @namespace = if self.class.namespaces.any?
+                     (self.class.namespaces.last.name.split("/") + name.to_s.split("/").slice(0..-2)).map(&:classify).join("::")
+                   else
+                     name.to_s.split("/").slice(0..-2).map(&:classify).join("::")
+                   end
 
       generate_mailer
       generate_controller
@@ -149,6 +153,10 @@ module EasyMail
         @all ||= []
       end
 
+      def namespaces
+        @namespaces ||= []
+      end
+
       def setup(options = {}, &block)
         self.default_to = options[:to]
         self.default_from = options[:from]
@@ -158,6 +166,30 @@ module EasyMail
         instance_eval &block
       end
 
+      def send_to
+        namespaces.any? ? namespaces[-1].to : default_to
+      end
+
+      def send_bcc
+        namespaces.any? ? namespaces[-1].bcc: default_bcc
+      end
+
+      def send_from
+        namespaces.any? ? namespaces[-1].from: default_from
+      end
+
+      def send_subject
+        namespaces.any? ? namespaces[-1].subject: default_subject
+      end
+
+      def namespace(name, options = {}, &block)
+        namespaces << EasyMail::Namespace.new(self, name, options = {})
+
+        instance_eval &block
+
+        namespaces.pop
+      end
+
       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

data/lib/easy_mail/namespace.rb

@@ -0,0 +1,23 @@
+module EasyMail
+  class Namespace
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+
+    attr_accessor :name, :to, :bcc, :from, :subject
+
+    def initialize(mailer, name, attributes = {})
+      @name = (mailer.namespaces.map(&:name) + [name.to_s]).join("/")
+      if mailer.namespaces.any?
+        @to = attributes[:to] || mailer.namespaces[-1].to
+        @bcc = attributes[:bcc] || mailer.namespaces[-1].bcc
+        @from = attributes[:from] || mailer.namespaces[-1].from
+        @subject = attributes[:subject] || mailer.namespaces[-1].subject
+      else
+        @to = attributes[:to] || mailer.default_to
+        @bcc= attributes[:bcc] || mailer.default_bcc
+        @from = attributes[:from] || mailer.default_from
+        @subject = attributes[:subject] || mailer.default_subject
+      end
+    end
+  end
+end

data/lib/easy_mail/version.rb

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

data/lib/easy_mail.rb

@@ -8,6 +8,7 @@ require 'action_mailer'
 require "easy_validator"
 
 require "easy_mail/mailer"
+require "easy_mail/namespace"
 require "easy_mail/base_model"
 require "easy_mail/version"
 

data/spec/easy_mail_spec.rb

@@ -13,16 +13,19 @@ describe EasyMail::Mailer do
       end
     end
 
-    module Store
-      module Part
+    module NamespaceOne
+      class ApplicationController < ::ApplicationController
+      end
+
+      module NamespaceTwo
         class ApplicationController < ::ApplicationController
         end
       end
     end
 
     module Mail
-      module Store
-        module Part
+      module NamespaceOne
+        module NamespaceTwo
           class Contact < EasyMail::BaseModel
             attr_accessor :name, :email, :message
           end
@@ -42,73 +45,132 @@ describe EasyMail::Mailer do
       EasyMail::Mailer.setup to: "production@to.com", from: "production@from.com", bcc: "production@bcc.com", subject: "Production Subject" do
          new :contact
          new :contact_2, to: "1liang@andertec.ca", bcc: "1123924971@qq.com", from: "1test@gmail.com", subject: "1Please Read"
-         new "store/part/contact"
+         new "namespace_one/namespace_two/contact"
+
+         namespace :namespace_one do
+           new :contact
+
+           new "namespace_two/contact_3"
+
+           namespace :namespace_two do
+             new :contact_2
+           end
+         end
       end
     end
 
     it do
-      defined?(Mail::ContactsController).should == "constant"
-      defined?(ContactMailer).should == "constant"
+      EasyMail::Mailer.all.select{|m| m.name == "contact" && m.namespace == ""}.count.should == 1
+      EasyMail::Mailer.all.select{|m| m.name == "contact_2" && m.namespace == ""}.count.should == 1
+
+      EasyMail::Mailer.all.select{|m| m.name == "contact" && m.namespace == "NamespaceOne"}.count.should == 1
+
+      EasyMail::Mailer.all.select{|m| m.name == "contact" && m.namespace == "NamespaceOne::NamespaceTwo"}.count.should == 1
+      EasyMail::Mailer.all.select{|m| m.name == "contact_2" && m.namespace == "NamespaceOne::NamespaceTwo"}.count.should == 1
+      EasyMail::Mailer.all.select{|m| m.name == "contact_3" && m.namespace == "NamespaceOne::NamespaceTwo"}.count.should == 1
     end
 
-    it do
-      defined?(Store::Part::Mail::ContactsController).should == "constant"
-      defined?(Store::Part::ContactMailer).should == "constant"
+
     end
 
-    it "contact" do
-      mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact" && m.namespace == "" }
-      mailer.form_key.should == :mail_contact
-      mailer.template_path.should == "mail_template"
-      mailer.route_url.should == "/contact"
-      mailer.route_to_controller_part.should == "mail/contacts"
-      mailer.route_as.should == "mail_contact"
-
-      mailer.to.should == "liang@andertec.ca"
-      mailer.bcc.should == "123924971@qq.com"
-      mailer.from.should == "test@gmail.com"
-      mailer.subject.should == "Production Subject"
+  describe ".new" do
+    let(:production_env?) { false }
+    let(:mailer_params) { {} }
+
+    before do
+      Rails.stub_chain(:env, :production?).and_return(production_env?)
+
+      EasyMail::Mailer.stub(:default_to).and_return("default_to@gmail.com")
+      EasyMail::Mailer.stub(:default_bcc).and_return("default_bcc@gmail.com")
+      EasyMail::Mailer.stub(:default_from).and_return("default_from@gmail.com")
+      EasyMail::Mailer.stub(:default_subject).and_return("Default Subject")
     end
 
-    it "contact_2" do
-      mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact_2" && m.namespace == "" }
+    it do
+      @mailer = EasyMail::Mailer.new(:contact, mailer_params)
+      @mailer.to.should == "liang@andertec.ca"
+      @mailer.bcc.should == "123924971@qq.com"
+      @mailer.from.should == "test@gmail.com"
+      @mailer.subject.should == "Default Subject"
+      @mailer.namespace.should == ""
+
+      @mailer.form_key.should == :mail_contact
+      @mailer.template_path.should == "mail_template"
+      @mailer.route_url.should == "/contact"
+      @mailer.route_to_controller_part.should == "mail/contacts"
+      @mailer.route_as.should == "mail_contact"
 
-      mailer.to.should == "liang@andertec.ca"
-      mailer.bcc.should == "123924971@qq.com"
-      mailer.from.should == "test@gmail.com"
-      mailer.subject.should == "1Please Read"
+      defined?(Mail::ContactsController).should == "constant"
+      defined?(ContactMailer).should == "constant"
     end
 
-    it "store/part/contact" do
-      mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact" && m.namespace == "Store::Part" }
-      mailer.name.should == "contact"
-      mailer.namespace.should == "Store::Part"
-      mailer.form_key.should == :store_part_mail_contact
-      mailer.template_path.should == "mail_template/store/part"
-      mailer.route_url.should == "/store/part/contact"
-      mailer.route_to_controller_part.should == "store/part/mail/contacts"
-      mailer.route_as.should == "store_part_mail_contact"
+    context "with have mailer_params" do
+      let(:mailer_params) { { to: "to@gmail.com", bcc: "bcc@gmail.com", from: "from@gamil.com", subject: "Subject 1" } }
+
+      it do
+        @mailer = EasyMail::Mailer.new(:contact, mailer_params)
+        @mailer.to.should == "liang@andertec.ca"
+        @mailer.bcc.should == "123924971@qq.com"
+        @mailer.from.should == "test@gmail.com"
+        @mailer.subject.should == "Subject 1"
+        @mailer.namespace.should == ""
+      end
     end
 
     context "with production env" do
       let(:production_env?) { true }
 
-      it "contact" do
-        mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact" && m.namespace == "" }
 
-        mailer.to.should == "production@to.com"
-        mailer.bcc.should == "production@bcc.com"
-        mailer.from.should == "production@from.com"
-        mailer.subject.should == "Production Subject"
+      it do
+      @mailer = EasyMail::Mailer.new(:contact, mailer_params)
+        @mailer.to.should == "default_to@gmail.com"
+        @mailer.bcc.should == "default_bcc@gmail.com"
+        @mailer.from.should == "default_from@gmail.com"
+        @mailer.subject.should == "Default Subject"
+        @mailer.namespace.should == ""
       end
 
-      it "contact_2" do
-        mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact_2" && m.namespace == "" }
+      context "with namespace" do
+        let(:namespace_params) { {} }
+
+        before do
+          EasyMail::Mailer.namespaces.clear
 
-        mailer.to.should == "1liang@andertec.ca"
-        mailer.bcc.should == "1123924971@qq.com"
-        mailer.from.should == "1test@gmail.com"
-        mailer.subject.should == "1Please Read"
+          EasyMail::Mailer.namespaces << EasyMail::Namespace.new(EasyMail::Mailer, :namespace_one)
+          EasyMail::Mailer.namespaces << EasyMail::Namespace.new(EasyMail::Mailer, :namespace_two, namespace_params)
+        end
+
+        it do
+          @mailer = EasyMail::Mailer.new(:contact, mailer_params)
+          @mailer.to.should == "default_to@gmail.com"
+          @mailer.bcc.should == "default_bcc@gmail.com"
+          @mailer.from.should == "default_from@gmail.com"
+          @mailer.subject.should == "Default Subject"
+          @mailer.namespace.should == "NamespaceOne::NamespaceTwo"
+
+          @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.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"
+
+          defined?(NamespaceOne::NamespaceTwo::Mail::ContactsController).should == "constant"
+          defined?(NamespaceOne::NamespaceTwo::ContactMailer).should == "constant"
+        end
+
+        context "with have attributes" do
+          let(:namespace_params) { { to: "n2_to@gmail.com", from: "n2_from@gmail.com", bcc: "n2_bcc@gmail.com", subject: "N2 Subject"} }
+
+          it do
+            @mailer = EasyMail::Mailer.new(:contact, mailer_params)
+            @mailer.to.should == "n2_to@gmail.com"
+            @mailer.bcc.should == "n2_bcc@gmail.com"
+            @mailer.from.should == "n2_from@gmail.com"
+            @mailer.subject.should == "N2 Subject"
+            @mailer.namespace.should == "NamespaceOne::NamespaceTwo"
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_mail
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_validator
@@ -43,6 +43,7 @@ files:
 - lib/easy_mail.rb
 - lib/easy_mail/base_model.rb
 - lib/easy_mail/mailer.rb
+- lib/easy_mail/namespace.rb
 - lib/easy_mail/version.rb
 - lib/generators/easy_mail/install/install_generator.rb
 - lib/generators/easy_mail/install/templates/confirmation.html.erb