iain-pizza-generators 0.1.2 → 0.1.3

data/rails_generators/pizza_authentication/templates/sessions_controller.rb

@@ -1,24 +1,26 @@
-class <%= user_session_plural_class_name %>Controller < ResourceController::Singleton
+class <%= user_session_plural_class_name %>Controller < ApplicationController
 
-  actions :new, :create, :destroy
+  before_filter :login_required,  :only   => :destroy
+  before_filter :logout_required, :except => :destroy
 
-  create do
-    success do
-      wants.html { redirect_to root_url }
-      flash { t(:success) }
-    end
-    failure.flash_now { t(:failure) }
+  def new
+    @<%= user_session_singular_name %> = <%= user_session_class_name %>.new
   end
 
-  destroy.success do
-    flash { t(:success) }
-    wants.html { redirect_to root_url }
+  def create
+    @<%= user_session_singular_name %> = <%= user_session_class_name %>.new(params[:<%= user_session_singular_name %>])
+    if @<%= user_session_singular_name %>.save
+      flash[:notice] = t(:success)
+      redirect_to root_url
+    else
+      render :action => 'new'
+    end
   end
 
-  private
-
-  def object
-    @object ||= <%= user_session_class_name %>.find
+  def destroy
+    current_<%= user_session_singular_name %>.destroy
+    flash[:notice] = t(:success)
+    redirect_to root_url
   end
 
 end

data/rails_generators/pizza_authentication/templates/tests/rspec/sessions_controller.rb

@@ -2,42 +2,125 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'authlogic/testing/test_unit_helpers' # put this in spec/spec_helper.rb
 
 describe <%= user_session_plural_class_name %>Controller do
-  fixtures :all
+
   integrate_views
 
-  describe "new action" do
+  def new_<%= user_singular_name %>(args = {})
+    Factory(:<%= user_singular_name %>, args)
+  end
+
+  describe "viewing the login page" do
+
+    context "when not logged in" do
+
+      it "should show the login page" do
+        get :new
+        response.should render_template(:new)
+      end
+
+    end
+
+    context "when logged in" do
+
+      it "should redirect to the home page" do
+        set_session_for new_<%= user_singular_name %>
+        get :new
+        response.should redirect_to(root_url)
+      end
 
-    it "should render new template" do
-      get :new
-      response.should render_template(:new)
     end
 
   end
 
-  describe "create action" do
+  describe "logging in" do
+
+    def login_with args
+      post :create, :<%= user_session_singular_name %> => { :login => "bob" }.merge(args)
+    end
+
+    before :each do
+      @<%= user_singular_name %> = new_<%= user_singular_name %>(:login => "bob", :password => "right")
+      <%= user_class_name %>.stub!(:find).and_return(@<%= user_singular_name %>)
+    end
+
+    context "with valid credentials" do
+
+      before :each do
+        login_with :password => "right"
+      end
+
+      it "should set a session for the <%= user_singular_name %>" do
+        controller.load_<%= user_session_singular_name %>
+        controller.current_<%= user_singular_name %>.should == @<%= user_singular_name %>
+      end
+
+      it "should be logged in" do
+        controller.load_<%= user_session_singular_name %>
+        controller.should be_logged_in
+      end
+
+      it "should redirect to the home page" do
+        response.should redirect_to(root_url)
+      end
 
-    it "should render new template when authentication is invalid" do
-      post :create, :<%= user_session_singular_name %> => { :login => "foo", :password => "wrong" }
-      response.should render_template(:new)
-      <%= user_session_class_name %>.find.should be_nil
     end
 
-    it "should redirect when authentication is valid" do
-      post :create, :<%= user_session_singular_name %> => { :login => "foo", :password => "secret" }
-      response.should redirect_to(root_url)
-      <%= user_session_class_name %>.find.should_not be_nil
-      <%= user_session_class_name %>.find.user.should == <%= user_plural_name %>(:one)
+    context "with invalid credentials" do
+
+      before :each do
+        login_with :password => "wrong"
+      end
+
+      it "should not set a session" do
+        controller.load_<%= user_session_singular_name %>
+        controller.current_<%= user_singular_name %>.should be_nil
+      end
+
+      it "should not be logged in" do
+        controller.load_<%= user_session_singular_name %>
+        controller.should_not be_logged_in
+      end      
+
+      it "should show the login page again" do
+        response.should render_template(:new)
+      end
+
     end
 
   end
 
-  describe "destroy action" do
+  describe "logging out" do
+
+    context "when logged in" do
+
+      before :each do
+        set_session_for new_<%= user_singular_name %>
+        get :destroy
+      end
+
+      it "should redirect to the home page" do
+        response.should redirect_to(root_url)
+      end
+
+      it "should have destroyed the session" do
+        controller.load_<%= user_session_singular_name %>
+        controller.current_<%= user_session_singular_name %>.should be_nil
+      end
+
+      it "should not be logged in" do
+        controller.load_<%= user_session_singular_name %>
+        controller.should_not be_logged_in
+      end      
+
+    end
+
+    context "when not yet logged in" do
+
+      it "should redirect to the login page" do
+        get :destroy
+        response.should redirect_to(login_url)
+      end
 
-    it "should destroy user session" do
-      set_session_for <%= user_plural_name %>(:one)
-      delete :destroy
-      <%= user_session_class_name %>.find.should be_nil
-      response.should redirect_to(root_url)
     end
 
   end

data/rails_generators/pizza_authentication/templates/tests/rspec/user.rb

@@ -2,44 +2,96 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe <%= user_class_name %> do
 
-  def new_<%= user_singular_name %>(attributes = {})
-    attributes[:login] ||= 'foo'
-    attributes[:password] ||= 'abc123'
-    attributes[:password_confirmation] ||= attributes[:password]
-    <%= user_class_name %>.new(attributes)
-  end
+  context "when making a new <%= user_singular_name %>" do
 
-  before(:each) do
-    <%= user_class_name %>.delete_all
-  end
+    def new_<%= user_singular_name %>(attrs = {})
+      Factory.build(:<%= user_singular_name %>, attrs)
+    end
 
-  it "should be valid" do
-    new_<%= user_singular_name %>.should be_valid
-  end
+    before(:each) do
+      <%= user_class_name %>.delete_all
+    end
 
-  it "should require login" do
-    new_<%= user_singular_name %>(:login => '').should have_at_least(1).error_on(:login)
-  end
+    it "should be valid" do
+      new_<%= user_singular_name %>.should be_valid
+    end
 
-  it "should require password" do
-    new_<%= user_singular_name %>(:password => '').should have_at_least(1).error_on(:password)
-  end
+    it "should require login" do
+      new_<%= user_singular_name %>(:login => '').should have_at_least(1).error_on(:login)
+    end
 
-  it "should validate uniqueness of login" do
-    new_<%= user_singular_name %>(:login => 'uniquename').save!
-    new_<%= user_singular_name %>(:login => 'uniquename').should have_at_least(1).error_on(:login)
-  end
+    it "should require password" do
+      new_<%= user_singular_name %>(:password => '').should have_at_least(1).error_on(:password)
+    end
 
-  it "should not allow odd characters in login" do
-    new_<%= user_singular_name %>(:login => 'odd ^&(@)').should have_at_least(1).error_on(:login)
-  end
+    it "should not allow odd characters in login" do
+      new_<%= user_singular_name %>(:login => 'odd ^&(@)').should have_at_least(1).error_on(:login)
+    end
+
+    it "should validate uniqueness of login" do
+      new_<%= user_singular_name %>(:login => 'uniquename').save!
+      new_<%= user_singular_name %>(:login => 'uniquename').should have_at_least(1).error_on(:login)
+    end
+
+    it "should require email" do
+      new_<%= user_singular_name %>(:email => '').should have_at_least(1).error_on(:email)
+    end
+
+    it "should validate uniqueness of email" do
+      new_<%= user_singular_name %>(:email => 'unique@email.com').save!
+      new_<%= user_singular_name %>(:email => 'unique@email.com').should have_at_least(1).error_on(:email)
+    end
+
+    it "should not allow bad formatted email addresses" do
+      new_<%= user_singular_name %>(:email => 'a@b').should have_at_least(1).error_on(:email)
+    end
+
+    it "should validate password is longer than 3 characters" do
+      new_<%= user_singular_name %>(:password => 'bad').should have_at_least(1).error_on(:password)
+    end
+
+    it "should require matching password confirmation" do
+      new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').should have_at_least(1).error_on(:password)
+    end
 
-  it "should validate password is longer than 3 characters" do
-    new_<%= user_singular_name %>(:password => 'bad').should have_at_least(1).error_on(:password)
   end
 
-  it "should require matching password confirmation" do
-    new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').should have_at_least(1).error_on(:password)
+  context "when editing a <%= user_singular_name %>" do
+
+    before :each do
+      @<%= user_singular_name %> = Factory(:<%= user_singular_name %>, :login => "bob", :password => "secret")
+    end
+
+    it "should not change the login" do
+      lambda {
+        @<%= user_singular_name %>.update_attributes(:login => "different")
+      }.should_not change(@<%= user_singular_name %>, :login)
+    end
+
+    it "should not change the password when no old password has been entered" do
+      lambda {
+        @<%= user_singular_name %>.update_attributes(:password => "newpassword", :password_confirmation => "newpassword")
+      }.should_not change(@<%= user_singular_name %>, :password)
+    end
+
+    it "should change the password when old password has been entered" do
+      lambda {
+        @<%= user_singular_name %>.update_attributes(:old_password => "secret", :password => "newpassword", :password_confirmation => "newpassword")
+      }.should change(@<%= user_singular_name %>, :password)
+    end
+
+    it "should change the email when old password has been entered" do
+      lambda {
+        @<%= user_singular_name %>.update_attributes(:old_password => "secret", :email => "new@email.com")
+      }.should change(@<%= user_singular_name %>, :email)
+    end
+
+    it "should not change the email when no old password has been entered" do
+      lambda {
+        @<%= user_singular_name %>.update_attributes(:email => "new@email.com")
+      }.should_not change(@<%= user_singular_name %>, :email)
+    end
+
   end
 
 end

data/rails_generators/pizza_authentication/templates/tests/rspec/users_controller.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe <%= user_plural_class_name %>Controller do
-  fixtures :all
+
   integrate_views
 
   describe "new action" do

data/rails_generators/pizza_authentication/templates/tests/testunit/sessions_controller.rb

@@ -3,20 +3,24 @@ require 'authlogic/testing/test_unit_helpers' # put this in test/test_helper.rb
 
 class <%= user_session_plural_class_name %>ControllerTest < ActionController::TestCase
 
+  def setup
+    @<%= user_singular_name %> = Factory(:<%= user_singular_name %>, :login => "bob", :password => "right")
+  end
+
   test "new action should render new template" do
     get :new
     assert_template 'new'
   end
 
   test "create action should create user session when succesful login" do
-    post :create, :<%= user_session_singular_name %> => { :login => "foo", :password => "secret" }
+    post :create, :<%= user_session_singular_name %> => { :login => "bob", :password => "right" }
     assert <%= user_session_singular_name %> = <%= user_session_class_name %>.find
-    assert_equal <%= user_plural_name %>(:foo), <%= user_session_singular_name %>.user
+    assert_equal @<%= user_singular_name %>, <%= user_session_singular_name %>.<%= user_singular_name %>
     assert_redirected_to root_url
   end
 
   test "create action should render new template when failed login" do
-    post :create, :<%= user_session_singular_name %> => { :login => "foo", :password => "wrong" }
+    post :create, :<%= user_session_singular_name %> => { :login => "bob", :password => "wrong" }
     assert_template 'new'
     assert_nil <%= user_session_class_name %>.find
   end
@@ -27,6 +31,6 @@ class <%= user_session_plural_class_name %>ControllerTest < ActionController::Te
     delete :destroy
     assert_nil <%= user_session_class_name %>.find
     assert_redirected_to login_url
-  end 
+  end
 
 end

data/rails_generators/pizza_authentication/templates/tests/testunit/users_controller.rb

@@ -5,13 +5,13 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     get :new
     assert_template 'new'
   end
-  
+
   def test_create_invalid
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
     post :create
     assert_template 'new'
   end
-  
+
   def test_create_valid
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/rails_generators/pizza_authentication/templates/user.rb

@@ -1,3 +1,18 @@
 class <%= user_class_name %> < ActiveRecord::Base
-  acts_as_authentic
+  acts_as_authentic :session_class => "<%= user_session_class_name %>"
+
+  attr_accessible :login, :email, :password, :password_confirmation, :old_password
+
+  validate_on_update :old_password_entered
+
+  def login=(str)
+    write_attribute(:login, str) if new_record?
+  end
+
+  private
+
+  def old_password_entered
+    
+  end
+
 end

data/rails_generators/pizza_authentication/templates/users_controller.rb

@@ -1,13 +1,38 @@
-class <%= user_plural_class_name %>Controller < ResourceController::Base
+class <%= user_plural_class_name %>Controller < ApplicationController
 
-  actions :new, :create
+  before_filter :logout_required, :only => [ :new, :create ]
+  before_filter :login_required,  :only => [ :show, :edit, :update ]
 
-  create do
-    success do
-      flash { t(:success) }
-      wants.html { redirect_to root_url }
+  def new
+    @<%= user_singular_name %> = <%= user_class_name %>.new
+  end
+
+  def create
+    @<%= user_singular_name %> = <%= user_class_name %>.new(params[:<%= user_singular_name %>])
+    if @<%= user_singular_name %>.save
+      flash[:notice] = t(:success)
+      redirect_to <%= user_singular_name %>_url
+    else
+      render :action => 'new'
+    end
+  end
+
+  def show
+    @<%= user_singular_name %> = current_<%= user_singular_name %>
+  end
+
+  def edit
+    @<%= user_singular_name %> = current_<%= user_singular_name %>
+  end
+
+  def update
+    @<%= user_singular_name %> = current_<%= user_singular_name %>
+    if @<%= user_singular_name %>.update_attributes(params[:<%= user_singular_name %>])
+      flash[:notice] = t(:success)
+      redirect_to <%= user_singular_name %>_url
+    else
+      render :action => 'new'
     end
-    failure.flash_now { t(:failure) }
   end
 
 end

data/rails_generators/pizza_authentication/templates/views/haml/edit.html.haml

@@ -0,0 +1,21 @@
+- title t(:title)
+
+- form_for @<%= user_singular_name %> do |f|
+  = f.error_messages
+  - f.fieldset do
+    - f.required_field :email
+    - f.field do
+      = f.required :old_password
+      = f.password_field :old_password
+    - f.field do
+      = f.label :password
+      = f.password_field :password
+    - f.field do
+      = f.label :password_confirmation
+      = f.password_field :password_confirmation
+    - f.field do
+      %label &nbsp;
+      = f.submit t(:submit)
+
+%ol.actions
+  %li.show= link_to t(:show), <%= user_singular_name %>_path

data/rails_generators/pizza_authentication/templates/views/haml/login.html.haml

@@ -1,9 +1,9 @@
 - title t(:title)
 
-- form_for @<%= user_session_singular_name %>, :url => object_path do |f|
+- form_for @<%= user_session_singular_name %>, :url => <%= user_session_singular_name %>_path do |f|
   = f.error_messages
   - f.fieldset do
-    - f.field :login
+    - f.required_field :login
     - f.field do
       = f.required :password
       = f.password_field :password

data/rails_generators/pizza_authentication/templates/views/haml/new.html.haml

@@ -0,0 +1,19 @@
+- title t(:title)
+
+- form_for @<%= user_singular_name %> do |f|
+  = f.error_messages
+  - f.fieldset do
+    - f.required_field :login
+    - f.required_field :email
+    - f.field do
+      = f.required :password
+      = f.password_field :password
+    - f.field do
+      = f.required :password_confirmation
+      = f.password_field :password_confirmation
+    - f.field do
+      %label &nbsp;
+      = f.submit t(:submit)
+
+%ol.actions
+  %li.login= link_to t(:login), login_path

data/rails_generators/pizza_authentication/templates/views/haml/show.html.haml

@@ -0,0 +1,15 @@
+- title t(:title)
+
+- definition_list_for @<%= user_singular_name %> do |dl|
+  - dl.show_h :login
+  - dl.show_h :email
+  - dl.show_h :login_count
+  - dl.show_h :last_request_at
+  - dl.show_h :current_logint_at
+  - dl.show_h :last_login_at
+  - dl.show_h :current_login_ip
+  - dl.show_h :last_login_ip
+
+%ol.actions
+  %li.edit= link_to t(:edit), edit_<%= user_singular_name %>_path
+  %li.logout= link_to t(:logout), logout_path

data/rails_generators/pizza_authentication/templates/views/haml/signup.html.haml

@@ -1,9 +1,10 @@
 - title t(:title)
 
-- form_for @<%= user_singular_name %>, :url => collection_path do |f|
+- form_for @<%= user_singular_name %>, :url => <%= user_session_singular_name %>_path do |f|
   = f.error_messages
   - f.fieldset do
-    - f.field :login
+    - f.required_field :login
+    - f.required_field :email
     - f.field do
       = f.required :password
       = f.password_field :password

data/rails_generators/pizza_scaffold/pizza_scaffold_generator.rb

@@ -136,18 +136,17 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
   def controller_methods(dir_name)
     controller_actions.map do |action|
       read_template("#{dir_name}/#{action}.rb")
-    end.join("  \n").strip
+    end.join("\n").strip
   end
   
-  def render_form(url)
+  def render_form
     if form_partial?
       if options[:erb]
-        "<%= render :partial => 'form' %>"
+        "<%= render 'form' %>"
       else
-        "= render :partial => 'form', :locals => { :form_url => #{url} }"
+        "= render \"form\""
       end
     else
-      (options[:erb] ? "" : "- form_url = #{url}\n") +
       read_template("views/#{view_language}/_form.html.#{view_language}")
     end
   end

data/rails_generators/pizza_scaffold/templates/actions/create.rb

@@ -1,4 +1,16 @@
-  create do
-    success.flash     { t(:success, :model => <%= class_name %>.human_name) }
-    failure.flash_now { t(:failure, :model => <%= class_name %>.human_name) }
+  # POST /<%= plural_name %>
+  # POST /<%= plural_name %>.xml
+  def create
+    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
+
+    respond_to do |format|
+      if @<%= singular_name %>.save
+        flash[:notice] = '<%= class_name.titleize %> was successfully created.'
+        format.html { redirect_to(<%= item_path('url') %>) }
+        format.xml  { render :xml => @<%= singular_name %>, :status => :created, :location => @<%= singular_name %> }
+      else
+        format.html { render :new }
+        format.xml  { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity }
+      end
+    end
   end

data/rails_generators/pizza_scaffold/templates/actions/destroy.rb

@@ -1,4 +1,11 @@
-  destroy do
-    success.flash     { t(:success, :model => <%= class_name %>.human_name) }
-    failure.flash     { t(:failure, :model => <%= class_name %>.human_name) }
+  # DELETE /<%= plural_name %>/1
+  # DELETE /<%= plural_name %>/1.xml
+  def destroy
+    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    @<%= singular_name %>.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(<%= plural_name %>_url) }
+      format.xml  { head :ok }
+    end
   end

data/rails_generators/pizza_scaffold/templates/actions/edit.rb

@@ -0,0 +1,4 @@
+  # GET /<%= plural_name %>/1/edit
+  def edit
+    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+  end

data/rails_generators/pizza_scaffold/templates/actions/index.rb

@@ -1,3 +1,10 @@
-  def collection
-    @collection ||= end_of_association_chain.paginate(:page => params[:page])
+  # GET /<%= plural_name %>
+  # GET /<%= plural_name %>.xml
+  def index
+    @<%= plural_name %> = <%= class_name %>.paginate(:page => params[:page])
+
+    respond_to do |format|
+      format.html # index.html.<%= view_language %>
+      format.xml  { render :xml => @<%= plural_name %> }
+    end
   end

data/rails_generators/pizza_scaffold/templates/actions/new.rb

@@ -0,0 +1,10 @@
+  # GET /<%= plural_name %>/new
+  # GET /<%= plural_name %>/new.xml
+  def new
+    @<%= singular_name %> = <%= class_name %>.new
+
+    respond_to do |format|
+      format.html # new.html.<%= view_language %>
+      format.xml  { render :xml => @<%= singular_name %> }
+    end
+  end

data/rails_generators/pizza_scaffold/templates/actions/show.rb

@@ -0,0 +1,10 @@
+  # GET /<%= plural_name %>/1
+  # GET /<%= plural_name %>/1.xml
+  def show
+    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.<%= view_language %>
+      format.xml  { render :xml => @<%= singular_name %> }
+    end
+  end

data/rails_generators/pizza_scaffold/templates/actions/update.rb

@@ -1,4 +1,16 @@
-  update do
-    success.flash     { t(:success, :model => <%= class_name %>.human_name) }
-    failure.flash_now { t(:failure, :model => <%= class_name %>.human_name) }
+  # PUT /<%= plural_name %>/1
+  # PUT /<%= plural_name %>/1.xml
+  def update
+    @<%= singular_name %> = <%= class_name %>.find(params[:id])
+
+    respond_to do |format|
+      if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+        flash[:notice] = '<%= class_name.titleize %> was successfully updated.'
+        format.html { redirect_to(<%= item_path('url') %>) }
+        format.xml  { head :ok }
+      else
+        format.html { render :edit }
+        format.xml  { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity }
+      end
+    end
   end