aws-ses 0.4.4 → 0.5.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.5:
+* Check for existence of html or text body when attachments are included
+* Message ids in mail objects should now reflect what is actually sent.
+
 0.4.4:
 * Fixed error in initialized settings if you don't set them manually
 

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.4.4", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.5.0", :require => 'aws/ses'
     
 == For Rails 3.x
 
@@ -89,4 +89,4 @@ Special thanks to Marcel Molina Jr. for his creation of AWS::S3 which I used por
 * nathanbertram
 * sshaw
 * teeparham (documentation)
-* pzb
+* pzb

data/README.rdoc

@@ -26,11 +26,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 :to        => ['jon@example.com', 'dave@example.com'],
+  ses.send_email (
+               :to        => ['jon@example.com', 'dave@example.com'],
                :source    => '"Steve Smith" <steve@example.com>',
                :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: 
 
@@ -94,8 +95,13 @@ GetSendStatisticsResponse#data_points is an array where each element is a hash w
 * +Complaints+
 * +Timestamp+
 
-  response = ses.statistics
-  response.data_points # =>
+For example:
+
+    response = ses.statistics
+    response.data_points
+
+will return:
+
       [{"Bounces"=>"0",
         "Timestamp"=>"2011-01-26T16:30:00Z",
         "DeliveryAttempts"=>"1",
@@ -124,7 +130,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.4.4", :require => 'aws/ses'
+    gem "aws-ses", "~> 0.5.0", :require => 'aws/ses'
     
 == For Rails 3.x
 
@@ -193,4 +199,4 @@ Special thanks to Marcel Molina Jr. for his creation of AWS::S3 which I used por
 * nathanbertram
 * sshaw
 * teeparham (documentation)
-* pzb
+* pzb

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/aws-ses.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{aws-ses}
-  s.version = "0.4.4"
+  s.name = "aws-ses"
+  s.version = "0.5.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 = %q{2011-11-19}
-  s.description = %q{Client library for Amazon's Simple Email Service's REST API}
-  s.email = %q{drew.blas@gmail.com}
+  s.date = "2013-04-30"
+  s.description = "Client library for Amazon's Simple Email Service's REST API"
+  s.email = "drew.blas@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.erb",
@@ -49,11 +49,11 @@ Gem::Specification.new do |s|
     "test/response_test.rb",
     "test/send_email_test.rb"
   ]
-  s.homepage = %q{http://github.com/drewblas/aws-ses}
+  s.homepage = "http://github.com/drewblas/aws-ses"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Client library for Amazon's Simple Email Service's REST API}
+  s.rubygems_version = "1.8.19"
+  s.summary = "Client library for Amazon's Simple Email Service's REST API"
   s.test_files = [
     "test/address_test.rb",
     "test/base_test.rb",

data/lib/aws/ses.rb

@@ -23,6 +23,6 @@ require 'ses/version'
 require 'ses/addresses'
 
 if defined?(Rails)
-  major, minor = Rails.version.split('.')
+  major, minor = Rails.version.to_s.split('.')
   require 'actionmailer/ses_extension' if major == '2' && minor == '3'
-end
+end

data/lib/aws/ses/send_email.rb

@@ -9,13 +9,13 @@ module AWS
     #                :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: 
+    # By default, the email "from" display address is whatever is before the @.
+    # To change the display from, use the format:
     #
     #   "Steve Smith" <steve@example.com>
     #
     # You can also send Mail objects using send_raw_email:
-    # 
+    #
     #   m = Mail.new( :to => ..., :from => ... )
     #   ses.send_raw_email(m)
     #
@@ -24,9 +24,9 @@ module AWS
     module SendEmail
       
       # Sends an email through SES
-      # 
+      #
       # the destination parameters can be:
-      # 
+      #
       # [A single e-mail string]  "jon@example.com"
       # [A array of e-mail addresses]  ['jon@example.com', 'dave@example.com']
       #
@@ -75,7 +75,7 @@ module AWS
       #
       # This uses the underlying Mail object from the mail gem
       # You can pass in a Mail object, a Hash of params that will be parsed by Mail.new, or just a string
-      # 
+      #
       # Note that the params are different from send_email
       # Specifically, the following fields from send_email will NOT work:
       #
@@ -96,8 +96,9 @@ module AWS
       # @option args [String] :to alias for :destinations
       # @return [Response]
       def send_raw_email(mail, args = {})
-        message = mail.is_a?(Hash) ? Mail.new(mail).to_s : mail.to_s
-        package = { 'RawMessage.Data' => Base64::encode64(message) }
+        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?
+        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]
@@ -105,7 +106,9 @@ module AWS
         else
             add_array_to_hash!(package, 'Destinations', args[:to]) if args[:to]
         end
-        request('SendRawEmail', package)
+        result = request('SendRawEmail', package)
+        message.message_id = "#{result.parsed['SendRawEmailResult']['MessageId']}@email.amazonses.com"
+        result
       end
 
       alias :deliver! :send_raw_email

data/test/helper.rb

@@ -54,3 +54,9 @@ class Test::Unit::TestCase
     Base.new(:access_key_id=>'123', :secret_access_key=>'abc')
   end
 end
+
+# Deals w/ http://github.com/thoughtbot/shoulda/issues/issue/117, see 
+# http://stackoverflow.com/questions/3657972/nameerror-uninitialized-constant-testunitassertionfailederror-when-upgradin
+unless defined?(Test::Unit::AssertionFailedError)
+  Test::Unit::AssertionFailedError = ActiveSupport::TestCase::Assertion
+end

data/test/send_email_test.rb

@@ -46,6 +46,24 @@ class SendEmailTest < Test::Unit::TestCase
       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/">
+      #    <SendRawEmailResult>
+      #      <MessageId>abc-123</MessageId>
+      #    </SendRawEmailResult>
+      #    <ResponseMetadata>
+      #      <RequestId>xyz-123</RequestId>
+      #    </ResponseMetadata>
+      #  </SendRawEmailResponse>
+      #})
+      message = Mail.new({:from => 'jon@example.com', :to => 'dave@example.com', :subject => 'Subject1'})
+      message.attachments['foo'] = { :mime_type => 'application/csv', :content => '1,2,3' }
+      assert_raise ArgumentError do
+        result = @base.send_raw_email message
+      end
+    end
+
     should 'send a raw e-mail with a hash object' do
       mock_connection(@base, :body => %{
         <SendRawEmailResponse xmlns="http://ses.amazonaws.com/doc/2010-12-01/">
@@ -64,4 +82,4 @@ class SendEmailTest < Test::Unit::TestCase
       assert_equal 'xyz-123', result.request_id
     end
   end
-end
+end

metadata

@@ -1,151 +1,171 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aws-ses
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Drew Blas
 - Marcel Molina Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-19 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xml-simple
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 5
+  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
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda-context
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  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 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  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 
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
+  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 
-        segments: 
-        - 0
-        - 8
-        - 11
+      - !ruby/object:Gem::Version
         version: 0.8.11
   type: :development
-  version_requirements: *id009
+  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
 email: drew.blas@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.erb
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
 - CHANGELOG
 - Gemfile
@@ -175,37 +195,32 @@ files:
 - test/mocks/fake_response.rb
 - test/response_test.rb
 - test/send_email_test.rb
-has_rdoc: true
 homepage: http://github.com/drewblas/aws-ses
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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.3.6
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Client library for Amazon's Simple Email Service's REST API
-test_files: 
+test_files:
 - test/address_test.rb
 - test/base_test.rb
 - test/extensions_test.rb