my_forum 0.0.1.beta21 → 0.0.1.beta22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c11068cd89ded12b374df93e26bbf158a42e0f84
-  data.tar.gz: 1378f0a856061dbf5a547666578eaa31825d6ca0
+  metadata.gz: 6687212d40454b3bd545b5c820d5376fda03eb06
+  data.tar.gz: 296495aa0ecbac42795cc0160fc015831e484e03
 SHA512:
-  metadata.gz: 112f7ff639947e8e4d3d3e3d247588cba505b028dd72288c48ceb82a24d3fe8775ca0098f331bd00beec1b6648110634c99d56326bb43eba0d66c731d095190f
-  data.tar.gz: 4d64f4d3ab47161a73f9db84f6efc7e4163b4265cbe7b9b266d0bceed884fded1a40e34163d929afceef5d566485b02e36b117d52faaafb97fa9f43936e0ef3e
+  metadata.gz: 124b015faae0d8d258efa32adcfbc1a939ef9d6d6aa6fa62a3522c6587fcb25cec81dd498e504f330af85601f306e35422bf6174bcb45a7be78a3b1f074e013b
+  data.tar.gz: 63f95b1ff1ec240aaf7abf64472ed6d24cbc0e0fba47196de6c8192452327a79df0adcd1afb74688320a282b481be65feef494b4b53f910b735f52d15368a649

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

@@ -1,4 +1,22 @@
 ready = ->
+  # Quote button
+  $('.quote-post').click (event) ->
+    quoute_post_id = $(event.target).data('post-id')
+
+    $.ajax
+      url: '/post/' + quoute_post_id
+      type: "GET"
+      dataType: "json"
+      success: (response) ->
+        quote  = $('#quick_answer_textarea').val()
+        quote += '\n[quote author=' + response.author+ ']'
+        quote += response.text
+        quote += '[/quote]\n\n'
+
+        $('#quick_answer_textarea').val(quote)
+        $('body').scrollTo($('#quick_answer_textarea'))
+
+
   # BBCode editor
   $('.text-editor-buttons').click (event) ->
     return false if !$(event.target).is('a') and !$(event.target).is('i')

data/app/controllers/my_forum/posts_controller.rb

@@ -2,21 +2,36 @@ require_dependency "my_forum/application_controller"
 
 module MyForum
   class PostsController < ApplicationController
-    before_filter :find_topic
-    before_filter :find_forum
+    before_filter :find_topic, except: [:show]
+    before_filter :find_forum, except: [:show]
 
     def create
-      post = @topic.posts.build(post_params)
-      post.user = current_user
-      post.save
+      unless params[:post].fetch(:text).blank?
+        post = @topic.posts.build(post_params)
+        post.user = current_user
+        post.save
 
-      process_attachments(post)
+        process_attachments(post)
+      end
 
       last_page = @topic.posts.count / Post::PER_PAGE
       last_page = 1 if last_page == 0
       redirect_to forum_topic_path(@forum, @topic, page: last_page)
     end
 
+    def destroy
+      post = Post.find(params[:id])
+      post.update(is_deleted: true)
+      redirect_to forum_topic_path(post.topic.forum, post.topic)
+    end
+
+    def show
+      post = Post.find(params[:id])
+      respond_to do |format|
+        format.js { render json: { text: post.text, author: post.user.login }.as_json, status: :ok }
+      end
+    end
+
     private
 
     def process_attachments(post)

data/app/helpers/my_forum/posts_helper.rb

@@ -20,13 +20,13 @@ module MyForum
       end
 
       # Bold text
-      text.gsub!(/(\[b\])(?<bold_text>.*)(\[\/b\])/i) { |match| "<strong>#{$1}</strong>" }
+      text.gsub!(/(\[b\](?<bold_text>.+?)\[\/b\])/i) { |match| "<strong>#{$1}</strong>" }
 
       # Italic
-      text.gsub!(/(\[i\])(?<italic_text>.*)(\[\/i\])/i) { |match| "<i>#{$1}</i>" }
+      text.gsub!(/(\[i\])(?<italic_text>.*?)(\[\/i\])/i) { |match| "<i>#{$1}</i>" }
 
       # Cut
-      text.gsub!(/(\[cut\])(?<cut_text>.*)(\[\/cut\])/i) { |match| "<pre>#{$1}</pre>" }
+      text.gsub!(/(\[cut\])(?<cut_text>.*?)(\[\/cut\])/i) { |match| "<pre>#{$1}</pre>" }
 
       # Color
       text.gsub!(/\[color=(.*?)\](.*?)\[\/color\]/i) { "<span style='color: #{$1}'>#{$2}</span>" }
@@ -35,9 +35,15 @@ module MyForum
       text.gsub!(/\[size=(.*?)\](.*?)\[\/size\]/i) { "<span style='font-size: #{$1}'>#{$2}</span>" }
 
       # Quote
-      text.gsub!(/\[quote author=(.*?) link=(.*?) date=(.*?)\]/i) { bbquote(author: $1, date: $3) }
-      text.gsub!(/\[\/quote\]/i, '</div>')
-      text.gsub!(/\[quote(.*)\]/i, "<div class='bbqoute'>")
+      #text.gsub!(/\[quote author=(.*?) link=(.*?) date=(.*?)\]/i) { bbquote(author: $1, date: $3) }
+      #text.gsub!(/\[\/quote\]/i, '</div>')
+      #text.gsub!(/\[quote(.*)\]/i, "<div class='bbqoute'>")
+      text.gsub!(/(?<open>\[quote author=(?<autor>(.*?)) (.+)\](?<text>(.+))(?<close>\[\/quote\]))/i) do |match|
+        # "<div class='bbqoute'> <div class='quote_info'>#{$~[:autor]} #{t('my_forum.bbquote.wrote')} #{Time.now}:</div> #{$~[:text]} </div>"
+        "<div class='bbqoute'> <div class='quote_info'>#{$~[:autor]} #{t('my_forum.bbquote.wrote')}:</div> #{$~[:text]} </div>"
+      end
+
+
 
       # Link
       text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i) { "<a href='#{$1}'>#{$2}</a>" }

data/app/models/my_forum/post.rb

@@ -5,6 +5,8 @@ module MyForum
 
     after_create :update_topic_latest_post
 
+    default_scope { where(is_deleted: false) }
+
     PER_PAGE = 15
 
     private

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

@@ -5,7 +5,12 @@
     - user_login = post.user.try(:login)
     = online_user_marker(user_login)
     = user_login
-  .col-md-1.post_number.pull-right
+  .col-md-2.post_number.text-right
+    - # TODO optimize condition!
+    - if current_user and current_user.is_admin? and post.topic.posts.first != post
+      =link_to t('.delete'), forum_topic_post_path(@forum, post.topic, post), class: 'btn btn-xs btn-danger', method: :delete, data: { confirm: "Are you sure?" }
+    %button.btn.btn-xs.btn-warning.quote-post{ data: { post_id: post.id } }
+      =t('.quote')
     =link_to t('.number', post_number: post_counter), forum_topic_path(@forum, post.topic, show_post: post_counter)
 .row
   .col-md-2

data/config/locales/ru.yml

@@ -71,6 +71,8 @@ ru:
       post:
         sent: "Отправленно: %{datetime}"
         number: "Сообщение #%{post_number}"
+        quote: 'Цитировать'
+        delete: 'удалить'
 
     users:
       signin:

data/config/routes.rb

@@ -8,6 +8,8 @@ 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
 
+  match 'post/:id',         to: 'posts#show',               via: [:get], as: :post_content
+
   resources :images
   resources :avatars
   resources :attachments

data/db/migrate/20151218135729_add_is_deleted.rb

@@ -0,0 +1,6 @@
+class AddIsDeleted < ActiveRecord::Migration
+  def change
+    add_column :my_forum_posts, :is_deleted, :boolean, default: false
+    add_column :my_forum_topics, :is_deleted, :boolean, default: false
+  end
+end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta21"
+  VERSION = "0.0.1.beta22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta21
+  version: 0.0.1.beta22
 platform: ruby
 authors:
 - Vitaly Omelchenko
@@ -278,6 +278,7 @@ files:
 - 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
+- db/migrate/20151218135729_add_is_deleted.rb
 - lib/my_forum.rb
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb