mail_envi 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mail_envi.rb

@@ -1,4 +1,4 @@
-require 'rails/railtie'
+require 'rails'
 require 'mail'
 require 'mail_envi/config'
 
@@ -21,11 +21,8 @@ module MailEnvi
   end
 
   def self.config &block
-    if block_given?
-      @config = MailEnvi::Config.new &block
-    else
-      @config ||= MailEnvi::Config.new
-    end
+    @config = MailEnvi::Config.new &block if block_given?
+    @config || MailEnvi::Config.new
   end
 
 

data/mail_envi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_envi}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Yung Hwa Kwon}]
-  s.date = %q{2011-09-13}
+  s.date = %q{2011-09-14}
   s.description = %q{}
   s.email = %q{yung.kwon@damncarousel.com}
   s.extra_rdoc_files = [

data/test/mailer/test_user_mailer.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-require File.expand_path("../../dummy/config/environment.rb",  __FILE__)
+# require File.expand_path("../../dummy/config/environment.rb",  __FILE__)
 
 class TestUserMailer < ActionMailer::TestCase
   context "when configured with MailEnvi" do
@@ -8,6 +8,8 @@ class TestUserMailer < ActionMailer::TestCase
       mock(user = Object.new)
       stub(user).email {'user@company.com'}
 
+      Dummy::Application.initialize!
+
       email = UserMailer.registration_complete(user).deliver
       assert (not ActionMailer::Base.deliveries.empty?)
       assert_equal ['configured@company.com'], email.to

data/test/test_helper.rb

@@ -5,6 +5,7 @@ ENV["RAILS_ENV"] = "test"
 
 # load the dummy app
 # require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../dummy/config/application.rb",  __FILE__)
 
 
 begin

data/test/test_mail_envi.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'mail_envi'
+# $:.unshift File.expand_path('../../lib', __FILE__)
+# require 'mail_envi'
 
 class TestMailEnvi < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
@@ -10,27 +10,34 @@ class TestMailEnvi < ActiveSupport::TestCase
     MailEnvi::Rails::Railtie.new
   end
 
+  context "when running these tests" do
+    should "run faster than it does now" do
+      skip
+    end
+  end
+
   context "in a production environment" do
     setup { stub(MailEnvi).ronment {'production'} }
 
     should "not register the Mail interceptor" do
       dont_allow(::Mail).register_interceptor(anything)
-      mail_envi.run_initializers
+      # mail_envi.run_initializers
+      Dummy::Application.initialize!
     end
   end
 
   context "in a development or included environments" do
     should "register the default Mail interceptor" do
-      skip "This needs fixing"
-      MailEnvi.config do |config|
+      mail_envi_config = MailEnvi.config do |config|
         config.include_environments [:test, :staging, :beta]
       end
 
-      %w(development test staging beta).each do |v|
-        stub(MailEnvi).ronment {v}
-        mock(::Mail).register_interceptor(MailEnvi::DefaultInterceptor)
-        mail_envi.run_initializers
-      end
+      stub(MailEnvi).ronment {'staging'}
+      stub(MailEnvi).config {mail_envi_config}
+
+      mock(::Mail).register_interceptor(MailEnvi::DefaultInterceptor)
+      # mail_envi.run_initializers # does not execute after_initialize
+      Dummy::Application.initialize!
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: mail_envi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Yung Hwa Kwon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1327940184685094388
+      hash: -4161991172690583465
       segments: 
       - 0
       version: "0"