chatroom 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTUyOWQ0OWVjZDBmMzUwNDYwY2Y2NTk1OTRiMzBhYWQxNTQxODVlOQ==
+    MDU1OTVhMzJhNGJlYzQzZTk3MDVmMDk4OGEzZjI3ZmVjMWQwZTkyMg==
   data.tar.gz: !binary |-
-    NTY3ZWQ2NjY5OWZhZGFlNGZlZDYyNmUyYmYxNzFjODQ0MWZjMDIwOQ==
+    YjAyNjIyMmU0OWVmOGZiY2E5MmUyYjlhNzAxODU4YjIzMzg5ODZhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGMxYzI2Mjc5MDg2ZTYwNWY3MDBmMDQxMzM3Y2M2ZTA3YzJjZjA4NjE1ZTZm
-    N2FlNWJlNTVjMjA5Y2JhMmE1ZGExOTA1YzQ2Nzc3NThjYmRjNjM2YjkyMzA0
-    NThlNTc2N2FiNzBkNTM1YjgxNTA2YmZiYWVhYjNkYmY1OGY0N2Q=
+    NzQwNjI3ZjkxZGIzZWI1NjAzMzJjODVhOTFjNjFlYjY3NGFhOGZiN2VkNTU5
+    MDU2OTM0MjBjZDMzMmE3YTlmYzY3NmU5NTVlNDkyMmM3ZTI3M2U2ZmRjNjJj
+    NTljMDQxYjgyMWQwYzJlZDI4YjA1MTNmNjMzZTY3MmY1ZGM2ZjU=
   data.tar.gz: !binary |-
-    ZTM3ODgzZDQ1OWEwZjkzZDgwOTBiZmQ2ZDJiYTViZGQwOGY4NWM5ODc1MDQ1
-    M2IyMjEyMDc1NjVlN2Q5MGI0ZTVhMWVlNGZkNjc4NDhmNDVhMjhmNGI3OTY0
-    MGNjMWNmYTYzMDdhMjlhYTcwN2Q4MzI0YjdlMjZmZmJlNjM4ODU=
+    NTMzYzFjMmFlOTE2Yjg0MmUxNjgwZGY0YzNmMWUyMjM4ZGM0OTc2MGE1NjRi
+    MGU0ZjBmZTkzZmQyZWU2ZmE5ODg3MmRhYWFhNjY0OTBjZmViMGI5YzVhYzkw
+    YTNjMTZlYzljMWViYzY5OTdmZWMzZWI2ZDlhZmNlYzYwYzMyNDY=

data/app/assets/javascripts/chatroom/messages.js.coffee

@@ -63,6 +63,7 @@ window.Messages =
 					row.append(cell)
 				table.append(row)
 			table.append(page)
+		$("span.emotions-page").off("click")
 		Messages.emotionsPageTurning()
 		false
 

data/app/controllers/chatroom/messages_controller.rb

@@ -9,7 +9,6 @@ module Chatroom
 		# POST /messages.json
 		def create
 			message = message_params
-			message[:content] = prevent_script(message[:content])
 			@message = Message.create!(message)
 		end
 
@@ -18,15 +17,5 @@ module Chatroom
 			def message_params
 				params.require(:message).permit(:content)
 			end
-
-			def prevent_script(text)
-				txt = text.gsub(/<(\s*)([^\d\W\s]+)(\s*)([;\-\w="'\s:\/\.]+)>/) do |s|
-					"\\<#{$1}#{$2}#{$3}#{$4}\>"
-				end
-				txt = txt.gsub(/<\/(\s*)([^\d\W\s]+)(\s*)([;\-\w="'\s:\/\.]+)>/) do |s|
-					"\\</#{$1}#{$2}#{$3}#{$4}>"
-				end
-				return txt
-			end
 	end
 end

data/app/helpers/chatroom/message_helper.rb

@@ -5,7 +5,7 @@ module Chatroom
 				<div class='info-message'>
 					<span class='sender'>:</span><span class='send-time'>#{msg.try(:send_time)}</span>
 				</div>
-				<span class='say'>#{msg.try(:html_content)}</span>
+				<span class='say'>#{sanitize(msg.try(:html_content), tags: %w(br img span p i b a), attributes: %w(id class style))}</span>
 			</span>"
 		end
 
@@ -17,7 +17,7 @@ module Chatroom
 				<div class='info-message'>
 					<span class='sender'>:</span><span class='send-time'>#{msg.try(:send_time)}</span>
 				</div>
-				<span class='say'>#{msg.try(:html_content)}</span>
+				<span class='say'>#{sanitize(msg.try(:html_content), tags: %w(br img span p i b a), attributes: %w(id class style))}</span>
 			</span>"
 			end
 			messages.join('')

data/lib/chatroom/version.rb

@@ -1,3 +1,3 @@
 module Chatroom
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatroom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TsaiKoga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler