h2g_ajaxchat 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed7c95dd7baa7e075472ce965f71916083e8f662a269292ef90bf195b89c1bc
-  data.tar.gz: 104cbd2876daee33558effccd165653bba0bcfd4ca4e691afcb67b257ab488df
+  metadata.gz: 941e2d26eb4eb2933c760bfc321214f8278f2e6266f94a35b5bcfcf969c6e369
+  data.tar.gz: b9ec8471271d3dfee2d5316376e8889b71be9abb9fce803ed5698e150692d1df
 SHA512:
-  metadata.gz: b38375b60ea5ae5fac4040e0136e59ae62af25b457ff207feb4f43f397d2296a56fa75a0b4dbcfe670df62f8e3dc537b9871be78c54ae5095ce351d262fbcfaf
-  data.tar.gz: 3b8a18a0c8d2240de2947b497d90203f74418ff75f8f2eb3972924f488360969117debf8d49d51b2f1eaee659ad03866667da47a7bd55887868451064f0e334e
+  metadata.gz: 51e2850f810132d03cfa9f71b2ff69e787ea1aaae16df17ffb327cae97672c8dbc4d33410c4dae131c43ed1e025d7a6a05380b426a5c1382511888786e269a56
+  data.tar.gz: 2e0f56b8e26b60accb24d4aabf5e60acdef9f1a8b731a5b795d9861e0cb3ba6bc083ddccf613b853f95678d75a73d0d76d89f522a109e8a2c8f49915906ea844

data/lib/h2g_ajaxchat.rb

@@ -10,6 +10,7 @@ require 'simple-config'
 
 # This file includes the following classes
 #
+# * AjaxChatPlugin Base class for plugins
 # * DummyRequest (used for testing)
 # * ChatCore  (chat engine)
 # * DummyRws  (used for testing)
@@ -18,9 +19,31 @@ require 'simple-config'
 # * Login      < WebPage
 # * Logout     < WebPage
 # * LogoutPost < WebPage
-# * AjaxChat
+# * AjaxChat (the main class)
 
 
+class AjaxChatPlugin
+
+  def initialize(settings={})    
+  end
+
+  # Customises the ajax chat html etc; ac = ajaxchat object
+  #
+  def apply(ac)
+  end
+
+  # messages from the plugin to be added to the chat timeline
+  #
+  def messages()
+    []
+  end
+  
+  # messages from the chat timeline
+  #
+  def on_newmessage(*a)
+  end
+end
+
 class DummyRequest
 
   def initialize()
@@ -136,20 +159,23 @@ end
 
 class WebPage
   
-  attr_reader :name
   attr_accessor :css, :html, :js, :s
 
-  def initialize(name, h={} )
-    @h, @name = h, name
+  def initialize( h={} )
+    @h = h
   end
 
   def to_css()
   end
 
   def to_html()
+    b = binding
+
+    ERB.new(html()).result(b)    
   end
 
   def to_js()
+    js()
   end
 
   def s()
@@ -157,7 +183,7 @@ class WebPage
   end
   
   def to_s()
-    @s
+    s()
   end
 
   protected
@@ -189,7 +215,7 @@ end
 class Index < WebPage
   
   def initialize(h)
-    @name, @h = :index, h
+    @h = h
   end
   
   def html()
@@ -220,9 +246,7 @@ div p span {colour: #dde}
 
   def to_html()
     
-    b = binding
-
-    ERB.new(@html).result(b)
+    super()
   end
   
   def js()
@@ -276,16 +300,13 @@ EOF
 
   end  
 
-  def to_js()
-    @js
-  end
   
 end
 
 class Login < WebPage
   
-  def initialize(h)
-    @name = :login
+  def initialize(h={})
+
   end
 
   def html()
@@ -303,16 +324,13 @@ class Login < WebPage
 
   end
   
-  def to_html()
-    @html
-  end
   
 end
 
 class Logout < WebPage
   
-  def initialize(h)
-    @name = :logout
+  def initialize(h={})
+
   end
 
   def html()
@@ -329,16 +347,13 @@ class Logout < WebPage
 
   end
   
-  def to_html()
-    @html
-  end
   
 end
 
 class LogoutPost < WebPage
   
-  def initialize(h)
-    @name = :logout_post
+  def initialize(h={})
+
   end
 
   def s()
@@ -346,10 +361,7 @@ class LogoutPost < WebPage
     @s ||= 'You have successfully logged out'
 
   end
-  
-  def to_s()
-    @s
-  end
+
   
 end
 
@@ -358,21 +370,25 @@ class AjaxChat
   
   attr_reader :rws, :views
 
-  def initialize(chatobj, rws=DummyRws.new(self), config: nil, debug: false)
+  def initialize(chatobj=ChatCore.new, rws: DummyRws.new(self), config: nil, 
+                 debug: false)
     
     @chat, @rws, @debug = chatobj, rws, debug    
 
-    plugins =  if config then
+    @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
               
+        next if settings[:disabled]
         pluginklass_name = 'AjaxChatPlugin' + name.to_s
         
-        Kernel.const_get(pluginklass_name).new(settings)
+        #Kernel.const_get(pluginklass_name).new(settings)
+        eval("#{pluginklass_name}.new(#{settings})")
         
-      end  
+      end.compact  
       
     else
       
@@ -396,7 +412,7 @@ class AjaxChat
       logout_post: @logout_post
     }
     
-    plugins.each {|plugin| plugin.apply(self) if plugin.respond_to? :apply }
+    @plugins.each {|plugin| plugin.apply(self) if plugin.respond_to? :apply }
     
   end
   
@@ -417,12 +433,8 @@ class AjaxChat
     @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
+                  
+        plugin.on_newmesage(t, uid, username, msg) if x.respond_to? :on_newmessage
         
       end   
           
@@ -480,7 +492,7 @@ class AjaxChat
 
   end
 
-  # user for debugging
+  # used for debugging
   def messages()
     @chat.messages
   end  
@@ -492,7 +504,7 @@ class AjaxChat
     
   end
   
-  # user for debugging
+  # used for debugging
   def users()
     @chat.users
   end
@@ -501,6 +513,8 @@ class AjaxChat
   
   def view(obj)
     
+    puts 'inside view obj: ' + obj.inspect if @debug
+    
     if obj.to_s.length > 0 then
       obj.to_s
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h2g_ajaxchat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   PrknRa5wCOkWn6MNeaZ10MuRCv0E4IRGb8q/2WczGDXI3lmwDWOzPzia3/A32vdt
   hlwWFeE0gWND9J9tivS5qxBI
   -----END CERTIFICATE-----
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-07-06 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
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   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
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: 
 email: james@jamesrobertson.eu
 executables: []