diff --git a/.travis.yml b/.travis.yml index 3b03796..20c13a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,8 @@ rvm: - - 1.9.3 - - 2.0.0 + - 2.2.2 - jruby-19mode - - ruby-head - -matrix: - allow_failures: - - rvm: ruby-head - - gemfile: gemfiles/rails_head.gemfile gemfile: - gemfiles/rails_3.gemfile - - gemfiles/rails_4.gemfile - - gemfiles/rails_head.gemfile + - gemfiles/rails_4.0.gemfile + - gemfiles/rails_4.1.gemfile diff --git a/Gemfile b/Gemfile index 8dedc1b..9ce1691 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "rails", "~> 4.1.0" -gem "slim" +gem "slim-rails" gem "haml" gem "kramdown" diff --git a/README.md b/README.md index 9fd3af0..50c1149 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Adds your HTML templates into Angular's `$templateCache` using Rails asset pipeline. +**IMPORTANT**: for Rails 4.2+ use version 1.0+ of this gem. For Rails 3 - 4.1 use version 0.x + It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM). ## Usage diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec index 03b7017..5ae84e1 100644 --- a/angular-rails-templates.gemspec +++ b/angular-rails-templates.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency "railties", ">= 3.1" - s.add_dependency "sprockets", "~> 2" + s.add_dependency "sprockets", "~> 2.0" s.add_dependency "tilt" s.add_development_dependency "minitest" diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.0.gemfile similarity index 80% rename from gemfiles/rails_4.gemfile rename to gemfiles/rails_4.0.gemfile index 28f88b7..a5762af 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -1,9 +1,8 @@ source "https://rubygems.org" -gem "rails", "~> 4.0.1" +gem "rails", "~> 4.0.0" gem "slim-rails" gem "haml" gem "kramdown" - gemspec :path => ".././" diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile new file mode 100644 index 0000000..334b99b --- /dev/null +++ b/gemfiles/rails_4.1.gemfile @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +gem "rails", "~> 4.1.0" +gem "slim-rails" +gem "haml" +gem "kramdown" + +gemspec :path => ".././"