Permalink
Browse files

Reset project

  • Loading branch information...
1 parent 81d5a40 commit ba7945cb5dc8efb5500265aa3db38b140bcd0fbd @bitboxer bitboxer committed Jun 12, 2011
Showing with 304 additions and 1,838 deletions.
  1. +4 −3 .gitignore
  2. +0 −1 .rspec
  3. +0 −18 .watchr
  4. +16 −16 Gemfile
  5. +99 −104 Gemfile.lock
  6. +12 −7 README
  7. +3 −2 Rakefile
  8. +9 −0 app/assets/javascripts/application.js
  9. +7 −0 app/assets/stylesheets/application.css
  10. +0 −1 app/coffeescripts/application.coffee
  11. +0 −83 app/controllers/organizations_controller.rb
  12. +0 −26 app/controllers/pages_controller.rb
  13. +0 −7 app/controllers/welcome_controller.rb
  14. +0 −23 app/helpers/error_messages_helper.rb
  15. +0 −22 app/helpers/layout_helper.rb
  16. +0 −2 app/helpers/organizations_helper.rb
  17. 0 {public/stylesheets → app/mailers}/.gitkeep
  18. 0 app/models/.gitkeep
  19. +0 −2 app/models/event.rb
  20. +0 −2 app/models/organization.rb
  21. +0 −9 app/models/user.rb
  22. +0 −96 app/sass/application.scss
  23. +11 −24 app/views/layouts/application.html.erb
  24. +0 −25 app/views/organizations/_form.html.erb
  25. +0 −6 app/views/organizations/edit.html.erb
  26. +0 −25 app/views/organizations/index.html.erb
  27. +0 −5 app/views/organizations/new.html.erb
  28. +0 −15 app/views/organizations/show.html.erb
  29. +0 −19 app/views/pages/_impressum.html.erb
  30. +0 −1 app/views/pages/missing.html.erb
  31. +0 −1 app/views/pages/show.html.erb
  32. +0 −12 app/views/users/confirmations/new.html.erb
  33. +0 −7 app/views/users/mailer/confirmation_instructions.html.erb
  34. +0 −5 app/views/users/mailer/reset_password_instructions.html.erb
  35. +0 −7 app/views/users/mailer/unlock_instructions.html.erb
  36. +0 −16 app/views/users/passwords/edit.html.erb
  37. +0 −12 app/views/users/passwords/new.html.erb
  38. +0 −25 app/views/users/registrations/edit.html.erb
  39. +0 −18 app/views/users/registrations/new.html.erb
  40. +0 −17 app/views/users/sessions/new.html.erb
  41. +0 −19 app/views/users/shared/_links.erb
  42. +0 −12 app/views/users/unlocks/new.html.erb
  43. +0 −12 app/views/welcome/index.html.erb
  44. +4 −4 config/application.rb
  45. +0 −22 config/database.yml_example
  46. +4 −3 config/deploy.rb
  47. +3 −4 config/environments/development.rb
  48. +17 −14 config/environments/production.rb
  49. +6 −2 config/environments/test.rb
  50. +0 −49 config/initializers/barista_config.rb
  51. +0 −142 config/initializers/devise.rb
  52. +0 −3 config/initializers/sass.rb
  53. +1 −1 config/initializers/secret_token.rb
  54. +1 −1 config/initializers/session_store.rb
  55. +12 −0 config/initializers/wrap_parameters.rb
  56. +0 −162 config/locales/de.yml
  57. +0 −42 config/locales/devise.de.yml
  58. +0 −39 config/locales/devise.en.yml
  59. +1 −1 config/locales/en.yml
  60. +1 −8 config/routes.rb
  61. +64 −0 config/watchr.rb
  62. +0 −14 db/migrate/20110327133310_create_organizations.rb
  63. +0 −26 db/migrate/20110327194043_devise_create_users.rb
  64. +0 −17 db/migrate/20110402055920_create_events.rb
  65. +0 −9 db/migrate/20110425200634_remove_passwort_salt_from_users.rb
  66. +1 −36 db/schema.rb
  67. +2 −2 db/seeds.rb
  68. +1 −1 lib/tasks/watchr.rake
  69. 0 log/.gitkeep
  70. BIN public/images/rails.png
  71. +0 −16 public/javascripts/jquery.js
  72. +0 −159 public/javascripts/rails.js
  73. +0 −125 spec/controllers/organizations_controller_spec.rb
  74. +0 −14 spec/helpers/organizations_helper_spec.rb
  75. +0 −21 spec/models/organization_spec.rb
  76. +0 −12 spec/models/user_spec.rb
  77. +0 −11 spec/requests/organizations_spec.rb
  78. +0 −35 spec/routing/organizations_routing_spec.rb
  79. +0 −12 spec/routing/welcome_routing_spec.rb
  80. +0 −42 spec/spec_helper.rb
  81. +0 −20 spec/views/organizations/edit.html.erb_spec.rb
  82. +0 −24 spec/views/organizations/index.html.erb_spec.rb
  83. +0 −20 spec/views/organizations/new.html.erb_spec.rb
  84. +0 −18 spec/views/organizations/show.html.erb_spec.rb
  85. 0 test/fixtures/.gitkeep
  86. 0 test/functional/.gitkeep
  87. 0 test/integration/.gitkeep
  88. +12 −0 test/performance/browsing_test.rb
  89. +13 −0 test/test_helper.rb
  90. 0 test/unit/.gitkeep
  91. 0 vendor/assets/stylesheets/.gitkeep
View
@@ -1,7 +1,8 @@
.bundle
-config/database.yml
db/*.sqlite3
log/*.log
tmp/
-public/javascripts/*.js
-public/stylesheets/*.css
+.sass-cache/
+config/database.yml
+.rvmrc
+public/assets
View
@@ -1 +0,0 @@
---colour --drb
View
@@ -1,18 +0,0 @@
-def run_spec(file)
- unless File.exist?(file)
- puts "#{file} does not exist"
- return
- end
-
- puts "Running #{file}"
- system "bundle exec rspec #{file}"
- puts
-end
-
-watch("spec/(.*/.*)/*_spec\.rb") do |match|
- run_spec match[0]
-end
-
-watch("app/(.*/.*)\.rb") do |match|
- run_spec %{spec/#{match[1]}_spec.rb}
-end
View
@@ -1,36 +1,36 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.7'
+gem 'rails', '3.1.0.rc4'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
-# Basic stuff everyone needs
-gem 'jquery-rails', '>= 0.2.6'
gem 'sqlite3'
gem 'mysql2'
-gem 'devise', "~> 1.2.1"
+# Asset template engines
+gem 'sass-rails', "~> 3.1.0.rc"
+gem 'coffee-script'
+gem 'uglifier'
+
+gem 'jquery-rails'
# Deployment
gem 'vlad'
gem 'vlad-git'
-# Monitoring
+# # Monitoring
gem 'newrelic_rpm'
# Date Handling
gem 'ice_cube', "~> 0.6.7"
gem 'ri_cal', "~> 0.8.7"
-# Coffeescript
-gem "barista"
-
-# Sass Stylesheets
-gem "sass"
-
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
gem 'watchr'
-gem 'spork', '~> 0.9.0.rc'
-group :development, :test do
- gem 'rspec-rails'
- gem "nifty-generators"
- gem 'itslog'
+group :test do
+ # Pretty printed test output
+ gem 'turn', :require => false
end
View
@@ -1,137 +1,132 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.7)
- actionpack (= 3.0.7)
- mail (~> 2.2.15)
- actionpack (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.7)
- activesupport (= 3.0.7)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- activesupport (3.0.7)
- arel (2.0.9)
- barista (1.0.0)
- coffee-script (~> 2.1.1)
+ actionmailer (3.1.0.rc4)
+ actionpack (= 3.1.0.rc4)
+ mail (~> 2.3.0)
+ actionpack (3.1.0.rc4)
+ activemodel (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.0)
+ rack-cache (~> 1.0.1)
+ rack-mount (~> 0.8.1)
+ rack-test (~> 0.6.0)
+ sprockets (~> 2.0.0.beta.10)
+ tzinfo (~> 0.3.27)
+ activemodel (3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ bcrypt-ruby (~> 2.1.4)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.0.rc4)
+ activemodel (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ arel (~> 2.1.1)
+ tzinfo (~> 0.3.27)
+ activeresource (3.1.0.rc4)
+ activemodel (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ activesupport (3.1.0.rc4)
+ multi_json (~> 1.0)
+ ansi (1.2.5)
+ arel (2.1.1)
bcrypt-ruby (2.1.4)
- builder (2.1.2)
- coffee-script (2.1.3)
+ builder (3.0.0)
+ coffee-script (2.2.0)
coffee-script-source
- coffee-script-source (1.0.1)
- devise (1.2.1)
- bcrypt-ruby (~> 2.1.2)
- orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
- diff-lcs (1.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.5.0)
- ice_cube (0.6.7)
- itslog (0.1.0)
- jquery-rails (0.2.7)
- rails (~> 3.0)
- thor (~> 0.14.4)
- mail (2.2.17)
- activesupport (>= 2.3.6)
+ execjs
+ coffee-script-source (1.1.1)
+ erubis (2.7.0)
+ execjs (1.1.2)
+ multi_json (~> 1.0)
+ hike (1.0.0)
+ i18n (0.6.0)
+ ice_cube (0.6.8)
+ jquery-rails (1.0.9)
+ railties (~> 3.0)
+ thor (~> 0.14)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mysql2 (0.2.7)
- newrelic_rpm (2.14.1)
- nifty-generators (0.4.6)
- open4 (0.9.6)
- orm_adapter (0.0.4)
+ multi_json (1.0.3)
+ mysql2 (0.3.2)
+ newrelic_rpm (3.0.1)
+ open4 (1.0.1)
polyglot (0.3.1)
- rack (1.2.2)
- rack-mount (0.6.14)
+ rack (1.3.0)
+ rack-cache (1.0.2)
+ rack (>= 0.4)
+ rack-mount (0.8.1)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.0)
rack (>= 1.0)
- rails (3.0.7)
- actionmailer (= 3.0.7)
- actionpack (= 3.0.7)
- activerecord (= 3.0.7)
- activeresource (= 3.0.7)
- activesupport (= 3.0.7)
+ rails (3.1.0.rc4)
+ actionmailer (= 3.1.0.rc4)
+ actionpack (= 3.1.0.rc4)
+ activerecord (= 3.1.0.rc4)
+ activeresource (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
bundler (~> 1.0)
- railties (= 3.0.7)
- railties (3.0.7)
- actionpack (= 3.0.7)
- activesupport (= 3.0.7)
+ railties (= 3.1.0.rc4)
+ railties (3.1.0.rc4)
+ actionpack (= 3.1.0.rc4)
+ activesupport (= 3.1.0.rc4)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- rake-remote_task (2.0.3)
- open4 (~> 0.9.0)
- rake (~> 0.8.0)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2)
+ rdoc (3.6.1)
ri_cal (0.8.8)
- 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)
- sass (3.1.0)
- spork (0.9.0.rc4)
+ sass (3.1.2)
+ sass-rails (3.1.0.rc.2)
+ actionpack (~> 3.1.0.rc1)
+ railties (~> 3.1.0.rc1)
+ sass (>= 3.1.2)
+ sprockets (>= 2.0.0.beta.9)
+ sprockets (2.0.0.beta.10)
+ hike (~> 1.0)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.3)
thor (0.14.6)
+ tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.26)
- vlad (2.2.0)
- open4 (~> 0.9.0)
- rake (~> 0.8.0)
- rake-remote_task (~> 2.0)
- vlad-git (2.2.0)
- vlad (>= 2.1.0)
- warden (1.0.3)
- rack (>= 1.0.0)
+ turn (0.8.2)
+ ansi (>= 1.2.2)
+ tzinfo (0.3.27)
+ uglifier (0.5.4)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
+ vlad (1.4.0)
+ open4
+ rake (>= 0.8.1)
+ vlad-git (2.1.0)
watchr (0.7)
PLATFORMS
ruby
DEPENDENCIES
- barista
- devise (~> 1.2.1)
+ coffee-script
ice_cube (~> 0.6.7)
- itslog
- jquery-rails (>= 0.2.6)
+ jquery-rails
mysql2
newrelic_rpm
- nifty-generators
- rails (= 3.0.7)
+ rails (= 3.1.0.rc4)
ri_cal (~> 0.8.7)
- rspec-rails
- sass
- spork (~> 0.9.0.rc)
+ sass-rails (~> 3.1.0.rc)
sqlite3
+ turn
+ uglifier
vlad
vlad-git
watchr
View
@@ -91,7 +91,7 @@ mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
class WeblogController < ActionController::Base
def index
- @posts = Post.find(:all)
+ @posts = Post.all
debugger
end
end
@@ -139,7 +139,7 @@ To reload your controllers and models after launching the console run
<tt>reload!</tt>
More information about irb can be found at:
-link:http://www.rubycentral.com/pickaxe/irb.html
+link:http://www.rubycentral.org/pickaxe/irb.html
== dbconsole
@@ -156,6 +156,10 @@ PostgreSQL and SQLite 3.
The default directory structure of a generated Ruby on Rails application:
|-- app
+ | |-- assets
+ | |-- images
+ | |-- javascripts
+ | `-- stylesheets
| |-- controllers
| |-- helpers
| |-- mailers
@@ -172,9 +176,6 @@ The default directory structure of a generated Ruby on Rails application:
| `-- tasks
|-- log
|-- public
- | |-- images
- | |-- javascripts
- | `-- stylesheets
|-- script
|-- test
| |-- fixtures
@@ -188,11 +189,16 @@ The default directory structure of a generated Ruby on Rails application:
| |-- sessions
| `-- sockets
`-- vendor
+ |-- assets
+ `-- stylesheets
`-- plugins
app
Holds all the code that's specific to this particular application.
+app/assets
+ Contains subdirectories for images, stylesheets, and JavaScript files.
+
app/controllers
Holds controllers that should be named like weblogs_controller.rb for
automated URL mapping. All controllers should descend from
@@ -237,8 +243,7 @@ lib
the load path.
public
- The directory available for the web server. Contains subdirectories for
- images, stylesheets, and javascripts. Also contains the dispatchers and the
+ The directory available for the web server. Also contains the dispatchers and the
default HTML files. This should be set as the DOCUMENT_ROOT of your web
server.
Oops, something went wrong.

0 comments on commit ba7945c

Please sign in to comment.