Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
+gemfile:
+  - Gemfile.rails-3.1
+  - Gemfile.rails-3.2

Gemfile

@@ -1,6 +1,4 @@
-source :rubygems
-
-gemspec
+eval File.read('Gemfile.rails-3.1')
 
 group :test do
   if RUBY_PLATFORM =~ /darwin/

Gemfile.rails-3.1

@@ -0,0 +1,9 @@
+source :rubygems
+
+spec = eval File.read('less-rails.gemspec')
+deps = spec.dependencies.map { |dep| {:name => dep.name, :version => dep.requirement.to_s} }
+
+deps.reject! { |dep| dep[:name] =~ /actionpack|rails/ }
+deps.each    { |dep| gem dep[:name], dep[:version] }
+
+gem 'rails', '~> 3.1.3'

Gemfile.rails-3.2

@@ -0,0 +1,9 @@
+source :rubygems
+
+spec = eval File.read('less-rails.gemspec')
+deps = spec.dependencies.map { |dep| {:name => dep.name, :version => dep.requirement.to_s} }
+
+deps.reject! { |dep| dep[:name] =~ /actionpack|rails/ }
+deps.each    { |dep| gem dep[:name], dep[:version] }
+
+gem 'rails', '3.2.0.rc1'

less-rails.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_runtime_dependency 'less', '~> 2.0.7'
-  s.add_runtime_dependency 'actionpack', '~> 3.1.1'
+  s.add_runtime_dependency 'actionpack', '>= 3.1'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'guard-minitest'
-  s.add_development_dependency 'rails',  '~> 3.1.3'
+  s.add_development_dependency 'rails',  '~> 3.1'
 end

lib/less/rails/version.rb

@@ -1,5 +1,5 @@
 module Less
   module Rails
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end