tft_rails 0.6.1 → 0.6.2

data/README.md

@@ -60,6 +60,20 @@ a wonderful job to illustrate many concepts for teaching, but it is no replaceme
 that has been peer-reviewed by many experienced developers and is in use in many commercial applications. Devise is the
 current industry standard solution and was used here.
 
+Adding to TFT Rails
+-------------------
+
+To modify the exercises, make your code changes, then run all chapters in
+successive order in a few rails app. After every solutions generator, the
+specs should run clean.
+
+TODO: Rig up a test suite which will create a new rails app, then install
+all chapters and solutions in successive order and run the spec suite every time.
+This may necessitate construction our own Test Runner or similar. I'm not
+sure how to do this.
+
+TODO: Add Chapter 12. The project currently contains Chapters 7 through 11, adapted for Devise.
+
 Sponsors
 --------
 

data/lib/generators/chapter07/begin/begin_generator.rb

@@ -7,6 +7,13 @@ module Chapter07
         directory(self.class.source_root, Rails.root, :force => true)
       end
 
+      def insert_gitignore
+        dest = File.join(Rails.root,'.gitignore')
+        insert_into_file(dest, :before => /\Z/) do # insert before end
+          "\n.idea\n"
+        end
+      end
+
       def augment_gemfile
         gem 'devise', '~> 1.3.4'
         gem 'gravatar_image_tag', '~> 1.0.0'

data/lib/generators/chapter07/begin/templates/spec/spec_helper.rb

@@ -7,6 +7,16 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
+Webrat.configure do |config|
+  config.mode = :rack
+end
+
+module Webrat::Logging
+  def logger
+    Rails.logger  # log to test.log, rather than webrat.log
+  end
+end
+
 RSpec.configure do |config|
   # == Mock Framework
   #

data/lib/generators/chapter08_09/begin/instructions.md

@@ -50,9 +50,16 @@ The Devise sign-in page meets our needs and doesn't need customizing.
 However, we need to work on the layout to make sure that it shows a "Sign out" link
 if a user is logged in, and a "Sign in" link only if a user is not logged in.
 
-[Devise][devise] offers the controller methods `user_signed_in?` and `current_user`
+[Devise][devise] offers the controller methods `signed_in?` and `current_user`
 to report on the current login status. The first method returns `true` or `false`
 depending on whether a user logged in, the second returns the actual user object,
 or `nil` if no user is logged in.
 
+(Note that Devise supports multiple sign-in scopes, e.g. for regular users and
+for admins. The method `signed_in?` checks that any scope is signed in. To
+check for a specific scope, the method `user_signed_in?` is available. For the
+purpose of RailsTutorial with Devise, this distinction is not important since
+we only have one type of user. Admin privileges are implemented differently,
+with the admin flag)
+
 [devise]: https://github.com/plataformatec/devise "Devise on github"

data/lib/generators/chapter10/solutions/snippets/migration_add_admin_to_users.rb

@@ -1,6 +1,6 @@
 class AddAdminToUsers < ActiveRecord::Migration
   def self.up
-    add_column :users, :admin, :boolean
+    add_column :users, :admin, :boolean, :default => false, :null => false
   end
 
   def self.down

data/lib/generators/chapter11_1/solutions/templates/app/{model → models}/micropost.rb

@@ -2,7 +2,7 @@ class Micropost < ActiveRecord::Base
 
   belongs_to :user
 
-  default_scope order('created_at DESC')
+  default_scope order('microposts.created_at DESC')
 
   validates :user_id, :presence => true
   validates :content, :presence => true, :length => {:maximum => 140}

data/lib/generators/chapter11_2/solutions/solutions_generator.rb

@@ -1,6 +1,12 @@
 module Chapter11_2
   module Generators
     class SolutionsGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_app_tree
+        directory(self.class.source_root, Rails.root)
+      end
+
     end
   end
 end

data/lib/generators/chapter11_3/begin/templates/app/views/pages/home.html.erb

@@ -0,0 +1,24 @@
+<% if signed_in? %>
+  <table class="front" summary="For signed-in users">
+    <tr>
+      <td class="main">
+        <h1 class="micropost">What's up?</h1>
+        <%#= micropost form %>
+        <%#= feed of microposts %>
+      </td>
+      <td class="sidebar round">
+        <%#= sidebar with user info (name, image link) %>
+      </td>
+    </tr>
+  </table>
+<% else %>
+  <h1>Sample App</h1>
+
+  <p>
+    This is the home page for the
+    <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+    sample application.
+  </p>
+
+  <%= link_to "Sign up now!", signup_path, :class => "signup_button round" %>
+<% end %>

data/lib/generators/chapter11_3/begin/templates/app/views/shared/_feed.html.erb

@@ -0,0 +1,6 @@
+<%# if there are feed items %>
+  <table class="microposts" summary="User microposts">
+    <%#= display feed items here %>
+  </table>
+  <%#= pagination ? %>
+<%# end %>

data/lib/generators/chapter11_3/begin/templates/app/views/shared/_feed_item.html.erb

@@ -0,0 +1,14 @@
+<tr>
+  <td class="gravatar">
+    <%# image %>
+  </td>
+  <td class="micropost">
+    <span class="user">
+      <%#= link to user %>
+    </span>
+    <span class="content"><%#= content of feed entry (i.e. a micropost) %></span>
+    <span class="timestamp">
+      Posted <%#= posting time of micropost %> ago.
+    </span>
+  </td>
+</tr>

data/lib/generators/chapter11_3/begin/templates/app/views/shared/_micropost_form.html.erb

@@ -0,0 +1,9 @@
+<%#= form helper  %>
+  <%#=  error display %>
+  <div class="field">
+    <%#= content form field  %>
+  </div>
+  <div class="actions">
+    <%#= submit button %>
+  </div>
+<%# end %>

data/lib/generators/chapter11_3/begin/templates/app/views/shared/_user_info.html.erb

@@ -0,0 +1,11 @@
+<div class="user_info">
+  <a href="<%#= link to user %>">
+    <%#= user's image %>
+    <span class="user_name">
+      <%#= user's name %>
+    </span>
+    <span class="microposts">
+      <%# number of user's microposts %>
+    </span>
+  </a>
+</div>

data/lib/generators/chapter11_3/begin/templates/spec/controllers/microposts_controllers_11_3_spec.rb

@@ -74,6 +74,7 @@ describe MicropostsController do
         wrong_user = Factory(:user, :email => Factory.next(:email))
         sign_in(wrong_user)
         @micropost = Factory(:micropost, :user => @user)
+        request.env["HTTP_REFERER"] = root_path
       end
 
       it "should deny access" do

data/lib/generators/chapter11_3/begin/templates/spec/models/user_11_3_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe User do
+
+  describe "micropost associations" do
+
+    before(:each) do
+      @user = Factory(:user)
+      @mp1 = Factory(:micropost, :user => @user, :created_at => 1.day.ago)
+      @mp2 = Factory(:micropost, :user => @user, :created_at => 1.hour.ago)
+    end
+
+    describe "status feed" do
+
+      it "should have a feed" do
+        @user.should respond_to(:feed)
+      end
+
+      it "should include the user's microposts" do
+        @user.feed.include?(@mp1).should be_true
+        @user.feed.include?(@mp2).should be_true
+      end
+
+      it "should not include a different user's microposts" do
+        mp3 = Factory(:micropost,
+                      :user => Factory(:user, :email => Factory.next(:email)))
+        @user.feed.include?(mp3).should be_false
+      end
+    end
+  end
+end

data/lib/generators/chapter11_3/begin/templates/spec/requests/micropost_11_3_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "Microposts" do
+
+  before(:each) do
+    user = Factory(:user)
+    visit signin_path
+    fill_in :email,    :with => user.email
+    fill_in :password, :with => user.password
+    click_button
+  end
+
+  describe "creation" do
+
+    describe "failure" do
+
+      it "should not make a new micropost" do
+        lambda do
+          visit root_path
+          fill_in :micropost_content, :with => ""
+          click_button
+          response.should render_template('pages/home')
+          response.should have_selector("div#error_explanation")
+        end.should_not change(Micropost, :count)
+      end
+    end
+
+    describe "success" do
+
+      it "should make a new micropost" do
+        content = "Lorem ipsum dolor sit amet"
+        lambda do
+          visit root_path
+          fill_in :micropost_content, :with => content
+          click_button
+          response.should have_selector("span.content", :content => content)
+        end.should change(Micropost, :count).by(1)
+      end
+    end
+  end
+end

data/lib/generators/chapter11_3/solutions/solutions_generator.rb

@@ -1,7 +1,29 @@
 module Chapter11_3
   module Generators
     class SolutionsGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
 
+      def copy_app_tree
+        directory(self.class.source_root, Rails.root)
+      end
+
+      def add_microposts_resource
+        dest = File.join(Rails.root,'config','routes.rb')
+        insert_into_file(dest, :after => %r{resources\s+:users.*$}) do
+          "\n  resources :microposts, :only => [:create, :destroy]"
+        end
+      end
+
+      def add_feed_method_to_user
+        dest = File.join(Rails.root, 'app', 'models', 'user.rb')
+        insert_into_file(dest, :before => /end\s*\Z/) do # insert before end
+          <<-CODE.gsub(/^\s+\|/,'  ')
+            |def feed
+            |  microposts
+            |end
+          CODE
+        end
+      end
 
     end
   end

data/lib/generators/chapter11_3/solutions/templates/app/controllers/microposts_controller.rb

@@ -0,0 +1,20 @@
+class MicropostsController < ApplicationController
+  before_filter :authenticate_user!
+
+  def create
+    @micropost  = current_user.microposts.build(params[:micropost])
+    if @micropost.save
+      flash[:success] = "Micropost created!"
+      redirect_to root_path
+    else
+      render 'pages/home'
+    end
+  end
+
+ def destroy
+   # .try will call the method given, unless the caller is nil
+   current_user.microposts.find_by_id(params[:id]).try(:destroy)
+   redirect_to :back
+ end
+
+end

data/lib/generators/chapter11_3/solutions/templates/app/controllers/pages_controller.rb

@@ -0,0 +1,22 @@
+class PagesController < ApplicationController
+  def home
+    @title = "Home"
+    if signed_in?
+      @micropost = current_user.microposts.build
+      @feed_items = current_user.feed.paginate(:page => params[:page])
+    end
+  end
+
+  def contact
+    @title = 'Contact'
+  end
+
+  def about
+    @title = 'About'
+  end
+
+  def help
+    @title = 'Help'
+  end
+
+end

data/lib/generators/chapter11_3/solutions/templates/app/views/microposts/_micropost.html.erb

@@ -0,0 +1,15 @@
+<tr>
+  <td class="micropost">
+    <span class="content"><%= micropost.content %></span>
+    <span class="timestamp">
+      Posted <%= time_ago_in_words(micropost.created_at) %> ago.
+    </span>
+  </td>
+  <% if signed_in? && current_user.id == micropost.user_id %>
+  <td>
+    <%= link_to "delete", micropost, :method => :delete,
+                                     :confirm => "You sure?",
+                                     :title => micropost.content %>
+  </td>
+  <% end %>
+</tr>

data/lib/generators/chapter11_3/solutions/templates/app/views/pages/home.html.erb

@@ -0,0 +1,24 @@
+<% if signed_in? %>
+  <table class="front" summary="For signed-in users">
+    <tr>
+      <td class="main">
+        <h1 class="micropost">What's up?</h1>
+        <%= render 'shared/micropost_form' %>
+        <%= render 'shared/feed' %>
+      </td>
+      <td class="sidebar round">
+        <%= render 'shared/user_info' %>
+      </td>
+    </tr>
+  </table>
+<% else %>
+  <h1>Sample App</h1>
+
+  <p>
+    This is the home page for the
+    <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+    sample application.
+  </p>
+
+  <%= link_to "Sign up now!", signup_path, :class => "signup_button round" %>
+<% end %>

data/lib/generators/chapter11_3/solutions/templates/app/views/shared/_error_messages.html.erb

@@ -0,0 +1,13 @@
+<% if object.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(object.errors.count, "error") %>
+        prohibited this <%= object.class.to_s.underscore.humanize.downcase %>
+        from being saved:</h2>
+    <p>There were problems with the following fields:</p>
+    <ul>
+    <% object.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>

data/lib/generators/chapter11_3/solutions/templates/app/views/shared/_feed.html.erb

@@ -0,0 +1,6 @@
+<% if @feed_items.present? %>
+  <table class="microposts" summary="User microposts">
+    <%= render :partial => 'shared/feed_item', :collection => @feed_items %>
+  </table>
+  <%= will_paginate @feed_items %>
+<% end %>

data/lib/generators/chapter11_3/solutions/templates/app/views/shared/_feed_item.html.erb

@@ -0,0 +1,21 @@
+<tr>
+  <td class="gravatar">
+    <%= link_to gravatar_for(feed_item.user), feed_item.user %>
+  </td>
+  <td class="micropost">
+    <span class="user">
+      <%= link_to feed_item.user.name, feed_item.user %>
+    </span>
+    <span class="content"><%= feed_item.content %></span>
+    <span class="timestamp">
+      Posted <%= time_ago_in_words(feed_item.created_at) %> ago.
+    </span>
+  </td>
+  <% if signed_in? && current_user.id == feed_item.user_id %>
+  <td>
+    <%= link_to "delete", feed_item, :method => :delete,
+                                     :confirm => "You sure?",
+                                     :title => feed_item.content %>
+  </td>
+  <% end %>
+</tr>

data/lib/generators/chapter11_3/solutions/templates/app/views/shared/_micropost_form.html.erb

@@ -0,0 +1,9 @@
+<%= form_for @micropost do |f| %>
+  <%= render 'shared/error_messages', :object => f.object %>
+  <div class="field">
+    <%= f.text_area :content %>
+  </div>
+  <div class="actions">
+    <%= f.submit "Submit" %>
+  </div>
+<% end %>

data/lib/generators/chapter11_3/solutions/templates/app/views/shared/_user_info.html.erb

@@ -0,0 +1,11 @@
+<div class="user_info">
+  <a href="<%= user_path(current_user) %>">
+    <%= gravatar_for current_user, :size => 30 %>
+    <span class="user_name">
+      <%= current_user.name %>
+    </span>
+    <span class="microposts">
+      <%= pluralize(current_user.microposts.count, "micropost") %>
+    </span>
+  </a>
+</div>

metadata

@@ -2,7 +2,7 @@
 name: tft_rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Wolfram Arnold
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 Z
+date: 2011-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -38,8 +38,24 @@ files:
 - lib/generators/chapter11_3/begin/instructions.md
 - lib/generators/chapter11_3/begin/templates/spec/controllers/pages_controller_11_3_spec.rb
 - lib/generators/chapter11_3/begin/templates/spec/controllers/microposts_controllers_11_3_spec.rb
+- lib/generators/chapter11_3/begin/templates/spec/models/user_11_3_spec.rb
+- lib/generators/chapter11_3/begin/templates/spec/requests/micropost_11_3_spec.rb
+- lib/generators/chapter11_3/begin/templates/app/views/pages/home.html.erb
+- lib/generators/chapter11_3/begin/templates/app/views/shared/_user_info.html.erb
+- lib/generators/chapter11_3/begin/templates/app/views/shared/_micropost_form.html.erb
+- lib/generators/chapter11_3/begin/templates/app/views/shared/_feed.html.erb
+- lib/generators/chapter11_3/begin/templates/app/views/shared/_feed_item.html.erb
 - lib/generators/chapter11_3/solutions/USAGE
 - lib/generators/chapter11_3/solutions/solutions_generator.rb
+- lib/generators/chapter11_3/solutions/templates/app/controllers/microposts_controller.rb
+- lib/generators/chapter11_3/solutions/templates/app/controllers/pages_controller.rb
+- lib/generators/chapter11_3/solutions/templates/app/views/pages/home.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/microposts/_micropost.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/shared/_user_info.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/shared/_error_messages.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/shared/_micropost_form.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/shared/_feed.html.erb
+- lib/generators/chapter11_3/solutions/templates/app/views/shared/_feed_item.html.erb
 - lib/generators/chapter07/begin/USAGE
 - lib/generators/chapter07/begin/begin_generator.rb
 - lib/generators/chapter07/begin/instructions.md
@@ -127,7 +143,7 @@ files:
 - lib/generators/chapter10/begin/instructions.md
 - lib/generators/chapter10/begin/snippets/custom.css
 - lib/generators/chapter10/begin/snippets/factories.rb
-- lib/generators/chapter10/begin/templates/lib/tasks/same_data.rake
+- lib/generators/chapter10/begin/templates/lib/tasks/sample_data.rake
 - lib/generators/chapter10/begin/templates/spec/controllers/users_controller_10_spec.rb
 - lib/generators/chapter10/begin/templates/spec/models/user_10_spec.rb
 - lib/generators/chapter10/begin/templates/app/views/layouts/application.html.erb
@@ -159,15 +175,15 @@ files:
 - lib/generators/chapter11_1/begin/USAGE
 - lib/generators/chapter11_1/begin/begin_generator.rb
 - lib/generators/chapter11_1/begin/instructions.md
-- lib/generators/chapter11_1/begin/templates/lib/tasks/same_data.rake
+- lib/generators/chapter11_1/begin/templates/lib/tasks/sample_data.rake
 - lib/generators/chapter11_1/begin/templates/spec/models/user_11_1_spec.rb
 - lib/generators/chapter11_1/begin/templates/spec/models/microposts_11_1_spec.rb
 - lib/generators/chapter11_1/solutions/USAGE
 - lib/generators/chapter11_1/solutions/solutions_generator.rb
 - lib/generators/chapter11_1/solutions/snippets/migration_create_microposts.rb
 - lib/generators/chapter11_1/solutions/templates/spec/factories.rb
-- lib/generators/chapter11_1/solutions/templates/app/model/user.rb
-- lib/generators/chapter11_1/solutions/templates/app/model/micropost.rb
+- lib/generators/chapter11_1/solutions/templates/app/models/user.rb
+- lib/generators/chapter11_1/solutions/templates/app/models/micropost.rb
 - LICENSE
 - Rakefile
 - Gemfile