simplepubsub 0.5.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1805609c5dec321fbde1b6c835a93edef5448009
-  data.tar.gz: e8b0604afbb9096bf109d34c65917360730a4801
+  metadata.gz: d900a96af9a7e45304f1cf25193a619b6a09ea69
+  data.tar.gz: 074182bcf709b23c432b45a1298f17d7eee8433f
 SHA512:
-  metadata.gz: 70c9367e4e48284bb71e68d0dfd1ec45b7947973a00978f4d06c7096cc2759ceccfdf3c9881317d1858fe8d7f60f042874eae9c82888c1c245391b72994c3fc6
-  data.tar.gz: 610a2d6be70cc96c9ab3d07b34729874d5bfba5b18b1781d72f3742c6dad9be0e1e0f659f4c40153fd5c529c4600100e48d58b1d7d436191d3ebd755445cf480
+  metadata.gz: 43fcd46034de9636033bf24ae6e40746201d547f8582b80d2f02232f112ba202c5701768b51787220525293505ed7d7d4979ff29e0ba2a466e2dadbee2c56369
+  data.tar.gz: 316b94f9395578f798b72eabc7a7aedf4aac58e18e8d9bfdd7a29db835af04bba166ed95f205a90380988ac26bb4de0fda566681dec31df764ca4d4bb8ebfe0a

data/lib/simplepubsub.rb

@@ -2,264 +2,126 @@
 
 # file: simplepubsub.rb
 
-require 'open-uri'
-require 'drb'
-require 'dws-registry'
-require 'socket'
-require 'chronic_duration'
+require 'websocket-eventmachine-server'
+require 'websocket-eventmachine-client'
 
 
-USER_AGENT = 'SimplePbSub client 0.5'
-
 module SimplePubSub
 
-  class Client
-    class PubSub
+  class Server
 
-      class Echo
+    def start(options={})
 
-        def initialize(options, &get_proc)
-          
-          @interval = options[:interval]
-          @t1 = Time.now
-          @get_proc = get_proc
-        end
+      opt = {host: '0.0.0.0', port: 59000}.merge options
+      host, port = opt[:host], opt[:port]
 
-        def message(topic, message)
-                    
-          return if @interval and @t1 + ChronicDuration.parse(@interval) > Time.now          
-          @t1 = Time.now
-          @get_proc.call topic, message
-        end
-      end
+      EM.run do
 
-      def initialize(hostname)
-        @hostname = hostname
-      end
+        subscribers = {}
 
-      def get(topic, options={}, &get_proc)
+        WebSocket::EventMachine::Server.start(host: host, port: port) do |ws|
 
-        DRb.start_service nil, Echo.new(options, &get_proc)
-         
-        obj = DRbObject.new nil, "druby://#{@hostname}:59000"
-        obj.subscribe(topic, DRb.uri)
-        DRb.thread.join        
+          ws.onopen do
+            puts "Client connected"
+          end
 
-      end
+          ws.onmessage do |msg, type|
 
-      def publish(topic, message)
+            puts "Received message: #{msg}"
 
-        DRb.start_service
-        obj = DRbObject.new nil, "druby://#{@hostname}:59000"
-        obj.deliver topic, message
-      end
-    end
+            a = msg.split(/\s*:\s*/,2)
+           
+            if a.first == 'subscribe to topic' then
 
-    attr_reader :remote_obj
+              topic = a.last
+              subscribers[topic] ||= []
+              subscribers[topic] << ws 
 
-    # generally used by the web server
-    #
-    def initialize(hostname)
-      
-      DRb.start_service
-      # attach to the DRb server via a URI given on the command line
-      @remote_obj = DRbObject.new nil, "druby://#{hostname}:59000"      
-    end
-    
-    def self.connect(base_url)
-      yield(PubSub.new base_url)
+            elsif a.length > 1
+
+              puts "publish this %s: %s" % a
+              topic, message = a
+
+              if subscribers[topic] and subscribers[topic].any? then
+
+                connections = subscribers[topic]
+                connections += subscribers['#'] if subscribers['#']
+                connections.each {|c| c.send message }
+              end
+
+            end
+
+            ws.send msg, :type => type
+          end
+
+          ws.onclose do
+            puts "Client disconnected"
+          end
+        end
+
+      end
     end
   end
-  
-  class Server
-      
-    attr_reader :subscribers, :bridges
-    
-    def initialize(raw_reg='simplepubsub.xml')
 
+  class Client
 
-      h = {DWSRegistry: ->{raw_reg}, String: ->{DWSRegistry.new raw_reg},:'RSC::Package' => ->{raw_reg}}
+    class PubSub
 
-      @reg = h[raw_reg.class.to_s.to_sym].call
-      
-      doc = Rexle.new(@reg.xml('hkey_apps/simplepubsub'))
+      attr_reader :proc, :topic, :message
 
-      root = doc.root
-      # try to read the subscribers
-      topics = root.xpath 'subscription_topics/*'
+      def get(topic, options={}, &get_proc)
 
-      @hostname = Socket.gethostname
-      @subscribers, @bridges = {'#' => []}, {'#' => {}}     
-            
-      topics.each do |topic_element|
-        topic = topic_element.name
-        @subscribers[topic] ||= []
-        @subscribers[topic] = topic_element.xpath 'subscribers/*/text()'
+        @topic = 'subscribe to topic'
+        @proc, @message = get_proc, topic
       end
 
-      @subscribers['#'] = root.xpath 'subscription_all_topics' + \
-          '/subscribers/*/text()'                            
+      def publish(topic, message)
 
-      root.xpath('bridge_topics/*').each do |topic_element|
-        topic = topic_element.name
-        @bridges[topic] = topic_element.elements[0].elements.inject({}) do |r,x|
-          r.merge({x.name.to_s => x.text('address')})
-        end
+        @topic, @message = topic, message
+        @proc = ->(_,_){ :stop}
       end
+    end
+    
+    def self.connect(hostname, port='59000')
 
+      pubsub = PubSub.new
+      yield(pubsub)
 
-      @bridges['#'] = root.xpath('bridge_all_topics/subscribers/*')
-          .inject({}) do |r,x|
-        r.merge({x.name.to_s => x.text('address')})
-      end
+      EM.run do
 
-      'done'
-    end
+        address = hostname + ':' + port
 
-    def start()
-      
-      # start up the DRb service
-      DRb.start_service 'druby://:59000', self
+        ws = WebSocket::EventMachine::Client.connect(:uri => 'ws://' + address)
 
-      # wait for the DRb service to finish before exiting
-      DRb.thread.join
+        ws.onopen do
+          puts "Connected"
+        end
 
-      'done'
-    end
-    
-    def subscribe(topic, uri)
-      
-      topic.sub!('/','_')
-      @subscribers[topic] ||= []
-      @subscribers[topic] << uri      
-      
-      # e.g. 'hkey_apps/simplepubsub/subscription_topics/magic/subscribers/niko', 
-      #         'druby://niko:353524'
-      if topic == '#' then
-        key = "hkey_apps/simplepubsub/subscription_all_topics/subscribers/%s" % \
-          [uri[/[^\/]+$/].sub(':','')]
-      else
-        key = "hkey_apps/simplepubsub/subscription_topics/%s/subscribers/%s" % \
-          [topic, uri[/[^\/]+$/].sub(':','')]        
-      end
-      
-      @reg.set_key key, uri
-    end   
-    
-    def deliver(topic, msg)
-      
-      topic.sub!('/','_')
-      
-      if not @subscribers.include?(topic) and \
-          not @subscribers.include?('#') then
-        return 'no topic subscribers' 
-      end
-                 
-
-      DRb.start_service
-
-      topic_subscribers = @subscribers[topic]
-      
-      if topic_subscribers then
-      
-        topic_subscribers.each do |uri|
-
-          next if @subscribers['#'].include? uri
-          
-          Thread.new {
-            begin          
-              
-              echo = DRbObject.new nil, uri            
-              echo.message topic, msg
-              
-            rescue DRb::DRbConnError => e             
-              
-              @subscribers[topic].delete uri
-              
-              if @subscribers[topic].empty? then
-                @subscribers.delete topic 
-                key = "hkey_apps/simplepubsub/subscription_topics/%s" % [topic]
-              else
-                key = "hkey_apps/simplepubsub/subscription_topics/%s/subscribers/%s" % \
-                    [topic, uri[/[^\/]+$/].sub(':','')]              
-              end
-              
-              @reg.delete_key key
-            end          
-          }
-          
+        ws.onmessage do |msg, type|
+
+          a = msg.split(/\s*,\s*/,2)
+          topic, message = a
+          r = pubsub.proc.call topic, message
+          (ws.close; EM.stop) if r == :stop
         end
-      end            
-
-      @subscribers['#'].each do |uri|
-        Thread.new {
-          
-          begin
-            echo = DRbObject.new nil, uri        
-            echo.message topic, msg
-          rescue DRb::DRbConnError => e
-            
-            @subscribers['#'].delete uri
-            key = "hkey_apps/simplepubsub/subscription_all_topics/subscribers/%s" % \
-                  [uri[/[^\/]+$/].sub(':','')]         
-            @reg.delete_key key          
-          end          
-        }
+
+        ws.onclose do
+          puts "Disconnected"
+        end
+
+        EventMachine.next_tick do
+          ws.send pubsub.topic + ': ' + pubsub.message
+        end
+
 
       end
-    end
-    
-    def add_bridge(topic, hostname, address)
-      
-      if topic == '#' then
-
-        key = "hkey_apps/simplepubsub/bridge_all_topics/webserver/%s/address" % \
-            [hostname]        
-      else
-        topic.sub!('/','_')
-        @bridges[topic] ||= {}
-
-        key = "hkey_apps/simplepubsub/bridge_topics/%s/webserver/%s/address" % \
-            [topic, hostname]
-      end
-      
-      @bridges[topic].merge!(hostname => address)      
-      @reg.set_key key, address    
-    end
-    
-    def delete_bridge(topic, hostname)
-      
-      @bridges[topic].delete hostname
-      
-      if @bridges[topic].empty? and topic != '#' then        
-        @bridges.delete_key(topic)
-        key = "hkey_apps/simplepubsub/bridge_topics/%s" % [topic]
-      else
-        key = "hkey_apps/simplepubsub/bridge_topics/%s/webserver/%s/address" % \
-            [topic, hostname]                
-      end
-      
-      @reg.delete_key key      
-    end
-    
-    def bridge_deliver(topic, message, excluded_host=nil)
-      
-      return 'no matching topic' unless @bridges.has_key? topic
-      
-      if excluded_host  then
-        bridges = @bridges[topic].select{|x| x != excluded_host}
-      else
-        bridges = @bridges[topic]
-      end
-      
-      bridges.values.each do |address|
-        url = "http://%s/do/simplepubsub/bridgepub?topic=%s&hostname=%s&message=%s" % \
-            [address, URI.escape(topic), @hostname, URI.escape(message)]
-        r = open(url, 'UserAgent' => USER_AGENT)
-      end
-      'bridge delivered'
-    end
-    
+    end    
   end
-  
+end
+
+if __FILE__ == $0 then
+
+  # Subscribe example
+  SimplePubSub::Server.new.start
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepubsub
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,10 +31,10 @@ cert_chain:
   i0PBE6fLwlIMk8jNNUcX3J1csSMgLNTwE8CwrlSZE8sueHj0pQzICM7lF0gGREO6
   hQHD0LljU3MusQ==
   -----END CERTIFICATE-----
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dws-registry
+  name: websocket-eventmachine-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -48,7 +48,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic_duration
+  name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="