ar_mailer_aws 0.0.4 → 0.1.0

data/spec/ar_mailer_aws/clients/smtp_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ArMailerAWS::Clients::SMTP do
+
+  describe '#send_emails' do
+    before do
+      allow(ArMailerAWS).to receive(:client_config).and_return({smtp: {
+          address: 'smtp.example.com',
+          port: 587,
+          domain: 'example.com',
+          authentication: 'plain',
+          enable_starttls_auto: true,
+          user_name: 'test@example.com',
+          password: '123456'
+      }})
+      @client = ArMailerAWS::Clients::SMTP.new
+    end
+
+    it 'start smtp session' do
+      session = Net::SMTP.new('smtp.example.com', 587)
+      expect(Net::SMTP).to receive(:new).with('smtp.example.com', 587).and_return(session)
+      expect(session).to receive(:start).with('example.com', 'test@example.com', '123456', 'plain')
+      @client.send_emails([])
+    end
+
+    it 'send emails' do
+      session = double('session').as_null_object
+      email = double('email', id: 1, mail: 'mail', from: 'from', to: 'to')
+
+      allow(Net::SMTP).to receive(:new).and_return(session)
+      allow(session).to receive(:start).and_yield(session)
+      expect(session).to receive(:send_message).with('mail', 'from', 'to')
+      expect(email).to receive(:destroy)
+      @client.send_emails([email])
+    end
+  end
+
+end

data/spec/ar_mailer_aws/mailer_spec.rb

@@ -4,23 +4,23 @@ describe ArMailerAWS::Mailer do
 
   it 'initializer email_class option' do
     mailer = ArMailerAWS::Mailer.new(email_class: CustomEmailClass)
-    mailer.email_class.name.should == 'CustomEmailClass'
+    expect(mailer.email_class.name).to eq 'CustomEmailClass'
   end
 
   context 'delivering' do
     before do
       @mail = double('Mail')
-      @mail.stub(:return_path).and_return('from@example.com')
-      @mail.stub(:destinations).and_return(['to@example.com'])
-      @mail.stub(:encoded).and_return('email content')
+      allow(@mail).to receive(:return_path).and_return('from@example.com')
+      allow(@mail).to receive(:destinations).and_return(['to@example.com'])
+      allow(@mail).to receive(:encoded).and_return('email content')
       @mailer = ArMailerAWS::Mailer.new
     end
 
     it '#check_params' do
       params = @mailer.send(:check_params, @mail)
-      params[0].should == 'from@example.com'
-      params[1].should == ['to@example.com']
-      params[2].should == 'email content'
+      expect(params[0]).to eq 'from@example.com'
+      expect(params[1]).to eq ['to@example.com']
+      expect(params[2]).to eq 'email content'
     end
 
     it 'store emails into db on deliver!' do

data/spec/ar_mailer_aws/options_parser_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe ArMailerAWS::OptionsParser do
+
+  it 'return defaults if no options specified' do
+    options = ArMailerAWS::OptionsParser.parse_options([])
+    expect(options.batch_size).to eq 100
+    expect(options.delay).to eq 180
+    expect(options.quota).to eq 10_000
+    expect(options.rate).to eq 5
+    expect(options.max_age).to eq 3600 * 24 * 7
+    expect(options.max_attempts).to eq 5
+  end
+
+  it 'batch_size' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-b 10)).batch_size).to eq 10
+  end
+
+  it 'delay' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-d 90)).delay).to eq 90
+  end
+
+  it 'quota' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-q 100)).quota).to eq 100
+  end
+
+  it 'rate' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-r 7)).rate).to eq 7
+  end
+
+  it 'max_age' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-m 300)).max_age).to eq 300
+  end
+
+  it 'max_attempts' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-a 10)).max_attempts).to eq 10
+  end
+
+  it 'verbose' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-v)).verbose).to be_truthy
+  end
+
+  it 'pid_dir' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(-p tmp/pids)).pid_dir).to eq 'tmp/pids'
+  end
+
+  it 'app_name' do
+    expect(ArMailerAWS::OptionsParser.parse_options(%w(--app-name my_daemon)).app_name).to eq 'my_daemon'
+  end
+
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :from
     t.string :to
     t.text :mail, limit: 16777215
+    t.integer :send_attempts_count, default: 0
     t.datetime :last_send_attempt_at
     t.datetime :created_at
   end

metadata

@@ -1,139 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: ar_mailer_aws
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.9
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mandrill-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: 1.0.49
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.0.49
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Daemon for sending butches of emails via Amazon SES using ActiveRecord
@@ -145,8 +173,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -154,19 +183,26 @@ files:
 - ar_mailer_aws.gemspec
 - bin/ar_mailer_aws
 - lib/ar_mailer_aws.rb
+- lib/ar_mailer_aws/clients/amazon_ses.rb
+- lib/ar_mailer_aws/clients/base.rb
+- lib/ar_mailer_aws/clients/mandrill.rb
+- lib/ar_mailer_aws/clients/smtp.rb
 - lib/ar_mailer_aws/mailer.rb
+- lib/ar_mailer_aws/options_parser.rb
 - lib/ar_mailer_aws/railtie.rb
-- lib/ar_mailer_aws/sender.rb
 - lib/ar_mailer_aws/version.rb
 - lib/generators/ar_mailer_aws/ar_mailer_aws_generator.rb
 - lib/generators/ar_mailer_aws/templates/ar_mailer_aws.rb
 - lib/generators/ar_mailer_aws/templates/migration.rb
 - lib/generators/ar_mailer_aws/templates/model.rb
 - spec/ar_mailer_aws/ar_mailer_aws_spec.rb
+- spec/ar_mailer_aws/clients/amazon_ses_spec.rb
+- spec/ar_mailer_aws/clients/base_spec.rb
+- spec/ar_mailer_aws/clients/smtp_spec.rb
 - spec/ar_mailer_aws/mailer_spec.rb
-- spec/ar_mailer_aws/parse_options_spec.rb
-- spec/ar_mailer_aws/sender_spec.rb
+- spec/ar_mailer_aws/options_parser_spec.rb
 - spec/spec_helper.rb
+- unused/sender.rb
 homepage: https://github.com/leschenko/ar_mailer_aws
 licenses:
 - MIT
@@ -177,23 +213,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: Send butches of emails via Amazon SES
+summary: Send batches of emails via Amazon SES
 test_files:
 - spec/ar_mailer_aws/ar_mailer_aws_spec.rb
+- spec/ar_mailer_aws/clients/amazon_ses_spec.rb
+- spec/ar_mailer_aws/clients/base_spec.rb
+- spec/ar_mailer_aws/clients/smtp_spec.rb
 - spec/ar_mailer_aws/mailer_spec.rb
-- spec/ar_mailer_aws/parse_options_spec.rb
-- spec/ar_mailer_aws/sender_spec.rb
+- spec/ar_mailer_aws/options_parser_spec.rb
 - spec/spec_helper.rb

data/lib/ar_mailer_aws/sender.rb

@@ -1,90 +0,0 @@
-module ArMailerAWS
-  class Sender
-    attr_reader :options, :model, :ses
-
-    def initialize(options={})
-      @options = options.is_a?(Hash) ? OpenStruct.new(options) : options
-      @model = ArMailerAWS.email_class.constantize
-      @ses = AWS::SimpleEmailService.new ArMailerAWS.ses_options
-      @day = Date.today
-      @sent_count = 0
-    end
-
-    def send_batch
-      cleanup
-      emails = find_emails
-      log "found #{emails.length} emails to deliver"
-      send_emails(emails) unless emails.empty?
-    end
-
-    def send_emails(emails)
-      sent_per_second = 0
-      emails.each do |email|
-        if exceed_quota?
-          log "exceed daily quota in #{@quota}, sent by mailer #{@sent_count}, other #{@sent_last_24_hours}"
-          return
-        end
-        begin
-          if sent_per_second == options.rate
-            sleep 1
-            sent_per_second = 0
-          else
-            sent_per_second += 1
-          end
-          log "send email to #{email.to}"
-          @ses.send_raw_email email.mail, from: email.from, to: email.to
-          email.destroy
-          @sent_count += 1
-        rescue => e
-          log "ERROR sending email #{email.id} - #{email.inspect}: #{e.message}\n   #{e.backtrace.join("\n   ")}", :error
-          ArMailerAWS.error_proc.call(email, e) if ArMailerAWS.error_proc
-          email.update_column(:last_send_attempt_at, Time.now)
-        end
-      end
-    end
-
-    def exceed_quota?
-      if @day == Date.today
-        options.quota <= @sent_count + sent_last_24_hours
-      else
-        @sent_count = 0
-        @sent_last_24_hours = nil
-        false
-      end
-    end
-
-    def sent_last_24_hours
-      @sent_last_24_hours ||= begin
-        count = @ses.quotas[:sent_last_24_hours]
-        log "#{count} emails sent last 24 hours"
-        count
-      end
-    end
-
-    def find_emails
-      @model.where('last_send_attempt_at IS NULL OR last_send_attempt_at < ?', Time.now - 300).limit(options.batch_size)
-    end
-
-    def cleanup
-      return if options.max_age.to_i.zero?
-      timeout = Time.now - options.max_age
-      emails = @model.destroy_all(['last_send_attempt_at IS NOT NULL AND created_at < ?', timeout])
-
-      log "expired #{emails.length} emails"
-    end
-
-    def log(msg, level=:info)
-      formatted_msg = "[#{Time.now}] ar_mailer_aws: #{msg}"
-      puts formatted_msg if options.verbose
-      if logger
-        logger.send(level, msg)
-      elsif options.verbose && defined? Rails
-        Rails.logger.send(level, formatted_msg)
-      end
-    end
-
-    def logger
-      ArMailerAWS.logger
-    end
-  end
-end