Add support for Solidus 2.0 and Rails 5

.travis.yml

@@ -1,14 +1,19 @@
 sudo: false
 cache: bundler
 language: ruby
-env:
- - SOLIDUS_BRANCH=v1.1 DB=mysql
- - SOLIDUS_BRANCH=v1.2 DB=mysql
- - SOLIDUS_BRANCH=v1.3 DB=mysql
- - SOLIDUS_BRANCH=master DB=mysql
- - SOLIDUS_BRANCH=v1.1 DB=postgres
- - SOLIDUS_BRANCH=v1.2 DB=postgres
- - SOLIDUS_BRANCH=v1.3 DB=postgres
- - SOLIDUS_BRANCH=master DB=postgres
 rvm:
- - 2.3.0
+ - 2.3.1
+env:
+ matrix:
+ - SOLIDUS_BRANCH=v1.1 DB=postgres
+ - SOLIDUS_BRANCH=v1.2 DB=postgres
+ - SOLIDUS_BRANCH=v1.3 DB=postgres
+ - SOLIDUS_BRANCH=v1.4 DB=postgres
+ - SOLIDUS_BRANCH=v2.0 DB=postgres
+ - SOLIDUS_BRANCH=master DB=postgres
+ - SOLIDUS_BRANCH=v1.1 DB=mysql
+ - SOLIDUS_BRANCH=v1.2 DB=mysql
+ - SOLIDUS_BRANCH=v1.3 DB=mysql
+ - SOLIDUS_BRANCH=v1.4 DB=mysql
+ - SOLIDUS_BRANCH=v2.0 DB=mysql
+ - SOLIDUS_BRANCH=master DB=mysql

Gemfile

@@ -1,10 +1,18 @@
-source 'https://rubygems.org'
-
-gemspec
+source "https://rubygems.org"
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+gem "solidus", github: "solidusio/solidus", branch: branch
+
+if branch == 'master' || branch >= "v2.0"
+ gem "rails-controller-testing", group: :test
+end
 
-gem 'mysql2'
 gem 'pg'
 gem 'sqlite3'
+gem 'mysql2'
+
+group :development, :test do
+ gem "pry-rails"
+end
+
+gemspec

lib/solidus_i18n.rb

@@ -1,4 +1,3 @@
-require 'sass/rails'
 require 'rails-i18n'
 require 'solidus_core'
 require 'solidus_i18n/engine'

solidus_i18n.gemspec

@@ -26,20 +26,18 @@ Gem::Specification.new do |s|
  s.add_runtime_dependency 'i18n_data', '~> 0.7.0'
  s.add_runtime_dependency 'rails-i18n', '~> 4.0.1'
  s.add_runtime_dependency 'kaminari-i18n', '~> 0.3.2'
- s.add_runtime_dependency 'routing-filter', '~> 0.5.0'
- s.add_runtime_dependency 'solidus_core', '~> 1.1'
+ s.add_runtime_dependency 'routing-filter', '~> 0.6.0'
+ s.add_runtime_dependency 'solidus_core', ['>= 1.1', '< 3']
  s.add_runtime_dependency 'deface', '~> 1.0'
 
  s.add_development_dependency 'byebug'
  s.add_development_dependency 'capybara', '~> 2.4.4'
- s.add_development_dependency 'coffee-rails', '~> 4.0.0'
  s.add_development_dependency 'database_cleaner', '~> 1.3'
  s.add_development_dependency 'factory_girl', '~> 4.5'
  s.add_development_dependency 'ffaker', '>= 1.25.0'
  s.add_development_dependency 'poltergeist', '~> 1.5'
  s.add_development_dependency 'pry-rails', '>= 0.3.0'
  s.add_development_dependency 'rubocop', '>= 0.24.1'
  s.add_development_dependency 'rspec-rails', '~> 3.1'
- s.add_development_dependency 'sass-rails', '~> 5.0.0'
  s.add_development_dependency 'simplecov', '~> 0.9'
 end