inline_styles_mailer 0.0.5 → 0.0.6

data/lib/inline_styles_mailer.rb

@@ -41,10 +41,6 @@ module InlineStylesMailer
       @css_content
     end
 
-    def locate_layout
-      "mailer"
-    end
-
     def page
       @page ||= InlineStyles::Page.new.with_css(css_content)
     end
@@ -62,19 +58,36 @@ module InlineStylesMailer
       super(mail, &block) # We'll just let this pass through
     else
       super(options) do |format|
-        # Only format for text if an appropriate template exists
-        # TODO we should be finding this file using Rails
-        unless Dir[Rails.root.join('app', 'views', self.class.name.underscore, "#{action_name}.text.*")].empty?
-          format.text do
-            render
+        # Rails 3.1 takes an array, while Rails 3.0 takes a string.
+        # See https://github.com/billhorsman/inline_styles_mailer/issues/1
+        prefixes = options[:template_path] || self.class.name.underscore
+        prefixes = [prefixes] unless Rails.version =~ /^3\.0/
+        templates = lookup_context.find_all(options[:template_name] || action_name, prefixes)
+        templates.each do |template|
+          template_path = template.inspect.split("/").slice(-2, 2).join("/")
+          template.formats.each do |f|
+            format.send(f) do
+              case f.to_s
+              when "html"
+                html = render_to_string :file => template_path, :layout => layout_to_use, :formats => [:html]
+                render :text => self.class.page.with_html(html).apply, :formats => [:html]
+              else
+                render :formats => [f]
+              end
+            end
           end
         end
-        format.html do
-          html = render_to_string :file => self.class.locate_template(action_name), :layout => self.class.locate_layout
-          render :text => self.class.page.with_html(html).apply
-        end
       end
     end
   end
 
+  def layout_to_use
+    case _layout
+    when ActionView::Template
+      _layout.inspect.split("/").last.split(".").first
+    when String
+      _layout.split("/").last.split(".").first
+    end
+  end
+
 end

data/lib/inline_styles_mailer/version.rb

@@ -1,3 +1,3 @@
 module InlineStylesMailer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_styles_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70197361758100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197361758100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inline_styles
-  requirement: &70197361757240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197361757240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70197361756400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70197361756400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70197361755480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197361755480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Convenient use of inline_styles gem with Rails 3.1
 email:
 - bill@logicalcobwebs.com
@@ -79,8 +99,8 @@ files:
 - spec/fixtures/assets/stylesheets/_override.css.sass
 - spec/fixtures/assets/stylesheets/_override.css.scss
 - spec/fixtures/layout.html.erb
-- spec/fixtures/views/foo_mailer/foo.html
-- spec/fixtures/views/layouts/mailer.html.erb
+- spec/fixtures/views/foo_mailer/foo.html.erb
+- spec/fixtures/views/layouts/foo_mailer.html.erb
 - spec/foo_mailer.rb
 - spec/inline_styles_mailer/inline_styles_mailer_spec.rb
 - spec/spec_helper.rb
@@ -102,12 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1994760373707209580
 requirements: []
 rubyforge_project: inline_styles_mailer
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Convenient use of inline_styles gem with Rails 3.1
@@ -117,8 +134,8 @@ test_files:
 - spec/fixtures/assets/stylesheets/_override.css.sass
 - spec/fixtures/assets/stylesheets/_override.css.scss
 - spec/fixtures/layout.html.erb
-- spec/fixtures/views/foo_mailer/foo.html
-- spec/fixtures/views/layouts/mailer.html.erb
+- spec/fixtures/views/foo_mailer/foo.html.erb
+- spec/fixtures/views/layouts/foo_mailer.html.erb
 - spec/foo_mailer.rb
 - spec/inline_styles_mailer/inline_styles_mailer_spec.rb
 - spec/spec_helper.rb