Permalink
Browse files

update 3.2. sample app

  • Loading branch information...
1 parent a33aa00 commit 253f662003a53d443a721e6ee662ee37579b23cd @jasnow committed Jan 21, 2012
Showing with 95 additions and 88 deletions.
  1. +10 −4 Gemfile
  2. +81 −80 Gemfile.lock
  3. +1 −1 spec/spec_helper.rb
  4. +3 −3 vendor/bundle/ruby/1.9.1/bin/rails
View
14 Gemfile
@@ -1,6 +1,10 @@
source 'http://rubygems.org'
-gem 'rails'
+gem 'rake', '~> 0.9.0'
+
+gem 'rails', '~> 3.2.rc'
+
+gem 'rack'
gem 'gravatar_image_tag'
@@ -13,9 +17,10 @@ gem 'uglifier'
gem 'jquery-rails'
+gem 'nokogiri', '1.5.0'
+
group :development, :test do
- gem 'sqlite3'
- gem 'sqlite3-ruby'
+ gem 'sqlite3-ruby', :require => 'sqlite3'
end
group :development do
@@ -27,7 +32,8 @@ end
group :test do
gem 'rspec-rails'
gem 'webrat'
- gem 'spork'
+ gem 'spork', '~> 0.9.0.rc'
+ gem 'factory_girl', "~> 2.0.5"
gem 'factory_girl_rails'
# Pretty printed test output
View
@@ -1,152 +1,153 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
- mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionmailer (3.2.0)
+ actionpack (= 3.2.0)
+ mail (~> 2.4.0)
+ actionpack (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.0)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.1)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
annotate (2.4.0)
- ansi (1.3.0)
- arel (2.2.1)
- bcrypt-ruby (3.0.0)
+ ansi (1.4.1)
+ arel (3.0.0)
builder (3.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
+ coffee-script-source (1.2.0)
diff-lcs (1.1.3)
erubis (2.7.0)
- execjs (1.2.4)
+ execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.0.5)
factory_girl_rails (1.1.0)
factory_girl (~> 2.0.0)
railties (>= 3.0.0)
- faker (0.9.5)
+ faker (1.0.1)
i18n (~> 0.4)
gravatar_image_tag (1.0.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.13)
- railties (~> 3.0)
+ journey (1.0.0)
+ jquery-rails (2.0.0)
+ railties (< 5.0, >= 3.2.0.beta)
thor (~> 0.14)
- mail (2.3.0)
+ json (1.6.5)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
nokogiri (1.5.0)
- polyglot (0.3.2)
- rack (1.3.2)
- rack-cache (1.0.3)
+ polyglot (0.3.3)
+ rack (1.4.0)
+ rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.2.0)
+ actionmailer (= 3.2.0)
+ actionpack (= 3.2.0)
+ activerecord (= 3.2.0)
+ activeresource (= 3.2.0)
+ activesupport (= 3.2.0)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.2.0)
+ railties (3.2.0)
+ actionpack (= 3.2.0)
+ activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.9.4)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- rspec-rails (2.6.1)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.6.0)
- sass (3.1.7)
- sass-rails (3.1.0)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (>= 3.1.4)
- spork (0.8.5)
- sprockets (2.0.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
+ sass (3.1.12)
+ sass-rails (3.2.3)
+ railties (~> 3.2.0.beta)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ spork (0.9.0.rc9)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ tilt (!= 1.3.0, ~> 1.1)
+ sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
- tzinfo (0.3.29)
- uglifier (1.0.2)
+ turn (0.8.3)
+ ansi
+ tzinfo (0.3.31)
+ uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
webrat (0.7.3)
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
- will_paginate (3.0.0)
+ will_paginate (3.0.2)
PLATFORMS
ruby
DEPENDENCIES
annotate
coffee-script
+ factory_girl (~> 2.0.5)
factory_girl_rails
faker
gravatar_image_tag
jquery-rails
- rails
+ nokogiri (= 1.5.0)
+ rack
+ rails (~> 3.2.rc)
+ rake (~> 0.9.0)
rspec-rails
sass-rails
- spork
- sqlite3
+ spork (~> 0.9.0.rc)
sqlite3-ruby
turn
uglifier
View
@@ -12,7 +12,7 @@
# in ./support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
- Rspec.configure do |config|
+ RSpec.configure do |config|
# == Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -2,7 +2,7 @@
#
# This file was generated by RubyGems.
#
-# The application 'rails' is installed as part of a gem, and
+# The application 'railties' is installed as part of a gem, and
# this file is here to facilitate running it.
#
@@ -15,5 +15,5 @@ if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
ARGV.shift
end
-gem 'rails', version
-load Gem.bin_path('rails', 'rails', version)
+gem 'railties', version
+load Gem.bin_path('railties', 'rails', version)

0 comments on commit 253f662

Please sign in to comment.