my_forum 0.0.1.beta8 → 0.0.1.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cc43fd34c90373024f8b0db296d9aaa4578aa9e
-  data.tar.gz: e6843ae240c19ed657d2b281be89be6a218ec90f
+  metadata.gz: 15f3d8458ba75bf60cea62853b7253c7dd1ad637
+  data.tar.gz: d9d3a429871206dc06b4d446a04401955df29070
 SHA512:
-  metadata.gz: 423fd0a4e3dd7d74d7f111a4eb38a365134ab85db3b273128503146e68f749ca9dbd4b2f1e5a244d09eb0b09d8b271acd18fcbd532c96484165fc48698395089
-  data.tar.gz: 54899113f69ee3cebcb701ff26471000d33a12ef17fa9a313a4cf95adbb927f852d9149379c245400ea361930202b9c639300d9cc15caed29d3c92a0e3041faf
+  metadata.gz: 05cbbc2f3e37f93f026de0e4945d9d68c5d60d4e0316783fff75ea8b647c58fe76c319459748c1a7407819fe59ec60e388a3d6b168f7f91dc4131f471f888b3b
+  data.tar.gz: 424d15c63e41e54fa179b18e8b6cfc1aaea8659e66a7fa3eb1282752a857fdba57594c625f32f7ea1a2bc6eb7f9d1647dfc75b070cace571c37e2357ab125b0f

data/app/assets/stylesheets/my_forum/welcome.css.scss

@@ -61,6 +61,12 @@
   }
 }
 
+#recent_topics {
+  table {
+    font-size: 10px;
+  }
+}
+
 #online_users {
   margin: 20px 0;
   font-size: 10px

data/app/controllers/my_forum/application_controller.rb

@@ -30,6 +30,19 @@ module MyForum
     end
     helper_method :new_pm_count
 
+    def forum_time(time)
+      local_time = time.localtime
+
+      if local_time.to_date == Time.now.to_date
+        return t('my_forum.today', hhmm: local_time.strftime('%H:%M'))
+      elsif local_time.to_date == (Time.now - 1.day).to_date
+        return t('my_forum.yerstaday ', hhmm: local_time.strftime('%H:%M'))
+      end
+
+      local_time.strftime('%Y-%m-%d %H:%M')
+    end
+    helper_method :forum_time
+
     private
 
     def user_activity

data/app/controllers/my_forum/welcome_controller.rb

@@ -7,6 +7,17 @@ module MyForum
 
       @forum_categories = Category.includes(:forums, :user_groups).
           reject{|category| (category.user_groups.map(&:name) & (current_user_groups)).blank? }
+
+
+      # Don`r forget permissions
+      available_forum_ids = MyForum::Forum.where(category_id: @forum_categories.map(&:id)).pluck(:id)
+      @recent_topics = Topic.find_by_sql("
+        SELECT my_forum_topics.* FROM my_forum_topics
+        JOIN my_forum_forums ON my_forum_forums.id = my_forum_topics.forum_id
+        WHERE my_forum_forums.id IN (#{available_forum_ids.join(',')})
+        ORDER BY my_forum_topics.updated_at DESC limit 10
+      ")
+
     end
   end
 end

data/app/helpers/my_forum/application_helper.rb

@@ -35,8 +35,9 @@ module MyForum
       content_tag :div, obj.errors.full_messages.to_sentence, class: 'errors_for'
     end
 
+    # TODO deprecate!
     def time(datetime)
-      datetime.strftime('%T %F')
+      forum_time(datetime)
     end
 
   end

data/app/helpers/my_forum/forums_helper.rb

@@ -19,7 +19,7 @@ module MyForum
 
     def forum_stat(forum)
       html  = content_tag(:div, t('.topics_count', topics_count: forum.topics_count))
-      html += content_tag(:div, t('.messages_count', messages_count: forum.topics_count))
+      html += content_tag(:div, t('.messages_count', messages_count: forum.posts_count))
       html.html_safe
     end
 
@@ -27,8 +27,9 @@ module MyForum
       info = forum.latest_topic_info
 
       html  = content_tag(:div, info ? (t('.last_answer_from') + info.user_login) : '-' )
-      html += content_tag(:div, info ? (t('.in_forum') + info.topic_name) : '-' )
-      html += content_tag(:div, info ? info.post_created_at : '-' )
+      html += content_tag(:div, info ? (link_to((t('.in_forum') + info.topic_name), forum_topic_path(info.forum_id, info.id))) : '-' )
+      html += content_tag(:div, info ? forum_time(info.post_created_at) : '-' )
+
       html.html_safe
     end
 

data/app/helpers/my_forum/topics_helper.rb

@@ -2,7 +2,7 @@ module MyForum
   module TopicsHelper
 
     def topic_last_post_info(topic)
-      html  = content_tag(:div, time(topic.last_post_time))
+      html  = content_tag(:div, forum_time(topic.last_post_time))
       html += content_tag(:div, topic.last_post_user_login)
       html.html_safe
     end

data/app/models/my_forum/forum.rb

@@ -6,7 +6,12 @@ module MyForum
 
     def latest_topic_info
       Topic.find_by_sql("
-        SELECT my_forum_topics.name AS topic_name, my_forum_posts.created_at AS post_created_at, my_forum_users.login AS user_login
+        SELECT
+          my_forum_topics.name AS topic_name,
+          my_forum_topics.forum_id,
+          my_forum_topics.id,
+          my_forum_posts.created_at AS post_created_at,
+          my_forum_users.login AS user_login
         FROM my_forum_posts
         JOIN my_forum_topics ON my_forum_topics.id = my_forum_posts.topic_id
         JOIN my_forum_users ON my_forum_posts.user_id = my_forum_users.id

data/app/views/my_forum/welcome/index.haml

@@ -13,6 +13,21 @@
               .col-md-2.col-sm-2.forum-info= forum_stat(forum)
               .col-md-3.col-sm-3.forum-last-message-info= forum_last_message_info(forum)
 
+  #recent_topics
+    %table.table
+      %caption= t('.recent_topics')
+      %thead
+        %tr
+          %th= t('.topic_name')
+          %th= t('.last_message_from')
+          %th= t('.date')
+      %tbody
+        -@recent_topics.each do |topic|
+          %tr
+            %td= link_to topic.name, forum_topic_path(topic.forum, topic)
+            %td= topic.posts.last.user.login
+            %td= forum_time(topic.updated_at)
+
   #online_users.well
     = t('.users_online')
     = online_users

data/config/locales/en.yml

@@ -1,5 +1,8 @@
 en:
   my_forum:
+    today: "Today '%{hhmm}'"
+    yerstaday: "Yerstaday '%{hhmm}'"
+
     admin:
       forums:
         index:

data/config/locales/ru.yml

@@ -1,5 +1,8 @@
 ru:
+  today: "Сегодня"
   my_forum:
+    today: "Сегодня в %{hhmm}"
+    yerstaday: "Вчера в %{hhmm}"
     create_new_pm: 'Написать личное сообщение'
     create_new_topic: 'Создать новую тему'
     bbquote:
@@ -36,6 +39,10 @@ ru:
         in_forum: 'в '
         users_online: 'Сейчас на форуме: '
         today_online: 'Сегодня на форуме были: '
+        recent_topics: 'Последние сообщения'
+        topic_name: 'Тема:'
+        last_message_from: 'Последнее сообщение от:'
+        date: 'Дата:'
 
     forums:
       show:

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta8"
+  VERSION = "0.0.1.beta9"
 end

data/lib/tasks/my_forum_tasks.rake

@@ -1,4 +1,15 @@
 namespace :my_forum do
+  namespace :service do
+    desc 'Recalculate category posts count'
+    task recalculate_posts_count: :environment do
+      MyForum::Forum.all.each do |forum|
+        topic_ids = MyForum::Topic.where(forum_id: forum.id).pluck(:id)
+        count     = MyForum::Post.where(topic_id: topic_ids).count
+        forum.update(posts_count: count)
+      end
+    end
+  end
+
   namespace :import do
     namespace :smf do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta8
+  version: 0.0.1.beta9
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails