aws-ses 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d83b84b06b584bdb5c4643e75dde6cd185d7b54
+  data.tar.gz: f7c7c7d108a5e87ba91b5249f2e8795a6ace7606
+SHA512:
+  metadata.gz: bd17ce170e886f373038bbee96b593398ad2f9a1397bcce409cc7d9c0ecdcd6adceca4756d9380b7d114cc503797065de349df675ff409d1a8ab8806c147e00b
+  data.tar.gz: 97d79a71412f8bf55659ac2bca9697072b5ad0a7ec6531d45ab249d56e817f6b56f0f432b1a2f21acdf9a5cb3c68869dd3aa5f50ae853828b6cc9bd25a46fd47

data/Gemfile

@@ -7,13 +7,12 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda-context", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  #gem "rcov", ">= 0"
   gem 'flexmock', '~> 0.8.11'
 end
 
 gem 'xml-simple'
 gem 'builder'
 gem 'mime-types'
-gem 'mail', '> 2.2.5'
+gem 'mail', '> 2.2.5'

data/Gemfile.lock

@@ -1,39 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
-    builder (3.0.0)
+    builder (3.2.2)
     flexmock (0.8.11)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda-context (1.0.0.beta1)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    xml-simple (1.0.13)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.1)
+    shoulda-context (1.2.1)
+    xml-simple (1.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder
-  bundler (~> 1.0.0)
+  bundler
   flexmock (~> 0.8.11)
-  jeweler (~> 1.5.2)
   mail (> 2.2.5)
   mime-types
-  rcov
   shoulda-context
   xml-simple

data/README.erb

@@ -20,7 +20,7 @@ This gem is compatible with Rails >= 3.0.0 and Rails 2.3.x
 
 To use, first add the gem to your Gemfile:
 
-    gem "aws-ses", "~> 0.5.0", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.6.0", :require => 'aws/ses'
     
 == For Rails 3.x
 

data/README.rdoc

@@ -19,6 +19,17 @@ Before you can do anything, you must establish a connection using Base.new.  A b
 
 The minimum connection options that you must specify are your access key id and your secret access key.
 
+=== Connecting to a server from another region
+
+The default server API endpoint is "email.us-east-1.amazonaws.com", corresponding to the US East 1 region.
+
+To connect to a different one, just pass it as a parameter to the AWS::SES::Base initializer:
+
+  ses = AWS::SES::Base.new(
+    :access_key_id     => 'abc', 
+    :secret_access_key => '123',
+    :server => 'email.eu-west-1.amazonaws.com'
+  )
 
 == Send E-mail
 
@@ -26,12 +37,12 @@ Adds functionality for send_email and send_raw_email
 Use the following to send an e-mail:
 
   ses = AWS::SES::Base.new( ... connection info ... )
-  ses.send_email (
+  ses.send_email(
                :to        => ['jon@example.com', 'dave@example.com'],
                :source    => '"Steve Smith" <steve@example.com>',
-               :subject   => 'Subject Line'
+               :subject   => 'Subject Line',
                :text_body => 'Internal text body'
-    )
+  )
 By default, the email "from" display address is whatever is before the @. 
 To change the display from, use the format: 
 
@@ -130,7 +141,7 @@ This gem is compatible with Rails >= 3.0.0 and Rails 2.3.x
 
 To use, first add the gem to your Gemfile:
 
-    gem "aws-ses", "~> 0.5.0", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.6.0", :require => 'aws/ses'
     
 == For Rails 3.x
 

data/Rakefile

@@ -11,20 +11,6 @@ require 'rake'
 
 require 'erb'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "aws-ses"
-  gem.homepage = "http://github.com/drewblas/aws-ses"
-  gem.license = "MIT"
-  gem.summary = %Q{Client library for Amazon's Simple Email Service's REST API}
-  gem.description = gem.summary
-  gem.email = "drew.blas@gmail.com"
-  gem.authors = ["Drew Blas", 'Marcel Molina Jr.']
-  # Do not add dependencies here because Jewler will add them from the Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -32,16 +18,16 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
+# require 'rcov/rcovtask'
+# Rcov::RcovTask.new do |test|
+#   test.libs << 'test'
+#   test.pattern = 'test/**/*_test.rb'
+#   test.verbose = true
+# end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 require File.dirname(__FILE__) + '/lib/aws/ses'
 
 namespace :doc do
@@ -64,6 +50,7 @@ namespace :doc do
     system 'open doc/index.html'
   end
 
+  desc "Generate readme.rdoc from readme.erb"
   task :readme do
     require 'support/rdoc/code_info'
     RDoc::CodeInfo.parse('lib/**/*.rb')

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/aws-ses.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aws-ses"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Drew Blas", "Marcel Molina Jr."]
-  s.date = "2013-04-30"
+  s.date = "2014-10-13"
   s.description = "Client library for Amazon's Simple Email Service's REST API"
   s.email = "drew.blas@gmail.com"
   s.extra_rdoc_files = [
@@ -75,9 +75,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, ["> 2.2.5"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, ["~> 0.8.11"])
     else
       s.add_dependency(%q<xml-simple>, [">= 0"])
@@ -85,9 +82,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<mail>, ["> 2.2.5"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<flexmock>, ["~> 0.8.11"])
     end
   else
@@ -96,9 +90,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<mail>, ["> 2.2.5"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<flexmock>, ["~> 0.8.11"])
   end
 end

data/lib/aws/ses/base.rb

@@ -17,6 +17,18 @@ module AWS #:nodoc:
   #   )
   # 
   # The minimum connection options that you must specify are your access key id and your secret access key.
+  #
+  # === Connecting to a server from another region
+  # 
+  # The default server API endpoint is "email.us-east-1.amazonaws.com", corresponding to the US East 1 region.
+  # To connect to a different one, just pass it as a parameter to the AWS::SES::Base initializer:
+  #
+  #   ses = AWS::SES::Base.new(
+  #     :access_key_id     => 'abc', 
+  #     :secret_access_key => '123',
+  #     :server => 'email.eu-west-1.amazonaws.com'
+  #   )
+
   module SES
     
     API_VERSION = '2010-12-01'
@@ -35,7 +47,7 @@ module AWS #:nodoc:
     # @param [Boolean] urlencode whether or not to url encode the result., true or false
     # @return [String] the signed and encoded string.
     def SES.encode(secret_access_key, str, urlencode=true)
-      digest = OpenSSL::Digest::Digest.new('sha256')
+      digest = OpenSSL::Digest.new('sha256')
       b64_hmac =
         Base64.encode64(
           OpenSSL::HMAC.digest(digest, secret_access_key, str)).gsub("\n","")

data/lib/aws/ses/send_email.rb

@@ -22,7 +22,7 @@ module AWS
     # send_raw_email will also take a hash and pass it through Mail.new automatically as well.
     #
     module SendEmail
-      
+
       # Sends an email through SES
       #
       # the destination parameters can be:
@@ -51,25 +51,25 @@ module AWS
       # @return [Response] the response to sending this e-mail
       def send_email(options = {})
         package     = {}
-        
+
         package['Source'] = options[:source] || options[:from]
-        
+
         add_array_to_hash!(package, 'Destination.ToAddresses', options[:to]) if options[:to]
         add_array_to_hash!(package, 'Destination.CcAddresses', options[:cc]) if options[:cc]
         add_array_to_hash!(package, 'Destination.BccAddresses', options[:bcc]) if options[:bcc]
-        
+
         package['Message.Subject.Data'] = options[:subject]
-        
+
         package['Message.Body.Html.Data'] = options[:html_body] if options[:html_body]
         package['Message.Body.Text.Data'] = options[:text_body] || options[:body] if options[:text_body] || options[:body]
-        
+
         package['ReturnPath'] = options[:return_path] if options[:return_path]
-        
+
         add_array_to_hash!(package, 'ReplyToAddresses', options[:reply_to]) if options[:reply_to]
-        
+
         request('SendEmail', package)
       end
-      
+
       # Sends using the SendRawEmail method
       # This gives the most control and flexibility
       #
@@ -98,24 +98,36 @@ module AWS
       def send_raw_email(mail, args = {})
         message = mail.is_a?(Hash) ? Mail.new(mail) : mail
         raise ArgumentError, "Attachment provided without message body" if message.has_attachments? && message.text_part.nil? && message.html_part.nil?
+
+        raw_email = build_raw_email(message, args)
+        result = request('SendRawEmail', raw_email)
+        message.message_id = "#{result.parsed['SendRawEmailResult']['MessageId']}@email.amazonses.com"
+        result
+      end
+
+      alias :deliver! :send_raw_email
+      alias :deliver  :send_raw_email
+
+      private
+
+      def build_raw_email(message, args = {})
+        # the message.to_s includes the :to and :cc addresses
         package = { 'RawMessage.Data' => Base64::encode64(message.to_s) }
         package['Source'] = args[:from] if args[:from]
         package['Source'] = args[:source] if args[:source]
         if args[:destinations]
             add_array_to_hash!(package, 'Destinations', args[:destinations])
         else
-            add_array_to_hash!(package, 'Destinations', args[:to]) if args[:to]
+          mail_addresses = [message.to, message.cc, message.bcc].flatten.compact
+          args_addresses = [args[:to], args[:cc], args[:bcc]].flatten.compact
+
+          mail_addresses = args_addresses unless args_addresses.empty?
+
+          add_array_to_hash!(package, 'Destinations', mail_addresses)
         end
-        result = request('SendRawEmail', package)
-        message.message_id = "#{result.parsed['SendRawEmailResult']['MessageId']}@email.amazonses.com"
-        result
+        package
       end
 
-      alias :deliver! :send_raw_email
-      alias :deliver  :send_raw_email
-      
-      private
-      
       # Adds all elements of the ary with the appropriate member elements
       def add_array_to_hash!(hash, key, ary)
         cnt = 1
@@ -125,23 +137,23 @@ module AWS
         end
       end
     end
-    
+
     class EmailResponse < AWS::SES::Response
       def result
         super["#{action}Result"]
       end
-      
+
       def message_id
         result['MessageId']
       end
     end
-    
+
     class SendEmailResponse < EmailResponse
-    
+
     end
-    
+
     class SendRawEmailResponse < EmailResponse
-    
+
     end
   end
 end

data/test/send_email_test.rb

@@ -4,12 +4,12 @@ class SendEmailTest < Test::Unit::TestCase
   context 'when sending email' do
     setup do
       @base = generate_base
-      @basic_email = { :from => 'jon@example.com', 
+      @basic_email = { :from => 'jon@example.com',
                         :to   => 'dave@example.com',
-                        :subject => 'Subject1', 
+                        :subject => 'Subject1',
                         :text_body => 'Body1' }
     end
-    
+
     context 'adding to a hash' do
       should 'add array elements to the hash' do
         hash = {}
@@ -18,7 +18,7 @@ class SendEmailTest < Test::Unit::TestCase
         expected = {'SomeKey.member.1' => 'x', 'SomeKey.member.2' => 'y'}
         assert_equal expected, hash
       end
-      
+
       should 'add singular elements to the hash' do
         hash = {}
         ary  = 'z'
@@ -27,7 +27,7 @@ class SendEmailTest < Test::Unit::TestCase
         assert_equal expected, hash
       end
     end
-    
+
     should 'send an e-mail' do
       mock_connection(@base, :body => %{
         <SendEmailResponse xmlns="http://ses.amazonaws.com/doc/2010-12-01/">
@@ -39,13 +39,13 @@ class SendEmailTest < Test::Unit::TestCase
           </ResponseMetadata>
         </SendEmailResponse>
       })
-      
+
       result = @base.send_email @basic_email
       assert result.success?
       assert_equal 'abc-123', result.message_id
       assert_equal 'xyz-123', result.request_id
     end
-    
+
     should 'throw ArgumentException when attachment supplied without a body' do
       #mock_connection(@base, :body => %{
       #  <SendRawEmailResponse xmlns="http://ses.amazonaws.com/doc/2010-12-01/">
@@ -75,11 +75,49 @@ class SendEmailTest < Test::Unit::TestCase
           </ResponseMetadata>
         </SendRawEmailResponse>
       })
-      
+
       result = @base.send_raw_email(@basic_email)
       assert result.success?
       assert_equal 'abc-123', result.message_id
       assert_equal 'xyz-123', result.request_id
     end
+
+    context "with a standard email"  do
+      setup do
+        @message = Mail.new({:from => 'jon@example.com', :to => 'dave@example.com', :cc => 'sally@example.com', :subject => 'Subject1', :body => "test body"})
+      end
+
+      should "add the 2 addresses to the Destinations" do
+        package = @base.send("build_raw_email", @message)
+        assert_equal 'dave@example.com',  package['Destinations.member.1']
+        assert_equal 'sally@example.com', package['Destinations.member.2']
+      end
+
+      should "be able to override the e-mail destinations" do
+        dest_options = {:to => "another@example.com", :cc => "bob@example.com" }
+        package = @base.send("build_raw_email", @message, dest_options)
+        assert_equal 'another@example.com',  package['Destinations.member.1']
+        assert_equal 'bob@example.com', package['Destinations.member.2']
+      end
+    end
+
+    should "add the bcc address to the email destinations" do
+      message = Mail.new({:from => 'jon@example.com', :bcc => "robin@example.com", :to => 'dave@example.com', :subject => 'Subject1', :body => "test body"})
+      package = @base.send("build_raw_email", message)
+      assert_equal 'dave@example.com',  package['Destinations.member.1']
+      assert_equal 'robin@example.com', package['Destinations.member.2']
+    end
+
+    should "when only bcc address in the email" do
+      message = Mail.new({:from => 'jon@example.com', :bcc => ["robin@example.com", 'dave@example.com'], :subject => 'Subject1', :body => "test body"})
+      package = @base.send("build_raw_email", message)
+      assert_equal 'robin@example.com', package['Destinations.member.1']
+      assert_equal 'dave@example.com',  package['Destinations.member.2']
+    end
+
+    should "add the mail addresses to the email destination" do
+      message = Mail.new({:from => 'jon@example.com', :to => ["robin@example.com", 'dave@example.com'], :subject => 'Subject1', :body => "test body"})
+
+    end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ses
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Drew Blas
@@ -10,150 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.11
 description: Client library for Amazon's Simple Email Service's REST API
@@ -166,7 +105,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files:
-- .document
+- ".document"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -198,25 +137,24 @@ files:
 homepage: http://github.com/drewblas/aws-ses
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Client library for Amazon's Simple Email Service's REST API