update

TODO.md

@@ -1,9 +0,0 @@
-* add badges
-* haml
-* twitter-bootstrap-rails
-* User (login, email, password_digest, state)
-* user crud in admin namespace
-* user list on frontend
-* registration
-* facebook registration (omniauth)
-* heroku

app/controllers/web/passwords_controller.rb

@@ -28,7 +28,7 @@ def update
     return redirect_to(root_path) unless params[:reset_password_token]
     user = User.where(params.slice(:reset_password_token)).first!
     @user = user.becomes(UserPasswordEditType)
-    if @user.update_attributes(params[:user])
+    if @user.update(params[:user])
       f(:success)
       redirect_to root_path
     else

app/controllers/web/topics_controller.rb

@@ -8,23 +8,27 @@ def new
     @topic = current_user.topics.build
   end
 
+  def edit
+    @topic = current_user.topics.find(params[:id])
+  end
+
   def create
-    topic = AccountTopicType.new(params[:topic])
-    topic.creator = current_user
-    if topic.save
+    @topic = AccountTopicType.new(params[:topic])
+    @topic.creator = current_user
+    if @topic.save
       f(:success)
-      redirect_to topic_path(topic)
+      redirect_to edit_topic_path(@topic)
     else
-      f(:error)
       render :new
     end
   end
 
   def update
     @topic = current_user.topics.find(params[:id])
     @topic = @topic.becomes(AccountTopicType)
-    if @topic.update_attributes(params[:topic])
-      redirect_to action: :index
+    if @topic.update(params[:topic])
+      f(:success)
+      redirect_to edit_topic_path(@topic)
     else
       render :new
     end

app/controllers/web/users/comments_controller.rb

@@ -0,0 +1,5 @@
+class Web::Users::CommentsController < Web::Users::ApplicationController
+  def index
+    @comments = resource_user.topic_comments.page(params[:page])
+  end
+end

app/controllers/web/users_controller.rb

@@ -5,7 +5,7 @@ def index
   end
 
   def show
-    @user = User.active.find(params[:id])
+    @user = User.active.where(login: params[:id]).first!
   end
 
   def new

app/helpers/web/users/comments_helper.rb

@@ -0,0 +1,2 @@
+module Web::Users::CommentsHelper
+end

app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
 
   has_many :authorizations, dependent: :destroy
   has_many :topics, foreign_key: :creator_id, dependent: :restrict_with_exception
-  has_many :topic_comments, dependent: :restrict_with_exception
+  has_many :topic_comments, class_name: 'Topic::Comment', dependent: :restrict_with_exception
 
   validates :email, uniqueness: true, presence: true, email: true
   validates :login, uniqueness: true, presence: true

app/views/web/topics/_form.html.haml

@@ -0,0 +1,4 @@
+= f.input :state_event, as: :state_event
+= f.input :name
+= f.input :body
+= f.submit

app/views/web/topics/edit.html.haml

@@ -0,0 +1,2 @@
+= simple_form_for @topic do |f|
+  = render 'form', f: f

app/views/web/topics/new.html.haml

@@ -1,5 +1,2 @@
 = simple_form_for @topic do |f|
-  = f.input :state_event, as: :state_event
-  = f.input :name
-  = f.input :body
-  = f.submit
+  = render 'form', f: f

app/views/web/users/comments/index.html.haml

@@ -0,0 +1,2 @@
+%h1 Web::Users::Comments#index
+%p Find me in app/views/web/users/comments/index.html.haml

app/views/web/users/index.html.haml

@@ -7,7 +7,7 @@
   %tbody
     - @users.each do |u|
       %tr
-        %td= link_to u, user_path(u)
+        %td= link_to u, user_path(u.login)
         %td= u.human_state_name
         %td= l u.created_at
 

config/application.rb

@@ -15,8 +15,6 @@ class Application < Rails::Application
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    config.logger = Logger.new(STDOUT)
-
     config.autoload_paths += Dir["#{config.root}/lib/**/"]
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.

config/environments/production.rb

@@ -10,6 +10,8 @@
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
 
+  config.logger = Logger.new(STDOUT)
+
   # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

config/routes.rb

@@ -17,6 +17,7 @@
       end
       scope module: :users do
         resources :topics, only: [:index]
+        resources :comments, only: [:index]
       end
     end
     resources :hubs, only: [:index]

test/controllers/web/users/comments_controller_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class Web::Users::CommentsControllerTest < ActionController::TestCase
+  setup do
+    @user = create :user
+    @topic = create :topic, creator: @user
+    @params = {user_id: @user.login}
+  end
+
+  test "should get index" do
+    get :index, @params
+    assert_response :success
+  end
+
+end

test/helpers/web/users/comments_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Web::Users::CommentsHelperTest < ActionView::TestCase
+end