add rails 4 support

zendesk · Apr 7, 2014 · 90ded9e · 90ded9e
1 parent b09f4dc
commit 90ded9e
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.sqlite3
+gemfiles/*.lock
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,17 @@ script: "bundle exec rake test"
 rvm:
   - 1.9.3
   - 2.0
+  - 2.1
 gemfile:
   - gemfiles/activerecord_2.3.gemfile
   - gemfiles/activerecord_3.0.gemfile
   - gemfiles/activerecord_3.1.gemfile
   - gemfiles/activerecord_3.2.gemfile
+  - gemfiles/activerecord_4.0.gemfile
 matrix:
   exclude:
     - rvm: 2.0
       gemfile: gemfiles/activerecord_2.3.gemfile
+  exclude:
+    - rvm: 2.1
+      gemfile: gemfiles/activerecord_2.3.gemfile
diff --git a/Appraisals b/Appraisals
@@ -13,3 +13,7 @@ end
 appraise "activerecord-3.2" do
   gem 'activerecord', '~> 3.2.0', :require => "active_record"
 end
+
+appraise "activerecord-4.0" do
+  gem 'activerecord', '~> 4.0.0', :require => "active_record"
+end
diff --git a/gemfiles/activerecord_2.3.gemfile b/gemfiles/activerecord_2.3.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "debugger"
-gem "iconv", :platforms=>:mri_20
-gem "activerecord", "~> 2.3.6", :require=>"active_record"
+gem "iconv", :platforms => :mri_20
+gem "activerecord", "~> 2.3.6", :require => "active_record"
 
-gemspec :path=>"../"
+gemspec :path => "../"
diff --git a/gemfiles/activerecord_2.3.gemfile.lock b/gemfiles/activerecord_2.3.gemfile.lock
diff --git a/gemfiles/activerecord_3.0.gemfile b/gemfiles/activerecord_3.0.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "debugger"
-gem "iconv", :platforms=>:mri_20
-gem "activerecord", "~> 3.0.0", :require=>"active_record"
+gem "iconv", :platforms => :mri_20
+gem "activerecord", "~> 3.0.0", :require => "active_record"
 
-gemspec :path=>"../"
+gemspec :path => "../"
diff --git a/gemfiles/activerecord_3.0.gemfile.lock b/gemfiles/activerecord_3.0.gemfile.lock
diff --git a/gemfiles/activerecord_3.1.gemfile b/gemfiles/activerecord_3.1.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "debugger"
-gem "iconv", :platforms=>:mri_20
-gem "activerecord", "~> 3.1.0", :require=>"active_record"
+gem "iconv", :platforms => :mri_20
+gem "activerecord", "~> 3.1.0", :require => "active_record"
 
-gemspec :path=>"../"
+gemspec :path => "../"
diff --git a/gemfiles/activerecord_3.1.gemfile.lock b/gemfiles/activerecord_3.1.gemfile.lock
diff --git a/gemfiles/activerecord_3.2.gemfile b/gemfiles/activerecord_3.2.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "debugger"
-gem "iconv", :platforms=>:mri_20
-gem "activerecord", "~> 3.2.0", :require=>"active_record"
+gem "iconv", :platforms => :mri_20
+gem "activerecord", "~> 3.2.0", :require => "active_record"
 
-gemspec :path=>"../"
+gemspec :path => "../"
diff --git a/gemfiles/activerecord_3.2.gemfile.lock b/gemfiles/activerecord_3.2.gemfile.lock
diff --git a/gemfiles/activerecord_4.0.gemfile b/gemfiles/activerecord_4.0.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "debugger"
+gem "iconv", :platforms => :mri_20
+gem "activerecord", "~> 4.0.0", :require => "active_record"
+
+gemspec :path => "../"
diff --git a/preload.gemspec b/preload.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = Preload::VERSION
   gem.license       = "MIT"
 
-  gem.add_dependency 'activerecord', '>= 2.3.6', '< 3.3'
+  gem.add_dependency 'activerecord', '>= 2.3.6', '< 5.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'shoulda'