Adding a setup to typo blog. Will redirect user to the editor after f…

…irst account creation

app/controllers/accounts_controller.rb

@@ -1,5 +1,6 @@
 class AccountsController < ApplicationController
 
+  before_filter :verify_config
   before_filter :verify_users, :only => [:login, :recover_password]
   filter_parameter_logging "password"
 
@@ -106,5 +107,8 @@ def verify_users
     redirect_to(:controller => "accounts", :action => "signup") if User.count == 0
     true
   end
-
+
+  def verify_config
+    redirect_to :controller => "setup", :action => "index" if  ! this_blog.configured?
+  end
 end

app/controllers/articles_controller.rb

@@ -1,5 +1,4 @@
 class ArticlesController < ContentController
-  before_filter :verify_config
   before_filter :login_required, :only => [:preview]
   before_filter :auto_discovery_feed, :only => [:show, :index]
 
@@ -187,10 +186,10 @@ def markup_help
   private
 
   def verify_config
-    if User.count == 0
+    if  ! this_blog.configured?
+      redirect_to :controller => "setup", :action => "index"
+    elsif User.count == 0
       redirect_to :controller => "accounts", :action => "signup"
-    elsif ! this_blog.configured?
-      redirect_to :controller => "admin/settings", :action => "redirect"
     else
       return true
     end

app/controllers/setup_controller.rb

@@ -0,0 +1,25 @@
+class SetupController < ApplicationController
+  before_filter :check_config
+  layout 'accounts'
+
+  def index
+    if request.post?
+      Blog.transaction do
+        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
+        this_blog.save
+        redirect_to :controller => 'accounts', :action => 'signup'
+      end      
+    end
+  end
+
+  private
+  def check_config
+    return unless this_blog.configured?
+
+    if User.count == 0
+      redirect_to :controller => "accounts", :action => "signup" 
+    else
+      redirect_to :controller => 'articles', :action => 'index'
+    end
+  end
+end

app/views/accounts/confirm.html.erb

@@ -12,5 +12,5 @@
   <%= _("Don't lose the mail sent at %s or you won't be able to login anymore", current_user.email)%>
 </p>
 <p class='input_text_title right'>
-  <%= _("Proceed to %s",  link_to(_("admin"), :controller => 'admin/settings')) %>
+  <%= _("Proceed to %s",  link_to(_("admin"), :controller => 'admin/content/new')) %>
 </p>

app/views/accounts/signup.html.erb

@@ -4,6 +4,7 @@
 
 <% form_tag :action=> "signup" do %>
 <div>
+  <h1><%= _("Create an account")%></h1>
   <h2><label for="user_login"><%= _("Username") %>:</label></h2>
   <p class='input_text_title'>
     <%= text_field(:user, :login, {:class => 'title large'})%>

app/views/setup/index.html.erb

@@ -0,0 +1,20 @@
+<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
+
+<div id="flash"><%= error_messages_for 'setup' %></div>
+
+<% form_tag :action=> 'index' do %>
+<div>
+  <h1><%= _("Setup")%></h1>
+  <h2><label for="user_login"><%= _("Blog name") %>:</label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:setting, :blog_name, {:class => 'title large'})%>
+  </p>
+</div>
+<div>
+  <h2><label for="user_email"><%= _("Blog url")%>:</label></h2>
+  <p class='input_text_title'>
+    <%= text_field(:setting, :base_url, {:class => 'title large'})%>
+  </p>
+</div>
+<p><input type="submit" id="submit" class='save large' value="<%= _('Save')%>" /></p>
+<% end %>

config/routes.rb

@@ -41,7 +41,8 @@
   map.search '/search/:q.:format', :controller => "articles", :action => "search"
   map.search_base '/search/', :controller => "articles", :action => "search"
   map.connect '/archives/', :controller => "articles", :action => "archives"
-
+  map.connect '/setup', :controller => 'setup', :action => 'index'
+
   # I thinks it's useless. More investigating
   map.connect "trackbacks/:id/:day/:month/:year",
     :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}

spec/controllers/accounts_controller_spec.rb

@@ -234,6 +234,75 @@ def params
   end
 end
 
+describe 'GET signup with 0 existing users and unconfigured blog' do
+  controller_name :accounts
+
+  before(:each) do
+    Blog.delete_all
+    @blog = Blog.new.save
+    User.delete_all
+  end
+
+  it 'redirects to setup' do
+    get 'signup'
+    response.should redirect_to(:controller => 'setup', :action => 'index')
+  end
+end
+
+describe 'POST signup with 0 existing users and unconfigured blog' do
+  controller_name :accounts
+
+  before(:each) do
+    Blog.delete_all
+    @blog = Blog.new.save
+    User.delete_all
+  end
+
+  it 'redirects to setup' do
+    post 'signup', params
+    response.should redirect_to(:controller => 'setup', :action => 'index')
+  end
+
+  def params
+    {'user' =>  {'login' => 'newbob', 'password' => 'newpassword',
+        'password_confirmation' => 'newpassword'}}
+  end
+end
+
+describe 'GET login with 0 existing users and unconfigured blog' do
+  controller_name :accounts
+
+  before(:each) do
+    Blog.delete_all
+    @blog = Blog.new.save
+    User.delete_all
+  end
+
+  it 'redirects to setup' do
+    get 'login'
+    response.should redirect_to(:controller => 'setup', :action => 'index')
+  end
+end
+
+describe 'POST login with 0 existing users and unconfigured blog' do
+  controller_name :accounts
+
+  before(:each) do
+    Blog.delete_all
+    @blog = Blog.new.save
+    User.delete_all
+  end
+
+  it 'redirects to setup' do
+    post 'login', params
+    response.should redirect_to(:controller => 'setup', :action => 'index')
+  end
+
+  def params
+    {'user' =>  {'login' => 'newbob', 'password' => 'newpassword'}}
+  end
+end
+
 describe 'POST signup with 0 existing users' do
   controller_name :accounts
 

spec/controllers/setup_controller_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'GET setup with no configured blog' do
+  controller_name :setup
+
+  before(:each) do
+    Blog.delete_all
+    @blog = Blog.new.save
+  end
+
+  it 'renders index' do
+    get 'index'
+    response.should render_template('index')
+  end
+end
+
+describe 'GET setup with a configured blog and no user' do
+  controller_name :setup
+
+  before(:each) do
+    User.stub!(:count).and_return(0)
+    @user = mock("user")
+    @user.stub!(:reload).and_return(@user)
+    User.stub!(:new).and_return(@user)
+
+  end
+
+  it 'redirects to setup' do
+    get 'index'
+    response.should redirect_to(:controller => 'accounts', :action => 'signup')
+  end
+end
+
+describe 'GET setup with a configured blog and some users' do
+  controller_name :setup
+
+  it 'redirects to login' do
+    get 'index'
+    response.should redirect_to(:controller => 'articles', :action => 'index')
+  end
+end