mail_alternatives_with_attachments 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjQ0NDQ3ZDY5M2RjZGJkOTRhZDA1ZWU2NTkwZDljNWVlZTU3OTUzOA==
+  data.tar.gz: !binary |-
+    N2FkMjJiNDM0NWY3ZjY4NjM2OTU5NDI3Y2Y1ZTM0ODRkYWM1NmM3OA==
+SHA512:
+  metadata.gz: !binary |-
+    MjA3OTkwMTUxYjBlMjExMDgzYjMyMWI0ZjdiOTY4YTlkOWYyN2Y3NjgzZGE4
+    ODc3ZjZkNzQwMWFhZmYyMDc4ZTcyZjZiNjRhMmEyN2ZhNjM4NDZhZWU4MWMy
+    ZmNhYTc0MDc5NjVmNzlkYzljOWM0OTRmMDYzMzZhY2EzY2JlN2E=
+  data.tar.gz: !binary |-
+    YmNlZjkzZDY1MTU1NTU0MDEzY2VlYWU2ZDNmNjdlOWIyZTU3NzdlYTc5OTdk
+    OWJjODQ5M2U3NzNlZjY2MGU4YmI4YWEyOGJjNTk4ZTYxOWM5ODRiOThmNTlk
+    NDJmYTI5MjYyNTRjYmJkMTZjMTQ5NTdkNmRkNWJkODM5NTFjZDQ=

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 James Coleman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,7 +1,7 @@
 Why?
 ====
 
-Spam filters often require that an HTML email also have a Text alternative that is generally the same as the HTML message. This means you need to send an email with a MIME type of `multipart/alternative` containing `text/html` and `text/plain` parts. ActionMailer 3 supports this scenario, but it falls apart when you need to add (inline) attachments to that mix. The property MIME hierarchy for an email like this is:
+Spam filters often require that an HTML email also have a text alternative that is generally the same as the HTML message. This means you need to send an email with a MIME type of `multipart/alternative` containing `text/html` and `text/plain` parts. ActionMailer 3 supports this scenario, but it falls apart when you need to add (inline) attachments to that mix. The proper MIME hierarchy for an email like this is:
 
 * `multipart/mixed`
     * `multipart/alternative`
@@ -13,13 +13,24 @@ Spam filters often require that an HTML email also have a Text alternative that
 
 If this seems more complicated then it should be, that's because it is. Thankfully, this gem allows you to create this entire hierarchy without all the hard work.
 
+Installation:
+=============
+
+Either include 
+
+    gem "mail_alternatives_with_attachments"
+
+in your Gemfile (if using Bundler) or run
+
+    gem install mail_alternatives_with_attachments
+
 Usage:
 ======
 
 Including the `mail_alternatives_with_attachments` gem in your project will patch ActionMailer with the following two methods:
 
-* `ActionMailer::Base#prepare_message(headers={})`: This method does exactly what `ActionMailer::Base#mail(headers={})` does; however it doesn't automatically rendering of templates so that we add our own custom message parts.
-* `Mail::Message#alternative_content_types_with_attachment(options, &block)`: This method allows you to conveniently add all of the different parts of complex email with alternatives and attachments.
+* `ActionMailer::Base#prepare_message(headers={})`: This method does exactly what `ActionMailer::Base#mail(headers={})` does; however it doesn't automatically render templates. This allows us to add our own custom message parts.
+* `Mail::Message#alternative_content_types_with_attachment(options, &block)`: This method allows you to conveniently add all of the different parts of a complex email with alternatives and attachments.
 
 Typically when using ActionMailer 3, you would create a message with the following code:
 
@@ -31,7 +42,7 @@ Typically when using ActionMailer 3, you would create a message with the followi
       end
     end
 
-Using this gem to create an email with both alternatives and attachments you would use the following code:
+To create an email with both alternatives and attachments you would use the following code:
 
     class MyEmailerClass < ActionMailer::Base
       def my_email_method(address, attachment, logo)
@@ -39,7 +50,7 @@ Using this gem to create an email with both alternatives and attachments you wou
         
         message.alternative_content_types_with_attachment(
           :text => render_to_string(:template => "my_template.text"),
-          :html => render_to_string("my_template.html")
+          :html => render_to_string(:template => "my_template.html")
         ) do |inline_attachments|
           inline_attachments.inline['logo.png'] = logo
         end

data/lib/mail_alternatives_with_attachments/action_mailer_prepare_message.rb

@@ -2,19 +2,19 @@ module MailAlternativesWithAttachments::ActionMailerPrepareMessage
 
   # Copied directly from ActionMailer::Base#mail but without
   # the automatic rendering of templates.
-  def prepare_message(headers={})
-    # Guard flag to prevent both the old and the new API from firing
-    # Should be removed when old API is removed
-    @mail_was_called = true
+  def prepare_message(headers = {}, &block)
+    return @_message if @_mail_was_called && headers.blank? && !block
+
+    @_mail_was_called = true
     m = @_message
 
-    # At the beginning, do not consider class default for parts order neither content_type
+    # At the beginning, do not consider class default for content_type
     content_type = headers[:content_type]
-    parts_order  = headers[:parts_order]
 
     # Call all the procs (if any)
-    default_values = self.class.default.merge(self.class.default) do |k,v|
-      v.respond_to?(:call) ? v.bind(self).call : v
+    default_values = {}
+    self.class.default.each do |k,v|
+      default_values[k] = v.is_a?(Proc) ? instance_eval(&v) : v
     end
 
     # Handle defaults
@@ -25,7 +25,7 @@ module MailAlternativesWithAttachments::ActionMailerPrepareMessage
     m.charset = charset = headers[:charset]
 
     # Set configure delivery behavior
-    wrap_delivery_behavior!(headers.delete(:delivery_method))
+    wrap_delivery_behavior!(headers.delete(:delivery_method), headers.delete(:delivery_method_options))
 
     # Assign all headers except parts_order, content_type and body
     assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
@@ -36,8 +36,7 @@ module MailAlternativesWithAttachments::ActionMailerPrepareMessage
     m.charset      = charset
 
     if m.multipart?
-      parts_order ||= headers[:parts_order]
-      m.body.set_sort_order(parts_order)
+      m.body.set_sort_order(headers[:parts_order])
       m.body.sort_parts!
     end
 

data/lib/mail_alternatives_with_attachments/version.rb

@@ -1,3 +1,3 @@
 module MailAlternativesWithAttachments
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/mail_alternatives_with_attachments.gemspec

@@ -12,8 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q{ActionMailer 3 makes it much easier to send emails, but there is one case it doesn't handle well.\
  Specifically, it is difficult to send a message that has the proper MIME hiearchy for an email with both HTML and text alternatives\
  that also includes attachments. This gem solves that need.}
-
-  s.rubyforge_project = "mail_alternatives_with_attachments"
+ s.license       = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -23,4 +22,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "actionmailer", "~> 4.0"
 end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mail_alternatives_with_attachments
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - James Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000Z
-dependencies: []
+date: 2014-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: ! "ActionMailer 3 makes it much easier to send emails, but there is one
   case it doesn't handle well.\\\n Specifically, it is difficult to send a message
   that has the proper MIME hiearchy for an email with both HTML and text alternatives\\\n
@@ -23,6 +36,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - README.markdown
 - Rakefile
 - lib/mail_alternatives_with_attachments.rb
@@ -31,28 +45,28 @@ files:
 - lib/mail_alternatives_with_attachments/version.rb
 - mail_alternatives_with_attachments.gemspec
 homepage: https://github.com/jcoleman/mail_alternatives_with_attachments
-licenses: []
+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: mail_alternatives_with_attachments
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem makes it easy to send multipart alternative emails from ActionMailer
   3
 test_files: []