my_forum 0.0.2 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1ba421dcc871ea818bc90b35ad0ec9c0c0e74b
-  data.tar.gz: f08beb05ab8c50fe16c9a0fb40cd793a426a679d
+  metadata.gz: b41182adb8b596c4921371310fbd823932646e8f
+  data.tar.gz: b1a66385c9b08ce3d4b02ecf581ef348b3b48c6a
 SHA512:
-  metadata.gz: 2c3b1e5edb986c2cb9247315cd3edf131776d1b7ffb242a674fb3040d028fee1e04a3b6307b6e39021c8e85ccb40a25f699a776a777b38ed8475f8f86dd7b05e
-  data.tar.gz: c54770fa9defa218db1581bf133b9ccb384615444ded4a803119edfb8e981b2842782f168adfbe3834a78d0a0f6fe62fdf5e11b588b599268f74e653d62bbd98
+  metadata.gz: e30aebce379a7b413628cc63b46f7974740ca76872a06612d13d3e1b5b1861cb3e86b82e311798b24686261767d992dbf62b7a39f1307de40d0b30706e1345c1
+  data.tar.gz: 0bac644ed881e21bdbdcb841e737c4b7d626d01cece21c5e618053b73d4dd5449fbd1358f21ec5a5030047956ee2a25779eeaa93697d059909cc34f23ec214fe

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

@@ -16,5 +16,9 @@ ready = ->
       data:
         text: data
 
+  $('.user_autocomplete').keypress (event) ->
+    # determinate @ char
+    return unless event.keyCode == 64
+
 $(document).ready(ready)
 $(document).on('page:load', ready)

data/app/helpers/my_forum/posts_helper.rb

@@ -12,6 +12,7 @@ module MyForum
       # Images
       text.gsub!(/\[img\]/i,   '<img src="')
       text.gsub!(/\[\/img\]/i, '" />')
+      text.gsub!(/\[img\](.*?)\[\/img\]/i) { ActionController::Base.helpers.image_tag($1) }
 
       # Youtube
       text.gsub!(/(?:https?:\/\/)?(?:www\.)?youtu(?:\.be|be\.com)\/(?:watch\?v=)?(?<video_code>[\w-]{10,})/i) do |match|
@@ -56,16 +57,16 @@ module MyForum
         text.gsub!(/#{Regexp.quote(code)}/) { "<img src='#{path}' class='smile' />" }
       end
 
-      # Link
+      # Link TODO
       # ActionController::Base.helpers.... - this method uses in controller, which don`t know link_to
-      text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i)    { ActionController::Base.helpers.link_to($2, $1, target: '_blank') }
-      text.gsub!(/(http:\/\/[\S]+|www:\/\/[\S]+)/i) { ActionController::Base.helpers.link_to($1, $1, target: '_blank') }
+      #text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i)    { ActionController::Base.helpers.link_to($2, $1, target: '_blank') }
+      #text.gsub!(/(http:\/\/[\S]+|www:\/\/[\S]+)/i) { ActionController::Base.helpers.link_to($1, $1, target: '_blank') }
 
       # Ping user
       text.gsub!(/@\S+/) { |match| "<span class='badge'>#{match}</span>" }
 
 
-      text.html_safe
+      auto_link(text).html_safe
     end
 
     def bbquote(author:, date:)

data/config/locales/ru.yml

@@ -5,7 +5,7 @@ ru:
       sent: 'Сообщение отправленно'
     mailer:
       new_pm_notification_subject: 'Уведомление о новом личном сообщении'
-      ping_user: "Вас упоминули в теме %{topic_name}"
+      ping_user: "Вас упоминули в теме '%{topic_name}'"
     shared:
       post_preview:
         preview: 'Предпросмотр сообщения'

data/lib/my_forum/engine.rb

@@ -4,6 +4,7 @@ module MyForum
 
     require 'jquery-rails'
     require 'bootstrap-sass'
+    require 'rails_autolink'
 
     config.after_initialize do
       ActionView::Base.sanitized_allowed_tags = %w(strong em a img br p i pre div span iframe)

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.2"
+  VERSION = "0.0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails_autolink
+  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