Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Support Rails 3.0.x again!

  • Loading branch information...
commit fbb617b397380391204c0d2d3741fb62b753ad50 1 parent 194bddc
@Mange authored
View
1  .travis.yml
@@ -6,5 +6,6 @@ rvm:
- 1.9.3
gemfile:
+ - gemfiles/rails-3.0.gemfile
- gemfiles/rails-3.1.gemfile
- gemfiles/rails-3.2.gemfile
View
4 Appraisals
@@ -1,3 +1,7 @@
+appraise 'rails-3.0' do
+ gem 'rails', '~> 3.0.0'
+end
+
appraise 'rails-3.1' do
gem 'rails', '~> 3.1.0'
end
View
3  Changelog.md
@@ -5,6 +5,9 @@
* 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
View
4 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
View
20 README.md
@@ -23,16 +23,16 @@ 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):
-
-* Ruby 1.8.7 + Rails 3.1.x
-* Ruby 1.9.2 + Rails 3.1.x
-* Ruby 1.9.3 + Rails 3.1.x
-* Ruby 1.8.7 + Rails 3.2.x
-* Ruby 1.9.2 + Rails 3.2.x
-* Ruby 1.9.3 + Rails 3.2.x
-
-Rails 3.0 is also officially supported, but not explicitly tested right now.
+Tested with [Travis CI](http://travis-ci.org) using the [all combinations of](http://travis-ci.org/#!/Mange/roadie):
+
+* 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.
View
7 gemfiles/rails-3.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "rails", "~> 3.0.0"
+
+gemspec :path=>"../"
View
115 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
View
4 gemfiles/rails-3.1.gemfile.lock
@@ -1,8 +1,8 @@
PATH
remote: /Users/mange/Projects/roadie
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
View
4 gemfiles/rails-3.2.gemfile.lock
@@ -1,8 +1,8 @@
PATH
remote: /Users/mange/Projects/roadie
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
View
2  roadie.gemspec
@@ -16,7 +16,7 @@ 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'
View
12 spec/spec_helper.rb
@@ -46,8 +46,16 @@ def reset_test_config
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
Please sign in to comment.
Something went wrong with that request. Please try again.