From 28298d578f66d480ddc868bd3010b939c2a4761c Mon Sep 17 00:00:00 2001
From: "Peter M. Goldstein" <peter.m.goldstein@gmail.com>
Date: Sun, 22 Sep 2013 12:22:56 -0700
Subject: [PATCH] Add Rails 4 as a permitted dependency.  Add Rails 4 to the
 test matrix.  Remove Ruby 1.8.x from test matrix because specs were failing
 anyway because of capybara dependency.  Add JRuby to the test matrix and
 neaten up the JRuby dependencies.

---
 .gitignore               |  1 +
 .travis.yml              | 28 ++++++++++++++--------------
 gemfiles/rails32.gemfile | 12 ++++++++++++
 gemfiles/rails40.gemfile | 11 +++++++++++
 impressionist.gemspec    |  6 ++----
 5 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 gemfiles/rails32.gemfile
 create mode 100644 gemfiles/rails40.gemfile

diff --git a/.gitignore b/.gitignore
index 81acdb5..66e4aa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@
 /test_app/test
 /test_app/vendor
 Gemfile.lock
+gemfiles/*.lock
 *.swo
 *.swp
diff --git a/.travis.yml b/.travis.yml
index 4434831..0a8bb01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,21 @@
 language: ruby
-
-bundler_args: '--binstubs --without documentation'
-before_install: gem install bundler
-
-before_script: "cd tests/test_app && bundle install && ./script/rails generate impressionist -f && rake db:migrate && cd .."
-
+before_script: 
+  - cd tests/test_app
+  - bundle exec rails g impressionist -f
+  - bundle exec rake db:migrate
+  - cd ..
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
-
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+gemfile:
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
 matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails40.gemfile
   allow_failures:
-      - rvm: rbx-18mode
-      - rvm: 1.8.7
       - rvm: 1.9.2
-      - rvm: ruby-head
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
new file mode 100644
index 0000000..810f15f
--- /dev/null
+++ b/gemfiles/rails32.gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.2.12'
+gem 'jquery-rails'
+gem 'json'
+
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+gem 'jdbc-sqlite3', :platforms => [:jruby]
+
+gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+
+gemspec :path => '../'
\ No newline at end of file
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
new file mode 100644
index 0000000..3b25da9
--- /dev/null
+++ b/gemfiles/rails40.gemfile
@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.0.0'
+gem 'jquery-rails'
+gem 'json'
+
+gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.rc1', :platforms => [:jruby]
+
+gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+
+gemspec :path => '../'
\ No newline at end of file
diff --git a/impressionist.gemspec b/impressionist.gemspec
index 3328ef6..87ae05d 100644
--- a/impressionist.gemspec
+++ b/impressionist.gemspec
@@ -20,13 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'httpclient', '~> 2.2'
 
-  # Nokogiri has dropped support for Ruby 1.8.7 onwards version 1.5.10
-  s.add_dependency 'nokogiri', (RUBY_VERSION.match("1.8.7") ? '1.5.10' : '~> 1.6.0')
+  s.add_dependency 'nokogiri', '~> 1.6.0'
 
-  # Capybara has dropped support for Ruby 1.8.7 onwards version 2.0.3
   s.add_development_dependency 'capybara', '>= 2.0.3'
   s.add_development_dependency 'rake', '>= 0.9'
-  s.add_development_dependency 'rails', '3.2.12'
+  s.add_development_dependency 'rails', '>= 3.2.12', '< 4.1'
   s.add_development_dependency 'rdoc', '>= 2.4.2'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'simplecov'