RubyGems - h2g_ajaxchat - Versions diffs - 0.3.0 → 0.3.1 - Mend

h2g_ajaxchat 0.3.0 → 0.3.1

Files changed (6) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a2cf7b50b820656771890f8cb122798afc244978db1f66b2515adab699494d
-  data.tar.gz: 337be4f988d85f925abd286df7a27be25e67493fa1346e7c7d71bbf3f7abf883
+  metadata.gz: fed7c95dd7baa7e075472ce965f71916083e8f662a269292ef90bf195b89c1bc
+  data.tar.gz: 104cbd2876daee33558effccd165653bba0bcfd4ca4e691afcb67b257ab488df
 SHA512:
-  metadata.gz: 73b8f7645dbca15f7f737f034812a157aa8424281a56a244e8848962509bd380802dc778db3a9d68a1ba0db951efeb27e3d54446e0c5960a86ce6fd93cc145f9
-  data.tar.gz: bb44bb414122e1eaa926cb5e8e9c0e90c1d419942470f460958adf84545e2743e14601c81cc4a6a8596d6b4586b0bb09898c4dc786da6d633a3db70c5e9afc66
+  metadata.gz: b38375b60ea5ae5fac4040e0136e59ae62af25b457ff207feb4f43f397d2296a56fa75a0b4dbcfe670df62f8e3dc537b9871be78c54ae5095ce351d262fbcfaf
+  data.tar.gz: 3b8a18a0c8d2240de2947b497d90203f74418ff75f8f2eb3972924f488360969117debf8d49d51b2f1eaee659ad03866667da47a7bd55887868451064f0e334e

checksums.yaml.gz.sig CHANGED

Binary file

data.tar.gz.sig CHANGED

Binary file

data/lib/h2g_ajaxchat.rb CHANGED

@@ -109,13 +109,11 @@ class ChatCore
   protected
-  def append_message(msg)
-    u = @session[:username]
-    id = @session[:session_id].to_s
-    @users[id] = u.to_s
-    @messages << [Time.now, id, u, msg]
+  def append_message(t=Time.now, id=@session[:session_id].to_s,
+                     u=@session[:username], msg)
+    @users[id] = u.to_s
+    @messages << [t, id, u, msg]
   end
@@ -138,6 +136,7 @@ end
 class WebPage
+  attr_reader :name
   attr_accessor :css, :html, :js, :s
   def initialize(name, h={} )
@@ -153,8 +152,12 @@ class WebPage
   def to_js()
   end
+  def s()
+    @s ||= html_template()
+  end
   def to_s()
-    @s = html_template()
+    @s
   end
   protected
@@ -189,17 +192,7 @@ class Index < WebPage
     @name, @h = :index, h
   end
-  def to_css()
-@css ||= '
-body {font-family: Arial;}
-#chatbox {overflow: scroll; height: 40%}
-div p span {colour: #dde}
-'
-  end
-  def to_html()
-    b = binding
+  def html()
 @html ||= <<EOF
 <body onload="refresh()">
@@ -215,10 +208,24 @@ div p span {colour: #dde}
   </div>
 EOF
+  end
+  def to_css()
+@css ||= '
+body {font-family: Arial;}
+#chatbox {overflow: scroll; height: 40%}
+div p span {colour: #dde}
+'
+  end
+  def to_html()
+    b = binding
     ERB.new(@html).result(b)
   end
-  def to_js()
+  def js()
 @js ||= <<EOF
@@ -267,7 +274,11 @@ function ajaxCall2() {
 EOF
-    end
+  end
+  def to_js()
+    @js
+  end
 end
@@ -277,7 +288,7 @@ class Login < WebPage
     @name = :login
   end
-  def to_html()
+  def html()
     @html ||= '
 <div id="loginform">
@@ -292,6 +303,10 @@ class Login < WebPage
   end
+  def to_html()
+    @html
+  end
 end
 class Logout < WebPage
@@ -300,7 +315,7 @@ class Logout < WebPage
     @name = :logout
   end
-  def to_html()
+  def html()
     @html ||= '
 	<div id="logoutform">
@@ -314,6 +329,10 @@ class Logout < WebPage
   end
+  def to_html()
+    @html
+  end
 end
 class LogoutPost < WebPage
@@ -322,18 +341,22 @@ class LogoutPost < WebPage
     @name = :logout_post
   end
-  def to_s()
+  def s()
     @s ||= 'You have successfully logged out'
   end
+  def to_s()
+    @s
+  end
 end
 class AjaxChat
-  attr_reader :rws
+  attr_reader :rws, :views
   def initialize(chatobj, rws=DummyRws.new(self), config: nil, debug: false)
@@ -342,7 +365,7 @@ class AjaxChat
     plugins =  if config then
       SimpleConfig.new(config).to_h.map do |name, settings|
+        puts 'name: ' + name.inspect if @debug
         settings = {} if settings.is_a? String
         pluginklass_name = 'AjaxChatPlugin' + name.to_s
@@ -362,21 +385,46 @@ class AjaxChat
     @index, @login, @logout, @logout_post  = \
         [Index, Login, Logout, LogoutPost].map do |klass|
-      obj = klass.new @h
-      plugins.each {|plugin| plugin.apply obj }
-      obj
+      klass.new @h
     end
+    @views = {
+      index: @index,
+      login: @login,
+      logout: @logout,
+      logout_post: @logout_post
+    }
+    plugins.each {|plugin| plugin.apply(self) if plugin.respond_to? :apply }
   end
   def chatter(newmsg=nil)
     id, users = @rws.req.session[:session_id].to_s, @chat.users
+    chat = @chat
+    # check for new messages to be added via the plugins
+    @plugins.each do |plugin|
+      next unless plugin.respond_to? :messages
+      plugin.messages.each {|x| chat.append_message *x }
+    end
     @chat.chatter(@rws.req, newmsg) do  |t, uid, username, msg|
+      @plugins.each do |plugin|
+        plugin.messages.each do |x|
+          x.on_newmesage(t, uid, username, msg) if x.respond_to? :on_newmessage
+        end
+      end
       s2 = if id == uid then
         "you: %s" % msg

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h2g_ajaxchat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson

metadata.gz.sig CHANGED

Binary file