my_forum 0.0.1.beta32 → 0.0.1.beta33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f30da0c902dc4cd875aafee489523ec8625b2663
-  data.tar.gz: e15252c800442769c97569021bfd5700100b2c7e
+  metadata.gz: 42d3c4effdd86a539eb88301254c27338b41e46c
+  data.tar.gz: 6aa22f02793852e3978d20090e4bff5bc22ea810
 SHA512:
-  metadata.gz: 78238441523954305ba88332ab7a1bb46274bbcdeb88e48fb8fc9ae0957ea2246428fd44870acfcfd9e609a932d1cc5d9c18913033f5f4d59632e693b74c749f
-  data.tar.gz: 276fed314891ee8b47bfbb43b3e61f309d87aa29e18ee10ae40636c91714be7a9c03210b5b3d43f0dd586a4ed1d7150029cb980ea6641823fb28e363183db2d4
+  metadata.gz: ba7c4fe57317a26cf37ca85ac973dd47c41de8601b5353405536b4e34a3be18fee3619dae762db1611a5ee1bf381dbf7f01fc9619c62314b538e8f23b345e8b9
+  data.tar.gz: 327d3b5eea5608aeb07fbb0ea1f1e7796296c7748abe1cb72ae799e68a585ca2612cd44d7a8f3386bc1f08c21facb6d6f1cfcd119ae8b27366e175689a649117

data/app/controllers/my_forum/attachments_controller.rb

@@ -12,7 +12,7 @@ module MyForum
       attachment_ids = []
 
       params[:files].each do |uploaded_io|
-        next unless Attachment::ALLOWED_FILE_EXTENSIONS.include? File.extname(uploaded_io.original_filename)
+        next unless Attachment::ALLOWED_FILE_CONTENT_TYPE.include? uploaded_io.content_type
 
         file_name = "#{Time.now.to_i}_#{uploaded_io.original_filename}"
         File.open(File.join(upload_path, file_name), 'wb') do |file|

data/app/controllers/my_forum/posts_controller.rb

@@ -14,9 +14,9 @@ module MyForum
         process_attachments(post)
       end
 
-      last_page = @topic.posts.count / Post::PER_PAGE
+      last_page = (@topic.posts.count.to_f / Post::PER_PAGE).ceil
       last_page = 1 if last_page == 0
-      redirect_to forum_topic_path(@forum, @topic, page: last_page)
+      redirect_to forum_topic_path(@forum, @topic, page: last_page, go_to_last_post: true)
     end
 
     def destroy

data/app/controllers/my_forum/topics_controller.rb

@@ -12,7 +12,7 @@ module MyForum
     def show
       @topic = Topic.find(params[:id])
       check_access_permissions(@topic)
-      @topic_posts = @topic.posts.paginate(per_page: 16, page: params[:page])
+      @topic_posts = @topic.posts.paginate(per_page: Post::PER_PAGE, page: params[:page])
       @new_post = Post.new #TODO if quick_answer_enabled
 
       @topic.mark_as_read(current_user, @topic_posts.last)

data/app/controllers/my_forum/users_controller.rb

@@ -112,7 +112,7 @@ module MyForum
     end
 
     def upload_avatar(avatar_param)
-      return false unless Avatar::ALLOWED_FILE_EXTENSIONS.include? File.extname(avatar_param.original_filename)
+      return false unless Avatar::ALLOWED_FILE_CONTENT_TYPE.include? avatar_param.content_type
 
       current_avatar  = current_user.avatar
       upload_path     = File.join(Avatar::UPLOAD_PATH, current_user.id.to_s)

data/app/helpers/my_forum/posts_helper.rb

@@ -13,7 +13,8 @@ module MyForum
       text.gsub!(/\[\/img\]/i, '" />')
 
       # Youtube
-      text.gsub!(/(http|www)(.*youtu*.+\/)(watch\?(.+)?v=|embed\/watch\?|\/)(?<video_code>[a-z1-9]+)[?!\s]/i) do |match|
+      #[?!\s]
+      text.gsub!(/(?:https?:\/\/)?(?:www\.)?youtu(?:\.be|be\.com)\/(?:watch\?v=)?(?<video_code>[\w-]{10,})/i) do |match|
         "<iframe width='560' height='315' src='https://www.youtube.com/embed/#{$~[:video_code]}' frameborder='0' allowfullscreen></iframe>"
       end
 

data/app/models/my_forum/attachment.rb

@@ -6,6 +6,7 @@ module MyForum
     UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'attachments')
     URL  = File.join('/uploads', 'attachments')
 
-    ALLOWED_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif)
+    ALLOWED_FILE_EXTENSIONS   = %w(.jpg .jpeg .png .gif)
+    ALLOWED_FILE_CONTENT_TYPE = %w(image/jpeg image/png image/gif)
   end
 end

data/app/models/my_forum/avatar.rb

@@ -5,6 +5,7 @@ module MyForum
     UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'avatars')
     URL  = File.join('/uploads', 'avatars')
 
-    ALLOWED_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif)
+    ALLOWED_FILE_EXTENSIONS   = %w(.jpg .jpeg .png .gif)
+    ALLOWED_FILE_CONTENT_TYPE = %w(image/jpeg image/png image/gif)
   end
 end

data/app/views/my_forum/private_messages/show.haml

@@ -7,4 +7,4 @@
       = reply_pm_button(@pm)
 
       %h3= @pm.subject
-      = format_bbcode @pm.body
+      = sanitize format_bbcode @pm.body

data/app/views/my_forum/topics/_profile_popover.haml

@@ -1,22 +1,22 @@
 .profile-popover
   .row
-    .col-sm-5
-      = t('my_forum.profile_popover.posts_count')
-    .col-sm-4
-      = user.posts_count
+    .col-sm-5= t('my_forum.profile_popover.posts_count')
+    .col-sm-4= user.posts_count
 
   .row
-    .col-sm-5
-      = t('my_forum.profile_popover.registered_at')
-    .col-sm-4
-      = time(user.created_at)
+    .col-sm-5= t('my_forum.profile_popover.registered_at')
+    .col-sm-4= time(user.created_at)
 
   .row
-    .col-sm-5
-      = t('my_forum.profile_popover.status')
+    .col-sm-5= t('my_forum.profile_popover.status')
     .col-sm-4
-      = is_online_user?(user.login) ? t('my_forum.profile_popover.online') : t('my_forum.profile_popover.offline')
+      - is_online = is_online_user?(user.login)
+      = is_online ? t('my_forum.profile_popover.online') : t('my_forum.profile_popover.offline')
+
+  - unless
+    .row
+      .col-sm-5= t('my_forum.profile_popover.last_online')
+      .col-sm-4= time(user.updated_at)
 
   .row.pm
-    .col-sm-12
-      = link_to t('my_forum.profile_popover.write_pm'), new_private_message_path(to: user.login), class: 'btn btn-xs btn-warning'
+    .col-sm-12= link_to t('my_forum.profile_popover.write_pm'), new_private_message_path(to: user.login), class: 'btn btn-xs btn-warning'

data/app/views/my_forum/topics/show.haml

@@ -13,7 +13,7 @@
           .box
             = render partial: 'post', collection: @topic_posts
 
-        .row
+        .row{ id: 'pagination' }
           = will_paginate @topic_posts
 
       - if is_admin?
@@ -56,9 +56,4 @@
         setTimeout (-> $(_this).popover("hide") if !$(".popover:hover").length ), 300
       )
 
-
-    container = $('body')
-    scroll_to = $('post_number_' + "#{params[:show_post]}")
-    scroll_to = 'post_number_' + "#{params[:show_post]}"
-
-    $('body').scrollTo(scroll_to)
+    $('body').scrollTo('#pagination')

data/config/locales/ru.yml

@@ -10,6 +10,7 @@ ru:
       status: 'Текущий статус:'
       online: 'на форуме'
       offline: 'не на форуме'
+      last_online: 'Был на форуме'
       write_pm: 'Написать ЛС'
 
     today: "Сегодня в %{hhmm}"

data/lib/my_forum/engine.rb

@@ -6,8 +6,8 @@ module MyForum
     require 'bootstrap-sass'
 
     config.after_initialize do
-      ActionView::Base.sanitized_allowed_tags = %w(strong em a img br p i pre div span)
-      ActionView::Base.sanitized_allowed_attributes = %w(href title class src)
+      ActionView::Base.sanitized_allowed_tags = %w(strong em a img br p i pre div span iframe)
+      ActionView::Base.sanitized_allowed_attributes = %w(href title class src width height)
     end
 
     config.generators do |g|

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta32"
+  VERSION = "0.0.1.beta33"
 end

data/spec/dummy/db/schema.rb

@@ -11,12 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151012095554) do
+ActiveRecord::Schema.define(version: 20151221205045) do
 
   create_table "my_forum_categories", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "my_forum_category_permissions", force: :cascade do |t|
@@ -26,14 +26,22 @@ ActiveRecord::Schema.define(version: 20151012095554) do
     t.datetime "updated_at",    null: false
   end
 
+  create_table "my_forum_emoticons", force: :cascade do |t|
+    t.string   "file_name"
+    t.string   "code"
+    t.boolean  "is_active",  default: true
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+  end
+
   create_table "my_forum_forums", force: :cascade do |t|
     t.integer  "category_id"
     t.string   "name"
     t.string   "description"
     t.integer  "topics_count"
     t.integer  "posts_count"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
   end
 
   create_table "my_forum_images", force: :cascade do |t|
@@ -50,22 +58,25 @@ ActiveRecord::Schema.define(version: 20151012095554) do
     t.integer  "user_id"
     t.integer  "topic_id"
     t.integer  "post_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "my_forum_posts", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "topic_id"
     t.integer  "forum_id"
-    t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.text     "text",       limit: 4294967295
+    t.datetime "created_at",                                    null: false
+    t.datetime "updated_at",                                    null: false
+    t.boolean  "is_deleted",                    default: false
   end
 
   create_table "my_forum_private_messages", force: :cascade do |t|
     t.integer  "sender_id"
+    t.string   "sender_login"
     t.integer  "recipient_id"
+    t.string   "recipient_login"
     t.boolean  "sender_deleted",    default: false
     t.boolean  "recipient_deleted", default: false
     t.boolean  "unread",            default: true
@@ -79,8 +90,8 @@ ActiveRecord::Schema.define(version: 20151012095554) do
     t.string   "name"
     t.string   "color"
     t.text     "rights"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "my_forum_topics", force: :cascade do |t|
@@ -94,44 +105,54 @@ ActiveRecord::Schema.define(version: 20151012095554) do
     t.boolean  "pinned",         default: false
     t.boolean  "closed",         default: false
     t.boolean  "deleted",        default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+    t.boolean  "is_deleted",     default: false
   end
 
   create_table "my_forum_user_group_links", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "user_group_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
   create_table "my_forum_user_groups", force: :cascade do |t|
     t.string   "name"
     t.string   "html_color"
     t.boolean  "default",    default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "my_forum_user_roles", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "role_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "my_forum_users", force: :cascade do |t|
     t.string   "login"
     t.string   "password"
     t.string   "salt"
+    t.string   "real_name"
+    t.integer  "gender"
+    t.date     "birthdate"
+    t.text     "signature"
+    t.text     "avatar_url"
+    t.string   "location"
+    t.string   "user_ip"
+    t.text     "additional_info"
     t.string   "email"
     t.integer  "posts_count"
+    t.boolean  "activated",          default: false
     t.boolean  "is_admin",           default: false
     t.boolean  "is_moderator",       default: false
     t.boolean  "is_deleted",         default: false
     t.boolean  "permanently_banned", default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                         null: false
+    t.datetime "updated_at",                         null: false
     t.datetime "last_logged_in"
   end