rails_email_preview 0.0.1 → 0.0.2

data/app/assets/stylesheets/rails_email_preview/application.css.sass

@@ -1,5 +1,4 @@
 #message_headers 
-  height: 85px
   padding: 10px 0 0 0
   margin: 0
   background: #fff
@@ -28,11 +27,4 @@
 
 
   p.alternate
-    position: absolute
-    top: 0
-    right: 15px
-
-
-  p.alternate a
-    color: #09c
-
+    float: right

data/app/controllers/rails_email_preview/emails_controller.rb

@@ -12,8 +12,7 @@ class RailsEmailPreview::EmailsController < RailsEmailPreview::ApplicationContro
     @mail = @preview_class.new.send(params[:mail_action])
     body_part = @mail
     if @mail.multipart?
-      content_type = Rack::Mime.mime_type(params[:format])
-      body_part = @mail.parts.find { |part| part.content_type.match(content_type) } || @mail.parts.first
+      body_part = @mail.parts.find { |part| part.content_type.start_with?(@part_type) } || @mail.parts.first
     end
     body = body_part.body
     if body_part.content_type =~ /plain/
@@ -25,5 +24,6 @@ class RailsEmailPreview::EmailsController < RailsEmailPreview::ApplicationContro
   private
   def load_preview_class
     @preview_class = (RailsEmailPreview.preview_classes || []).find {|pc| pc.name.underscore == params[:mail_class]}
+    @part_type = params[:part_type] || 'text/html'
   end
 end

data/app/views/rails_email_preview/emails/show.html.haml

@@ -1,5 +1,11 @@
 %a#back-to-all{:href => rails_email_preview.root_url} « Back to list
 #message_headers
+  - if @mail.multipart?
+    %p.alternate
+      - if @part_type == 'text/html'
+        %a{:href => rails_email_preview.email_url(params.merge(:part_type => 'text/plain'))} View plain text version
+      - else
+        %a{:href => rails_email_preview.email_url(params.merge(:part_type => 'text/html'))} View HTML version
   %dl
     %dt From:
     %dd= @mail.from
@@ -14,15 +20,7 @@
     %dt To:
     %dd= @mail.to
 
-  - if @mail.multipart?
-    %p.alternate
-      - if body_part.content_type && body_part.content_type.match(/text\/html/)
-        %a{:href => rails_email_preview.email_url(params.merge(:format => 'txt'))}} View plain text version
-      - else
-        %a{:href => rails_email_preview.email_url(params.merge(:format => 'html'))}} View HTML version
-
-
-%iframe#src-iframe{:src => rails_email_preview.raw_email_url(params),
+%iframe#src-iframe{:src => rails_email_preview.raw_email_url(params.slice(:mail_class, :mail_action, :part_type)),
   :width => "100%", :height => "800", :onload => 'emailLoaded()', :style => "display:none"}
 %pre#loading Loading...
 

data/config/routes.rb

@@ -1,13 +1,11 @@
 RailsEmailPreview::Engine.routes.draw do
   root :to => 'emails#index'
-  match 'raw/:mail_class/:mail_action(.:format)',
+  match 'raw/:mail_class/:mail_action',
         :as => :raw_email,
         :to => 'emails#show_raw',
-        :defaults => {:format => 'html'},
         :mail_class => %r([\w/]+)
-  match ':mail_class/:mail_action(.:format)',
+  match ':mail_class/:mail_action',
         :as => :email,
         :to => 'emails#show',
-        :defaults => {:format => 'html'},
         :mail_class => %r([\w/]+)
 end

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &22389360 !ruby/object:Gem::Requirement
+  requirement: &20440480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *22389360
+  version_requirements: *20440480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &22388840 !ruby/object:Gem::Requirement
+  requirement: &20438980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *22388840
+  version_requirements: *20438980
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &22388440 !ruby/object:Gem::Requirement
+  requirement: &20438580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22388440
+  version_requirements: *20438580
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &22387980 !ruby/object:Gem::Requirement
+  requirement: &20438120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22387980
+  version_requirements: *20438120
 description: Insert RailsEmailPreview description.
 email: glex.spb@gmail.com
 executables: []
@@ -98,5 +98,5 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Visual Email Preview for Rails >= 3, implemented as a Rails Engine. v0.0.1
+summary: Visual Email Preview for Rails >= 3, implemented as a Rails Engine. v0.0.2
 test_files: []