Merge pull request #4 from jaimeiniesta/master

Thanks!

.travis.yml

@@ -1 +1,4 @@
-rvm: 1.9.2
+rvm: 1.9.2
+gemfile:
+  - gemfiles/Gemfile.rails-3.0.x
+  - gemfiles/Gemfile.rails-3.1.x

Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in make_flaggable.gemspec
 gemspec

gemfiles/Gemfile.rails-3.0.x

@@ -0,0 +1,9 @@
+source 'http://rubygems.org'
+
+gem "activerecord", "~> 3.0.0"
+gem "bundler", "~> 1.0.0"
+gem "rspec", "~> 2.6.0"
+gem "database_cleaner", "0.6.7"
+gem "sqlite3-ruby", "~> 1.3.0"
+gem "generator_spec", "~> 0.8.2"
+gem "rake", "0.8.7"

gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,9 @@
+source 'http://rubygems.org'
+
+gem "activerecord", "~> 3.1.0"
+gem "bundler", "~> 1.0.0"
+gem "rspec", "~> 2.6.0"
+gem "database_cleaner", "0.6.7"
+gem "sqlite3-ruby", "~> 1.3.0"
+gem "generator_spec", "~> 0.8.4"
+gem "rake", "0.8.7"

make_flaggable.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "make_flaggable"
 
-  s.add_dependency "activerecord", "~> 3.0.0"
+  s.add_dependency "activerecord", ">= 3.0.0"
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rspec", "~> 2.6.0"
   s.add_development_dependency "database_cleaner", "0.6.7"
   s.add_development_dependency "sqlite3-ruby", "~> 1.3.0"
-  s.add_development_dependency "generator_spec", "~> 0.8.2"
+  s.add_development_dependency "generator_spec", "~> 0.8.4"
   s.add_development_dependency "rake", "0.8.7"
 
   s.files        = `git ls-files`.split("\n")