fixing up before/after code in episode 260

igrabes · Apr 5, 2011 · de20fd9 · de20fd9
1 parent 922772d
commit de20fd9
Show file tree

Hide file tree

Showing 115 changed files with 4 additions and 9,279 deletions.
diff --git a/...ode-260/chatter-before/chatter/.gitignore → episode-260/chatter-after/.gitignore b/...ode-260/chatter-before/chatter/.gitignore → episode-260/chatter-after/.gitignore
diff --git a/episode-260/chatter-before/chatter/Gemfile → episode-260/chatter-after/Gemfile b/episode-260/chatter-before/chatter/Gemfile → episode-260/chatter-after/Gemfile
diff --git a/...e-260/chatter-before/chatter/Gemfile.lock → episode-260/chatter-after/Gemfile.lock b/...e-260/chatter-before/chatter/Gemfile.lock → episode-260/chatter-after/Gemfile.lock
diff --git a/episode-260/chatter-before/chatter/Rakefile → episode-260/chatter-after/Rakefile b/episode-260/chatter-before/chatter/Rakefile → episode-260/chatter-after/Rakefile
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/...er/app/controllers/messages_controller.rb → ...er/app/controllers/messages_controller.rb b/...er/app/controllers/messages_controller.rb → ...er/app/controllers/messages_controller.rb
diff --git a/...chatter/app/helpers/application_helper.rb → ...r-after/app/helpers/application_helper.rb b/...chatter/app/helpers/application_helper.rb → ...r-after/app/helpers/application_helper.rb
diff --git a/...tter/app/helpers/error_messages_helper.rb → ...fter/app/helpers/error_messages_helper.rb b/...tter/app/helpers/error_messages_helper.rb → ...fter/app/helpers/error_messages_helper.rb
diff --git a/...fore/chatter/app/helpers/layout_helper.rb → ...hatter-after/app/helpers/layout_helper.rb b/...fore/chatter/app/helpers/layout_helper.rb → ...hatter-after/app/helpers/layout_helper.rb
diff --git a/...re/chatter/app/helpers/messages_helper.rb → ...tter-after/app/helpers/messages_helper.rb b/...re/chatter/app/helpers/messages_helper.rb → ...tter-after/app/helpers/messages_helper.rb
diff --git a/...tter-before/chatter/app/models/message.rb → ...e-260/chatter-after/app/models/message.rb b/...tter-before/chatter/app/models/message.rb → ...e-260/chatter-after/app/models/message.rb
diff --git a/...er/app/views/layouts/application.html.erb → ...er/app/views/layouts/application.html.erb b/...er/app/views/layouts/application.html.erb → ...er/app/views/layouts/application.html.erb
diff --git a/...tter/app/views/messages/_message.html.erb → ...fter/app/views/messages/_message.html.erb b/...tter/app/views/messages/_message.html.erb → ...fter/app/views/messages/_message.html.erb
diff --git a/.../chatter/app/views/messages/create.js.erb → ...er-after/app/views/messages/create.js.erb b/.../chatter/app/views/messages/create.js.erb → ...er-after/app/views/messages/create.js.erb
diff --git a/...chatter/app/views/messages/index.html.erb → ...r-after/app/views/messages/index.html.erb b/...chatter/app/views/messages/index.html.erb → ...r-after/app/views/messages/index.html.erb
diff --git a/episode-260/chatter-before/chatter/config.ru → episode-260/chatter-after/config.ru b/episode-260/chatter-before/chatter/config.ru → episode-260/chatter-after/config.ru
diff --git a/episode-260/chatter/config/application.rb → ...e-260/chatter-after/config/application.rb b/episode-260/chatter/config/application.rb → ...e-260/chatter-after/config/application.rb
diff --git a/...260/chatter-before/chatter/config/boot.rb → episode-260/chatter-after/config/boot.rb b/...260/chatter-before/chatter/config/boot.rb → episode-260/chatter-after/config/boot.rb
diff --git a/...hatter-before/chatter/config/database.yml → ...ode-260/chatter-after/config/database.yml b/...hatter-before/chatter/config/database.yml → ...ode-260/chatter-after/config/database.yml
diff --git a/...tter-before/chatter/config/environment.rb → ...e-260/chatter-after/config/environment.rb b/...tter-before/chatter/config/environment.rb → ...e-260/chatter-after/config/environment.rb
diff --git a/...hatter/config/environments/development.rb → ...-after/config/environments/development.rb b/...hatter/config/environments/development.rb → ...-after/config/environments/development.rb
diff --git a/...chatter/config/environments/production.rb → ...r-after/config/environments/production.rb b/...chatter/config/environments/production.rb → ...r-after/config/environments/production.rb
diff --git a/...efore/chatter/config/environments/test.rb → ...chatter-after/config/environments/test.rb b/...efore/chatter/config/environments/test.rb → ...chatter-after/config/environments/test.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...chatter/config/initializers/faye_token.rb → ...r-after/config/initializers/faye_token.rb b/...chatter/config/initializers/faye_token.rb → ...r-after/config/initializers/faye_token.rb
diff --git a/...hatter/config/initializers/inflections.rb → ...-after/config/initializers/inflections.rb b/...hatter/config/initializers/inflections.rb → ...-after/config/initializers/inflections.rb
diff --git a/...chatter/config/initializers/mime_types.rb → ...r-after/config/initializers/mime_types.rb b/...chatter/config/initializers/mime_types.rb → ...r-after/config/initializers/mime_types.rb
diff --git a/...atter/config/initializers/secret_token.rb → ...after/config/initializers/secret_token.rb b/...atter/config/initializers/secret_token.rb → ...after/config/initializers/secret_token.rb
diff --git a/...tter/config/initializers/session_store.rb → ...fter/config/initializers/session_store.rb b/...tter/config/initializers/session_store.rb → ...fter/config/initializers/session_store.rb
diff --git a/...tter-before/chatter/config/locales/en.yml → ...e-260/chatter-after/config/locales/en.yml b/...tter-before/chatter/config/locales/en.yml → ...e-260/chatter-after/config/locales/en.yml
diff --git a/...0/chatter-before/chatter/config/routes.rb → episode-260/chatter-after/config/routes.rb b/...0/chatter-before/chatter/config/routes.rb → episode-260/chatter-after/config/routes.rb
diff --git a/...migrate/20110403022903_create_messages.rb → ...migrate/20110403022903_create_messages.rb b/...migrate/20110403022903_create_messages.rb → ...migrate/20110403022903_create_messages.rb
diff --git a/...e-260/chatter-before/chatter/db/schema.rb → episode-260/chatter-after/db/schema.rb b/...e-260/chatter-before/chatter/db/schema.rb → episode-260/chatter-after/db/schema.rb
diff --git a/...de-260/chatter-before/chatter/db/seeds.rb → episode-260/chatter-after/db/seeds.rb b/...de-260/chatter-before/chatter/db/seeds.rb → episode-260/chatter-after/db/seeds.rb
diff --git a/...chatter-before/chatter/doc/README_FOR_APP → episode-260/chatter-after/doc/README_FOR_APP b/...chatter-before/chatter/doc/README_FOR_APP → episode-260/chatter-after/doc/README_FOR_APP
diff --git a/episode-260/chatter/faye.ru → episode-260/chatter-after/faye.ru b/episode-260/chatter/faye.ru → episode-260/chatter-after/faye.ru
diff --git a/...chatter-before/chatter/lib/tasks/.gitkeep → episode-260/chatter-after/lib/tasks/.gitkeep b/...chatter-before/chatter/lib/tasks/.gitkeep → episode-260/chatter-after/lib/tasks/.gitkeep
diff --git a/...60/chatter-before/chatter/public/404.html → episode-260/chatter-after/public/404.html b/...60/chatter-before/chatter/public/404.html → episode-260/chatter-after/public/404.html
diff --git a/...60/chatter-before/chatter/public/422.html → episode-260/chatter-after/public/422.html b/...60/chatter-before/chatter/public/422.html → episode-260/chatter-after/public/422.html
diff --git a/...60/chatter-before/chatter/public/500.html → episode-260/chatter-after/public/500.html b/...60/chatter-before/chatter/public/500.html → episode-260/chatter-after/public/500.html
diff --git a/...chatter-before/chatter/public/favicon.ico → episode-260/chatter-after/public/favicon.ico b/...chatter-before/chatter/public/favicon.ico → episode-260/chatter-after/public/favicon.ico
diff --git a/...er-before/chatter/public/images/rails.png → ...260/chatter-after/public/images/rails.png b/...er-before/chatter/public/images/rails.png → ...260/chatter-after/public/images/rails.png
diff --git a/...chatter/public/javascripts/application.js → ...r-after/public/javascripts/application.js b/...chatter/public/javascripts/application.js → ...r-after/public/javascripts/application.js
diff --git a/...fore/chatter/public/javascripts/jquery.js → ...hatter-after/public/javascripts/jquery.js b/...fore/chatter/public/javascripts/jquery.js → ...hatter-after/public/javascripts/jquery.js
diff --git a/.../chatter/public/javascripts/jquery.min.js → ...er-after/public/javascripts/jquery.min.js b/.../chatter/public/javascripts/jquery.min.js → ...er-after/public/javascripts/jquery.min.js
diff --git a/...efore/chatter/public/javascripts/rails.js → ...chatter-after/public/javascripts/rails.js b/...efore/chatter/public/javascripts/rails.js → ...chatter-after/public/javascripts/rails.js
diff --git a/.../chatter-before/chatter/public/robots.txt → episode-260/chatter-after/public/robots.txt b/.../chatter-before/chatter/public/robots.txt → episode-260/chatter-after/public/robots.txt
diff --git a/...efore/chatter/public/stylesheets/.gitkeep → ...chatter-after/public/stylesheets/.gitkeep b/...efore/chatter/public/stylesheets/.gitkeep → ...chatter-after/public/stylesheets/.gitkeep
diff --git a/...hatter/public/stylesheets/application.css → ...-after/public/stylesheets/application.css b/...hatter/public/stylesheets/application.css → ...-after/public/stylesheets/application.css
diff --git a/...e-260/chatter-before/chatter/script/rails → episode-260/chatter-after/script/rails b/...e-260/chatter-before/chatter/script/rails → episode-260/chatter-after/script/rails
diff --git a/...-before/chatter/test/fixtures/message.yml → ...0/chatter-after/test/fixtures/message.yml b/...-before/chatter/test/fixtures/message.yml → ...0/chatter-after/test/fixtures/message.yml
diff --git a/...st/functional/messages_controller_test.rb → ...st/functional/messages_controller_test.rb b/...st/functional/messages_controller_test.rb → ...st/functional/messages_controller_test.rb
diff --git a/...chatter/test/performance/browsing_test.rb → ...r-after/test/performance/browsing_test.rb b/...chatter/test/performance/browsing_test.rb → ...r-after/test/performance/browsing_test.rb
diff --git a/...hatter-before/chatter/test/test_helper.rb → ...ode-260/chatter-after/test/test_helper.rb b/...hatter-before/chatter/test/test_helper.rb → ...ode-260/chatter-after/test/test_helper.rb
diff --git a/...before/chatter/test/unit/messages_test.rb → .../chatter-after/test/unit/messages_test.rb b/...before/chatter/test/unit/messages_test.rb → .../chatter-after/test/unit/messages_test.rb
diff --git a/...er-before/chatter/vendor/plugins/.gitkeep → ...260/chatter-after/vendor/plugins/.gitkeep b/...er-before/chatter/vendor/plugins/.gitkeep → ...260/chatter-after/vendor/plugins/.gitkeep
diff --git a/episode-260/chatter-before/Gemfile b/episode-260/chatter-before/Gemfile
@@ -2,6 +2,5 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.5'
 gem 'sqlite3'
-gem 'jquery-rails'
 gem 'nifty-generators'
-gem "mocha", :group => :test
+gem 'jquery-rails'
diff --git a/episode-260/chatter-before/Gemfile.lock b/episode-260/chatter-before/Gemfile.lock
@@ -42,7 +42,6 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.12)
     nifty-generators (0.4.6)
     polyglot (0.3.1)
     rack (1.2.2)
@@ -75,7 +74,6 @@ PLATFORMS
 
 DEPENDENCIES
   jquery-rails
-  mocha
   nifty-generators
   rails (= 3.0.5)
   sqlite3
diff --git a/episode-260/chatter-before/chatter/README → episode-260/chatter-before/README b/episode-260/chatter-before/chatter/README → episode-260/chatter-before/README
diff --git a/episode-260/chatter-before/app/controllers/messages_controller.rb b/episode-260/chatter-before/app/controllers/messages_controller.rb
@@ -4,11 +4,6 @@ def index
   end
 
   def create
-    @message = Message.new(params[:message])
-    if @message.save
-      redirect_to messages_url
-    else
-      render :action => 'new'
-    end
+    @message = Message.create!(params[:message])
   end
 end
diff --git a/...tter/app/views/messages/_message.html.erb → ...fore/app/views/messages/_message.html.erb b/...tter/app/views/messages/_message.html.erb → ...fore/app/views/messages/_message.html.erb
diff --git a/.../chatter/app/views/messages/create.js.erb → ...r-before/app/views/messages/create.js.erb b/.../chatter/app/views/messages/create.js.erb → ...r-before/app/views/messages/create.js.erb
diff --git a/episode-260/chatter-before/app/views/messages/index.html.erb b/episode-260/chatter-before/app/views/messages/index.html.erb
@@ -1,15 +1,10 @@
 <% title "Chat" %>
 
 <ul id="chat">
-<% for message in @messages %>
-  <li>
-    <span class="created_at"><%= message.created_at.strftime("%H:%M") %></span>
-    <%= message.content %>
-  </li>
-<% end %>
+  <%= render @messages %>
 </ul>
 
-<%= form_for Message.new do |f| %>
+<%= form_for Message.new, :remote => true do |f| %>
   <%= f.text_field :content %>
   <%= f.submit "Send" %>
 <% end %>
diff --git a/episode-260/chatter-before/chatter/app/helpers/application_helper.rb b/episode-260/chatter-before/chatter/app/helpers/application_helper.rb
diff --git a/episode-260/chatter-before/chatter/app/views/layouts/application.html.erb b/episode-260/chatter-before/chatter/app/views/layouts/application.html.erb
diff --git a/episode-260/chatter-before/chatter/config/application.rb b/episode-260/chatter-before/chatter/config/application.rb
diff --git a/episode-260/chatter-before/chatter/public/javascripts/application.js b/episode-260/chatter-before/chatter/public/javascripts/application.js
diff --git a/episode-260/chatter/.gitignore b/episode-260/chatter/.gitignore
diff --git a/episode-260/chatter/Gemfile b/episode-260/chatter/Gemfile
diff --git a/episode-260/chatter/Gemfile.lock b/episode-260/chatter/Gemfile.lock
diff --git a/episode-260/chatter/Rakefile b/episode-260/chatter/Rakefile
diff --git a/episode-260/chatter/app/controllers/application_controller.rb b/episode-260/chatter/app/controllers/application_controller.rb
diff --git a/episode-260/chatter/app/controllers/messages_controller.rb b/episode-260/chatter/app/controllers/messages_controller.rb
diff --git a/episode-260/chatter/app/helpers/error_messages_helper.rb b/episode-260/chatter/app/helpers/error_messages_helper.rb
diff --git a/episode-260/chatter/app/helpers/layout_helper.rb b/episode-260/chatter/app/helpers/layout_helper.rb
diff --git a/episode-260/chatter/app/helpers/messages_helper.rb b/episode-260/chatter/app/helpers/messages_helper.rb
diff --git a/episode-260/chatter/app/models/message.rb b/episode-260/chatter/app/models/message.rb
diff --git a/episode-260/chatter/app/views/messages/index.html.erb b/episode-260/chatter/app/views/messages/index.html.erb
diff --git a/episode-260/chatter/config.ru b/episode-260/chatter/config.ru
diff --git a/episode-260/chatter/config/boot.rb b/episode-260/chatter/config/boot.rb
diff --git a/episode-260/chatter/config/database.yml b/episode-260/chatter/config/database.yml
diff --git a/episode-260/chatter/config/environment.rb b/episode-260/chatter/config/environment.rb
diff --git a/episode-260/chatter/config/environments/development.rb b/episode-260/chatter/config/environments/development.rb