roadie 2.2.0 → 2.3.0.pre1

data/.gitignore

@@ -7,5 +7,4 @@ pkg
 .idea/*
 .rvmrc
 
-gemfiles/*.lock
 doc

data/.travis.yml

@@ -1,5 +1,11 @@
+bundler_args: --without guard
+
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
 
-script: "bundle exec rspec spec"
+gemfile:
+  - gemfiles/rails-3.0.gemfile
+  - gemfiles/rails-3.1.gemfile
+  - gemfiles/rails-3.2.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rails-3.0' do
+  gem 'rails',      '~> 3.0.0'
+end
+
+appraise 'rails-3.1' do
+  gem 'rails',      '~> 3.1.0'
+end
+
+appraise 'rails-3.2' do
+  gem 'rails',      '~> 3.2.0.rc1'
+end

data/Changelog.md

@@ -1,9 +1,20 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v2.2.0...master)
+[full changelog](https://github.com/Mange/roadie/compare/v2.3.0.pre1...master)
 
 * Nothing yet
 
+### 2.3.0.pre1
+
+[full changelog](https://github.com/Mange/roadie/compare/v2.2.0...v2.3.0.pre1)
+
+* Enhancements:
+  * Support Rails 3.2.pre1  - [Morton Jonuschat (yabawock)](https://github.com/yabawock)
+  * Sped up the Travis builds
+  * Official support for Rails 3.0 again
+    * Dependencies allow 3.0
+    * Travis builds 3.0 among the others
+
 ### 2.2.0
 
 [full changelog](https://github.com/Mange/roadie/compare/v2.1.0...v2.2.0)

data/Gemfile

@@ -1,2 +1,11 @@
 source :rubygems
 gemspec
+
+group :guard do
+  gem 'guard'
+  gem 'guard-rspec'
+
+  # Guard for Mac
+  gem 'rb-fsevent'
+  gem 'growl'
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    roadie (2.2.0)
-      actionmailer (~> 3.1.0)
+    roadie (2.3.0.pre1)
+      actionmailer (> 3.0.0, < 3.3.0)
       css_parser
       nokogiri (>= 1.4.4)
       sprockets
@@ -39,29 +39,34 @@ GEM
     activesupport (3.1.3)
       multi_json (~> 1.0)
     addressable (2.2.6)
+    appraisal (0.4.0)
+      bundler
+      rake
     arel (2.2.1)
     builder (3.0.0)
     css_parser (1.2.5)
       addressable
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    ffi (1.0.11)
     growl (1.0.3)
-    guard (0.8.8)
+    guard (0.10.0)
+      ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-rspec (0.5.8)
-      guard (>= 0.8.4)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.1)
+    json (1.6.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     polyglot (0.3.3)
-    rack (1.3.5)
+    rack (1.3.6)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -87,7 +92,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rb-fsevent (0.4.3.1)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -105,7 +110,7 @@ GEM
     sprockets (2.0.3)
       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)
@@ -117,10 +122,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   growl
   guard
   guard-rspec
   rails
   rb-fsevent
   roadie!
-  rspec-rails (>= 2.0.0)
+  rspec-rails

data/README.md

@@ -5,8 +5,6 @@ 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,12 +23,18 @@ Build Status
 
 [![Build history and status](https://secure.travis-ci.org/Mange/roadie.png)](http://travis-ci.org/#!/Mange/roadie)
 
-Tested with [Travis CI](http://travis-ci.org) using the [following combinations](http://travis-ci.org/#!/Mange/roadie):
+Tested with [Travis CI](http://travis-ci.org) using the [all combinations of](http://travis-ci.org/#!/Mange/roadie):
 
-* Ruby 1.8.7 with Rails 3.1.x
-* Ruby 1.9.2 with Rails 3.1.x
+* Ruby:
+  * 1.8.7
+  * 1.9.2
+  * 1.9.3
+* Rails
+  * 3.0
+  * 3.1
+  * 3.2
 
-Let me know if you want any other combination supported officially
+Let me know if you want any other combination supported officially.
 
 ### Versioning ###
 

data/Rakefile

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
+require 'appraisal'
 
 Bundler::GemHelper.install_tasks
 
@@ -22,3 +22,8 @@ end
 
 desc "Default: Run specs"
 task :default => :spec
+
+namespace :spec do
+  desc 'Run specs against all supported versions of Rails'
+  task :all => ["appraisal:install", "appraisal", "spec"]
+end

data/gemfiles/rails-3.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -0,0 +1,115 @@
+PATH
+  remote: /Users/mange/Projects/roadie
+  specs:
+    roadie (2.3.0.pre1)
+      actionmailer (> 3.0.0, < 3.3.0)
+      css_parser
+      nokogiri (>= 1.4.4)
+      sprockets
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.11)
+      actionpack (= 3.0.11)
+      mail (~> 2.2.19)
+    actionpack (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.11)
+      activesupport (= 3.0.11)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+    activesupport (3.0.11)
+    addressable (2.2.6)
+    appraisal (0.4.0)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    css_parser (1.2.5)
+      addressable
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    hike (1.2.1)
+    i18n (0.5.0)
+    json (1.6.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.11)
+      actionmailer (= 3.0.11)
+      actionpack (= 3.0.11)
+      activerecord (= 3.0.11)
+      activeresource (= 3.0.11)
+      activesupport (= 3.0.11)
+      bundler (~> 1.0)
+      railties (= 3.0.11)
+    railties (3.0.11)
+      actionpack (= 3.0.11)
+      activesupport (= 3.0.11)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.7.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  rails (~> 3.0.0)
+  roadie!
+  rspec-rails

data/gemfiles/rails-3.0.x.Gemfile.lock

@@ -0,0 +1,76 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.10)
+    builder (2.1.2)
+    css_parser (1.1.9)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.5.0)
+    polyglot (0.3.2)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rdoc (3.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (~> 3.0.0)
+  css_parser
+  nokogiri (>= 1.4.4)
+  rspec-rails

data/gemfiles/rails-3.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "~> 3.1.0"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.1.gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: /Users/mange/Projects/roadie
+  specs:
+    roadie (2.3.0.pre1)
+      actionmailer (> 3.0.0, < 3.3.0)
+      css_parser
+      nokogiri (>= 1.4.4)
+      sprockets
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    appraisal (0.4.0)
+      bundler
+      rake
+    arel (2.2.1)
+    builder (3.0.0)
+    css_parser (1.2.5)
+      addressable
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.4)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.7.0)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  rails (~> 3.1.0)
+  roadie!
+  rspec-rails

data/gemfiles/rails-3.1.x.Gemfile.lock

@@ -0,0 +1,73 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.0.rc6)
+      actionpack (= 3.1.0.rc6)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc6)
+      activemodel (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.2)
+      rack-mount (~> 0.8.1)
+      rack-test (~> 0.6.0)
+      sprockets (~> 2.0.0.beta.12)
+    activemodel (3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0.rc6)
+      multi_json (~> 1.0)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    css_parser (1.1.9)
+    diff-lcs (1.1.2)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    nokogiri (1.5.0)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.2)
+      rack (>= 1.0.0)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    rspec-rails (2.1.0)
+      rspec (~> 2.1.0)
+    sprockets (2.0.0.beta.14)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.3.2)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (~> 3.1.0.rc6)
+  css_parser
+  nokogiri (>= 1.4.4)
+  rspec-rails

data/gemfiles/rails-3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "~> 3.2.0.rc1"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.2.gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: /Users/mange/Projects/roadie
+  specs:
+    roadie (2.3.0.pre1)
+      actionmailer (> 3.0.0, < 3.3.0)
+      css_parser
+      nokogiri (>= 1.4.4)
+      sprockets
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.0.rc1)
+      actionpack (= 3.2.0.rc1)
+      mail (~> 2.3.0)
+    actionpack (3.2.0.rc1)
+      activemodel (= 3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      journey (~> 1.0.0.rc1)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.2.0.rc1)
+      activemodel (= 3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+      arel (~> 3.0.0.rc1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.0.rc1)
+      activemodel (= 3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+    activesupport (3.2.0.rc1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    appraisal (0.4.0)
+      bundler
+      rake
+    arel (3.0.0.rc1)
+    builder (3.0.0)
+    css_parser (1.2.5)
+      addressable
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.0.rc4)
+    json (1.6.4)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.0.rc1)
+      actionmailer (= 3.2.0.rc1)
+      actionpack (= 3.2.0.rc1)
+      activerecord (= 3.2.0.rc1)
+      activeresource (= 3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+      bundler (~> 1.0)
+      railties (= 3.2.0.rc1)
+    railties (3.2.0.rc1)
+      actionpack (= 3.2.0.rc1)
+      activesupport (= 3.2.0.rc1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.7.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  rails (~> 3.2.0.rc1)
+  roadie!
+  rspec-rails

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '2.2.0'
+  VERSION = '2.3.0.pre1'
 end

data/roadie.gemspec

@@ -16,19 +16,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'nokogiri', '>= 1.4.4'
   s.add_dependency 'css_parser'
-  s.add_dependency 'actionmailer', '~> 3.1.0'
+  s.add_dependency 'actionmailer', '> 3.0.0', '< 3.3.0'
   s.add_dependency 'sprockets'
 
   s.add_development_dependency 'rails'
-  s.add_development_dependency 'rspec-rails', '>= 2.0.0'
+  s.add_development_dependency 'rspec-rails'
 
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-rspec'
-
-  # Guard for Mac
-  s.add_development_dependency 'rb-fsevent'
-  s.add_development_dependency 'growl'
+  s.add_development_dependency 'appraisal'
 
   s.extra_rdoc_files = %w[README.md Changelog.md]
   s.require_paths = %w[lib]

data/spec/integration_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 
 module Roadie
   shared_examples "roadie integration" do
-    mailer = Class.new(ActionMailer::Base) do
-      def self.name() "IntegrationMailer" end
-
+    mailer = Class.new(AnonymousMailer) do
       default :css => :integration, :from => 'john@example.com'
       append_view_path FIXTURES_PATH.join('views')
 
+      # Needed for correct path lookup
+      self.mailer_name = "integration_mailer"
+
       def notification(to, reason)
         @reason = reason
         mail(:subject => 'Notification for you', :to => to) { |format| format.html; format.text }

data/spec/lib/roadie/action_mailer_extensions_spec.rb

@@ -3,14 +3,9 @@ require 'spec_helper'
 
 module Roadie
   describe ActionMailerExtensions, "CSS selection" do
-    mailer = Class.new(ActionMailer::Base) do
+    mailer = Class.new(AnonymousMailer) do
       default :css => :default
 
-      # Just to make ActionMailer::Base not puke
-      def self.name
-        "SomeMailer"
-      end
-
       def default_css
         mail(:subject => "Default CSS") do |format|
           format.html { render :text => '' }
@@ -57,14 +52,9 @@ module Roadie
   end
 
   describe ActionMailerExtensions, "using HTML" do
-    mailer = Class.new(ActionMailer::Base) do
+    mailer = Class.new(AnonymousMailer) do
       default :css => :simple
 
-      # Just to make ActionMailer::Base not puke
-      def self.name
-        "SomeMailer"
-      end
-
       def multipart
         mail(:subject => "Multipart email") do |format|
           format.html { render :text => 'Hello HTML' }

data/spec/spec_helper.rb

@@ -46,8 +46,16 @@ class TestApplication < Rails::Application
   end
 end
 
-ActionMailer::Railtie.run_initializers(:default, Rails.application)
-Roadie::Railtie.run_initializers(:default, Rails.application)
+if Roadie::Railtie.respond_to?(:run_initializers)
+  # Rails >= 3.1
+  ActionMailer::Railtie.run_initializers(:default, Rails.application)
+  Roadie::Railtie.run_initializers(:default, Rails.application)
+else
+  # Rails 3.0
+  Rails.application.config.active_support.deprecation = :log
+  Rails.logger = Logger.new('/dev/null')
+  Rails.application.initialize!
+end
 
 RSpec.configure do |c|
   c.before(:each) do
@@ -55,4 +63,4 @@ RSpec.configure do |c|
   end
 end
 
-Dir['./spec/support/**/*'].each { |file| require file }
+Dir['./spec/support/**/*.rb'].each { |file| require file }

data/spec/support/anonymous_mailer.rb

@@ -0,0 +1,21 @@
+# Subclass of ActionMailer::Base that does not crash when the class
+# is anonymous. Subclassed in the specs whenever a new mailer is
+# needed
+class AnonymousMailer < ActionMailer::Base
+  class << self
+    # Pretty much like super, but returns "anonymous" when no
+    # name is set
+    def mailer_name
+      if @mailer_name or name
+        super
+      else
+        "anonymous"
+      end
+    end
+
+    # Was an alias. (e.g. pointed to the old, non-overridden method)
+    def controller_path
+      mailer_name
+    end
+  end
+end

metadata

@@ -1,154 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: roadie
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.2.0
+version: !ruby/object:Gem::Version
+  version: 2.3.0.pre1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70348227069780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: css_parser
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227069780
+- !ruby/object:Gem::Dependency
+  name: css_parser
+  requirement: &70348227069320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227069320
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: &70348227068760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.1.0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227068760
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70348227068080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227068080
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70348227067600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227067600
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70348227008540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70348227008540
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70348227008120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id011
-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: 
+  version_requirements: *70348227008120
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - Changelog.md
-files: 
+files:
 - .autotest
 - .gitignore
 - .travis.yml
 - .yardopts
+- Appraisals
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -157,6 +114,14 @@ files:
 - README.md
 - Rakefile
 - autotest/discover.rb
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.0.gemfile.lock
+- gemfiles/rails-3.0.x.Gemfile.lock
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.1.gemfile.lock
+- gemfiles/rails-3.1.x.Gemfile.lock
+- gemfiles/rails-3.2.gemfile
+- gemfiles/rails-3.2.gemfile.lock
 - lib/roadie.rb
 - lib/roadie/action_mailer_extensions.rb
 - lib/roadie/asset_pipeline_provider.rb
@@ -183,40 +148,40 @@ files:
 - spec/lib/roadie_spec.rb
 - spec/shared_examples/asset_provider_examples.rb
 - spec/spec_helper.rb
+- spec/support/anonymous_mailer.rb
 - spec/support/change_url_options.rb
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb
 - spec/support/have_styling_matcher.rb
 - spec/support/parse_styling.rb
-has_rdoc: true
 homepage: http://github.com/Mange/roadie
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -3727812369412640023
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Making HTML emails comfortable for the Rails rockstars
-test_files: 
+test_files:
 - spec/fixtures/app/assets/stylesheets/integration.css
 - spec/fixtures/public/stylesheets/integration.css
 - spec/fixtures/views/integration_mailer/marketing.html.erb
@@ -232,6 +197,7 @@ test_files:
 - spec/lib/roadie_spec.rb
 - spec/shared_examples/asset_provider_examples.rb
 - spec/spec_helper.rb
+- spec/support/anonymous_mailer.rb
 - spec/support/change_url_options.rb
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb