premailer-rails3 1.0.0 → 1.0.1

data/.rspec

@@ -0,0 +1,2 @@
+--format doc
+--color

data/README.md

@@ -1,13 +1,39 @@
 # Premailer Rails 3 README
 
-This gem is a no config solution for the wonderful [Premailer gem](https://github.com/alexdunae/premailer) to be used with Rails 3.
+This gem is a no config solution for the wonderful
+[Premailer gem](https://github.com/alexdunae/premailer) to be used with Rails 3.
 It uses interceptors which were introduced in Rails 3 and tweaks all mails which
-receive the `deliver` method and adds a plain text part to it and inlines all CSS rules into the HTML part.
+are `deliver`ed and adds a plain text part to them and inlines all CSS rules
+into the HTML part.
 
-Currently it ignores any stylesheets linked within the email in favour of applying the stylesheet found at `public/stylesheets/email.css` or, if you use SASS on Heroku with Hassle, at `tmp/hassle/stylesheets/email.css`.
+By default it inlines all the CSS files that are linked to in the HTML:
+
+```html
+<link type='text/css' ... />
+```
+
+Don't worry about the host in the CSS URL since this will be ignored.
+
+If no CSS file is linked to in the HTML it will try to load a default CSS file
+`email.css`.
+
+Every CSS file (including the default `email.css`) is loaded from within the
+app. The retrieval of the file depends on your assets configuration:
+
+* Rails 3.1 asset pipeline: It will load the compiled version of the CSS asset
+  which is normally located in `app/assets/stylesheets/`.
+
+* Classic static assets: It will try to load the CSS file located in
+  `public/stylesheets/`
+
+* [Hassle](https://github.com/pedro/hassle): It will try to load the
+  compiled CSS file located in the default Hassle location
+  `tmp/hassle/stylesheets/`
 
 ## Installation
 
 Simply add the gem to your Gemfile in your Rails project:
 
     gem 'premailer-rails3'
+
+That's it!

data/lib/premailer-rails3/css_helper.rb

@@ -29,7 +29,7 @@ module PremailerRails
           if defined? Hassle and Rails.configuration.middleware.include? Hassle
             file = path == :default ? '/stylesheets/email.css' : path
             File.read("#{Rails.root}/tmp/hassle#{file}")
-          elsif Rails.configuration.try(:assets).try(:enabled)
+          elsif assets_enabled?
             file = if path == :default
                      'email.css'
                    else
@@ -52,5 +52,10 @@ module PremailerRails
       puts ex.message
       @@css_cache[path] = ''
     end
+
+    def assets_enabled?
+      return false unless Rails.configuration.respond_to?(:assets)
+      Rails.configuration.assets.enabled
+    end
   end
 end

data/lib/premailer-rails3/version.rb

@@ -1,3 +1,3 @@
 module PremailerRails
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/premailer-rails3/css_helper_spec.rb

@@ -104,7 +104,14 @@ describe PremailerRails::CSSHelper do
     end
 
     context 'when Rails asset pipeline is used' do
-      before { Rails.configuration.assets.stubs(:enabled).returns(true) }
+      before {
+        Rails.configuration.stubs(:assets).returns(
+          stub(
+            :enabled => true,
+            :prefix  => '/assets'
+          )
+        )
+      }
 
       it 'should load email.css when the default CSS is requested' do
         Rails.application.assets.expects(:find_asset) \

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'stubs/action_mailer'
 require 'stubs/rails'
-require 'stubs/try'
 require 'stubs/hassle'
 require 'fixtures/message'
 require 'fixtures/html'

data/spec/stubs/rails.rb

@@ -14,21 +14,9 @@ module Rails
       end
     end
 
-    module Assets
-      extend self
-
-      def prefix
-        '/assets'
-      end
-    end
-
     def middleware
       Middleware
     end
-
-    def assets
-      Assets
-    end
   end
 
   module Env

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &2157702240 !ruby/object:Gem::Requirement
+  requirement: &2165290820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157702240
+  version_requirements: *2165290820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157701400 !ruby/object:Gem::Requirement
+  requirement: &2165289360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2157701400
+  version_requirements: *2165289360
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2157700700 !ruby/object:Gem::Requirement
+  requirement: &2165287880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157700700
+  version_requirements: *2165287880
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2157699900 !ruby/object:Gem::Requirement
+  requirement: &2165278160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157699900
+  version_requirements: *2165278160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157699220 !ruby/object:Gem::Requirement
+  requirement: &2165276660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157699220
+  version_requirements: *2165276660
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &2157679360 !ruby/object:Gem::Requirement
+  requirement: &2165275360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157679360
+  version_requirements: *2165275360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157678940 !ruby/object:Gem::Requirement
+  requirement: &2165272480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157678940
+  version_requirements: *2165272480
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2157678160 !ruby/object:Gem::Requirement
+  requirement: &2165270980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157678160
+  version_requirements: *2165270980
 description: ! "This gem brings you the power of the premailer gem to Rails 3\n                     without
   any configuration needs. Create HTML emails, include a\n                     CSS
   file as you do in a normal HTML document and premailer will\n                     inline
@@ -110,6 +110,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -130,7 +131,6 @@ files:
 - spec/stubs/dummy.rb
 - spec/stubs/hassle.rb
 - spec/stubs/rails.rb
-- spec/stubs/try.rb
 homepage: https://github.com/fphilipe/premailer-rails3
 licenses: []
 post_install_message: 
@@ -167,4 +167,3 @@ test_files:
 - spec/stubs/dummy.rb
 - spec/stubs/hassle.rb
 - spec/stubs/rails.rb
-- spec/stubs/try.rb

data/spec/stubs/try.rb

@@ -1,5 +0,0 @@
-class Object
-  def try(method, *args)
-    self.__send__(method, *args) rescue nil
-  end
-end