inline_styles_mailer 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.0.4
+
+Smarter location of CSS files and more explicit override if you need it.
+
 ## v0.0.3
 
 Now copes with .sass and .css files (as well as .scss).

data/README.md

@@ -29,28 +29,33 @@ class FooMailer < ActionMailer::Base
 end
 ```
 
-If you have a CSS file <code>app/assets/stylesheets/_foo_mailer.css.scss</code> then it will get automatically applied to the mail using the inline_styles gem. That name (<code>_foo_mailer.css.scss</code>) is based on the mailer class name, FooMailer.
+If you have a CSS file <code>app/assets/stylesheets/_foo_mailer*</code> (where * can be .css, .css.scss or .css.sass) then it will get automatically applied to the mail using the inline_styles gem. That name (<code>_foo_mailer</code>) is based on your mailer class name, e.g. FooMailer. If you have more than one file matching that pattern then it will use them all.
 
-Want to use a different file? Declare <code>use_stylesheet</code>:
+It will use one of three preprocessing methods based on the filename:
+
+* [.scss](http://sass-lang.com/)
+* [.sass](http://sass-lang.com/)
+* anything else (e.g. .css) no preprocessing at all
+
+Want to use a different css file? Declare <code>use_stylesheet</code>:
 
 ```ruby
 class FooMailer < ActionMailer::Base
   include InlineStylesMailer
-  use_stylesheet '_bar'
-
-
-  def foo(email)
-    mail(:to => email, :subject => "Foo foo!")
-  end
-
+  use_stylesheet '_bar.css.sass'
+  ...
 end
 ```
 
-The location of that file (<code>app/assets/stylesheets/</code>) is fixed. It will use one of three preprocessing methods based on the filename:
+You can use an array of stylesheets if you like. Don't keep your stylesheets in <code>app/assets/stylesheets</code>? Declare <code>stylesheet_path</code>:
 
-* .scss
-* .sass
-* .css (i.e. no preprocessing at all)
+```ruby
+class FooMailer < ActionMailer::Base
+  include InlineStylesMailer
+  stylesheet_path 'public/stylesheets'
+  ...
+end
+```
 
 ## Development
 

data/lib/inline_styles_mailer.rb

@@ -14,8 +14,8 @@ module InlineStylesMailer
       @stylesheets = Array(stylesheets)
     end
 
-    def locate_css_file(stylesheet)
-      Rails.root.join("app", "assets", "stylesheets", "#{stylesheet}.css.scss")
+    def stylesheet_path(path)
+      @stylesheet_path = path
     end
 
     def locate_template(name)
@@ -23,10 +23,10 @@ module InlineStylesMailer
     end
 
     def css_content
-      @stylesheets ||= ["_#{self.name.underscore}"]
+      @stylesheets ||= ["_#{self.name.underscore}*"]
+      @stylesheet_path ||= File.join("app", "assets", "stylesheets")
       @css_content ||= @stylesheets.map {|stylesheet|
-        file = locate_css_file(stylesheet)
-        if File.exist?(file)
+        Dir[Rails.root.join(@stylesheet_path, "#{stylesheet}")].map {|file|
           case file
           when /\.scss$/
             Sass::Engine.new(File.read(file), syntax: :scss).render
@@ -36,10 +36,9 @@ module InlineStylesMailer
             # Plain old CSS? Let's assume it is.
             File.read(file)
           end
-        else
-          nil
-        end
-      }.compact.join
+        }.join("\n")
+      }.compact.join("\n")
+      @css_content
     end
 
     def locate_layout

data/lib/inline_styles_mailer/version.rb

@@ -1,3 +1,3 @@
 module InlineStylesMailer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/assets/stylesheets/{_foo_mailer.css → _override.css}

@@ -2,5 +2,5 @@ body {
   background: yellow;
 }
 body p {
-  color: red;
+  color: blue;
 }

data/spec/fixtures/assets/stylesheets/{_foo_mailer.css.sass → _override.css.sass}

@@ -1,6 +1,6 @@
 body
   :background yellow
   p
-    :color red
+    :color green
 
 

data/spec/fixtures/assets/stylesheets/_override.css.scss

@@ -0,0 +1,6 @@
+body {
+  background: yellow;
+  p {
+    color: orange;
+  }
+}

data/spec/inline_styles_mailer/inline_styles_mailer_spec.rb

@@ -6,40 +6,46 @@ describe InlineStylesMailer do
   before(:each) do
     FooMailer.reset
     Rails.should_receive(:root).any_number_of_times.and_return(Pathname.new(File.join("spec", "fixtures")))
+    FooMailer.stylesheet_path "assets/stylesheets"
+  end
+
+  context "Default CSS file" do
+    it "should inline the CSS" do
+      mail = FooMailer.foo
+      mail.body.should =~ /<p style="color: red;">Testing foo\.<\/p>/
+      mail.body.should =~ /<body style="background: yellow;">/
+    end
   end
 
   context "SCSS preprocessing" do
     before(:each) do
-      file = File.join("spec", "fixtures", "assets", "stylesheets", "_foo_mailer.css.scss")
-      FooMailer.should_receive(:locate_css_file).and_return(file)
+      FooMailer.use_stylesheet("_override.css.scss")
     end
     it "should inline the CSS" do
       mail = FooMailer.foo
-      mail.body.should =~ /<p style="color: red;">Testing foo\.<\/p>/
+      mail.body.should =~ /<p style="color: orange;">Testing foo\.<\/p>/
       mail.body.should =~ /<body style="background: yellow;">/
     end
   end
 
   context "SASS preprocessing" do
     before(:each) do
-      file = File.join("spec", "fixtures", "assets", "stylesheets", "_foo_mailer.css.sass")
-      FooMailer.should_receive(:locate_css_file).and_return(file)
+      FooMailer.use_stylesheet("_override.css.sass")
     end
     it "should inline the CSS" do
       mail = FooMailer.foo
-      mail.body.should =~ /<p style="color: red;">Testing foo\.<\/p>/
+      mail.body.should =~ /<p style="color: green;">Testing foo\.<\/p>/
       mail.body.should =~ /<body style="background: yellow;">/
     end
   end
 
   context "No preprocessing (plain old CSS)" do
     before(:each) do
-      file = File.join("spec", "fixtures", "assets", "stylesheets", "_foo_mailer.css")
-      FooMailer.should_receive(:locate_css_file).and_return(file)
+      FooMailer.use_stylesheet("_override.css")
     end
     it "should inline the CSS" do
       mail = FooMailer.foo
-      mail.body.should =~ /<p style="color: red;">Testing foo\.<\/p>/
+      mail.body.should =~ /<p style="color: blue;">Testing foo\.<\/p>/
       mail.body.should =~ /<body style="background: yellow;">/
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_styles_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70232207558180 !ruby/object:Gem::Requirement
+  requirement: &70249576618260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232207558180
+  version_requirements: *70249576618260
 - !ruby/object:Gem::Dependency
   name: inline_styles
-  requirement: &70232207556740 !ruby/object:Gem::Requirement
+  requirement: &70249576617160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232207556740
+  version_requirements: *70249576617160
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70232207555480 !ruby/object:Gem::Requirement
+  requirement: &70249576615600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70232207555480
+  version_requirements: *70249576615600
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70232207554600 !ruby/object:Gem::Requirement
+  requirement: &70249576614380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70232207554600
+  version_requirements: *70249576614380
 description: Convenient use of inline_styles gem with Rails 3.1
 email:
 - bill@logicalcobwebs.com
@@ -73,9 +73,10 @@ files:
 - inline_styles_mailer.gemspec
 - lib/inline_styles_mailer.rb
 - lib/inline_styles_mailer/version.rb
-- spec/fixtures/assets/stylesheets/_foo_mailer.css
-- spec/fixtures/assets/stylesheets/_foo_mailer.css.sass
 - spec/fixtures/assets/stylesheets/_foo_mailer.css.scss
+- spec/fixtures/assets/stylesheets/_override.css
+- 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
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1465499495019503480
+      hash: 1023047105202860642
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1465499495019503480
+      hash: 1023047105202860642
 requirements: []
 rubyforge_project: inline_styles_mailer
 rubygems_version: 1.8.10
@@ -113,9 +114,10 @@ signing_key:
 specification_version: 3
 summary: Convenient use of inline_styles gem with Rails 3.1
 test_files:
-- spec/fixtures/assets/stylesheets/_foo_mailer.css
-- spec/fixtures/assets/stylesheets/_foo_mailer.css.sass
 - spec/fixtures/assets/stylesheets/_foo_mailer.css.scss
+- spec/fixtures/assets/stylesheets/_override.css
+- 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