my_forum 0.0.1.beta2 → 0.0.1.beta3

data/app/helpers/my_forum/users_helper.rb

@@ -8,6 +8,8 @@ module MyForum
 
     # Display user avatar
     def user_avatar(user)
+      return image_tag(user.avatar, class: 'user-avatar') unless user.avatar.blank?
+
       image_tag('blank_avatar.png', class: 'user-avatar')
     end
 

data/app/models/my_forum/attachment.rb

@@ -0,0 +1,8 @@
+module MyForum
+  class Attachment < Image
+    belongs_to :user, class_name: 'MyForum::User'
+    belongs_to :post, class_name: 'MyForum::Post'
+
+    UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'attachments')
+  end
+end

data/app/models/my_forum/avatar.rb

@@ -0,0 +1,4 @@
+module MyForum
+  class Avatar < Image
+  end
+end

data/app/models/my_forum/image.rb

@@ -0,0 +1,5 @@
+module MyForum
+  class Image < ActiveRecord::Base
+    belongs_to  :user
+  end
+end

data/app/models/my_forum/post.rb

@@ -5,6 +5,8 @@ module MyForum
 
     after_create :update_topic_latest_post
 
+    PER_PAGE = 15
+
     private
 
     def update_topic_latest_post

data/app/models/my_forum/topic.rb

@@ -1,7 +1,7 @@
 module MyForum
   class Topic < ActiveRecord::Base
-    has_many  :posts, :counter_cache => true, dependent: :destroy
-    belongs_to  :forum, :counter_cache => true
+    has_many    :posts, counter_cache: true, dependent: :destroy
+    belongs_to  :forum, counter_cache: true
     belongs_to  :user
 
     def info
@@ -16,18 +16,19 @@ module MyForum
     end
 
     def unread?(current_user, last_post)
-      return true unless current_user
-
-      log = LogReadMark.where(user_id: current_user.id, topic_id: self.id, post_id: last_post.id).count
-      log >= 1 ? false : true
+      return false unless current_user
+      !LogReadMark.where(user_id: current_user.id, topic_id: self.id, post_id: last_post.id).present?
     end
 
-    def mark_as_read(current_user, last_topic)
+    def mark_as_read(current_user, last_post)
       return true unless current_user
 
       log = LogReadMark.find_or_create_by(user_id: current_user.id, topic_id: self.id)
-      log.post_id = last_topic.id
-      log.save
+
+      if last_post.id.to_i > log.post_id.to_i
+        log.post_id = last_post.id
+        log.save
+      end
     end
   end
 end

data/app/models/my_forum/user.rb

@@ -3,6 +3,7 @@ module MyForum
     require 'digest'
 
     has_many :posts, class_name: 'MyForum::Post'
+    has_many :attachments
     has_many :user_roles
     has_many :roles, through: :user_roles
     has_many :user_group_links

data/app/views/layouts/my_forum/_user_navbar.html.haml

@@ -1,5 +1,6 @@
 .col-md-6
   = "#{t('.welcome_to_forum')}, #{current_user.login}"
+  = current_user.id if Rails.env.development?
 
 .col-md-6
   .btn-group.pull-right{ role: 'group' }

data/app/views/my_forum/forums/_topic_subject.html.haml

@@ -11,5 +11,5 @@
     = link_to topic.name.html_safe, forum_topic_path(forum, topic)
 .row
   .col-md-12.topic_description
-    =topic.description.html_safe
-    =# t('.author', author: topic.owner.login)
+    =# topic.description.html_safe
+    = t('.author', author: topic.owner.login)

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

@@ -19,6 +19,8 @@
             - @private_messages.each do |message|
               %tr
                 - html_class = 'unread' if message.unread?
-                %td=link_to message.created_at, private_message_url(message), class: html_class
+                %td=link_to message.created_at.strftime('%d-%b-%y %H:%M'), private_message_url(message), class: html_class
                 %td=link_to message.sender_login, private_message_url(message), class: html_class
-                %td=link_to message.subject, private_message_url(message), class: html_class
+                %td=link_to message.subject, private_message_url(message), class: html_class
+
+      = will_paginate @private_messages

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

@@ -1,8 +1,12 @@
-.row.post-header
-  .col-md-12.post_from_user_login
+- post_counter += 1
+
+.row.post-header{ id: "post_number_#{post_counter}"}
+  .col-md-10.post_from_user_login
     - user_login = post.user.try(:login)
     = online_user_marker(user_login)
     = user_login
+  .col-md-1.post_number.pull-right
+    =link_to t('.number', post_number: post_counter), forum_topic_path(@forum, post.topic, show_post: post_counter)
 .row
   .col-md-2
     = render 'user_info', post: post

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

@@ -1,8 +1,86 @@
 .row
   .col-md-10.col-md-offset-1
+    .text-editor-buttons{ data: { apply_to: 'quick_answer_textarea' } }
+      %div.btn-group
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-bold' }
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-italic' }
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-strikethrough' }
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-underline' }
+
+      -# %div.btn-group
+      -#   =link_to '#', class: 'btn btn-default btn-sm' do
+      -#     %i{ class: 'fa fa-align-left' }
+      -#   =link_to '#', class: 'btn btn-default btn-sm' do
+      -#     %i{ class: 'fa fa-align-center' }
+      -#   =link_to '#', class: 'btn btn-default btn-sm' do
+      -#     %i{ class: 'fa fa-align-right' }
+      -#   =link_to '#', class: 'btn btn-default btn-sm' do
+      -#     %i{ class: 'fa fa-align-justify' }
+
+      %div.btn-group
+        =link_to '#', class: 'btn btn-default btn-sm', data: { toggle: 'modal' } do
+          %i{ class: 'fa fa-camera-retro' }
+
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-video-camera' }
+        =link_to '#', class: 'btn btn-default btn-sm' do
+          %i{ class: 'fa fa-link' }
+
+      %div.btn-group.smiles
+        - smiles = %w(acute aggressive beee blum2 blush2 cray dirol download i-m_so_happy ireful2)
+        - smiles.each do |smile_file|
+          =link_to '#', class: 'btn btn-default btn-sm' do
+            %img{ src: asset_path("my_forum/smiles/#{smile_file}.gif"), class: 'smile' }
+
     = form_for @new_post, url: forum_topic_posts_path(forum, topic), role: 'form' do |form|
-      .form-group= form.text_area :text, class: 'form-control'
+      .form-group= form.text_area :text, class: 'form-control quick-answer', id: 'quick_answer_textarea'
 
       .pull-right
         = form.submit t('.quick_answer'), class: 'btn btn-primary'
-        = link_to t('.advanced_answer'), '#', class: 'btn btn-primary'
+        =# link_to t('.advanced_answer'), '#', class: 'btn btn-primary'
+
+
+#add_photo.modal.fade
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          %span{ aria_hidden: "true" }
+            ×
+        %h4.modal-title
+          = t('.add_new_photo')
+      .modal-body
+        = form_for MyForum::Attachment.new, url: attachments_path, multipart: true, remote: true do |f|
+          = f.file_field :file
+
+        #loaded-content
+
+        :coffee
+          $('#attachment_file').change ->
+            file_data = $('#attachment_file').prop('files')[0]
+            form_data = new FormData()
+            form_data.append('file', file_data)
+
+            $.ajax({
+              url: "#{attachments_path}"
+              dataType: 'html'
+              cache: false
+              contentType: false
+              processData: false
+              data: form_data
+              type: 'post',
+              success: (data, textStatus, jqXHR) ->
+                response = $.parseJSON(data)
+                $('#quick_answer_textarea').append('[attachment=' + response.attachment_id + ']')
+            })
+
+
+      .modal-footer
+        %button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          Close
+        %button.btn.btn-primary{ type: 'button' }
+          Save changes

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

@@ -11,11 +11,19 @@
             =t('.messages_in_topic', count: @topic.posts.count)
         .row.post-list-container
           .box
-            - @topic_posts.each do |post|
-              = render 'post', post: post
+            = render partial: 'post', collection: @topic_posts
 
-        = will_paginate @topic_posts
+        .row
+          = will_paginate @topic_posts
 
       - if can_quick_answer?(@topic)
         #quick_answer
           = render 'quick_answer', forum: @forum, topic: @topic
+
+:coffee
+  $(document).on 'ready page:load', ->
+    container = $('body')
+    scroll_to = $('post_number_' + "#{params[:show_post]}")
+    scroll_to = 'post_number_' + "#{params[:show_post]}"
+
+    $('body').scrollTo(scroll_to);

data/config/locales/ru.yml

@@ -63,6 +63,7 @@ ru:
         advanced_answer: 'Расширенный ответ'
       post:
         sent: "Отправленно: %{datetime}"
+        number: "Сообщение #%{post_number}"
 
     users:
       signin:
@@ -116,6 +117,7 @@ ru:
   will_paginate:
     previous_label: 'Назад'
     next_label: 'Вперед'
+    page_gap: ''
 
 
   activerecord:

data/config/routes.rb

@@ -8,11 +8,16 @@ MyForum::Engine.routes.draw do
   match 'unread_topics', to: 'forums#unread_topics', via: [:get], as: :unread_topics
   match 'mark_all_as_read', to: 'forums#mark_all_as_read', via: [:get], as: :mark_all_as_read
 
+  resources :images
+  resources :avatars
+  resources :attachments
+
   resources :users do
     collection do
       get :autocomplete
     end
   end
+
   resources :private_messages
 
   resources :forums, only: [:index, :show] do

data/db/migrate/20141117122751_create_my_forum_posts.rb

@@ -4,7 +4,7 @@ class CreateMyForumPosts < ActiveRecord::Migration
       t.integer :user_id
       t.integer :topic_id
       t.integer :forum_id
-      t.text    :text
+      t.text    :text,    :limit => 4294967295
       t.timestamps null: false
     end
   end

data/db/migrate/20141118131215_create_my_forum_users.rb

@@ -7,17 +7,18 @@ class CreateMyForumUsers < ActiveRecord::Migration
       t.string  :real_name
       t.integer :gender
       t.date    :birthdate
-      t.string  :signature
+      t.text    :signature
       t.string  :avatar
       t.string  :location
       t.string  :user_ip
       t.text    :additional_info
       t.string  :email
       t.integer :posts_count
-      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.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.timestamps null: false
       t.timestamp :last_logged_in
     end

data/db/migrate/20151012095554_create_my_forum_images.rb

@@ -0,0 +1,12 @@
+class CreateMyForumImages < ActiveRecord::Migration
+  def change
+    create_table :my_forum_images do |t|
+      t.integer :user_id
+      t.integer :post_id
+      t.string  :file_name
+      t.integer :file_size
+      t.string  :type
+      t.timestamps null: false
+    end
+  end
+end

data/lib/my_forum/engine.rb

@@ -2,7 +2,7 @@ module MyForum
   class Engine < ::Rails::Engine
     isolate_namespace MyForum
 
-    require "jquery-rails"
+    require 'jquery-rails'
     require 'bootstrap-sass'
 
     config.generators do |g|

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta2"
+  VERSION = "0.0.1.beta3"
 end

data/lib/tasks/my_forum_tasks.rake

@@ -1,4 +1,131 @@
-# desc "Explaining what the task does"
-# task :my_forum do
-#   # Task goes here
-# end
+namespace :my_forum do
+  namespace :import do
+    namespace :smf do
+
+      $connection = Mysql2::Client.new Rails.configuration.database_configuration['smf_import']
+
+      desc "Import Boards"
+      task boards: :environment do
+        MyForum::Category.delete_all
+        MyForum::Forum.delete_all
+
+        sql = <<-SQL
+          SELECT
+            `smf_categories`.`name` AS category_name,
+            `smf_boards`.`name` AS board_name,
+            `smf_boards`.`description` AS board_description
+          FROM smf_boards
+          INNER JOIN `smf_categories` ON `smf_boards`.`id_cat` = `smf_categories`.`id_cat`
+        SQL
+
+        result = $connection.query sql
+        result.each do |row|
+          category = MyForum::Category.find_or_create_by(name: row['category_name'])
+          category.forums.create(name: row['board_name'], description: row['board_description'])
+        end
+      end
+
+      desc "Import Users"
+      task users: :environment do
+        MyForum::User.destroy_all
+
+        sql = "SELECT member_name, date_registered, real_name, email_address, personal_text, birthdate, website_title, website_url, signature, avatar, is_activated FROM smf_members;"
+        result = $connection.query sql
+        result.each do |row|
+          begin
+            date_registered = Time.at(row['date_registered'].to_i) rescue nil
+            user = MyForum::User.create!(
+              login:      row['member_name'],
+              email:      row['email_address'],
+              real_name:  row['real_name'],
+              birthdate:  row['birthdate'],
+              signature:  row['signature'],
+              avatar:     row['avatar'],
+              created_at: date_registered,
+              additional_info: {
+                personal_text:  row['personal_text'],
+                website_title:  row['website_title'],
+                website_url:    row['website_url'],
+                is_activated:   row['is_activated']
+            })
+          rescue => e
+            print e
+          end
+        end
+      end
+
+      desc "Import Topics and Posts"
+      task topics: :environment do
+        MyForum::Topic.delete_all
+        MyForum::Post.delete_all
+
+        sql = <<-SQL
+          SELECT
+            `smf_boards`.`name` AS board_name, `smf_messages`.`poster_email`, `smf_messages`.`poster_name`, `smf_messages`.`body`,
+            `smf_messages`.`subject`, `smf_messages`.`poster_time`, `smf_messages`.`id_topic`
+          FROM `smf_messages`
+          INNER JOIN `smf_boards` ON `smf_messages`.`id_board` = `smf_boards`.`id_board`
+          ORDER BY `id_msg` ASC, `id_topic` ASC;
+        SQL
+        result = $connection.query sql
+        result.each do |row|
+          begin
+            user = MyForum::User.find_by_email(row['poster_email']) || MyForum::User.find_by_login(row['poster_name'])
+            user = MyForum::User.create!(login: row['poster_name'], email: row['poster_email'], is_deleted: true) unless user
+
+            forum = MyForum::Forum.find_or_create_by(name: row['board_name'])
+
+            # smf does not uses description field, so i use it temponary while import process
+            unless topic = MyForum::Topic.where(description: row['id_topic']).first
+              topic = forum.topics.create!(name: row['subject'], description: row['id_topic'])
+            end
+
+            post_time = Time.at(row['poster_time'].to_i)
+            topic.posts.create!(user: user, text: row['body'], forum_id: forum.id, created_at: post_time, updated_at: post_time)
+          rescue => e
+            print e
+          end
+        end
+        MyForum::Topic.update_all(description: nil)
+
+      end
+
+      desc "Import Private Messages"
+      task pms: :environment do
+        MyForum::PrivateMessage.delete_all
+
+        sql = <<-SQL
+          SELECT
+            smf_personal_messages.msgtime, smf_personal_messages.subject, smf_personal_messages.body, smf_personal_messages.from_name,
+            smf_pm_recipients.id_member as to_member, smf_members.member_name
+          FROM smf_personal_messages
+          LEFT JOIN smf_pm_recipients ON smf_personal_messages.id_pm = smf_pm_recipients.id_pm
+          LEFT JOIN smf_members ON smf_members.id_member = smf_pm_recipients.id_member
+        SQL
+
+        result = $connection.query sql
+        result.each do |row|
+          sender = MyForum::User.find_by_login(row['from_name'])
+          recipient = MyForum::User.find_by_login(row['member_name'])
+          next unless sender and recipient
+
+          pm_time = Time.at(row['msgtime'].to_i)
+
+          MyForum::PrivateMessage.create!(
+            sender_id: sender.id,
+            sender_login: sender.login,
+            recipient_id: recipient.id,
+            recipient_login: recipient.login,
+            sender_deleted: false,
+            recipient_deleted: false,
+            unread: false,
+            subject: row['subject'],
+            body: row['body'],
+            created_at: pm_time,
+            updated_at: pm_time)
+        end
+
+      end
+    end
+  end
+end

data/spec/controllers/my_forum/attachments_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module MyForum
+  RSpec.describe AttachmentsController, type: :controller do
+
+  end
+end

data/spec/controllers/my_forum/images_controller_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module MyForum
+  RSpec.describe ImagesControllerController, type: :controller do
+
+  end
+end

data/spec/models/my_forum/image_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module MyForum
+  RSpec.describe Image, type: :model do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta2
+  version: 0.0.1.beta3
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: font-awesome-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple forum engine.
 email:
 - prosto.vint@gmail.com
@@ -118,6 +132,16 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/images/my_forum/smiles/acute.gif
+- app/assets/images/my_forum/smiles/aggressive.gif
+- app/assets/images/my_forum/smiles/beee.gif
+- app/assets/images/my_forum/smiles/blum2.gif
+- app/assets/images/my_forum/smiles/blush2.gif
+- app/assets/images/my_forum/smiles/cray.gif
+- app/assets/images/my_forum/smiles/dirol.gif
+- app/assets/images/my_forum/smiles/download.gif
+- app/assets/images/my_forum/smiles/i-m_so_happy.gif
+- app/assets/images/my_forum/smiles/ireful2.gif
 - app/assets/javascripts/my_forum/admin/categories.js.coffee
 - app/assets/javascripts/my_forum/admin/dashboard.js.coffee
 - app/assets/javascripts/my_forum/admin/forums.js.coffee
@@ -125,6 +149,8 @@ files:
 - app/assets/javascripts/my_forum/admin/users.js
 - app/assets/javascripts/my_forum/application.js
 - app/assets/javascripts/my_forum/forums.js.coffee
+- app/assets/javascripts/my_forum/jquery.scrollTo.min.js
+- app/assets/javascripts/my_forum/jquery.selection.js
 - app/assets/javascripts/my_forum/my_forum.js.coffee
 - app/assets/javascripts/my_forum/posts.js.coffee
 - app/assets/javascripts/my_forum/topics.js.coffee
@@ -148,7 +174,9 @@ files:
 - app/controllers/my_forum/admin/roles_controller.rb
 - app/controllers/my_forum/admin/users_controller.rb
 - app/controllers/my_forum/application_controller.rb
+- app/controllers/my_forum/attachments_controller.rb
 - app/controllers/my_forum/forums_controller.rb
+- app/controllers/my_forum/images_controller.rb
 - app/controllers/my_forum/posts_controller.rb
 - app/controllers/my_forum/private_messages_controller.rb
 - app/controllers/my_forum/topics_controller.rb
@@ -167,9 +195,12 @@ files:
 - app/helpers/my_forum/welcome_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/my_forum/user_mailer.rb
+- app/models/my_forum/attachment.rb
+- app/models/my_forum/avatar.rb
 - app/models/my_forum/category.rb
 - app/models/my_forum/category_permission.rb
 - app/models/my_forum/forum.rb
+- app/models/my_forum/image.rb
 - app/models/my_forum/log_read_mark.rb
 - app/models/my_forum/post.rb
 - app/models/my_forum/private_message.rb
@@ -229,10 +260,13 @@ files:
 - db/migrate/20150215204852_create_my_forum_user_group_links.rb
 - db/migrate/20150215212443_create_my_forum_category_permissions.rb
 - db/migrate/20150227210814_create_my_forum_private_messages.rb
+- db/migrate/20151012095554_create_my_forum_images.rb
 - lib/my_forum.rb
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb
 - lib/tasks/my_forum_tasks.rake
+- spec/controllers/my_forum/attachments_controller_spec.rb
+- spec/controllers/my_forum/images_controller_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -274,6 +308,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/helpers/my_forum/private_messages_helper_spec.rb
+- spec/models/my_forum/image_spec.rb
 - spec/models/my_forum/private_message_spec.rb
 - spec/models/my_forum/user_spec.rb
 - spec/rails_helper.rb
@@ -303,6 +338,8 @@ signing_key:
 specification_version: 4
 summary: Simple Forum
 test_files:
+- spec/controllers/my_forum/attachments_controller_spec.rb
+- spec/controllers/my_forum/images_controller_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -344,6 +381,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/helpers/my_forum/private_messages_helper_spec.rb
+- spec/models/my_forum/image_spec.rb
 - spec/models/my_forum/private_message_spec.rb
 - spec/models/my_forum/user_spec.rb
 - spec/rails_helper.rb