chatroom 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDlhYWNiOTIxODA5MGU5Mjc1ZmE5ZWI5ZmVlNmQzOWFmOWMwM2M1NQ==
+    ZTUyOWQ0OWVjZDBmMzUwNDYwY2Y2NTk1OTRiMzBhYWQxNTQxODVlOQ==
   data.tar.gz: !binary |-
-    ZGRjOWIzMDMwYjI3NGI5NzIwZWNhNDljYjJkMmFlYWM1NmRhMGU0Yg==
+    NTY3ZWQ2NjY5OWZhZGFlNGZlZDYyNmUyYmYxNzFjODQ0MWZjMDIwOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODQ0YTU0ZGM5OWM5OGFkNjM0Y2U4YWQzY2RmZjBiZGY5OTAxZDkxN2EyMzdi
-    NTQxMTNkNzY3MDdlNTk4YzVkM2FiNDBlNjJiM2Q0OGU0MzZhNjhhOWUyMmU5
-    YjdjZjhiMTkzNzFhMjg0MThlNTAwYWViYjVkZmEwNzEwMTMyYmQ=
+    NGMxYzI2Mjc5MDg2ZTYwNWY3MDBmMDQxMzM3Y2M2ZTA3YzJjZjA4NjE1ZTZm
+    N2FlNWJlNTVjMjA5Y2JhMmE1ZGExOTA1YzQ2Nzc3NThjYmRjNjM2YjkyMzA0
+    NThlNTc2N2FiNzBkNTM1YjgxNTA2YmZiYWVhYjNkYmY1OGY0N2Q=
   data.tar.gz: !binary |-
-    YjEwMTZlNzAxODgyY2U2ZWE1MGM3ZWM4MjA4Mzk3NjQzZTJhYzE5ODNmZmIz
-    NzY0YWJiN2E1NWZlODc4ZTBjNDY2N2VmNzhjNDUxOWYyOTM1NDgzZDNmYjAx
-    Mzk2ZTdjYmU5ODc1NzZhODQxMTQzZmQ1YjhmYTA2Zjc1OWE1YzM=
+    ZTM3ODgzZDQ1OWEwZjkzZDgwOTBiZmQ2ZDJiYTViZGQwOGY4NWM5ODc1MDQ1
+    M2IyMjEyMDc1NjVlN2Q5MGI0ZTVhMWVlNGZkNjc4NDhmNDVhMjhmNGI3OTY0
+    MGNjMWNmYTYzMDdhMjlhYTcwN2Q4MzI0YjdlMjZmZmJlNjM4ODU=

data/app/assets/javascripts/chatroom/marks.js

@@ -13,7 +13,14 @@ function convertTagToMark(str) {
 			"nap", "big_cry", "awkward_red", "angry", "naughty", "snag", "surprise", "bad",
 			"cool", "awkward", "scream", "vomit", "giggle", "lovely", "who_cares", "zhuai",
 			"hungry", "sleepy", "scared", "sweat", "simper", "solider", "strive", "shout",
-			"questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye"
+			"questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye",
+			"sweat", "pick_nose", "applause", "embarrassed", "cheeky_grin", "not_worth_left", "not_worth_right", "yawn", 
+			"contempt", "grievance", "sad", "sinister_smile", "kiss", "startle", "pitiful", "chopper",
+			"watermelon", "beer", "basketball", "pingpong", "coffee", "rice", "pig", "flower",
+			"wither", "love", "heart", "borken_heart", "cake", "light", "bomb", "sword", 
+			"football", "insect", "shit", "moon", "sun", "gift", "hug", "good", 
+			"Lously", "agree", "Yeal", "greet", "come", "fist", "little_finger",
+			"love_you", "no", "ok"
 		];
 		var s = "";
 

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

@@ -11,6 +11,9 @@ window.Messages =
 
 	maxChatroom: () ->
 		$("#chatBeam").hide()
+		flash = $("#chatBeam .max-chatroom").attr("interval")
+		$("#chatBeam .max-chatroom").attr("interval", null)
+		clearInterval(flash)
 		$("#chatroom").slideToggle()
 		false
 
@@ -43,9 +46,13 @@ window.Messages =
 	# Editor: show all the emotions for selecting
 	constructEmotions: () ->
 		table = $("table.chatroom-emotions-images tbody")
+		page = $("<div><span class='emotions-page' style='float: left;'><</span><span class='emotions-page' style='float:right;'>></span></div>")
 		if !table.has("span").length
-			for i in [0...5]
-				row = $("<tr></tr>")
+			for i in [0...10]
+				if i < 5
+					row = $("<tr></tr>")
+				else
+					row = $("<tr style='display:none;'></tr>")
 				for j in [0...8]
 					n = i * 8 + j
 					img = $("<span></span>").addClass("emotion-img")
@@ -55,6 +62,17 @@ window.Messages =
 					cell = $("<td></td>").addClass("chat-cell").append(img)
 					row.append(cell)
 				table.append(row)
+			table.append(page)
+		Messages.emotionsPageTurning()
+		false
+
+	emotionsPageTurning: () ->
+		$("span.emotions-page").click ->
+			if $(this).html() == "&lt;"
+				$("table.chatroom-emotions-images tbody tr").toggle()
+			else if $(this).html() == "&gt;"
+				$("table.chatroom-emotions-images tbody tr").toggle()
+			false
 		false
 	
 	displayAllEmotions: () -> 

data/app/assets/stylesheets/chatroom/messages.css.scss

@@ -242,6 +242,15 @@ table.chatroom-emotions-images {
 				}
 			}
 		}
+		div {
+			span.emotions-page {
+				&:hover {
+					color: red;
+					border: 1px solid $blueSea;
+				}
+				color: $blueSea;
+			}
+		}
 	}
 }
 

data/app/controllers/chatroom/messages_controller.rb

@@ -8,7 +8,9 @@ module Chatroom
 		# POST /messages
 		# POST /messages.json
 		def create
-			@message = Message.create!(message_params)
+			message = message_params
+			message[:content] = prevent_script(message[:content])
+			@message = Message.create!(message)
 		end
 
 		private
@@ -16,5 +18,15 @@ 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/views/chatroom/messages/create.js.erb

@@ -1,6 +1,16 @@
 <% publish_to "/messages/new" do %>
 	$("#chat").append("<%= escape_javascript new_communication(@message).html_safe %>");
+
+	if($("#chatBeam").css("display") != "none") {
+		if ($(".max-chatroom").attr("interval") == null ) {
+			var flash = setInterval(function() { $(".max-chatroom").fadeOut(100).fadeIn(100)}, 300);
+			$(".max-chatroom").attr("interval", flash)
+		}
+	} else {
+		$(".max-chatroom").attr("interval", null)
+	}
+
+	$("#chat").animate({scrollTop: $("#chat")[0].scrollHeight}, 100);
 <% end %>
-$("#chat").animate({scrollTop: $("#chat")[0].scrollHeight}, 100);
 
 $("#new_message_content").val(''); 

data/lib/chatroom/version.rb

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

data/lib/generators/chatroom/orm_helpers.rb

@@ -11,7 +11,14 @@ module Chatroom
 			"nap", "big_cry", "awkward_red", "angry", "naughty", "snag", "surprise", "bad",
 			"cool", "awkward", "scream", "vomit", "giggle", "lovely", "who_cares", "zhuai",
 			"hungry", "sleepy", "scared", "sweat", "simper", "solider", "strive", "shout",
-			"questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye"
+			"questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye",
+			"sweat", "pick_nose", "applause", "embarrassed", "cheeky_grin", "not_worth_left", "not_worth_right", "yawn", 
+			"contempt", "grievance", "sad", "sinister_smile", "kiss", "startle", "pitiful", "chopper",
+			"watermelon", "beer", "basketball", "pingpong", "coffee", "rice", "pig", "flower",
+			"wither", "love", "heart", "borken_heart", "cake", "light", "bomb", "sword", 
+			"football", "insect", "shit", "moon", "sun", "gift", "hug", "good", 
+			"Lously", "agree", "Yeal", "greet", "come", "fist", "little_finger",
+			"love_you", "no", "ok"
 		]
 		
 		# The created time of the message
@@ -22,7 +29,9 @@ module Chatroom
 		# convert the marks to html tags
 		def html_content
 			return "" if content.blank? 
-			str = content.gsub(/\\r\\n/, "<br/>") 
+			str = content.gsub(/<(\\s*)(\\w+)(\\s*)>/){ |s| "<\\\#{$1}#{$2}#{$3}>" }
+			str = str.gsub(/<\\/(\\s*)(\\w+)(\\s*)>/){ |s| "<\\\/#{$1}#{$2}#{$3}>" }
+			str = str.gsub(/\\r\\n/, "<br/>") 
 			str = str.gsub(/(\\s)/, "&nbsp;")
 			str = str.gsub(/\\[bold\\]/, "<b>")
 			str = str.gsub(/\\[-bold\\]/, "</b>")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatroom
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - TsaiKoga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,44 +96,9 @@ files:
 - app/assets/images/emotions/0.gif
 - app/assets/images/emotions/1.gif
 - app/assets/images/emotions/10.gif
-- app/assets/images/emotions/100.gif
-- app/assets/images/emotions/101.gif
-- app/assets/images/emotions/102.gif
-- app/assets/images/emotions/103.gif
-- app/assets/images/emotions/104.gif
-- app/assets/images/emotions/105.gif
-- app/assets/images/emotions/106.gif
-- app/assets/images/emotions/107.gif
-- app/assets/images/emotions/108.gif
-- app/assets/images/emotions/109.gif
 - app/assets/images/emotions/11.gif
-- app/assets/images/emotions/110.gif
-- app/assets/images/emotions/111.gif
-- app/assets/images/emotions/112.gif
-- app/assets/images/emotions/113.gif
-- app/assets/images/emotions/114.gif
-- app/assets/images/emotions/115.gif
-- app/assets/images/emotions/116.gif
-- app/assets/images/emotions/117.gif
-- app/assets/images/emotions/118.gif
-- app/assets/images/emotions/119.gif
 - app/assets/images/emotions/12.gif
-- app/assets/images/emotions/120.gif
-- app/assets/images/emotions/121.gif
-- app/assets/images/emotions/122.gif
-- app/assets/images/emotions/123.gif
-- app/assets/images/emotions/124.gif
-- app/assets/images/emotions/125.gif
-- app/assets/images/emotions/126.gif
-- app/assets/images/emotions/127.gif
-- app/assets/images/emotions/128.gif
-- app/assets/images/emotions/129.gif
 - app/assets/images/emotions/13.gif
-- app/assets/images/emotions/130.gif
-- app/assets/images/emotions/131.gif
-- app/assets/images/emotions/132.gif
-- app/assets/images/emotions/133.gif
-- app/assets/images/emotions/134.gif
 - app/assets/images/emotions/14.gif
 - app/assets/images/emotions/15.gif
 - app/assets/images/emotions/16.gif
@@ -218,16 +183,6 @@ files:
 - app/assets/images/emotions/88.gif
 - app/assets/images/emotions/89.gif
 - app/assets/images/emotions/9.gif
-- app/assets/images/emotions/90.gif
-- app/assets/images/emotions/91.gif
-- app/assets/images/emotions/92.gif
-- app/assets/images/emotions/93.gif
-- app/assets/images/emotions/94.gif
-- app/assets/images/emotions/95.gif
-- app/assets/images/emotions/96.gif
-- app/assets/images/emotions/97.gif
-- app/assets/images/emotions/98.gif
-- app/assets/images/emotions/99.gif
 - app/assets/images/emotions/static.gif
 - app/assets/javascripts/chatroom/marks.js
 - app/assets/javascripts/chatroom/messages.js.coffee