awesomemailer 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.0.3
+  * Added Sprockets-based loading for local files. Now your mailers
+    work with local assets written with something other than CSS!
 0.0.2
   * Fixed a bug left over from when declarations were split into an
     array

data/README.md

@@ -40,7 +40,7 @@ Suppose you have the following mailer:
 	  </body>
 	</html>
 
-... and your spreadsheet (email.css) might be kinda like this:
+... and your style sheet (email.css) might be kinda like this:
 
 	body {
 	  background: #f0f0f0;
@@ -71,7 +71,7 @@ Suppose you have the following mailer:
 	}
 
 ... you might be unhappy because most mail viewers couldn't care less that you included a stylesheet. But wait!
-There's ActionMailer! Just change your mailer to look like this:
+There's AwesomeMailer! Just change your mailer to look like this:
 
 	class UserMailer < AwesomeMailer::Base
 
@@ -122,4 +122,4 @@ AwesomeMailer is copyright (c) 2011 Delightful Widgets Inc.
 
 It was built by Flip Sasser (flip@x451.com) using libraries from Alex Dunae
 ([https://github.com/alexdunae/css_parser](https://github.com/alexdunae/css_parser)) and, as far as I know, Nick Sieger
-([https://github.com/hpricot/hpricot](https://github.com/hpricot/hpricot)). Those guys are AWESOME. Be their friends.
+([https://github.com/hpricot/hpricot](https://github.com/hpricot/hpricot)). Those guys are AWESOME. Be their friends.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/awesomemailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "awesomemailer"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-01-06"
+  s.date = "2012-08-27"
   s.description = "\n      AwesomeMailer embeds your e-mail CSS inline, allowing you to write e-mail templates without worrying too much about stylesheets\n    "
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "autotest/discover.rb",
     "awesomemailer.gemspec",
     "lib/awesome_mailer.rb",
     "lib/awesome_mailer/base.rb",
@@ -35,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/Plinq/awesome_mailer"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "An ActionMailer extension that embeds CSS inline in e-mails"
 
   if s.respond_to? :specification_version then

data/lib/awesome_mailer.rb

@@ -1 +1,4 @@
 require 'awesome_mailer/base'
+
+module AwesomeMailer
+end

data/lib/awesome_mailer/base.rb

@@ -6,6 +6,8 @@ require 'css_parser'
 module AwesomeMailer
   class Base < ActionMailer::Base
     abstract!
+    include ActionView::Helpers::AssetTagHelper::StylesheetTagHelpers
+    include ActionView::Helpers::AssetTagHelper::JavascriptTagHelpers
 
     def render(*arguments)
       html_string = super
@@ -42,14 +44,12 @@ module AwesomeMailer
           path_url = Addressable::URI.parse(url)
           path_url.path = File.dirname(path_url.path)
           declarations.scan(/(url\(?["']+(.[^'"]*)["']\))/i).each do |url_command, item|
-            next if item =~ /^http(s){0,1}:\/\//
+            next if item =~ /^(http(s){0,1}:\/\/|\/)/
             item_url = path_url.dup
             item_url.path = File.join(item_url.path, item)
             new_url_command = url_command.gsub(item, item_url.to_s)
             declarations[url_command] = new_url_command
           end
-        # else
-        #   declarations.reject {|item| item.match(/url\s*\(/) }
         end
         if selector =~ /(^@)/
           append_styles!(document, selector, declarations.to_s) if url
@@ -64,18 +64,35 @@ module AwesomeMailer
     def apply_stylesheet!(document, stylesheet)
       css_parser = CssParser::Parser.new
       clean_href = stylesheet['href'].split('?').shift
+      if self.class.default_url_options[:host]
+        clean_href.gsub!(/^http:\/\/#{self.class.default_url_options[:host]}/, '')
+      end
       url = nil
-      case stylesheet['href']
+      case clean_href
       when /^\/assets/
-        dirname = File.dirname(clean_href).split('/').reject(&:blank?)[1..-1]
-        css_parser.load_file!(File.join(Rails.root, 'app', 'assets', 'stylesheets', dirname, File.basename(clean_href)))
+        if asset = Rails.application.assets[clean_href.gsub(/^\/assets\//, '')]
+          css_parser.add_block!(asset.to_s, :media_types => :all)
+        else
+          dirname = File.dirname(clean_href).split('/').reject(&:blank?)[1..-1]
+          local_file = File.join(Rails.root, 'app', 'assets', 'stylesheets', dirname, File.basename(clean_href))
+          if File.file?(local_file)
+            css_parser.load_file!(local_file)
+          end
+        end
       when /^\//
         css_parser.load_file!(File.join(Rails.root, 'public', clean_href))
+      when /^#{self.class.default_url_options[:host]}\/assets/
+        raise 'wugh oh'
       else
+        raise stylesheet.inspect
         css_parser.load_uri!(stylesheet['href'])
         url = clean_href
-      end      
+      end
       apply_rules!(document, css_parser, url)
     end
+
+    def sprockets?
+      Rails.application.respond_to?(:assets)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesomemailer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &70365360837720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70365360837720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70365360837160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70365360837160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: ! "\n      AwesomeMailer embeds your e-mail CSS inline, allowing you
   to write e-mail templates without worrying too much about stylesheets\n    "
 email: flip@x451.com
@@ -47,7 +57,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- autotest/discover.rb
 - awesomemailer.gemspec
 - lib/awesome_mailer.rb
 - lib/awesome_mailer/base.rb
@@ -69,9 +78,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1107814900927690412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ActionMailer extension that embeds CSS inline in e-mails

data/autotest/discover.rb

@@ -1,4 +0,0 @@
-require 'autotest/fsevent'
-require 'autotest/growl'
-
-Autotest.add_discovery { "rspec2" }