diff --git a/.travis.yml b/.travis.yml index aeb2461..c249327 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ rvm: - - jruby - 1.8.7 - 1.9.2 - 1.9.3 + - 2.0.0 + - jruby - ree - rbx script: diff --git a/Appraisals b/Appraisals index 9d109c0..d3dbac4 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,7 @@ -appraise "rails-3.1.10" do - gem "rails", "3.1.10" +appraise "rails-3.1.11" do + gem "rails", "3.1.11" end -appraise "rails-3.2.11" do - gem "rails", "3.2.11" +appraise "rails-3.2.12" do + gem "rails", "3.2.12" end \ No newline at end of file diff --git a/Gemfile b/Gemfile index 226842d..51d5e2d 100644 --- a/Gemfile +++ b/Gemfile @@ -5,9 +5,9 @@ gemspec gem 'rails' group :assets do - gem 'sass-rails', '3.2.5' - gem 'coffee-rails', '3.2.2' - gem 'bootstrap-sass-rails', '2.2.1.0' + gem 'sass-rails' + gem 'coffee-rails' + gem 'bootstrap-sass-rails' end gem 'haml-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 0a928e2..dc64092 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,31 +7,31 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) ansi (1.4.3) @@ -44,9 +44,9 @@ GEM identifier rails (> 3.0.0) bcrypt-ruby (3.0.1) - bootstrap-sass-rails (2.2.1.0) - railties (~> 3.1) - sass-rails (~> 3.1) + bootstrap-sass-rails (2.3.1.0) + railties (>= 3.1.0) + sass-rails (>= 3.1.0) builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -54,76 +54,77 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.1) erubis (2.7.0) - excon (0.16.10) + excon (0.19.5) execjs (1.4.0) multi_json (~> 1.0) - fog (1.8.0) + fog (1.10.0) builder excon (~> 0.14) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) - net-scp (~> 1.0.4) + net-scp (~> 1.1) net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.4) - haml (3.1.7) - haml-rails (0.3.5) + haml (4.0.0) + tilt + haml-rails (0.4) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) - haml (~> 3.1) + haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.1) - i18n (0.6.1) + i18n (0.6.4) identifier (1.1.5) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (1.7.7) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - minitest (4.4.0) - multi_json (1.5.0) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-ssh (2.6.3) + mime-types (1.21) + minitest (4.6.2) + multi_json (1.6.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) + net-ssh (2.6.6) nokogiri (1.5.6) polyglot (0.3.3) - rack (1.4.3) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.12) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) ruby-hmac (0.4.0) - sass (3.2.5) - sass-rails (3.2.5) + sass (3.2.6) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -132,15 +133,15 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - thor (0.16.0) - tilt (1.3.3) + sqlite3 (1.3.7) + thor (0.17.0) + tilt (1.3.4) treetop (1.4.12) polyglot polyglot (>= 0.3.1) turn (0.9.6) ansi - tzinfo (0.3.35) + tzinfo (0.3.36) PLATFORMS ruby @@ -150,14 +151,14 @@ DEPENDENCIES appraisal attached bcrypt-ruby - bootstrap-sass-rails (= 2.2.1.0) - coffee-rails (= 3.2.2) + bootstrap-sass-rails + coffee-rails formula! haml-rails jquery-rails jruby-openssl minitest rails - sass-rails (= 3.2.5) + sass-rails sqlite3 turn diff --git a/README.rdoc b/README.rdoc index 16d1fea..5efa7ca 100644 --- a/README.rdoc +++ b/README.rdoc @@ -6,13 +6,14 @@ Formula is a Rails form helper that generates awesome markup. The project lets u The gem is tested with: -* Ruby on Rails 3.1.8 -* Ruby on Rails 3.2.9 +* Ruby on Rails 3.1.11 +* Ruby on Rails 3.2.12 +* Ruby (MRI) 2.0.0 * Ruby (MRI) 1.9.3 * Ruby (MRI) 1.9.2 * Ruby (MRI) 1.8.7 * Ruby (REE) 1.8.7 -* JRuby 1.7.0 +* JRuby 1.7.2 * Rubinius 1.2.4 == Installation