chatroom 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTU5ZTcxNjFhMTZlM2U0ZTQxZWM5MmJkMzE4MDk4YTUzNWE5NDEzOQ==
+    NDlhYWNiOTIxODA5MGU5Mjc1ZmE5ZWI5ZmVlNmQzOWFmOWMwM2M1NQ==
   data.tar.gz: !binary |-
-    OTA0N2YzNzA4MTQyOGQ2ZGJhYmRiZDk1ODBlNDc2YTY5NDY1Mzc5YQ==
+    ZGRjOWIzMDMwYjI3NGI5NzIwZWNhNDljYjJkMmFlYWM1NmRhMGU0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Nzg5ZTdlNmFlMGE0ZjNmYzYyMTg0MjYwZTY5NDFjNzRkMzlkNWVhYTI5NjRh
-    M2NkYmRkMjhiZGIzM2I5MDk4YWY3ODA4Njc4OWMxMzM4NjY0Y2VlYjY3MTk5
-    MGNjZjBjZTI1YmM4MjA3MGUxZDFmZWZlM2YwMzYwY2Q3ZTY5YTg=
+    ODQ0YTU0ZGM5OWM5OGFkNjM0Y2U4YWQzY2RmZjBiZGY5OTAxZDkxN2EyMzdi
+    NTQxMTNkNzY3MDdlNTk4YzVkM2FiNDBlNjJiM2Q0OGU0MzZhNjhhOWUyMmU5
+    YjdjZjhiMTkzNzFhMjg0MThlNTAwYWViYjVkZmEwNzEwMTMyYmQ=
   data.tar.gz: !binary |-
-    YzkwYWMzYmZmYzllNTIxNjYzZTdiYzY5NTkwZGU0Zjk1NTA0MjY0ZDhmYjk1
-    NzFhOTE2Mjg3ZmY0ZGI1MmE5Yjg3YTgzOTJmOWFiNWQwNTU3MGQ1YTQ3NWJi
-    MDIxMjExNDNiZDk0YTZiYWYyZTQyOWMwNmEyZTUyZTA0ZDk4MDM=
+    YjEwMTZlNzAxODgyY2U2ZWE1MGM3ZWM4MjA4Mzk3NjQzZTJhYzE5ODNmZmIz
+    NzY0YWJiN2E1NWZlODc4ZTBjNDY2N2VmNzhjNDUxOWYyOTM1NDgzZDNmYjAx
+    Mzk2ZTdjYmU5ODc1NzZhODQxMTQzZmQ1YjhmYTA2Zjc1OWE1YzM=

data/README.md

@@ -40,11 +40,20 @@ Start faye server in your terminal:
 
     rackup private_pub.ru -s thin -E production
 
-Add User to the Message:
-Just add a migration and add your code to show user's name in message\_helper.rb
+#####Add User to the Message:
+
+Add a migration and add your code to show user's name in message\_helper.rb:
 
     rails g migration add_user_id_to_messages
 
+Add hidden field about user\_id in chatroom/message\_helper.rb so as create the message with its ower:
+
+    <%= f.hidden_field :user_id, :value => current_user.id %>
+
+Allow params get the user\_id in chatroom/messages\_controller.rb:
+
+		params.require(:message).permit(:content, :user_id)
+
 ## Contributing
 
 1. Fork it

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

@@ -9,11 +9,11 @@
 
 function convertTagToMark(str) {
 		var emotions = [
-			"smile", "despressed", "like", "dull", "proud", "cry", "shy", "shut up",
-			"nap", "big cry", "awkward red", "angry", "naughty", "snag", "surprise", "bad",
-			"cool", "awkward", "scream", "vomit", "giggle", "lovely", "who cares", "zhuai",
+			"smile", "despressed", "like", "dull", "proud", "cry", "shy", "shut_up",
+			"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"
 		];
 		var s = "";
 

data/chatroom.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["969024089@qq.com"]
   spec.description   = %q{This gem can help you create a chatroom.}
   spec.summary       = %q{Chatroom provides functions, like adding emotions or changing text pattern.}
-  spec.homepage      = "http://github.com/TsaiKoga/"
+  spec.homepage      = "http://github.com/TsaiKoga/chatroom"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/chatroom.rb

@@ -1,12 +1,4 @@
 module Chatroom
-
 	require 'chatroom/engine' if defined?(Rails)
 	require 'generators/chatroom/install_generator'
-
-	# Default way to setup Chatroom. Run rails generate chatroom_install to create
-	# a fresh initializer with all configuration values.
-	# def self.setup
-		# yield self
-	# end
-
 end

data/lib/chatroom/version.rb

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

data/lib/generators/chatroom/chatroom_generator.rb

@@ -13,10 +13,7 @@ module Chatroom
 			class_option :routes, :desc => "Generate routes", :type => :boolean, :default => true
 
 			hook_for :orm
-			# hook_for :views
-			# hook_for :controllers
 			hook_for :assets
-			# hook_for :helpers
 
 			def add_chatroom_routes
 				chatroom_route = <<-ROUTE

data/lib/generators/chatroom/orm_helpers.rb

@@ -7,11 +7,11 @@ module Chatroom
 		validates :content, :presence => true, :length => { :maximum => 250 }
 
 		EMOTIONS = [
-			"smile", "despressed", "like", "dull", "proud", "cry", "shy", "shut up",
-			"nap", "big cry", "awkward red", "angry", "naughty", "snag", "surprise", "bad",
-			"cool", "awkward", "scream", "vomit", "giggle", "lovely", "who cares", "zhuai",
+			"smile", "despressed", "like", "dull", "proud", "cry", "shy", "shut_up",
+			"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"
 		]
 		
 		# The created time of the message
@@ -22,13 +22,15 @@ module Chatroom
 		# convert the marks to html tags
 		def html_content
 			return "" if content.blank? 
-			str = content.gsub(/\\[bold\\]/, "<b>")
+			str = content.gsub(/\\r\\n/, "<br/>") 
+			str = str.gsub(/(\\s)/, "&nbsp;")
+			str = str.gsub(/\\[bold\\]/, "<b>")
 			str = str.gsub(/\\[-bold\\]/, "</b>")
 			str = str.gsub(/\\[italic\\]/, "<i>")
 			str = str.gsub(/\\[-italic\\]/, "</i>")
 			str = str.gsub(/\\[color:(#.{6})\\]/){ |s| "<span style=\\"color:\#{$1}\\">" }
 			str = str.gsub(/\\[-color\\]/, "</span>")
-			str = str.gsub(/\\[(.+)\\]/) do |s|
+			str = str.gsub(/\\[(\\w+)\\]/) do |s|
 				emotion = EMOTIONS.index($1)
 				emotion.nil? ? "[\#{$1}]": "<img src=\\"/assets/emotions/\#{emotion}.gif\\" />" 
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatroom
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - TsaiKoga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,7 +251,7 @@ files:
 - lib/generators/chatroom/orm_helpers.rb
 - lib/generators/chatroom/views_generator.rb
 - lib/generators/templates/chatroom.rb
-homepage: http://github.com/TsaiKoga/
+homepage: http://github.com/TsaiKoga/chatroom
 licenses:
 - MIT
 metadata: {}