Permalink
Browse files

Meet rails 3.2

  • Loading branch information...
1 parent 6804c17 commit f0ee2ce38aa4c626af816cb15e32c47a7518c643 @pyromaniac pyromaniac committed Apr 8, 2012
View
2 .rvmrc
@@ -1 +1 @@
-rvm gemset use puffer_demo
+rvm use 1.9.2@puffer_demo --create
View
10 Gemfile
@@ -1,22 +1,20 @@
source 'http://rubygems.org'
gem 'rails'
+gem 'heroku'
-gem 'mongrel'
+gem 'mongrel', '>= 1.2.0.pre2'
gem 'pg'
-gem 'heroku'
-gem 'authlogic'
+gem 'devise'
gem 'paperclip'
-gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
-gem 'nested_set', :git => 'git://github.com/skyeagle/nested_set.git'
+gem 'nested_set'
gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
gem 'puffer_pages', :git => 'git://github.com/puffer/puffer_pages.git'
group :test, :development do
gem 'fabrication'
gem 'forgery'
- gem 'autotest'
gem 'rspec-rails'
end
View
@@ -1,162 +1,170 @@
GIT
- remote: git://github.com/puffer/liquid.git
- revision: 18ddffc9c4be25dadf9ec55dc5664a454ae3d072
- specs:
- liquid (2.2.2)
-
-GIT
remote: git://github.com/puffer/puffer.git
- revision: 0ed832ee126444ed98aee494a9cfb5db7a181559
+ revision: 0c1e000fa81060530170d269dd01848564d848ff
specs:
- puffer (0.0.19)
- cells (~> 3.4.4)
- rails (~> 3.0.4)
- will_paginate (~> 3.0.pre2)
+ puffer (0.1.1)
+ kaminari
+ orm_adapter
+ rails (>= 3.1)
GIT
remote: git://github.com/puffer/puffer_pages.git
- revision: 63323b3c1185e882e4e2f86ef3006d157812ff45
+ revision: e57cd487c98b7cd02450b3aaed4b4733b3052d38
specs:
- puffer_pages (0.0.14)
+ puffer_pages (0.1.1)
liquid
nested_set
- puffer (>= 0.0.17)
- rails
-
-GIT
- remote: git://github.com/skyeagle/nested_set.git
- revision: a91e3381a1637eaec0de0e2f06d3c780cea86882
- specs:
- nested_set (1.6.4)
- activerecord (>= 3.0.0)
- railties (>= 3.0.0)
+ puffer
+ rails (>= 3.1)
GEM
remote: http://rubygems.org/
specs:
- ZenTest (4.5.0)
- abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
- mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
- arel (2.0.9)
- authlogic (2.1.6)
- activesupport
- autotest (4.4.6)
- ZenTest (>= 4.4.1)
- builder (2.1.2)
- cells (3.4.4)
- cgi_multipart_eof_fix (2.5.0)
- configuration (1.2.0)
- daemons (1.1.0)
- diff-lcs (1.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- fabrication (0.9.5)
- fastthread (1.0.7)
- forgery (0.3.7)
- nokogiri (~> 1.4)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ 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)
+ multi_json (~> 1.0)
+ addressable (2.2.7)
+ arel (3.0.2)
+ bcrypt-ruby (3.0.1)
+ builder (3.0.0)
+ cocaine (0.2.1)
+ daemons (1.0.10)
+ devise (2.0.4)
+ bcrypt-ruby (~> 3.0)
+ orm_adapter (~> 0.0.3)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
+ diff-lcs (1.1.3)
+ erubis (2.7.0)
+ fabrication (1.3.2)
+ forgery (0.5.0)
gem_plugin (0.2.3)
- heroku (1.19.1)
- activesupport (>= 2.1.0)
- launchy (~> 0.3.2)
- rest-client (< 1.7.0, >= 1.4.0)
- i18n (0.5.0)
- launchy (0.3.7)
- configuration (>= 0.0.5)
- rake (>= 0.8.1)
- mail (2.2.15)
- activesupport (>= 2.3.6)
+ heroku (2.24.0)
+ launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
+ rest-client (~> 1.6.1)
+ rubyzip
+ hike (1.2.1)
+ i18n (0.6.0)
+ journey (1.0.3)
+ json (1.6.6)
+ kaminari (0.13.0)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ railties (>= 3.0.0)
+ launchy (2.1.0)
+ addressable (~> 2.2.6)
+ liquid (2.3.0)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- mongrel (1.1.5)
- cgi_multipart_eof_fix (>= 2.4)
- daemons (>= 1.0.3)
- fastthread (>= 1.0.1)
- gem_plugin (>= 0.2.3)
- nokogiri (1.4.4)
- paperclip (2.3.8)
- activerecord
- activesupport
- pg (0.10.1)
- polyglot (0.3.1)
- rack (1.2.2)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
+ mime-types (1.18)
+ mongrel (1.2.0.pre2)
+ daemons (~> 1.0.10)
+ gem_plugin (~> 0.2.3)
+ multi_json (1.2.0)
+ nested_set (1.7.0)
+ activerecord (>= 3.0.0)
+ railties (>= 3.0.0)
+ netrc (0.7.1)
+ orm_adapter (0.0.7)
+ paperclip (3.0.1)
+ activemodel (>= 3.0.0)
+ activerecord (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ cocaine (>= 0.0.2)
+ mime-types
+ pg (0.13.2)
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- rest-client (1.6.1)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rest-client (1.6.7)
mime-types (>= 1.16)
- rspec (2.5.0)
- rspec-core (~> 2.5.0)
- rspec-expectations (~> 2.5.0)
- rspec-mocks (~> 2.5.0)
- rspec-core (2.5.1)
- rspec-expectations (2.5.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.5.0)
- rspec-rails (2.5.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.5.0)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.1)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
+ rspec-rails (2.9.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.9.0)
+ rubyzip (0.9.7)
+ sprockets (2.1.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
- treetop (1.4.9)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.25)
- will_paginate (3.0.pre2)
+ tzinfo (0.3.32)
+ warden (1.1.1)
+ rack (>= 1.0)
PLATFORMS
ruby
DEPENDENCIES
- authlogic
- autotest
+ devise
fabrication
forgery
heroku
- liquid!
- mongrel
- nested_set!
+ mongrel (>= 1.2.0.pre2)
+ nested_set
paperclip
pg
puffer!
@@ -1,3 +0,0 @@
-class Admin::LayoutsController < PufferPages::LayoutsController
-
-end
@@ -1,3 +0,0 @@
-class Admin::PagesController < PufferPages::PagesController
-
-end
@@ -1,3 +0,0 @@
-class Admin::SnippetsController < PufferPages::SnippetsController
-
-end
@@ -1,24 +0,0 @@
-class Admin::UsersController < Puffer::Base
-
- setup do
- group :users
- end
-
- index do
- field :email
- field :login_count
- field :failed_login_count
- field :last_request_at
- field :current_login_at
- field :last_login_at
- field :current_login_ip
- field :last_login_ip
- end
-
- form do
- field :email
- field :password
- field :password_confirmation
- end
-
-end
@@ -1,3 +0,0 @@
-class Puffer::DashboardController < Puffer::DashboardBase
-
-end
Oops, something went wrong.

0 comments on commit f0ee2ce

Please sign in to comment.