homeland 0.0.6 → 0.0.7

data/app/controllers/homeland/topics_controller.rb

@@ -16,7 +16,7 @@ module Homeland
     # GET /topics
     # GET /topics.xml
     def index
-      @topics = Topic.last_actived.limit(10)
+      @topics = Topic.last_actived.limit(10).includes(:user)
       @sections = Section.all
 
     end
@@ -29,21 +29,13 @@ module Homeland
 
     def node
       @node = Node.find(params[:id])
-      @topics = @node.topics.last_actived.paginate(:page => params[:page],:per_page => 50)
+      @topics = @node.topics.last_actived.includes(:user).paginate(:page => params[:page],:per_page => 50)
 
       render :action => "index"
     end
 
     def recent
-      @topics = Topic.recent.limit(50)
-
-      render :action => "index"
-    end
-
-    def search
-      result = Redis::Search.query("Topic", params[:key], :limit => 500)
-      ids = result.collect { |r| r["id"] }
-      @topics = Topic.find(ids).paginate(:page => params[:page], :per_page => 20)
+      @topics = Topic.recent.limit(50).includes(:user)
 
       render :action => "index"
     end
@@ -51,8 +43,7 @@ module Homeland
     def show
       @topic = Topic.find(params[:id])
       @node = @topic.node
-      @replies = @topic.replies.all
-
+      @replies = @topic.replies.all.includes(:user)
     end
 
     # GET /topics/new

data/app/helpers/homeland/application_helper.rb

@@ -1,4 +1,4 @@
-# coding: utf-8  
+# coding: utf-8
 module Homeland
   module ApplicationHelper
     def owner?(item)
@@ -6,22 +6,22 @@ module Homeland
       return if current_user.blank?
       item.user_id == current_user.id
     end
-  
+
     def timeago(time, options = {})
       options[:class] ||= "timeago"
       content_tag(:abbr, time.to_s, options.merge(:title => time.getutc.iso8601)) if time
     end
-    
+
     def user_name_tag(user,options = {})
       return "" if user.blank?
       link_to_if(Homeland.user_path_method, user.name, [main_app, user])
     end
-    
+
     def user_avatar_tag(user)
       return "" if user.blank?
       img = image_tag(user.try(Homeland.user_avatar_method.to_sym))
       link_to_if(Homeland.user_path_method, raw(img), [main_app, user])
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeland
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails