active_wrapper 0.2.2 → 0.2.3

data/README.markdown

@@ -12,7 +12,7 @@ Setup
 -----
 
 <pre>
-sudo gem install active_wrapper
+sudo gem install active_wrapper --source http://gemcutter.org
 </pre>
 
 Usage

data/gemspec.rb

@@ -19,5 +19,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 end

data/lib/active_wrapper/mail.rb

@@ -13,21 +13,19 @@ module ActiveWrapper
       
       path = "#{base}/config/mail.yml"
       
+      if File.exists?(path)
+        yaml = YAML::load(File.open(path))
+        if yaml && yaml[@env]
+          yaml = yaml[@env].to_options
+          @config[:imap] = yaml[:imap].to_options if yaml[:imap]
+          @config[:smtp] = yaml[:smtp].to_options if yaml[:smtp]
+        end
+      end
       if @env == 'test'
         ActionMailer::Base.delivery_method = :test
-        @config = nil
-      else
-        if File.exists?(path)
-          yaml = YAML::load(File.open(path))
-          if yaml && yaml = yaml[@env].to_options
-            @config[:imap] = yaml[:imap].to_options unless @config[:imap]
-            @config[:smtp] = yaml[:smtp].to_options unless @config[:smtp]
-          end
-        end
-        if @config[:smtp]
-          ActionMailer::Base.delivery_method = :smtp
-          ActionMailer::Base.smtp_settings = @config[:smtp]
-        end
+      elsif @config[:smtp]
+        ActionMailer::Base.delivery_method = :smtp
+        ActionMailer::Base.smtp_settings = @config[:smtp]
       end
     end
     

data/spec/active_wrapper/mail_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ActiveWrapper::Db do
+  
+  before(:each) do
+    $db, $log, $mail = ActiveWrapper.setup(
+      :base => SPEC + '/example_project',
+      :env => 'test'
+    )
+  end
+  
+  it "should set instance variables" do
+    $mail.base.should == '/Users/winton/Sites/repositories/active/active_wrapper/spec/example_project'
+    $mail.config.should == {
+      :smtp => {
+        :address => "smtp.gmail.com",
+        :authentication => :plain,
+        :domain => "mydomain.com",
+        :password => "password",
+        :port => 587,
+        :enable_starttls_auto => true,
+        :user_name => "test@mydomain.com"
+      },
+      :imap => {
+        :password => "password",
+        :port => 993,
+        :server => "imap.gmail.com",
+        :ssl => true,
+        :use_login => true,
+        :username => "test@mydomain.com"
+      }
+    }
+    $mail.env.should == 'test'
+  end
+end

data/spec/example_project/config/mail.yml

@@ -0,0 +1,16 @@
+test:
+  imap:
+    password: password
+    port: 993
+    server: imap.gmail.com
+    ssl: true
+    use_login: true
+    username: test@mydomain.com
+  smtp:
+    address: smtp.gmail.com
+    authentication: :plain
+    domain: mydomain.com
+    password: password
+    port: 587
+    enable_starttls_auto: true
+    user_name: test@mydomain.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -08:00
+date: 2010-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,9 @@ files:
 - resources/migration.template
 - spec/active_wrapper/db_spec.rb
 - spec/active_wrapper/log_spec.rb
+- spec/active_wrapper/mail_spec.rb
 - spec/example_project/config/database.yml
+- spec/example_project/config/mail.yml
 - spec/example_project/db/migrate/001_test.rb
 - spec/example_project/Rakefile
 - spec/spec.opts