my_forum 0.0.1.beta23 → 0.0.1.beta24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed23ed60a37e201d6c95952c7decff9d690b6452
-  data.tar.gz: 2867a03850a8e9e8c6e010df6a3138e18c23bbc3
+  metadata.gz: 83d71115243552cf57f8858c49290e6c3cd64f8a
+  data.tar.gz: 6393661615784fdba897347493b2ab44928d4e68
 SHA512:
-  metadata.gz: a7cbd4137c9eced7c7285bb282083cfa7f98f5667bf16613217d97df10adaaa386bca512aba15f0deb9d3bf25d0125de9ecb9284e4de3e27e91934612bfa1c1d
-  data.tar.gz: c581225b7060f052ef8c7b146234e1d7e433fed63a14144a00c5800d9478b5be827f6d31c95406fe49e5e9f941a4ab896c6c7de8d6ae075bd07e1b5f5490b71c
+  metadata.gz: d9cdb9854415927bd70e9c2fb572bdf78bd074cd2e45296e686f8efb240fc232cacba74286a49cb9d34379614c89eb7bdea75c541e8ee851d7a31d47fad4c073
+  data.tar.gz: 0ef0e527d1adc0b765dc97f83955b8778bb028f963ff58440ca2d88998c812010f2e08295a912ec3528a2f8240af0aec0bc22aa4fd4628f3b61e38d5777b2678

data/app/assets/javascripts/my_forum/my_forum.js.coffee

@@ -19,15 +19,29 @@ ready = ->
 
   # BBCode editor
   $('.text-editor-buttons').click (event) ->
-    return false if !$(event.target).is('a') and !$(event.target).is('i')
-
     event.preventDefault()
 
     apply_to = $('.text-editor-buttons').data('apply-to')
     apply_to = $('#' + apply_to)
+
+    # Smiles
+    if $(event.target).attr('class').search('smile') >= 0
+      smile_code = $(event.target).data('code') || $(event.target).find('[data-code]').data('code')
+
+      if smile_code
+        text = apply_to.val()
+        apply_to.val(text + smile_code + ' ')
+
+      return false
+
+
+    # Text formatting
+    return false if !$(event.target).is('a') and !$(event.target).is('i')
+
     button = if $(event.target).is('a') then $(event.target).find('i') else $(event.target)
-    action = button.attr('class').replace('fa fa-', '');
+    html_class = button.attr('class')
 
+    action = if html_class then html_class.replace('fa fa-', '') else ''
     text = apply_to.val()
 
     switch action
@@ -41,7 +55,6 @@ ready = ->
         bbcode = '[u] [/u]'
       when 'link', 'video-camera', 'camera-retro'
         $('#add_photo').modal()
-
       else
         bbcode = ''
         console.log 'Unknown tag'

data/app/controllers/my_forum/admin/emoticons_controller.rb

@@ -0,0 +1,65 @@
+require_dependency "my_forum/application_controller"
+
+module MyForum
+  class Admin::EmoticonsController < ApplicationController
+    before_filter :verify_admin
+
+    layout 'layouts/my_forum/admin_application'
+
+    def index
+      @emoticons = Emoticon.all
+    end
+
+    def new
+      @emoticon = Emoticon.new
+    end
+
+    def create
+      #TODO validation add
+
+      # Create dir of not exists
+      FileUtils::mkdir_p Emoticon::UPLOAD_PATH
+
+      uploaded_io = params[:emoticon][:file_name]
+      File.open(File.join(Emoticon::UPLOAD_PATH, uploaded_io.original_filename), 'wb') do |file|
+        file.write(uploaded_io.read)
+      end
+
+      attachment = Emoticon.create(code: params[:emoticon][:code], file_name: uploaded_io.original_filename, is_active: true)
+
+      redirect_to admin_emoticons_path
+    end
+
+    def edit
+      @emoticon = Emoticon.find(params[:id])
+    end
+
+    def update
+      emoticon = Emoticon.find(params[:id])
+      emoticon.update(emoticon_params)
+
+      redirect_to admin_emoticons_path
+    end
+
+    def destroy
+      return unless emoticon = Emoticon.find(params[:id])
+
+      begin
+        FileUtils.rm File.join(Emoticon::UPLOAD_PATH, emoticon.file_name)
+        emoticon.destroy
+      rescue
+        Rails.logger.error 'can`t find and delete emoticon file'
+      ensure
+        emoticon.destroy
+      end
+
+      redirect_to admin_emoticons_path
+    end
+
+    private
+
+    def emoticon_params
+      params.require(:emoticon).permit(:code)
+    end
+  end
+end

data/app/controllers/my_forum/application_controller.rb

@@ -3,7 +3,7 @@ module MyForum
 
     before_filter :user_activity
 
-    helper_method :attachment_img_path
+    helper_method :attachment_img_path, :emoticons_list
 
     def authenticate_user!
       redirect_to admin_signin_path unless current_user
@@ -72,5 +72,9 @@ module MyForum
       attachment = Attachment.find_by_id(attachment_id.to_i)
       File.join(Attachment::URL, attachment.user_id.to_s, attachment.file_name)
     end
+
+    def emoticons_list
+      Emoticon.all.inject({}) {|hash, smile| hash.merge!(smile.code => File.join(Emoticon::URL, smile.file_name) ) }
+    end
   end
 end

data/app/controllers/my_forum/private_messages_controller.rb

@@ -42,12 +42,13 @@ module MyForum
         return
       end
 
-      @pm.recipient_id = recipient.id
+      @pm.recipient_id    = recipient.id
       @pm.recipient_login = recipient.login
-      @pm.sender_id = current_user_id
-      @pm.sender_login = current_user.login
+      @pm.sender_id       = current_user_id
+      @pm.sender_login    = current_user.login
       @pm.assign_attributes(pm_params)
-      @pm.save
+
+      UserMailer.pm_notification(recipient, current_user).deliver_now if @pm.save
 
       redirect_to action: :index
     end

data/app/helpers/my_forum/emoticons_helper.rb

@@ -0,0 +1,7 @@
+module MyForum
+  module EmoticonsHelper
+    def emoticon_url_for(emoticon)
+      File.join(Emoticon::URL, emoticon.file_name)
+    end
+  end
+end

data/app/helpers/my_forum/posts_helper.rb

@@ -43,7 +43,10 @@ module MyForum
         "<div class='bbqoute'> <div class='quote_info'>#{$~[:autor]} #{t('my_forum.bbquote.wrote')}:</div> #{$~[:text]} </div>"
       end
 
-
+      # Emoticons (smiles)
+      emoticons_list.each do |code, path|
+        text.gsub!(/#{Regexp.quote(code)}/) { "<img src='#{path}' class='smile' />" }
+      end
 
       # Link
       text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i) { "<a href='#{$1}'>#{$2}</a>" }

data/app/mailers/my_forum/user_mailer.rb

@@ -15,5 +15,10 @@ module MyForum
       @message = message
       mail(to: email, subject: subject)
     end
+
+    def pm_notification(user, sender)
+      @sender = sender
+      mail(to: user.email, subject: I18n.t('my_forum.mailer.new_pm_notification_subject'))
+    end
   end
 end

data/app/models/my_forum/emoticon.rb

@@ -0,0 +1,6 @@
+module MyForum
+  class Emoticon < ActiveRecord::Base
+    UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'emoticons')
+    URL = File.join('/uploads', 'emoticons')
+  end
+end

data/app/views/layouts/my_forum/admin_application.haml

@@ -21,6 +21,7 @@
             %li= link_to t('.manage_roles'), admin_roles_path
             %li= link_to t('.manage_users'), admin_users_path
             %li= link_to t('.manage_mail'), admin_mail_list_path
+            %li= link_to t('.manage_emoticons'), admin_emoticons_path
 
         .col-sm-9.col-md-10
           = yield

data/app/views/my_forum/admin/categories/new.haml

@@ -2,7 +2,4 @@
 
 = form_for @category, url: admin_categories_path do |f|
   = f.text_field :name, placeholder: t('.category_name')
-  = f.submit
-
-
-
+  = f.submit

data/app/views/my_forum/admin/emoticons/edit.haml

@@ -0,0 +1,4 @@
+.row.col-sm-2
+  = form_for @emoticon, url: admin_emoticon_path(@emoticon), multipart: true, role: 'form' do |f|
+    .form-group= f.text_field :code, class: 'form-control'
+    = f.submit

data/app/views/my_forum/admin/emoticons/index.haml

@@ -0,0 +1,15 @@
+- if @emoticons.blank?
+  =t('.no_emoticons')
+- else
+  %table.table
+    -@emoticons.each do |smile|
+      %tr
+        %td= smile.code
+        %td
+          %img{ src: emoticon_url_for(smile), class: 'smile' }
+        %td= smile.is_active
+        %td= link_to t('.edit'), edit_admin_emoticon_path(smile)
+        %td= link_to t('.delete'), admin_emoticon_path(smile), method: :delete, data: { confirm: "Are you sure?" }
+
+
+=link_to t('.add'), new_admin_emoticon_path

data/app/views/my_forum/admin/emoticons/new.haml

@@ -0,0 +1,5 @@
+.row.col-sm-2
+  = form_for @emoticon, url: admin_emoticons_path, multipart: true, role: 'form' do |f|
+    .form-group= f.file_field :file_name, class: 'form-control'
+    .form-group= f.text_field :code, class: 'form-control'
+    = f.submit

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

@@ -25,16 +25,18 @@
         =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' }
+        -# =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|
+        - emoticons_list.each do |code, path|
           =link_to '#', class: 'btn btn-default btn-sm smile-past' do
-            %img{ src: asset_path("my_forum/smiles/#{smile_file}.gif"), class: 'smile' }
+            %img{ src: path, class: 'smile', data: { code: code } }
+
+
+
 
     = form_for @new_post, url: forum_topic_posts_path(forum, topic), role: 'form' do |form|
       .form-group= form.text_area :text, class: 'form-control quick-answer', id: 'quick_answer_textarea'
@@ -60,11 +62,6 @@
         #loaded-content
 
         :coffee
-          $('.smile-past').click ->
-            smile_icon_path = $(this).find('img').attr('src')
-            smile_icon_file = smile_icon_path.split('/').pop()
-            $('#quick_answer_textarea').append('::' + smile_icon_file.split('.')[0] + ':: ')
-
           $('#attachment_file').change ->
             file_data = $('#attachment_file').prop('files')[0]
             form_data = new FormData()

data/app/views/my_forum/user_mailer/pm_notification.text.erb

@@ -0,0 +1,6 @@
+Привет!
+
+Пользователь <%= @sender.login %> отправил тебе личное сообщение!
+
+----
+http://vaz.od.ua

data/config/locales/ru.yml

@@ -1,6 +1,8 @@
 ru:
   today: "Сегодня"
   my_forum:
+    mailer:
+      new_pm_notification_subject: 'Уведомление о новом личном сообщении'
     today: "Сегодня в %{hhmm}"
     yesterday: "Вчера в %{hhmm}"
     create_new_pm: 'Написать личное сообщение'

data/config/routes.rb

@@ -34,6 +34,7 @@ MyForum::Engine.routes.draw do
     match 'forums', to: 'forums#index', via: [:get]
     match 'mail_list', to: 'mail#index', via: [:get, :post]
 
+    resources :emoticons
     resources :users
     resources :roles
     resources :categories do

data/db/migrate/20151220121140_create_my_forum_emoticons.rb

@@ -0,0 +1,10 @@
+class CreateMyForumEmoticons < ActiveRecord::Migration
+  def change
+    create_table :my_forum_emoticons do |t|
+      t.string  :file_name
+      t.string  :code
+      t.boolean :is_active, default: true
+      t.timestamps null: false
+    end
+  end
+end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta23"
+  VERSION = "0.0.1.beta24"
 end

data/spec/controllers/my_forum/admin/emoticons_controller_spec.rb

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

data/spec/models/my_forum/emoticon_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module MyForum
+  RSpec.describe Emoticon, 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.beta23
+  version: 0.0.1.beta24
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,6 +184,7 @@ files:
 - app/assets/stylesheets/my_forum/welcome.css.scss
 - app/controllers/my_forum/admin/categories_controller.rb
 - app/controllers/my_forum/admin/dashboard_controller.rb
+- app/controllers/my_forum/admin/emoticons_controller.rb
 - app/controllers/my_forum/admin/forums_controller.rb
 - app/controllers/my_forum/admin/mail_controller.rb
 - app/controllers/my_forum/admin/roles_controller.rb
@@ -202,6 +203,7 @@ files:
 - app/helpers/my_forum/admin/roles_helper.rb
 - app/helpers/my_forum/admin/users_helper.rb
 - app/helpers/my_forum/application_helper.rb
+- app/helpers/my_forum/emoticons_helper.rb
 - app/helpers/my_forum/forums_helper.rb
 - app/helpers/my_forum/posts_helper.rb
 - app/helpers/my_forum/private_messages_helper.rb
@@ -214,6 +216,7 @@ files:
 - app/models/my_forum/avatar.rb
 - app/models/my_forum/category.rb
 - app/models/my_forum/category_permission.rb
+- app/models/my_forum/emoticon.rb
 - app/models/my_forum/forum.rb
 - app/models/my_forum/image.rb
 - app/models/my_forum/log_read_mark.rb
@@ -234,6 +237,9 @@ files:
 - app/views/my_forum/admin/categories/edit.haml
 - app/views/my_forum/admin/categories/new.haml
 - app/views/my_forum/admin/dashboard/index.haml
+- app/views/my_forum/admin/emoticons/edit.haml
+- app/views/my_forum/admin/emoticons/index.haml
+- app/views/my_forum/admin/emoticons/new.haml
 - app/views/my_forum/admin/forums/index.haml
 - app/views/my_forum/admin/forums/new.haml
 - app/views/my_forum/admin/mail/index.haml
@@ -253,6 +259,7 @@ files:
 - app/views/my_forum/topics/new.haml
 - app/views/my_forum/topics/show.haml
 - app/views/my_forum/user_mailer/custom_email.text.erb
+- app/views/my_forum/user_mailer/pm_notification.text.erb
 - app/views/my_forum/user_mailer/reset_password_email.haml
 - app/views/my_forum/user_mailer/reset_password_email.text.erb
 - app/views/my_forum/users/edit.haml
@@ -279,10 +286,12 @@ files:
 - db/migrate/20150227210814_create_my_forum_private_messages.rb
 - db/migrate/20151012095554_create_my_forum_images.rb
 - db/migrate/20151218135729_add_is_deleted.rb
+- db/migrate/20151220121140_create_my_forum_emoticons.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/admin/emoticons_controller_spec.rb
 - spec/controllers/my_forum/admin/mail_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
@@ -324,6 +333,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/emoticon_spec.rb
 - spec/models/my_forum/private_message_spec.rb
 - spec/models/my_forum/user_spec.rb
 - spec/rails_helper.rb
@@ -353,6 +363,7 @@ signing_key:
 specification_version: 4
 summary: Simple Forum
 test_files:
+- spec/controllers/my_forum/admin/emoticons_controller_spec.rb
 - spec/controllers/my_forum/admin/mail_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
@@ -394,6 +405,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/helpers/my_forum/private_messages_helper_spec.rb
+- spec/models/my_forum/emoticon_spec.rb
 - spec/models/my_forum/private_message_spec.rb
 - spec/models/my_forum/user_spec.rb
 - spec/rails_helper.rb