h2g_ajaxchat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5575220d85e86b2c18aabfc6427cb88924328d4fc40c824038108727af5da1
-  data.tar.gz: a39989028a432c1c46d40aaecbe42012787261ef73a3f7cd199e31fb2ecf1e30
+  metadata.gz: f85b352a4b0b8983a25914a435145f0721e000e16b40c7bdfc815f8160ac8e81
+  data.tar.gz: 43e914e361c7c26c8ab9c9ecbed796c98adc8dffb9d835ede597afb9a0eaf2fa
 SHA512:
-  metadata.gz: 27cbfb9a5c8c87de83bd632bd71f98035d3a5c4c666b769f736eadb8a037c53752c4be4ab3b945c1c8d3720cdebc288e6fcb660bcc48a2280d64311d15378699
-  data.tar.gz: 4f00dd6a6f1f5e77e05ed2bc86a1043fcc0889c6663edf6b63b2dd48cacc0d92e9900901e72abf163bc8742b186aedc3e9925defc56bb21c476a1c43825ee545
+  metadata.gz: 90224175128a2631c1b7f37c159e6afb1302258ecc79842b6601ec3f2e5b4a41f903023b4709474f4cf43b65e75c67f4ad846e6fdd7fc0e7da61e2cadb73f12d
+  data.tar.gz: 07af2f963551f55c683797c3ba59eefde49a3220ce28c9690a44b475e29242e6f32bca392fae02a3b113044f98b0892cb8ed02d678eb3070b0372fb42f6f5778

data/lib/h2g_ajaxchat.rb

@@ -5,6 +5,20 @@
 # description: This gem makes it easier to build an AJAX chat project. 
 #              Designed for Rack-rscript.
 
+require 'simple-config'
+
+# This file includes the following classes
+#
+# * DummyRequest (used for testing)
+# * ChatCore
+# * DummyRws  (used for testing)
+# * WebPage
+# * Index      < WebPage
+# * Login      < WebPage
+# * Logout     < WebPage
+# * LogoutPost < WebPage
+# * AjaxChat
+
 
 class DummyRequest
 
@@ -60,7 +74,6 @@ class ChatCore
     else
 
       return '' unless newmsg
-      puts '_messages: ' + @messages.inspect
       @messages.length - 1
     end
 
@@ -123,9 +136,11 @@ class DummyRws
 end
 
 class WebPage
+  
+  attr_accessor :css, :html, :js, :s
 
-  def initialize(h={})
-    @h = h
+  def initialize(name, h={} )
+    @h, @name = h, name
   end
 
   def to_css()
@@ -138,7 +153,7 @@ class WebPage
   end
 
   def to_s()
-    html_template()
+    @s = html_template()
   end
 
   protected
@@ -166,142 +181,24 @@ end
 
 
 
-class AjaxChat
-  
-  attr_reader :rws
-
-  def initialize(chatobj, rws=DummyRws.new(self), debug: false)
-    @chat, @rws, @debug = chatobj, rws, debug
-  end
-  
-  def chatter(newmsg=nil)
-    
-    id, users = @rws.req.session[:session_id].to_s, @chat.users
-
-    @chat.chatter(@rws.req, newmsg) do  |t, uid, username, msg|
-          
-      s2 = if id == uid then
-        "you: %s" % msg
-      else
-        "%s: %s" % [users[uid], msg]
-      end
-      
-      "<p><span id='time'>%s</span> %s</p>" % [t.strftime("%H:%M:%S"), s2]
-      
-    end        
-    
-    
-  end
-
-  def login()
-
-    wp = WebPage.new
-
-    def wp.to_html()
-'
-	<div id="loginform">
-	<form action="login" method="post">
-		<p>Please enter your name to continue:</p>
-		<label for="name">Name:</label>
-		<input type="text" name="name" id="name" autofocus="true"/>
-		<input type="submit" name="enter" id="enter" value="Enter" />
-	</form>
-	</div>
-'
-
-    end
-
-    def wp.to_s()
-      to_html()
-    end
-
-    return wp
-
-  end
-
-  def login_post(username)
-
-    @chat.login @rws.req, username
-    @rws.redirect 'index'
-
-  end
-  
-  def logout()
-
-    wp = WebPage.new
-
-    def wp.to_html()
-'
-	<div id="logoutform">
-	<form action="logout" method="post">
-		<p>Are you sure you want to logout?</p>
-		<input type="submit" name="enter" id="enter" value="Yes" />
-	</form>
-	<a href="index">no, return to the chat page</a>
-	</div>
-	'
-
-    end
-
-    def wp.to_s()
-      to_html()
-    end
-
-    return wp
 
-  end  
+class Index < WebPage
   
-  def logout_post()
-
-    @chat.logout @rws.req
-            
-    wp = WebPage.new
-
-    def wp.to_s()
-      'You have successfully logged out'
-    end
-
-    return wp    
-
-  end  
-
-  def index()
-
-    @rws.req.session[:username] ? view_index() : login()
-
+  def initialize(h)
+    @name, @h = :index, h
   end
   
-  def messages()
-    @chat.messages
-  end  
-  
-  def req(obj)
-    @rws.req = obj
-    self
-  end
-  
-  def users()
-    @chat.users
-  end
-
-  private
-
-  def view_index()
-
-    h = {username: @rws.req.session[:username]}
-
-    wp = WebPage.new h
-
-    def wp.to_css()
-'
+  def to_css()
+@css ||= '
 body {font-family: Arial;}
 #chatbox {overflow: scroll; height: 40%}
 div p span {colour: #dde}
 '
-    end
+  end  
 
-    def wp.to_html()
-<<EOF
+  def to_html()
+
+@html ||= <<EOF
 <body onload="refresh()">
   <div id="wrapper">
 	  <div id="menu">
@@ -313,12 +210,13 @@ div p span {colour: #dde}
     <input name="usermsg" type="text" id="usermsg" size="33" onkeyup='ajaxCall1(event.keyCode, this)' autofocus='true'/>
 
   </div>      
-
 EOF
-    end
 
-    def wp.to_js()
-<<EOF
+  end
+  
+  def to_js()
+    
+@js ||= <<EOF
   
 function updateScroll(){
     var element = document.getElementById("chatbox");
@@ -365,12 +263,194 @@ function ajaxCall2() {
 
 EOF
 
+    end  
+  
+end
 
-    end
+class Login < WebPage
+  
+  def initialize(h)
+    @name = :login
+  end
 
-    return wp
+  def to_html()
 
+    @html ||= '
+<div id="loginform">
+<form action="login" method="post">
+  <p>Please enter your name to continue:</p>
+  <label for="name">Name:</label>
+  <input type="text" name="name" id="name" autofocus="true"/>
+  <input type="submit" name="enter" id="enter" value="Enter" />
+</form>
+</div>
+'
+
+  end
+  
+end
+
+class Logout < WebPage
+  
+  def initialize(h)
+    @name = :logout
   end
 
+  def to_html()
+
+    @html ||= '
+	<div id="logoutform">
+	<form action="logout" method="post">
+		<p>Are you sure you want to logout?</p>
+		<input type="submit" name="enter" id="enter" value="Yes" />
+	</form>
+	<a href="index">no, return to the chat page</a>
+	</div>
+	'
+
+  end
+  
 end
 
+class LogoutPost < WebPage
+  
+  def initialize(h)
+    @name = :logout_post
+  end
+
+  def to_s()
+
+    @s ||= 'You have successfully logged out'
+
+  end
+  
+end
+
+
+class AjaxChat
+  
+  attr_reader :rws
+
+  def initialize(chatobj, rws=DummyRws.new(self), config: nil, debug: false)
+    
+    @chat, @rws, @debug = chatobj, rws, debug    
+
+    plugins =  if config then
+    
+      SimpleConfig.new(config).to_h.map do |name, settings|
+        
+        settings = {} if settings.is_a? String
+              
+        pluginklass_name = 'AjaxChatPlugin' + name.to_s
+        
+        Kernel.const_get(pluginklass_name).new(settings)
+        
+      end  
+      
+    else
+      
+      []
+      
+    end
+    
+    @h = {}
+    
+    @index, @login, @logout, @logout_post  = \
+        [Index, Login, Logout, LogoutPost].map do |klass|
+      
+      obj = klass.new @h
+      
+      plugins.each {|plugin| plugin.apply obj }
+      
+      obj
+      
+    end
+    
+  end
+  
+  def chatter(newmsg=nil)
+    
+    id, users = @rws.req.session[:session_id].to_s, @chat.users
+
+    @chat.chatter(@rws.req, newmsg) do  |t, uid, username, msg|
+          
+      s2 = if id == uid then
+        "you: %s" % msg
+      else
+        "%s: %s" % [users[uid], msg]
+      end
+      
+      "<p><span id='time'>%s</span> %s</p>" % [t.strftime("%H:%M:%S"), s2]
+      
+    end        
+        
+  end
+
+  def login()
+
+    view @login
+
+  end
+
+  def login_post(username)
+
+    @chat.login @rws.req, username
+    @rws.redirect 'index'
+
+  end
+  
+  def logout()
+
+    view @logout
+
+  end  
+  
+  def logout_post()
+
+    @chat.logout @rws.req            
+    view @logout_post 
+
+  end  
+
+  def index()
+
+    if @rws.req.session[:username] then
+      
+      @h[:username] = @rws.req.session[:username]
+      view @index
+      
+    else
+      
+      @rws.redirect 'login'
+      
+    end
+
+  end
+  
+  def messages()
+    @chat.messages
+  end  
+  
+  def req(obj)
+    
+    @rws.req = obj
+    self
+    
+  end
+  
+  def users()
+    @chat.users
+  end
+  
+  private
+  
+  def view(obj)
+    
+    if obj.to_s.length > 0 then
+      obj.to_s
+    else
+      obj
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h2g_ajaxchat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,8 +35,28 @@ cert_chain:
   PrknRa5wCOkWn6MNeaZ10MuRCv0E4IRGb8q/2WczGDXI3lmwDWOzPzia3/A32vdt
   hlwWFeE0gWND9J9tivS5qxBI
   -----END CERTIFICATE-----
-date: 2020-07-04 00:00:00.000000000 Z
-dependencies: []
+date: 2020-07-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: simple-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 description: 
 email: james@jamesrobertson.eu
 executables: []