my_forum 0.0.2.1 → 0.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b41182adb8b596c4921371310fbd823932646e8f
-  data.tar.gz: b1a66385c9b08ce3d4b02ecf581ef348b3b48c6a
+  metadata.gz: a40b00dc7a7c405a51552ab8b369c72f3b3db8be
+  data.tar.gz: 25bdf7620f52b3343ccdf68300469013c658ff56
 SHA512:
-  metadata.gz: e30aebce379a7b413628cc63b46f7974740ca76872a06612d13d3e1b5b1861cb3e86b82e311798b24686261767d992dbf62b7a39f1307de40d0b30706e1345c1
-  data.tar.gz: 0bac644ed881e21bdbdcb841e737c4b7d626d01cece21c5e618053b73d4dd5449fbd1358f21ec5a5030047956ee2a25779eeaa93697d059909cc34f23ec214fe
+  metadata.gz: 846bc2b37590460b145f099f66af6368936c68cee9177dea4c9135349b10ab81a153bdc7cc0cc274c03b03e9a7cb8af5a8e3149cc6487bb51a736b53ce126bf9
+  data.tar.gz: b6f75d554ba9cadfd3f6d976923ad515913ff8d4182f37fe9477b23a6a631025b66cf26971bc9d7b589800750d451462ea3d78cf9dba73e12d75d79c24f8ca48

data/app/controllers/my_forum/posts_controller.rb

@@ -66,8 +66,10 @@ module MyForum
     def ping_user(post_text, page)
       return unless post_text
 
-      post_text.scan(/@\S+/).each do |user_login|
+      # Try to get second word after whitespace if login consist it (ex: @super mario)
+      post_text.scan(/(@\S+)(\s\S+)?/).each do |user_login, additional|
         user = User.find_by_login(user_login[1..-1]) # strip @
+        user = User.find_by_login(user_login[1..-1] + additional)   unless user
         UserMailer.ping_from_post(user, @topic, page).deliver_later if user
       end
     end

data/app/helpers/my_forum/posts_helper.rb

@@ -61,10 +61,19 @@ module MyForum
       # 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) { |match| "#{$1}" }
 
       # Ping user
-      text.gsub!(/@\S+/) { |match| "<span class='badge'>#{match}</span>" }
-
+      #text.gsub!(/@\S+/) { |match| "<span class='badge'>#{match}</span>" }
+      text.gsub!(/(@\S+)(\s\S+)?/) do |match|
+        user_login = $1[1..-1]
+
+        if User.login_exists?(user_login)
+          "<span class='badge'>#{$1}</span> #{$2}"
+        elsif User.login_exists?(user_login + $2)
+          "<span class='badge'>#{$1}#{$2}</span>"
+        end
+      end
 
       auto_link(text).html_safe
     end

data/app/models/my_forum/user.rb

@@ -47,6 +47,10 @@ module MyForum
       password == encrypt(submitted_password)
     end
 
+    def self.login_exists?(login)
+      User.find_by_login(login).present?
+    end
+
     private
 
     def encrypt_password

data/lib/my_forum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails