roadie 1.1.3 → 2.0.0

data/.travis.yml

@@ -2,8 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
 
-gemfile:
-  - gemfiles/rails-3.0.x.Gemfile
-  - gemfiles/rails-3.1.x.Gemfile
-
 script: "bundle exec rspec spec"

data/Changelog.md

@@ -1,9 +1,18 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.1.3...master)
+[full changelog](https://github.com/Mange/roadie/compare/v2.0.0...master)
 
 * Nothing yet
 
+### 2.0.0
+
+[full changelog](https://github.com/Mange/roadie/compare/v1.1.3...v2.0.0)
+
+* Enhancements:
+  * Support the Asset pipeline - [Arttu Tervo (arttu)](https://github.com/arttu)
+* Dependencies:
+  * Requires Rails 3.1 to work. You can keep on using the 1.x series in Rails 3.0
+
 ### 1.1.3
 
 [full changelog](https://github.com/Mange/roadie/compare/v1.1.2...v1.1.3)

data/Gemfile.lock

@@ -1,37 +1,36 @@
 PATH
   remote: .
   specs:
-    roadie (1.1.3)
-      actionmailer (~> 3.0)
+    roadie (2.0.0)
+      actionmailer (~> 3.1.0)
       css_parser
       nokogiri (>= 1.4.4)
+      sprockets
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
       mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.0)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    bcrypt-ruby (3.0.0)
     builder (3.0.0)
     css_parser (1.2.5)
       addressable
@@ -39,6 +38,7 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
+    json (1.6.1)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -47,8 +47,8 @@ GEM
     multi_json (1.0.3)
     nokogiri (1.5.0)
     polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.3)
+    rack (1.3.4)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -56,15 +56,16 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.9.4)
+    rdoc (3.10)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -78,10 +79,10 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    sprockets (2.0.0)
+    sprockets (2.0.2)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)

data/README.md

@@ -5,6 +5,8 @@ Roadie
 
 Roadie tries to make sending HTML emails a little less painful in Rails 3 by inlining stylesheets and rewrite relative URLs for you.
 
+You are currently looking at the README for version 2.0 and later which requires Rails 3.1. This gem can be used with Rails 3.0 by staying with the 1.x series.
+
 If you want to have this in Rails 2, please see [MailStyle](https://www.github.com/purify/mail_style).
 
 How does it work?
@@ -25,13 +27,21 @@ Build Status
 
 Tested with [Travis CI](http://travis-ci.org) using the [following combinations](http://travis-ci.org/#!/Mange/roadie):
 
-* Ruby 1.8.7 with Rails 3.0.x
-* Ruby 1.9.2 with Rails 3.0.x
 * Ruby 1.8.7 with Rails 3.1.x
 * Ruby 1.9.2 with Rails 3.1.x
 
 Let me know if you want any other combination supported officially
 
+### Versioning ###
+
+This project follows [Semtantic Versioning](http://semver.org/) and has been since version 1.0.0.
+
+Two branches are currently in place:
+* 2.x - Rails 3.1
+* 1.x - Rails 3.0
+
+The 1.x branch will continue to be supported until it is deemed unnecessary by the author, but properly made pull requests will be accepted indefinitely.
+
 Features
 --------
 
@@ -48,7 +58,7 @@ Features
 
 ### What about Sass / Less? ###
 
-Sass is supported "by accident" as long as the stylesheets are generated and stored in the stylesheets directory. This is the default behavior from Sass. You are recommended to add a deploy task that generates the stylesheets to make sure that they are present at all times.
+Sass is supported "by accident" as long as the stylesheets are generated and stored in the asset directories. You are recommended to add a deploy task that generates the stylesheets to make sure that they are present at all times on the machine generating the emails.
 
 Install
 -------
@@ -78,7 +88,7 @@ class Notifier < ActionMailer::Base
 end
 ```
 
-This will look for a css file called `email.css` in your `public/stylesheets` folder. The `css` method can take either a string, a symbol or an array of both. The ".css" extension will be added automatically.
+This will look for a css file called `email.css` in your assets. The `css` method can take either a string, a symbol or an array of both. The ".css" extension will be added automatically.
 
 ### Image URL rewriting ###
 
@@ -110,9 +120,9 @@ If the `link` tag uses an absolute URL to the stylesheet, it will not be inlined
 
 ```html
 <head>
-  <link rel="stylesheet" type="text/css" href="/stylesheets/emails/rock.css">        <!-- Will be inlined -->
+  <link rel="stylesheet" type="text/css" href="/assets/emails/rock.css">             <!-- Will be inlined -->
   <link rel="stylesheet" type="text/css" href="http://www.metal.org/metal.css">      <!-- Will NOT be inlined -->
-  <link rel="stylesheet" type="text/css" href="/stylesheets/jazz.css" media="print"> <!-- Will NOT be inlined -->
+  <link rel="stylesheet" type="text/css" href="/assets/jazz.css" media="print">      <!-- Will NOT be inlined -->
   <link rel="stylesheet" type="text/css" href="/ambient.css" data-immutable>         <!-- Will NOT be inlined -->
 </head>
 ```
@@ -134,14 +144,20 @@ Note that on my Mac OS X boxes, I don't have to do it as complex as they do it i
 Documentation
 -------------
 
-* [Online documentation for 1.1.2](http://rubydoc.info/gems/roadie/1.1.2/frames)
-* [Online documentation for 1.0.1](http://rubydoc.info/gems/roadie/1.0.1/frames)
+* [Online documentation for 2.0.0](http://rubydoc.info/gems/roadie/2.0.0/frames)
+* [Online documentation for 1.1.3](http://rubydoc.info/gems/roadie/1.1.3/frames)
 * [Online documentation for master](http://rubydoc.info/github/Mange/roadie/master/frames)
 * [Changelog](https://github.com/Mange/roadie/blob/master/Changelog.md)
 
 History and contributors
 ------------------------
 
+Major contributors to Roadie:
+
+* [Arttu Tervo (arttu)](https://github.com/arttu) - Asset pipeline support
+
+You can [see all contributors](https://github.com/Mange/roadie/contributors) on GitHub.
+
 This gem was originally developed for Rails 2 use on [Purify](http://purifyapp.com) under the name [MailStyle](https://www.github.com/purify/mail_style). However, the author stopped maintaining it and a fork took place to make it Rails 3 compatible.
 
 The following people have contributed to the orignal gem:

data/lib/roadie.rb

@@ -5,29 +5,25 @@ module Roadie
     Roadie::Inliner.new(*args).execute
   end
 
-  # Tries to load the CSS "names" specified in the +targets+ parameter inside the +root+ path.
+  # Shortcut to Rails.application.assets
+  def self.assets
+    Rails.application.assets
+  end
+
+  # Tries to load the CSS "names" specified in the +targets+ parameter using the Rails asset pipeline.
   #
   # @example
-  #   Roadie.load_css(Rails.root, %w[application newsletter])
+  #   Roadie.load_css(%w[application newsletter])
   #
-  # @param [Pathname] root The root path of your stylesheets
-  # @param [Array<String, Symbol>] targets Stylesheet names - <b>without extensions</b>
+  # @param [Array<String|Symbol>] targets Stylesheet names
   # @return [String] The combined contents of the CSS files
-  # @raise [CSSFileNotFound] When a target cannot be found under +[root]/[target].css+
-  def self.load_css(root, targets)
-    css_files_from_targets(root, targets).map do |file|
-      raise CSSFileNotFound, file unless file.exist?
-      file.read
+  # @raise [CSSFileNotFound] When a target cannot be found from Rails assets
+  def self.load_css(targets)
+    targets.map do |file|
+      raise CSSFileNotFound, file unless assets[file]
+      assets[file].to_s.strip
     end.join("\n")
   end
-
-  private
-    def self.css_files_from_targets(root, targets)
-      targets.map do |target| 
-        target = "#{target}.css" unless target.to_s.end_with? '.css'
-        root.join(target)
-      end
-    end
 end
 
 require 'roadie/version'

data/lib/roadie/action_mailer_extensions.rb

@@ -32,10 +32,6 @@ module Roadie
         Rails.application.config.action_mailer.default_url_options
       end
 
-      def stylesheet_root
-        Rails.root.join('public', 'stylesheets')
-      end
-
       def inline_style_response(response)
         if response[:content_type] == 'text/html'
           response.merge :body => Roadie.inline_css(css_rules, response[:body], url_options)
@@ -50,7 +46,7 @@ module Roadie
       end
 
       def css_rules
-        @css_rules ||= Roadie.load_css(stylesheet_root, css_targets) if css_targets.present?
+        @css_rules ||= Roadie.load_css(css_targets) if css_targets.present?
       end
   end
 end

data/lib/roadie/inliner.rb

@@ -25,12 +25,13 @@ module Roadie
     #
     # @param [String] css
     # @param [String] html
-    # @param [Hash] url_options Supported keys: +:host+, +:port+ and +:protocol+
+    # @param [Hash] url_options Supported keys: +:host+, +:port+, +:protocol+ and +:asset_path_prefix:+
     def initialize(css, html, url_options)
       @css = css
       @inline_css = []
       @html = html
       @url_options = url_options
+      @asset_path_prefix = (url_options && url_options[:asset_path_prefix] || "/assets/")
     end
 
     # Start the inlining and return the final HTML output
@@ -62,6 +63,13 @@ module Roadie
         end
       end
 
+      def find_asset_from_url(url)
+        asset_filename = url.path.sub(/^#{Regexp.quote(@asset_path_prefix)}/, '').gsub(%r{^/|//+}, '')
+        Roadie.assets[asset_filename].tap do |asset|
+          raise CSSFileNotFound.new(asset_filename, url) unless asset
+        end
+      end
+
       def adjust_html
         Nokogiri::HTML.parse(html).tap do |document|
           yield document
@@ -91,12 +99,8 @@ module Roadie
 
       def extract_link_elements
         all_link_elements_to_be_inlined_with_url.each do |link, url|
-          # Joining on an "absolute" path ignores everything before the absoluted path
-          # so we have to remove the starting slash
-          url_path = url.path.sub(%r{^/}, '')
-          file_path = Rails.root.join('public', url_path)
-          raise CSSFileNotFound.new(file_path, link['href']) unless file_path.file?
-          @inline_css << file_path.read
+          asset = find_asset_from_url(url)
+          @inline_css << asset.to_s
           link.remove
         end
       end

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '1.1.3'
+  VERSION = '2.0.0'
 end

data/roadie.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'nokogiri', '>= 1.4.4'
   s.add_dependency 'css_parser'
-  s.add_dependency 'actionmailer', '~> 3.0'
+  s.add_dependency 'actionmailer', '~> 3.1.0'
+  s.add_dependency 'sprockets'
 
   s.add_development_dependency 'rspec-rails', '>= 2.0.0'
 

data/spec/fixtures/app/assets/stylesheets/subdirectory/findme.css

@@ -0,0 +1 @@
+can you really find me?

data/spec/fixtures/app/assets/stylesheets/subdirectory/red_paragraphs.css

@@ -0,0 +1 @@
+p { color: red; }

data/spec/integration_spec.rb

@@ -1,15 +1,9 @@
 require 'spec_helper'
 
 describe "roadie integration" do
-  class TestApplication
-    def config
-      OpenStruct.new(:action_mailer => OpenStruct.new(:default_url_options => {:host => "example.app.org"}))
-    end
-  end
-
   class IntegrationMailer < ActionMailer::Base
     default :css => :integration, :from => 'john@example.com'
-    append_view_path Pathname.new(__FILE__).dirname.join('fixtures').join('views')
+    append_view_path FIXTURES_PATH.join('views')
 
     def notification(to, reason)
       @reason = reason
@@ -23,7 +17,10 @@ describe "roadie integration" do
   end
 
   before(:each) do
-    Rails.stub!(:root => Pathname.new(__FILE__).dirname.join('fixtures'), :application => TestApplication.new)
+    config = double(:action_mailer => double(:default_url_options => {:host => "example.app.org"}))
+    Rails.application.stub(:config => config)
+
+    Rails.stub(:root => FIXTURES_PATH)
     IntegrationMailer.delivery_method = :test
   end
 

data/spec/lib/roadie/action_mailer_extensions_spec.rb

@@ -79,18 +79,18 @@ describe Roadie::ActionMailerExtensions, "loading css files" do
     Roadie.stub!(:inline_css => 'html')
   end
 
-  it "loads css from Rails' stylesheet root" do
-    Roadie.should_receive(:load_css).with(Rails.root.join('public', 'stylesheets'), anything).and_return('')
+  it "loads css from Roadie" do
+    Roadie.should_receive(:load_css).with(anything).and_return('')
     CssLoadingMailer.use_default
   end
 
   it "loads the css specified in the default mailer settings" do
-    Roadie.should_receive(:load_css).with(anything, ['default_value']).and_return('')
+    Roadie.should_receive(:load_css).with(['default_value']).and_return('')
     CssLoadingMailer.use_default
   end
 
   it "loads the css specified in the specific mailer action instead of the default choice" do
-    Roadie.should_receive(:load_css).with(anything, ['specific']).and_return('')
+    Roadie.should_receive(:load_css).with(['specific']).and_return('')
     CssLoadingMailer.override(:specific)
   end
 
@@ -100,7 +100,7 @@ describe Roadie::ActionMailerExtensions, "loading css files" do
   end
 
   it "loads multiple css files when given an array" do
-    Roadie.should_receive(:load_css).with(anything, ['specific', 'other']).and_return('')
+    Roadie.should_receive(:load_css).with(['specific', 'other']).and_return('')
     CssLoadingMailer.override([:specific, :other])
   end
 end

data/spec/lib/roadie/inliner_spec.rb

@@ -149,15 +149,24 @@ describe Roadie::Inliner do
   end
 
   describe "linked stylesheets" do
-    before(:each) do
-      Rails.stub(:root => FixturesPath)
-    end
-
     it "inlines styles from the linked stylesheet" do
       rendering(<<-HTML).should have_styling('color' => 'green').at_selector('p')
         <html>
           <head>
-            <link rel="stylesheet" href="/stylesheets/green_paragraphs.css">
+            <link rel="stylesheet" href="/assets/green_paragraphs.css">
+          </head>
+          <body>
+            <p></p>
+          </body>
+        </html>
+      HTML
+    end
+
+    it "inlines styles from the linked stylesheet in subdirectory" do
+      rendering(<<-HTML).should have_styling('color' => 'red').at_selector('p')
+        <html>
+          <head>
+            <link rel="stylesheet" href="/assets/subdirectory/red_paragraphs.css">
           </head>
           <body>
             <p></p>
@@ -170,8 +179,8 @@ describe Roadie::Inliner do
       html = <<-HTML
         <html>
           <head>
-            <link rel="stylesheet" href="/stylesheets/green_paragraphs.css">
-            <link rel="stylesheet" href="/stylesheets/large_purple_paragraphs.css">
+            <link rel="stylesheet" href="/assets/green_paragraphs.css">
+            <link rel="stylesheet" href="/assets/large_purple_paragraphs.css">
           </head>
           <body>
             <p></p>
@@ -189,8 +198,8 @@ describe Roadie::Inliner do
       rendering(<<-HTML).should_not have_selector('link')
         <html>
           <head>
-            <link rel="stylesheet" href="/stylesheets/green_paragraphs.css">
-            <link rel="stylesheet" href="/stylesheets/large_purple_paragraphs.css">
+            <link rel="stylesheet" href="/assets/green_paragraphs.css">
+            <link rel="stylesheet" href="/assets/large_purple_paragraphs.css">
           </head>
           <body>
           </body>
@@ -203,7 +212,7 @@ describe Roadie::Inliner do
         rendering(<<-HTML).should_not have_styling('color' => 'green').at_selector('p')
           <html>
             <head>
-              <link rel="stylesheet" href="/stylesheets/green_paragraphs.css" media="print">
+              <link rel="stylesheet" href="/assets/green_paragraphs.css" media="print">
             </head>
             <body>
               <p></p>
@@ -216,7 +225,7 @@ describe Roadie::Inliner do
         rendering(<<-HTML).should have_selector('link')
           <html>
             <head>
-              <link rel="stylesheet" href="/stylesheets/green_paragraphs.css" media="print">
+              <link rel="stylesheet" href="/assets/green_paragraphs.css" media="print">
             </head>
             <body>
             </body>
@@ -230,7 +239,7 @@ describe Roadie::Inliner do
         rendering(<<-HTML).should_not have_styling('color' => 'green').at_selector('p')
           <html>
             <head>
-              <link rel="stylesheet" href="/stylesheets/green_paragraphs.css" data-immutable="true">
+              <link rel="stylesheet" href="/assets/green_paragraphs.css" data-immutable="true">
             </head>
             <body>
               <p></p>
@@ -243,7 +252,7 @@ describe Roadie::Inliner do
         rendering(<<-HTML).should have_selector('link')
           <html>
             <head>
-              <link rel="stylesheet" href="/stylesheets/green_paragraphs.css" data-immutable="true">
+              <link rel="stylesheet" href="/assets/green_paragraphs.css" data-immutable="true">
             </head>
             <body>
             </body>
@@ -284,7 +293,7 @@ describe Roadie::Inliner do
         html = <<-HTML
           <html>
             <head>
-              <link rel="stylesheet" href="/stylesheets/not_found.css">
+              <link rel="stylesheet" href="/assets/not_found.css">
             </head>
             <body>
             </body>
@@ -293,8 +302,8 @@ describe Roadie::Inliner do
 
         expect { rendering(html) }.to raise_error do |error|
           error.should be_a(Roadie::CSSFileNotFound)
-          error.filename.should == Rails.root.join('public', 'stylesheets', 'not_found.css')
-          error.guess.should == '/stylesheets/not_found.css'
+          error.filename.should == Roadie.assets['not_found.css']
+          error.guess.should == '/assets/not_found.css'
         end
       end
     end
@@ -304,7 +313,7 @@ describe Roadie::Inliner do
         html = <<-HTML
           <html>
             <head>
-              <link rel="not_stylesheet" href="/stylesheets/green_paragraphs.css">
+              <link rel="not_stylesheet" href="/assets/green_paragraphs.css">
             </head>
             <body>
               <p></p>

data/spec/lib/roadie_spec.rb

@@ -8,21 +8,31 @@ describe Roadie do
     end
   end
 
-  describe ".load_css(root, targets)" do
-    let(:fixtures_root) { Pathname.new(__FILE__).dirname.join('..', 'fixtures', 'public', 'stylesheets') }
+  describe ".assets" do
+    it "delegates to Rails.application.assets" do
+      Rails.stub(:application => double(:assets => 'assets'))
+      Roadie.assets.should == 'assets'
+    end
+  end
 
-    it "loads files matching the target names under root/public/stylesheets" do
-      Roadie.load_css(fixtures_root, ['foo']).should == 'contents of foo'
-      Roadie.load_css(fixtures_root, ['foo.css']).should == 'contents of foo'
+  describe ".load_css(targets)" do
+    it "loads files matching the target names in Rails assets" do
+      Roadie.load_css(['foo']).should == 'contents of foo'
+      Roadie.load_css(['foo.css']).should == 'contents of foo'
     end
 
     it "loads files in order and join them with a newline" do
-      Roadie.load_css(fixtures_root, %w[foo bar]).should == "contents of foo\ncontents of bar"
-      Roadie.load_css(fixtures_root, %w[bar foo]).should == "contents of bar\ncontents of foo"
+      Roadie.load_css(%w[foo bar]).should == "contents of foo\ncontents of bar"
+      Roadie.load_css(%w[bar foo]).should == "contents of bar\ncontents of foo"
+    end
+
+    it "loads files also from asset subdirectories" do
+      Roadie.load_css(%w[foo subdirectory/findme.css]).should == "contents of foo\ncan you really find me?"
+      Roadie.load_css(%w[bar foo]).should == "contents of bar\ncontents of foo"
     end
 
     it "raises a Roadie::CSSFileNotFound error when a css file could not be found" do
-      expect { Roadie.load_css(fixtures_root, ['not_here']) }.to raise_error(Roadie::CSSFileNotFound, /not_here/)
+      expect { Roadie.load_css(['not_here']) }.to raise_error(Roadie::CSSFileNotFound, /not_here/)
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,25 +14,32 @@ end
 
 require 'rspec'
 
-Dir['./spec/support/**/*'].each { |file| require file }
-
 require 'action_mailer'
+require 'sprockets'
 require 'roadie'
 
+FIXTURES_PATH = Pathname.new(File.dirname(__FILE__)).join('fixtures')
+
 class TestApplication
   def config
     OpenStruct.new(:action_mailer => OpenStruct.new(:default_url_options => {:host => "example.com"}))
   end
-end
 
-if defined?(Rails)
-  Rails.stub!(:root => Pathname.new('/path/to'), :application => TestApplication.new)
-else
-  class Rails
-    def self.root; Pathname.new('/path/to'); end
-    def self.application; TestApplication.new; end
+  def assets
+    env = Sprockets::Environment.new
+    env.append_path FIXTURES_PATH.join('app','assets','stylesheets')
+    env
   end
 end
 
-FixturesPath = Pathname.new(File.dirname(__FILE__)).join('fixtures')
+unless defined?(Rails)
+  class Rails; end
+end
 
+RSpec.configure do |c|
+  c.before(:each) do
+    Rails.stub(:application => TestApplication.new)
+  end
+end
+
+Dir['./spec/support/**/*'].each { |file| require file }

metadata

@@ -2,7 +2,7 @@
 name: roadie
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors: 
 - Magnus Bergmark
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +02:00
+date: 2011-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,20 +43,31 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.0"
+        version: 3.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: sprockets
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Roadie tries to make sending HTML emails a little less painful in Rails 3 by inlining stylesheets and rewrite relative URLs for you.
 email: 
 - magnus.bergmark@gmail.com
@@ -79,8 +90,6 @@ files:
 - README.md
 - Rakefile
 - autotest/discover.rb
-- gemfiles/rails-3.0.x.Gemfile
-- gemfiles/rails-3.1.x.Gemfile
 - lib/roadie.rb
 - lib/roadie/action_mailer_extensions.rb
 - lib/roadie/css_file_not_found.rb
@@ -88,11 +97,13 @@ files:
 - lib/roadie/style_declaration.rb
 - lib/roadie/version.rb
 - roadie.gemspec
-- spec/fixtures/public/stylesheets/bar.css
-- spec/fixtures/public/stylesheets/foo.css
-- spec/fixtures/public/stylesheets/green_paragraphs.css
-- spec/fixtures/public/stylesheets/integration.css
-- spec/fixtures/public/stylesheets/large_purple_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/bar.css
+- spec/fixtures/app/assets/stylesheets/foo.css
+- spec/fixtures/app/assets/stylesheets/green_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/integration.css
+- spec/fixtures/app/assets/stylesheets/large_purple_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/subdirectory/findme.css
+- spec/fixtures/app/assets/stylesheets/subdirectory/red_paragraphs.css
 - spec/fixtures/views/integration_mailer/marketing.html.erb
 - spec/fixtures/views/integration_mailer/notification.html.erb
 - spec/fixtures/views/integration_mailer/notification.text.erb
@@ -136,11 +147,13 @@ signing_key:
 specification_version: 3
 summary: Making HTML emails comfortable for the Rails rockstars
 test_files: 
-- spec/fixtures/public/stylesheets/bar.css
-- spec/fixtures/public/stylesheets/foo.css
-- spec/fixtures/public/stylesheets/green_paragraphs.css
-- spec/fixtures/public/stylesheets/integration.css
-- spec/fixtures/public/stylesheets/large_purple_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/bar.css
+- spec/fixtures/app/assets/stylesheets/foo.css
+- spec/fixtures/app/assets/stylesheets/green_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/integration.css
+- spec/fixtures/app/assets/stylesheets/large_purple_paragraphs.css
+- spec/fixtures/app/assets/stylesheets/subdirectory/findme.css
+- spec/fixtures/app/assets/stylesheets/subdirectory/red_paragraphs.css
 - spec/fixtures/views/integration_mailer/marketing.html.erb
 - spec/fixtures/views/integration_mailer/notification.html.erb
 - spec/fixtures/views/integration_mailer/notification.text.erb

data/gemfiles/rails-3.0.x.Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'nokogiri', '>= 1.4.4'
-gem 'css_parser'
-gem 'actionmailer', '~> 3.0.0'
-
-gem 'rspec-rails', :group => :development

data/gemfiles/rails-3.1.x.Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'nokogiri', '>= 1.4.4'
-gem 'css_parser'
-gem 'actionmailer', '~> 3.1.0'
-
-gem 'rspec-rails', :group => :development