easy_mail 0.0.2 → 1.0.0

data/lib/easy_mail/mailer.rb

@@ -3,18 +3,26 @@ module EasyMail
     include ActiveModel::Conversion
     extend ActiveModel::Naming
 
-    mattr_accessor :default_to, :default_bcc, :default_from, :default_subject, :default_config
+    mattr_accessor :default_to, :default_bcc, :default_from, :default_subject
 
     attr_accessor :name, :to, :bcc, :from, :subject, :template_name, :namespace
 
-    def initialize(attributes = {})
-      @name = attributes[:name].split("/").pop
-      @to = attributes[:to] || self.class.default_to
-      @bcc = attributes[:bcc] || self.class.default_bcc
-      @from = attributes[:from] || self.class.default_from
+    def initialize(name, attributes = {})
+      @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
+      else
+        @to = "liang@andertec.ca"
+        @bcc = "123924971@qq.com"
+        @from = "test@gmail.com"
+      end
+
       @subject = attributes[:subject] || self.class.default_subject
       @template_name = attributes[:name]
-      @namespace = attributes[:name].split("/").slice(0..-2).map(&:classify).join("::")
+      @namespace = name.to_s.split("/").slice(0..-2).map(&:classify).join("::")
 
       generate_mailer
       generate_controller
@@ -141,11 +149,13 @@ module EasyMail
         @all ||= []
       end
 
-      def default_config=(hash)
-        self.default_to = hash[:to]
-        self.default_from = hash[:from]
-        self.default_bcc = hash[:bcc]
-        self.default_subject = hash[:subject]
+      def setup(options = {}, &block)
+        self.default_to = options[:to]
+        self.default_from = options[:from]
+        self.default_bcc = options[:bcc]
+        self.default_subject = options[:subject]
+
+        instance_eval &block
       end
 
       def routes(router)

data/lib/easy_mail/version.rb

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

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

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

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

@@ -1,13 +1,4 @@
-raw_config = File.read("#{Rails.root}/config/mail_config.yml")
-
-EasyMail::Mailer.default_config = YAML.load(raw_config)[Rails.env].symbolize_keys
-
-#EasyMail::Mailer.new(name: "contact")
-
-#EasyMail::Mailer.new({
-#  name: "store/contact",
-#  to: "test@mail.com",
-#  from: "test@mail.com",
-#  bcc: "test@mail.com",
-#  subject: "Subject",
-#})
+EasyMail::Mailer.setup(to: "", from: "", bcc: "", subject: "") do
+  #  new :contact
+  #  new "store/contact", to: "test@mail.com", from: "test@mail.com", bcc: "test@mail.com", subject: "Subject"
+end

data/spec/easy_mail_spec.rb

@@ -1,106 +1,115 @@
 require "easy_mail"
 require "action_controller"
+require "rails"
 
 describe EasyMail::Mailer do
-  context "normal" do
-    let(:mailer_params) { { name: "contact" } }
-    before(:all) do
-      class ApplicationController < ActionController::Base
+  before(:all) do
+    class ApplicationController < ActionController::Base
+    end
+
+    module Mail
+      class Contact < EasyMail::BaseModel
+        attr_accessor :name, :email, :message
       end
+    end
 
-      module Mail
-        class Contact < EasyMail::BaseModel
-          attr_accessor :name, :email, :message
+    module Store
+      module Part
+        class ApplicationController < ::ApplicationController
+        end
+      end
+    end
 
-          validates_email_format_of :email
+    module Mail
+      module Store
+        module Part
+          class Contact < EasyMail::BaseModel
+            attr_accessor :name, :email, :message
+          end
         end
       end
     end
+  end
+
+  context ".setup" do
+    let(:production_env?) { false }
 
     before do
-      @mailer = EasyMail::Mailer.new(mailer_params)
-    end
+      Rails.stub_chain(:env, :production?).and_return(production_env?)
 
-    it "controller part" do
-      defined?(Mail::ContactsController).should == "constant"
-      @mailer.form_key.should == :mail_contact
+      EasyMail::Mailer.all.clear
+
+      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"
+      end
     end
 
-    it "mailer part" do
+    it do
+      defined?(Mail::ContactsController).should == "constant"
       defined?(ContactMailer).should == "constant"
-      @mailer.template_path.should == "mail_template"
     end
 
-    it "route part" do
-      @mailer.route_url.should == "/contact"
-      @mailer.route_to_controller_part.should == "mail/contacts"
-      @mailer.route_as.should == "mail_contact"
+    it do
+      defined?(Store::Part::Mail::ContactsController).should == "constant"
+      defined?(Store::Part::ContactMailer).should == "constant"
     end
 
-    context "with mail config" do
-      let(:mailer_params) do
-        {
-          name: "contact",
-          to: "liang@andertec.ca",
-          bcc: "123924971@qq.com",
-          from: "test@gmail.com",
-          subject: "Test Subject"
-        }
-      end
-
-      it do
-        @mailer.to.should == "liang@andertec.ca"
-        @mailer.bcc.should == "123924971@qq.com"
-        @mailer.from.should == "test@gmail.com"
-        @mailer.subject.should == "Test Subject"
-      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"
     end
-  end
-
-  context "have namespace" do
-    before(:all) do
-      class ApplicationController < ActionController::Base
-      end
 
-      module Store
-        module Part
-          class ApplicationController < ::ApplicationController
-          end
-        end
-      end
-
-      module Mail
-        module Store
-          module Part
-            class Contact < EasyMail::BaseModel
-              attr_accessor :name, :email, :message
-            end
-          end
-        end
-      end
+    it "contact_2" do
+      mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact_2" && m.namespace == "" }
 
-      @mailer = EasyMail::Mailer.new(name: "store/part/contact")
+      mailer.to.should == "liang@andertec.ca"
+      mailer.bcc.should == "123924971@qq.com"
+      mailer.from.should == "test@gmail.com"
+      mailer.subject.should == "1Please Read"
     end
 
-    it do
-      @mailer.name.should == "contact"
-      @mailer.namespace.should == "Store::Part"
+    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"
     end
 
-    it "controller part" do
-      defined?(Store::Part::Mail::ContactsController).should == "constant"
-      @mailer.form_key.should == :store_part_mail_contact
-    end
+    context "with production env" do
+      let(:production_env?) { true }
 
-    it "mailer part" do
-      defined?(Store::Part::ContactMailer).should == "constant"
-      @mailer.template_path.should == "mail_template/store/part"
-    end
+      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"
+      end
 
-    it "route part" do
-      @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"
+      it "contact_2" do
+        mailer = EasyMail::Mailer.all.detect{|m| m.name == "contact_2" && m.namespace == "" }
+
+        mailer.to.should == "1liang@andertec.ca"
+        mailer.bcc.should == "1123924971@qq.com"
+        mailer.from.should == "1test@gmail.com"
+        mailer.subject.should == "1Please Read"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_mail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_validator
@@ -47,12 +47,10 @@ files:
 - lib/generators/easy_mail/install/install_generator.rb
 - lib/generators/easy_mail/install/templates/confirmation.html.erb
 - lib/generators/easy_mail/install/templates/easy_mail.rb
-- lib/generators/easy_mail/install/templates/mail_config.yml
 - lib/generators/easy_mail/model/model_generator.rb
 - lib/generators/easy_mail/model/templates/model.rb
 - spec/base_model_spec.rb
 - spec/easy_mail_spec.rb
-- spec/mailer_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -80,5 +78,4 @@ summary: test
 test_files:
 - spec/base_model_spec.rb
 - spec/easy_mail_spec.rb
-- spec/mailer_spec.rb
 has_rdoc: 

data/lib/generators/easy_mail/install/templates/mail_config.yml

@@ -1,8 +0,0 @@
-development: &development
-  to: "liang@andertec.ca"
-  from: "123924971@qq.com"
-  subject: "Please Read"
-test:
-  <<: *development
-production:
-  <<: *development

data/spec/mailer_spec.rb

@@ -1,101 +0,0 @@
-require "easy_mail"
-require "action_controller"
-
-describe EasyMail::Mailer do
-  context "normal" do
-    let(:mailer_params) { { name: "contact" } }
-    before(:all) do
-      class ApplicationController < ActionController::Base
-      end
-
-      module Mail
-        class Contact < EasyMail::BaseModel
-          attr_accessor :name, :email, :message
-
-          validates_email_format_of :email
-        end
-      end
-    end
-
-    before do
-      @mailer = EasyMail::Mailer.new(mailer_params)
-    end
-
-    it "controller part" do
-      defined?(Mail::ContactsController).should == "constant"
-      @mailer.form_key.should == :mail_contact
-    end
-
-    it "mailer part" do
-      defined?(ContactMailer).should == "constant"
-      @mailer.template_path.should == "mail_template"
-    end
-
-    it "route part" do
-      @mailer.route_url.should == "/contact"
-      @mailer.route_to_controller_part.should == "mail/contacts"
-      @mailer.route_as.should == "mail_contact"
-    end
-
-    context "with mail config" do
-      let(:mailer_params) do
-        {
-          name: "contact",
-          to: "liang@andertec.ca",
-          bcc: "123924971@qq.com",
-          from: "test@gmail.com",
-          subject: "Test Subject"
-        }
-      end
-
-      it do
-        @mailer.to.should == "liang@andertec.ca"
-        @mailer.bcc.should == "123924971@qq.com"
-        @mailer.from.should == "test@gmail.com"
-        @mailer.subject.should == "Test Subject"
-      end
-    end
-  end
-
-  context "have namespace" do
-    before(:all) do
-      class ApplicationController < ActionController::Base
-      end
-
-      module Store
-        module Part
-          class ApplicationController < ::ApplicationController
-          end
-        end
-      end
-
-      module Mail
-        module Store
-          module Part
-            class Contact < EasyMail::BaseModel
-              attr_accessor :name, :email, :message
-            end
-          end
-        end
-      end
-
-      @mailer = EasyMail::Mailer.new(name: "store/part/contact")
-    end
-
-    it "controller part" do
-      defined?(Store::Part::Mail::ContactsController).should == "constant"
-      @mailer.form_key.should == :store_part_mail_contact
-    end
-
-    it "mailer part" do
-      defined?(Store::Part::ContactMailer).should == "constant"
-      @mailer.template_path.should == "mail_template/store/part"
-    end
-
-    it "route part" do
-      @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"
-    end
-  end
-end