active_wrapper 0.3.3 → 0.3.4

data/README.md

@@ -6,13 +6,13 @@ Wraps ActiveRecord and Logger for use in non-Rails environments.
 Compatibility
 -------------
 
-Tested with Ruby 1.8.6, 1.8.7, and 1.9.1.
+Maintained under Ruby 1.9.2.
 
 Setup
 -----
 
 <pre>
-sudo gem install active_wrapper --source http://gemcutter.org
+gem install active_wrapper
 </pre>
 
 Usage

data/lib/active_wrapper.rb

@@ -2,17 +2,17 @@ require File.dirname(__FILE__) + '/active_wrapper/gems'
 
 ActiveWrapper::Gems.require(:lib)
 
-require 'action_mailer'
 require 'active_record'
 require 'fileutils'
 require 'logger'
+require 'pony'
 require 'yaml'
 
 $:.unshift File.dirname(__FILE__) + '/active_wrapper'
 
 require 'db'
+require 'email'
 require 'log'
-require 'mail'
 require 'version'
 
 module ActiveWrapper
@@ -28,13 +28,9 @@ module ActiveWrapper
       }.merge(options.reject { |k, v| v.nil? })
       
       db = Db.new(options)
+      mail = Email.new(options)
       log = Log.new(options)
-      mail = Mail.new(options)
       
-      ActionMailer::Base.logger = log
-      
-      ActiveWrapper::Gems.lockfile
-    
       [ db, log, mail ]
     end
   end

data/lib/active_wrapper/db.rb

@@ -95,12 +95,12 @@ module ActiveWrapper
     
     def redirect_stdout(&block)
       if env == 'test'
-        stdout = $stdout
-        $stdout = File.new('/dev/null', 'w')
+        stdout = $stdout.dup
+        $stdout = $stdout.reopen(RUBY_PLATFORM =~ /mswin/ ? "NUL" : "/dev/null")
       end
       yield
       if env == 'test'
-        $stdout = stdout
+        $stdout.reopen(stdout)
       end
     end
   end

data/lib/active_wrapper/email.rb

@@ -0,0 +1,41 @@
+module ActiveWrapper
+  class Email
+    
+    attr_reader :base, :env, :config
+    
+    def initialize(options)
+      @base = options[:base]
+      @config = {
+        :smtp => options[:smtp],
+        :sendmail => options[:sendmail]
+      }
+      @env = options[:env].to_s
+      
+      path = "#{base}/config/mail.yml"
+      via = nil
+      
+      if File.exists?(path)
+        yaml = YAML::load(File.open(path))
+        if yaml && yaml[@env]
+          yaml = yaml[@env].to_options
+          [ :sendmail, :smtp ].each do |type|
+            if yaml[type]
+              via = type
+              if yaml[type].respond_to?(:to_options)
+                @config[type] = yaml[type].to_options
+              end
+            end
+          end
+        end
+      end
+      
+      if via
+        ::Pony.options = { :via => via, :via_options => config[via] }
+      end
+    end
+    
+    def deliver(options)
+      ::Pony.mail options
+    end
+  end
+end

data/lib/active_wrapper/gems.rb

@@ -6,16 +6,17 @@ unless defined?(ActiveWrapper::Gems)
     class Gems
     
       VERSIONS = {
-        :actionmailer => '=2.3.5',
-        :activerecord => '=2.3.5',
+        :activerecord => '=3.0.3',
+        :mysql2 => '=0.2.6',
+        :pony => '=1.1',
         :rake => '=0.8.7',
-        :rspec => '=1.3.0'
+        :rspec => '=1.3.1'
       }
     
       TYPES = {
-        :gemspec => [ :activerecord, :actionmailer, :mysql ],
+        :gemspec => [ :activerecord, :mysql2 ],
         :gemspec_dev => [ :rspec ],
-        :lib => [ :activerecord, :actionmailer, :mysql ],
+        :lib => [ :activerecord, :mysql2 ],
         :rake => [ :rake, :rspec ],
         :spec => [ :rspec ]
       }

data/lib/active_wrapper/version.rb

@@ -1,3 +1,3 @@
 module ActiveWrapper
-  VERSION = "0.3.3" unless defined?(::ActiveWrapper::VERSION)
+  VERSION = "0.3.4" unless defined?(::ActiveWrapper::VERSION)
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_wrapper
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -07:00
+date: 2010-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,60 +25,43 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 3
+        version: 3.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: mysql2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
+        - 0
         - 2
-        - 3
-        - 5
-        version: 2.3.5
+        - 6
+        version: 0.2.6
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        - 1
+        version: 1.3.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Wraps ActiveRecord and Logger for use in non-Rails environments
 email: 
 - mail@wintoni.us
@@ -91,9 +73,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/active_wrapper/db.rb
+- lib/active_wrapper/email.rb
 - lib/active_wrapper/gems.rb
 - lib/active_wrapper/log.rb
-- lib/active_wrapper/mail.rb
 - lib/active_wrapper/tasks.rb
 - lib/active_wrapper/version.rb
 - lib/active_wrapper.rb
@@ -114,7 +96,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -123,7 +104,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/active_wrapper/mail.rb

@@ -1,49 +0,0 @@
-module ActiveWrapper
-  class Mail
-    
-    attr_reader :base, :env, :config
-    
-    def initialize(options)
-      @base = options[:base]
-      @config = {
-        :smtp => options[:smtp] || {},
-        :sendmail => options[:sendmail] || nil,
-        :imap => options[:imap] || {}
-      }
-      @env = options[:env].to_s
-      
-      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[:sendmail] = yaml[:sendmail] if !yaml[:sendmail].nil?
-          @config[:smtp] = yaml[:smtp].to_options if yaml[:smtp]
-        end
-      end
-      if @env == 'test'
-        ActionMailer::Base.delivery_method = :test
-      elsif @config[:sendmail]
-        ActionMailer::Base.delivery_method = :sendmail
-      elsif @config[:smtp]
-        ActionMailer::Base.delivery_method = :smtp
-        ActionMailer::Base.smtp_settings = @config[:smtp]
-      end
-    end
-    
-    def deliver(options)
-      Mailer.deliver_email(options)
-    end
-    
-    class Mailer < ::ActionMailer::Base
-      def email(options)
-        from        options[:from]
-        recipients  options[:to]
-        subject     options[:subject]
-        body        options[:body]
-      end
-    end
-  end
-end