From 03dec0ec55f0ab27da0d32288d73d5877b94e415 Mon Sep 17 00:00:00 2001 From: pranjaldaga Date: Sat, 27 Apr 2013 14:37:11 +0530 Subject: [PATCH 1/2] Updated versions with coveralls and strong parameters inclusion --- Gemfile.lock | 243 +++++++++++++++++++++++++++------------------------ 1 file changed, 128 insertions(+), 115 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9098350..d369de3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,191 +1,204 @@ -GIT - remote: git://github.com/sferik/rails_admin.git - revision: 7972ef9923c40694d28eef88e1e068a3bb494123 - specs: - rails_admin (0.0.1) - bbenezech-nested_form (~> 0.0.6) - bootstrap-sass (~> 2.0) - builder (~> 3.0) - coffee-rails (~> 3.1) - haml (~> 3.1) - jquery-rails (>= 1.0) - jquery-ui-rails (~> 0.2.2) - kaminari (~> 0.12) - rack-pjax (~> 0.5) - rails (~> 3.1) - remotipart (~> 1.0) - sass-rails (~> 3.1) - GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) - mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) - addressable (2.2.7) + addressable (2.3.4) arel (3.0.2) - bbenezech-nested_form (0.0.6) bcrypt-ruby (3.0.1) - bootstrap-sass (2.0.2) - builder (3.0.0) + bootstrap-sass (2.3.1.1) + sass (~> 3.2) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.1) - crack (0.3.1) - daemons (1.1.8) - devise (2.0.4) + coffee-script-source (1.6.2) + colorize (0.5.8) + coveralls (0.6.7) + colorize + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + thor + crack (0.3.2) + devise (2.2.3) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) + orm_adapter (~> 0.1) railties (~> 3.1) - warden (~> 1.1.1) + warden (~> 1.2.1) erubis (2.7.0) - eventmachine (0.12.10) - execjs (1.3.0) + execjs (1.4.0) multi_json (~> 1.0) - fastercsv (1.5.4) + fastercsv (1.5.5) + font-awesome-sass-rails (3.0.2.2) + railties (>= 3.1.1) + sass-rails (>= 3.1.1) geokit (1.6.5) multi_json - haml (3.2.0.alpha.10) - hike (1.2.1) - hpricot (0.8.6) + haml (4.0.2) + tilt + hike (1.2.2) http_accept_language (1.0.2) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - jquery-ui-rails (0.2.2) + i18n (0.6.1) + journey (1.0.4) + jquery-rails (2.2.1) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) - json (1.6.6) - kaminari (0.13.0) + json (1.7.7) + kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - railties (>= 3.0.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - multi_json (1.3.2) + mime-types (1.23) + multi_json (1.7.2) + nested_form (0.3.2) newrelic_rpm (3.3.5) - orm_adapter (0.0.7) - pg (0.13.2) + nokogiri (1.5.9) + orm_adapter (0.4.0) + pg (0.15.1) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-pjax (0.5.9) - hpricot (~> 0.8.6) + rack-pjax (0.7.0) + nokogiri (~> 1.5) rack (~> 1.3) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (= 3.2.13) + rails_admin (0.4.7) + bootstrap-sass (~> 2.2) + builder (~> 3.0) + coffee-rails (~> 3.1) + font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) + haml (~> 4.0) + jquery-rails (~> 2.1) + jquery-ui-rails (~> 3.0) + kaminari (~> 0.14) + nested_form (~> 0.3) + rack-pjax (~> 0.6) + rails (~> 3.1) + remotipart (~> 1.0) + safe_yaml (~> 0.6) + sass-rails (~> 3.1) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (10.0.4) + rdoc (3.12.2) json (~> 1.4) - remotipart (1.0.2) - sass (3.1.16) - sass-rails (3.2.5) + remotipart (1.0.5) + rest-client (1.6.7) + mime-types (>= 1.16) + safe_yaml (0.9.1) + sass (3.2.8) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sendgrid (1.0.1) - json - json - simplecov (0.6.2) - multi_json (~> 1.3) - simplecov-html (~> 0.5.3) - simplecov-html (0.5.3) - sprockets (2.1.2) + simplecov (0.7.1) + multi_json (~> 1.0) + simplecov-html (~> 0.7.1) + simplecov-html (0.7.1) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - thin (1.3.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + sqlite3 (1.3.7) + strong_parameters (0.2.0) + actionpack (~> 3.0) + activemodel (~> 3.0) + railties (~> 3.0) + thin (1.6.3) + rack (~> 1.2) + thor (0.18.1) + tilt (1.3.7) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.3) + tzinfo (0.3.37) + uglifier (2.0.1) execjs (>= 0.3.0) - multi_json (>= 1.0.2) - validates_formatting_of (0.5.0) - rails (~> 3.0) - warden (1.1.1) + multi_json (~> 1.0, >= 1.0.2) + validates_formatting_of (0.8.0) + activemodel (~> 3.0) + warden (1.2.1) rack (>= 1.0) - webmock (1.8.6) + webmock (1.11.0) addressable (>= 2.2.7) - crack (>= 0.1.7) + crack (>= 0.3.2) + PLATFORMS ruby + DEPENDENCIES arel + coveralls devise fastercsv geokit - haml (~> 3.2.0.alpha) + haml http_accept_language newrelic_rpm pg rails (~> 3.2) - rails_admin! + rails_admin sass-rails - sendgrid (~> 1.0.1) simplecov sqlite3 + strong_parameters thin uglifier validates_formatting_of webmock + From 9751711354becba53d4c9c25c98ae681768a7c42 Mon Sep 17 00:00:00 2001 From: pranjaldaga Date: Sat, 27 Apr 2013 14:51:58 +0530 Subject: [PATCH 2/2] Updated version of haml as well as inclusion of coveralls and strong parameters --- Gemfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2f82349..b0c4a2e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,19 @@ source 'https://rubygems.org' +ruby '1.9.3' gem 'rails', '~> 3.2' gem 'arel' gem 'devise' gem 'geokit' -gem 'haml', '~> 3.2.0.alpha' +gem 'haml' gem 'http_accept_language' +gem 'newrelic_rpm' gem 'pg' gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git' -gem 'validates_formatting_of' gem 'sendgrid', '~> 1.0.1' -gem 'newrelic_rpm' +gem 'strong_parameters' +gem 'validates_formatting_of' platforms :ruby_18 do gem 'fastercsv' @@ -27,7 +29,8 @@ group :production do end group :test do - gem 'simplecov' + gem 'coveralls', :require => false + gem 'simplecov', :require => false gem 'sqlite3' gem 'webmock' end