winton-active_wrapper 0.1.5 → 0.1.6

data/README.markdown

@@ -18,7 +18,7 @@ require 'rubygems'
 require 'active_wrapper'
 
 $db, $log, $mail = ActiveWrapper.setup(
-  :base => File.dirname('__FILE__'),
+  :base => File.dirname(__FILE__),
   :env => 'development',
   :log => 'custom',
   :stdout => true

data/active_wrapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_wrapper}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Winton Welsh"]
-  s.date = %q{2009-07-03}
+  s.date = %q{2009-07-28}
   s.email = %q{mail@wintoni.us}
   s.extra_rdoc_files = ["README.markdown"]
   s.files = ["active_wrapper.gemspec", "gemspec.rb", "lib", "lib/active_wrapper", "lib/active_wrapper/db.rb", "lib/active_wrapper/log.rb", "lib/active_wrapper/mail.rb", "lib/active_wrapper/tasks.rb", "lib/active_wrapper.rb", "MIT-LICENSE", "Rakefile", "README.markdown", "resources", "resources/migration.template", "spec", "spec/spec.opts", "spec/spec_helper.rb"]

data/gemspec.rb

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

data/lib/active_wrapper/mail.rb

@@ -11,18 +11,21 @@ module ActiveWrapper
       
       if @env == 'test'
         ActionMailer::Base.delivery_method = :test
-      elsif File.exists?(path)
-        @config = YAML::load(File.open(path))
-        if @config && @config = @config[@env]
-          
-          @config = @config.to_options
-          @config[:imap] = @config[:imap].to_options if @config[:imap]
-          @config[:smtp] = @config[:smtp].to_options if @config[:smtp]
-          if @config[:smtp]
-            ActionMailer::Base.delivery_method = :smtp
-            ActionMailer::Base.smtp_settings = @config[:smtp]
+      else
+        @config[:smtp] = options[:smtp]
+        @config[:imap] = options[:imap]
+        if File.exists?(path)
+          @config = YAML::load(File.open(path))
+          if @config && @config = @config[@env]
+            @config = @config.to_options
+            @config[:imap] = @config[:imap].to_options unless @config[:imap]
+            @config[:smtp] = @config[:smtp].to_options unless @config[:smtp]
           end
         end
+        if @config[:smtp]
+          ActionMailer::Base.delivery_method = :smtp
+          ActionMailer::Base.smtp_settings = @config[:smtp]
+        end
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-active_wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/winton/active_wrapper
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Wraps ActiveRecord and Logger for use in non-Rails environments