<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>config/locales/pt-BR.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,243 +1,69 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create 
-database-backed web applications according to the Model-View-Control pattern. 
-
-This pattern splits the view (also called the presentation) into &quot;dumb&quot; templates
-that are primarily responsible for inserting pre-built data in between HTML tags.
-The model contains the &quot;smart&quot; domain objects (such as Account, Product, Person,
-Post) that holds all the business logic and knows how to persist themselves to
-a database. The controller handles the incoming requests (such as Save New Account,
-Update Product, Show Post) by manipulating the model and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails.  You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
+== Aplicativo de Demonstra&#231;&#227;o (vers&#227;o FISL 10)
 
+O objetivo deste aplicativo &#233; apenas demonstrar algumas caracter&#237;sticas
+do Ruby on Rails al&#233;m do B&#225;sico. O escopo percorre os seguintes assuntos:
 
-== Getting Started
+# Blog em 15 minutos com Cucumber e Rspec
+# Divis&#227;o em namespace de Administra&#231;&#227;o
+# Callbacks de Active Record com RedCloth
+# Pagina&#231;&#227;o simples com will_paginate
+# Upload de imagens com Paperclip
+# Sistema de autentica&#231;&#227;o com Authlogic
+# Page Caching e Sweepers
+# Deploy com Capistrano
+# In&#237;cio de Ajax n&#227;o-obstrusivo com jQuery
+# Dicas de p&#243;s-deploy com Apache e Passenger
 
-1. At the command prompt, start a new Rails application using the &lt;tt&gt;rails&lt;/tt&gt; command
-   and your application name. Ex: rails myapp
-2. Change directory into myapp and start the web server: &lt;tt&gt;script/server&lt;/tt&gt; (run with --help for options)
-3. Go to http://localhost:3000/ and get &quot;Welcome aboard: You're riding the Rails!&quot;
-4. Follow the guidelines to start developing your application
+Cada uma dessas etapas est&#225; dispon&#237;vel em branches, respectivamente:
 
+# parte_0_blog
+# parte_1_admin
+# parte_2_redcloth
+# parte_3_paginacao
+# parte_4_upload
+# parte_5_login
+# parte_6_cache
+# parte_7_deploy
+# parte_8_ajax
+# parte_9_ajustes
+# parte_10_final
 
-== Web Servers
+== Acessando cada Cap&#237;tulo
 
-By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
-with a variety of other web servers.
+Voc&#234; provavelmente baixou do Github desta forma:
 
-Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
-suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
-getting up and running with mongrel is as easy as: &lt;tt&gt;gem install mongrel&lt;/tt&gt;.
-More info at: http://mongrel.rubyforge.org
+  $ git clone git://github.com/akitaonrails/fisl_10_demo.git
 
-Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or
-Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use
-FCGI or proxy to a pack of Mongrels/Thin/Ebb servers.
+E com isso est&#225; agora no branch (master). Para mudar para qualquer um dos
+branches listados acima, fa&#231;a assim:
 
-== Apache .htaccess example for FCGI/CGI
+  $ git checkout -b parte_0_blog remotes/origin/parte_0_blog
 
-# General Apache options
-AddHandler fastcgi-script .fcgi
-AddHandler cgi-script .cgi
-Options +FollowSymLinks +ExecCGI
+N&#227;o esque&#231;a de colocar &quot;remotes/origin&quot; antes do nome do branch. Al&#233;m disso
+toda vez que trocar de branch, n&#227;o se esque&#231;a de fazer o seguinte tamb&#233;m:
 
-# If you don't want Rails to look in certain directories,
-# use the following rewrite rules so that Apache won't rewrite certain requests
-# 
-# Example:
-#   RewriteCond %{REQUEST_URI} ^/notrails.*
-#   RewriteRule .* - [L]
+  $ git reset --hard
+  $ git clean -d -f
+  $ rake db:reset
 
-# Redirect all requests not available on the filesystem to Rails
-# By default the cgi dispatcher is used which is very slow
-# 
-# For better performance replace the dispatcher with the fastcgi one
-#
-# Example:
-#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-RewriteEngine On
+Isso vai limpar arquivos untracked que sobram quando voc&#234; fica mudando
+entre diferentes branches. A &#250;ltima linha reinicia o banco de dados, que
+est&#225; configurado para SQLite3. Se n&#227;o quiser ficar zerando o banco toda
+hora, apenas a partir do branch (master) fa&#231;a &quot;rake db:migrate&quot;, os branches
+anteriores devem ser compat&#237;veis com a &#250;ltima vers&#227;o do banco.
 
-# If your Rails application is accessed via an Alias directive,
-# then you MUST also set the RewriteBase in this htaccess file.
-#
-# Example:
-#   Alias /myrailsapp /path/to/myrailsapp/public
-#   RewriteBase /myrailsapp
+== Testes
 
-RewriteRule ^$ index.html [QSA]
-RewriteRule ^([^.]+)$ $1.html [QSA]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+A cobertura de testes est&#225; baixa, mas tem um m&#237;nimo de Cucumber e RSpec.
+Tecnicamente em todos os branches nomeados acima os testes devem estar
+passando sem problemas. Voc&#234; pode execut&#225;-los assim:
 
-# In case Rails experiences terminal errors
-# Instead of displaying this message you can supply a file here which will be rendered instead
-# 
-# Example:
-#   ErrorDocument 500 /500.html
+  $ cucumber features -l pt
+  $ rake spec
 
-ErrorDocument 500 &quot;&lt;h2&gt;Application error&lt;/h2&gt;Rails application failed to start properly&quot;
+== Autoria
 
-
-== Debugging Rails
-
-Sometimes your application goes wrong.  Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files.  Have &quot;tail -f&quot; commands running
-on the server.log and development.log. Rails will automatically display debugging
-and runtime information to these files. Debugging info will also be shown in the
-browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code using
-the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController &lt; ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info(&quot;#{Time.now} Destroyed Weblog ID ##{@weblog.id}!&quot;)
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/ including:
-
-* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/
-* Learn to Program: http://pine.fm/LearnToProgram/  (a beginners guide)
-
-These two online (and free) books will bring you up to speed on the Ruby language
-and also on programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your Mongrel or
-Webrick server with --debugger. This means that you can break out of execution at any point
-in the code, investigate and change the model, AND then resume execution! 
-You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
-Example:
-
-  class WeblogController &lt; ActionController::Base
-    def index
-      @posts = Post.find(:all)
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  &gt;&gt; @posts.inspect
-  =&gt; &quot;[#&lt;Post:0x14a6be8 @attributes={\&quot;title\&quot;=&gt;nil, \&quot;body\&quot;=&gt;nil, \&quot;id\&quot;=&gt;\&quot;1\&quot;}&gt;,
-       #&lt;Post:0x14a6620 @attributes={\&quot;title\&quot;=&gt;\&quot;Rails you know!\&quot;, \&quot;body\&quot;=&gt;\&quot;Only ten..\&quot;, \&quot;id\&quot;=&gt;\&quot;2\&quot;}&gt;]&quot;
-  &gt;&gt; @posts.first.title = &quot;hello from a debugger&quot;
-  =&gt; &quot;hello from a debugger&quot;
-
-...and even better is that you can examine how your runtime objects actually work:
-
-  &gt;&gt; f = @posts.first
-  =&gt; #&lt;Post:0x13630c4 @attributes={&quot;title&quot;=&gt;nil, &quot;body&quot;=&gt;nil, &quot;id&quot;=&gt;&quot;1&quot;}&gt;
-  &gt;&gt; f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you enter &quot;cont&quot;
-
-
-== Console
-
-You can interact with the domain model by starting the console through &lt;tt&gt;script/console&lt;/tt&gt;.
-Here you'll have all parts of the application configured, just like it is when the
-application is running. You can inspect domain models, change values, and save to the
-database. Starting the script without arguments will launch it in the development environment.
-Passing an argument will specify a different environment, like &lt;tt&gt;script/console production&lt;/tt&gt;.
-
-To reload your controllers and models after launching the console run &lt;tt&gt;reload!&lt;/tt&gt;
-
-== dbconsole
-
-You can go to the command line of your database directly through &lt;tt&gt;script/dbconsole&lt;/tt&gt;.
-You would be connected to the database with the credentials defined in database.yml.
-Starting the script without arguments will connect you to the development database. Passing an
-argument will connect you to a different database, like &lt;tt&gt;script/dbconsole production&lt;/tt&gt;.
-Currently works for mysql, postgresql and sqlite.
-
-== Description of Contents
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from ApplicationController
-  which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb.
-  Most models will descend from ActiveRecord::Base.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby
-  syntax.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the common
-  header/footer method of wrapping views. In your views, define a layout using the
-  &lt;tt&gt;layout :default&lt;/tt&gt; and create a file named default.html.erb. Inside default.html.erb,
-  call &lt;% yield %&gt; to render the view using this layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are generated
-  for you automatically when using script/generate for controllers. Helpers can be used to
-  wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
-
-db
-  Contains the database schema in schema.rb.  db/migrate contains all
-  the sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when generated
-  using &lt;tt&gt;rake doc:app&lt;/tt&gt;
-
-lib
-  Application specific libraries. Basically, any kind of custom code that doesn't
-  belong under controllers, models, or helpers. This directory is in the load path.
-
-public
-  The directory available for the web server. Contains subdirectories for images, stylesheets,
-  and javascripts. Also contains the dispatchers and the default HTML files. This should be
-  set as the DOCUMENT_ROOT of your web server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the script/generate scripts, template
-  test files will be generated for you and placed in this directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins subdirectory.
-  If the app has frozen rails, those gems also go here, under vendor/rails/.
-  This directory is in the load path.
+Fabio Akita
+www.akitaonrails.com
+www.slideshare.net/akitaonrails
+www.vimeo.com/akitaonrails
\ No newline at end of file</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 class Admin::PostsController &lt; ApplicationController
   layout &quot;admin/admin&quot;
   before_filter :require_user
+  before_filter :load_uploads, :only =&gt; [:new, :edit, :update, :create]
   cache_sweeper :post_sweeper, :only =&gt; [:create, :update, :destroy]
   
   def index
@@ -13,7 +14,6 @@ class Admin::PostsController &lt; ApplicationController
   
   def new
     @post = Post.new
-    @uploads = Upload.all(:order =&gt; &quot;created_at DESC&quot;, :limit =&gt; 10)
   end
   
   def create
@@ -28,7 +28,6 @@ class Admin::PostsController &lt; ApplicationController
   
   def edit
     @post = Post.find(params[:id])
-    @uploads = Upload.all(:order =&gt; &quot;created_at DESC&quot;, :limit =&gt; 10)
   end
   
   def update
@@ -48,7 +47,7 @@ class Admin::PostsController &lt; ApplicationController
   def destroy
     redirect_to(admin_posts_path) and return if params[:cancel]
     @post = Post.find(params[:id])
-    #@post.destroy
+    @post.destroy
     
     respond_to do |wants|
       wants.html do 
@@ -58,4 +57,10 @@ class Admin::PostsController &lt; ApplicationController
       wants.js { head :ok }
     end
   end
+  
+  private
+  
+  def load_uploads
+    @uploads = Upload.all(:order =&gt; &quot;created_at DESC&quot;, :limit =&gt; 10)
+  end
 end</diff>
      <filename>app/controllers/admin/posts_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 class Comment &lt; ActiveRecord::Base
   belongs_to :post
+  validates_presence_of :comentario
   
   def self.per_page
     5</diff>
      <filename>app/models/comment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 class Post &lt; ActiveRecord::Base
   has_many :comments
   before_save :filtro_html
+  validates_presence_of :titulo
   
   def self.per_page
     5</diff>
      <filename>app/models/post.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@
 
 %small 
   Publicado em
-  = @post.created_at.to_s(:small)
+  = @post.created_at.to_s(:short)
 
 %p
   =@post.descricao_html</diff>
      <filename>app/views/admin/posts/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -14,6 +14,8 @@
   %body
     #container
       #user_nav
+        = link_to &quot;Ver Site&quot;, root_path
+        |
         = link_to &quot;Posts&quot;, admin_posts_path
         |
         = link_to &quot;Coment&#225;rios&quot;, admin_comments_path</diff>
      <filename>app/views/layouts/admin/admin.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@
 
 %small 
   Publicado em
-  = @post.created_at.to_s(:small)
+  = @post.created_at.to_s(:short)
 
 %p
   =@post.descricao_html
@@ -17,10 +17,11 @@
     %li
       %p= link_to comment.autor, comment.url
       disse em 
-      = comment.created_at.to_s(:small)
+      = comment.created_at.to_s(:short)
       %p= comment.comentario
 
 - form_for [@post, Comment.new] do |f|
+  = f.error_messages
   %p
     = f.label :autor
     %br </diff>
      <filename>app/views/posts/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -15,4 +15,4 @@
     = f.label :remember_me
     %br
   %p
-    = f.submit &quot;Submit&quot;
\ No newline at end of file
+    = f.submit &quot;Enviar&quot;
\ No newline at end of file</diff>
      <filename>app/views/user_sessions/new.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -5,11 +5,11 @@
     %br
     = f.text_field :email
   %p
-    = f.label :password, f.object.new_record? ? nil : &quot;Change password&quot;
+    = f.label :password, f.object.new_record? ? nil : &quot;Mudar Senha&quot;
     %br
     = f.password_field :password
   %p
-    = f.label :password_confirmation
+    = f.label &quot;Confirmar Senha&quot;
     %br
     = f.password_field :password_confirmation
   %p</diff>
      <filename>app/views/users/_form.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-- title &quot;User&quot;
+- title &quot;Usu&#225;rio&quot;
 
 %p
   %strong Email:
@@ -26,5 +26,5 @@
   =h @user.current_login_ip
 
 %p
-  = link_to &quot;Edit&quot;, edit_user_path(@user)
+  = link_to &quot;Editar&quot;, edit_user_path(@user)
   |</diff>
      <filename>app/views/users/show.html.haml</filename>
    </modified>
    <modified>
      <diff>@@ -43,5 +43,5 @@ Rails::Initializer.run do |config|
 
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
+  config.i18n.default_locale = :&quot;pt-BR&quot;
 end
\ No newline at end of file</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,7 @@ Dado /^que estou logado$/ do
   visit login_path
   fill_in &quot;email&quot;, :with =&gt; &quot;john@doe.com&quot;
   fill_in &quot;password&quot;, :with =&gt; &quot;john&quot;
-  click_button &quot;Submit&quot;
+  click_button &quot;Enviar&quot;
 end
 
 Dado /^que estou na homepage$/ do</diff>
      <filename>features/step_definitions/blog_simples_steps.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Comment do
   it &quot;should be valid&quot; do
-    Comment.new.should be_valid
+    Comment.new(:comentario =&gt; &quot;foo&quot;).should be_valid
   end
 end</diff>
      <filename>spec/models/comment_spec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Post do
   it &quot;should be valid&quot; do
-    Post.new.should be_valid
+    Post.new(:titulo =&gt; &quot;foo&quot;).should be_valid
   end
   
   it &quot;should convert Textile markup to HTML&quot; do</diff>
      <filename>spec/models/post_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>793485b8f3870a36aaf0d26387cc925f41d5b3bb</id>
    </parent>
  </parents>
  <author>
    <name>AkitaOnRails</name>
    <email>fabioakita@gmail.com</email>
  </author>
  <url>http://github.com/akitaonrails/fisl_10_demo/commit/c160e262cc5cdad71a5b0e4d23b8645ab717554c</url>
  <id>c160e262cc5cdad71a5b0e4d23b8645ab717554c</id>
  <committed-date>2009-06-25T13:57:13-07:00</committed-date>
  <authored-date>2009-06-25T13:57:13-07:00</authored-date>
  <message>Documentando, mais pequenos ajustes</message>
  <tree>a704db72e2404ee2ff55852d7027a0d21d5e9377</tree>
  <committer>
    <name>AkitaOnRails</name>
    <email>fabioakita@gmail.com</email>
  </committer>
</commit>
