RubyGems - JasonKing-inline_attachment - Versions diffs - 0.4.0 → 0.4.1 - Mend

JasonKing-inline_attachment 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

data/{README → README.markdown} RENAMED Viewed

@@ -1,26 +1,29 @@
-= Inline Attachment
+Inline Attachment
+=================
 This package adds full support for embedding inline images into your HTML emails
 through ActionMailer.
-== Installation
+Installation
+------------
 To perform a system wide installation:
-<tt>gem source -a http://gems.github.com</tt>
-<tt>gem install JasonKing-inline_attachment</tt>
+	gem source -a http://gems.github.com
+	gem install JasonKing-inline_attachment
 To use inline_attachment in your project, add the following line to your project's
 config/environment.rb:
-<tt>config.gem 'inline_attachment'</tt>
+	config.gem 'inline_attachment'
-== Usage
+Usage
+-----
 I've rewritten most of Edmond's great work in this version.  I now override
-path_to_image instead of image_tag because a big reason for all the Rails2
-breakages was because image_tag was basically reproduced in previous versions,
+path_to_image instead of `image_tag` because a big reason for all the Rails2
+breakages was because `image_tag` was basically reproduced in previous versions,
 so broke when that method changed.
 Now we override the very simple path_to_image, and most importantly we really
@@ -30,23 +33,23 @@ code for everything else.
 I've also integrated in with the new implicit multipart stuff.  So now, there is
 so little code required!
-  class Notifier < ActionMailer::Base
-    def signup
+#### notifier.rb
+	class Notifier < ActionMailer::Base
+	  def signup
 	    recipients %q{"Testing IA" <testing@handle.it>}
 		  from       %q{"Mr Tester" <tester@handle.it>}
 		  subject "Here's a funky test"
-    end
+	  end
 	end
-	# Oh yeah baby!  Read it and weep!  So how's this work?  Well, you'll need
-	# your templates named properly - see the `Multipart email` section of the
-	# ActionMailer::Base docs.
-	# signup.text.plain.erb
+Oh yeah baby!  Read it and weep!  So how's this work?  Well, you'll need
+your templates named properly - see the `Multipart email` section of the
+ActionMailer::Base docs.
+#### signup.text.plain.erb
 	Your username is: <%= @username %>
-  # signup.text.html.erb
+#### signup.text.html.erb
 	<html><head><title>Signup Notification</title></head><body>
 	  <%= image_tag "logo.png" %>
 		<p>Your username is: <%=h @username %>
@@ -54,9 +57,9 @@ so little code required!
 That's it!  InlineAttachment will look for
-"#{RAILS_ROOT}/public/images/logo.png" and will do the right thing and embed it
+`#{RAILS_ROOT}/public/images/logo.png` and will do the right thing and embed it
 inline into the HTML version of the email.  ActionMailer will do the right thing
-and offer the recipient both the text/plain and text/html parts as alternatives.
+and offer the recipient both the `text/plain` and `text/html` parts as alternatives.
 Note, that you should still be able to use this in the 0.3.0 way if you have
@@ -64,5 +67,11 @@ code that uses that.  But there were a lot of alternatives, and the examples in
 here didn't show a crucial step of shuffling the parts around to be sure that
 the image parts came after the html.
-You can also do the old "manual" method if you want.
+You can also do the old _manual_ method if you want.
+Contributors
+------------
+* Jason King (JasonKing)
+* Matt Griffin (betamatt)

data/lib/inline_attachment.rb CHANGED Viewed

@@ -15,47 +15,52 @@ module ActionMailer
   end
   class Base
-    alias_method :ia_original_create_mail, :create_mail
-    def create_mail
-      # sniff out inline html parts with inline images and wrap them up in a
-      # multipart/related mime part
-      got_inlines = false
-      related_parts = []
-      for_deletion = []
-      @parts.each_with_index do |p,i|
-        logger.debug "Considering #{i}"
-        if p.content_disposition == 'inline' && p.content_type =~ %r{^image/}i && p.headers[CID_NAME]
-          logger.debug "Just adding [#{i}] to the list\n#{p.filename}"
-          for_deletion << i
-          related_parts << p
-          got_inlines = true
-        end
+    private
+      def create_mail_with_inline_attachment
+        # sniff out inline html parts with inline images and wrap them up in a
+        # multipart/related mime part
+        got_inlines = false
+        related_parts = []
+        for_deletion = []
+        @parts.each_with_index do |p,i|
+          if p.content_disposition == 'inline' && p.content_type =~ %r{^image/}i && p.headers[CID_NAME]
+            for_deletion << i
+            related_parts << p
+            got_inlines = true
+          end
-        if got_inlines && p.content_type =~ %r{text/html}i
-          @parts[i] = ActionMailer::Part.new( :content_type => "multipart/related" )
-          @parts[i].parts << p
-          related_parts.each do |rp|
-            @parts[i].parts << rp
+          if got_inlines && p.content_type =~ %r{text/html}i
+            @parts[i] = ActionMailer::Part.new( :content_type => "multipart/related" )
+            @parts[i].parts << p
+            related_parts.each do |rp|
+              @parts[i].parts << rp
+            end
+            got_inlines = false
+            related_parts = []
           end
-          got_inlines = false
-          related_parts = []
         end
+        for_deletion.sort{|a,b|b<=>a}.each {|i|@parts.delete_at(i)}
+        create_mail_without_inline_attachment
       end
-      for_deletion.sort{|a,b|b<=>a}.each {|i|@parts.delete_at(i)}
-      ia_original_create_mail
-    end
+      alias_method_chain :create_mail, :inline_attachment
   end
 end
 module ActionView
   module Helpers #:nodoc:
     module AssetTagHelper
-      alias_method :ia_original_path_to_image, :path_to_image
-      def path_to_image(source)
+      def path_to_image_with_inline_attachment(source)
         @part_container ||= @controller
         if @part_container.is_a?(ActionMailer::Base) or @part_container.is_a?(ActionMailer::Part)
-          file_path = "#{RAILS_ROOT}/public#{ia_original_path_to_image(source).split('?').first}"
+          if source =~ %r{file://}
+            # Handle attached files from the local filesystem.  Should sandbox this somehow.
+            file_path = source.sub(%r{file://}, '')
+          else
+            # Public image files
+            file_path = "#{RAILS_ROOT}/public#{path_to_image_without_inline_attachment(source).split('?').first}"
+          end
           if File.exists?(file_path)
             basename  = File.basename(file_path)
             ext       = basename.split('.').last
@@ -71,8 +76,9 @@ module ActionView
             return "cid:#{cid}"
           end
         end
-        return ia_original_path_to_image(source)
+        return path_to_image_without_inline_attachment(source)
       end
+      alias_method_chain :path_to_image, :inline_attachment
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: JasonKing-inline_attachment
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jason King
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
+  type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -30,7 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
-- README
+- README.markdown
 - lib/inline_attachment.rb
 has_rdoc: true
 homepage: http://github.com/JasonKing/inline_attachment