wamp 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/wamp.rb

@@ -13,10 +13,10 @@ module WAMP
   autoload :MessageType, File.join(ROOT, "wamp", "message_type")
 
   module Engines
-    autoload :Memory,      File.join(ROOT, "wamp", "engines", "memory")
+    autoload :Memory, File.join(ROOT, "wamp", "engines", "memory")
+    autoload :Redis,  File.join(ROOT, "wamp", "engines", "redis")
   end
 
-  # autoload :Protocols,   File.join(ROOT, "wamp", "protocols")
   module Protocols
     autoload :Version1, File.join(ROOT, "wamp", "protocols", "version_1")
   end

data/lib/wamp/engines/memory.rb

@@ -11,7 +11,7 @@ module WAMP
       # Creates a new instance of the memory engine as well as some empty hashes
       # for holding clients and topics.
       # @param options [Hash] Optional. Options hash for the memory engine.
-      def initialize(options = {})
+      def initialize(options)
         @options = options
         @clients = {}
         @topics  = {}
@@ -86,8 +86,18 @@ module WAMP
         topic
       end
 
+      def create_event(client, topic_uri, payload, exclude, include)
+        topic = find_or_create_topic(topic_uri)
+
+        topic.publish(client, protocol, payload, exclude, include) if topic
+      end
+
       private
 
+      def protocol
+        WAMP::Protocols::Version1.new
+      end
+
       def new_client(websocket)
         WAMP::Socket.new(random_uuid, websocket)
       end

data/lib/wamp/engines/redis.rb

@@ -0,0 +1,82 @@
+require 'redis'
+require 'json'
+
+module WAMP
+  module Engines
+    class Redis < Memory
+      attr_accessor :clients, :topics
+
+      DEFAULT_HOST     = 'localhost'
+      DEFAULT_PORT     = 6379
+      DEFAULT_DATABASE = 0
+      DEFAULT_GC       = 60
+      LOCK_TIMEOUT     = 120
+
+      # Creates a new instance of the Redis engine and sets up the connections
+      # to the Redis server
+      def initialize(options)
+        super
+
+        @host      = options[:host]     || DEFAULT_HOST
+        @port      = options[:port]     || DEFAULT_PORT
+        @database  = options[:database] || DEFAULT_DATABASE
+        @gc        = options[:gc]       || DEFAULT_GC
+        @password  = options[:password]
+        @namespace = options[:namespace] || ''
+
+        @clients_ns  = @namespace + ":clients"
+        @topics_ns   = @namespace + ":topics"
+        @prefixes_ns = @namespace + ":prefixes"
+        @events_ns   = @namespace + ":events"
+
+        @completed_events = []
+
+        @redis      = ::Redis.new(host: @host, port: @port)
+        @subscriber = ::Redis.new(host: @host, port: @port)
+
+        if @password
+          @redis.auth(@password)
+          @subscriber.auth(@password)
+        end
+
+        @redis.select(@database)
+        @subscriber.select(@database)
+
+        redis_subscribe_to_events
+      end
+
+      def create_event(client, topic_uri, payload, excluded, included)
+        redis_create_event(client.id, topic_uri, protocol, payload, excluded, included)
+      end
+
+    private
+
+      def redis_subscribe_to_events
+        Thread.new do
+          @subscriber.subscribe(@events_ns) do |on|
+            on.message do |channel, message|
+              redis_handle_message(message)
+            end
+          end
+        end
+      end
+
+      def redis_handle_message(message)
+        begin
+          id, client_id, topic_uri, payload, excluded, included = JSON.parse(message)
+
+          client = find_clients(id: client_id).first
+          topic  = find_or_create_topic(topic_uri)
+
+          topic.publish(client, protocol, payload, excluded, included) if topic
+        rescue => e
+          puts e
+        end
+      end
+
+      def redis_create_event(client_id, topic_uri, protocol, payload, excluded, included)
+        @redis.publish @events_ns, [random_uuid, client_id, topic_uri, payload, excluded, included].to_json
+      end
+    end
+  end
+end

data/lib/wamp/server.rb

@@ -5,14 +5,16 @@ module WAMP
   class Server
     include WAMP::Bindable
 
-    attr_accessor :options, :topics, :callbacks
+    attr_accessor :options, :topics, :callbacks, :engine
 
     def initialize(options = {})
       @options   = options
+      @options[:engine] ||= {}
+      @options[:engine][:type] ||= :memory
 
       @topics    = {}
       @callbacks = {}
-      @engine    = WAMP::Engines::Memory.new
+      @engine    = WAMP::Engines.const_get(camelize(@options[:engine][:type])).new(@options[:engine])
       @protocol  = WAMP::Protocols::Version1.new
     end
 
@@ -40,9 +42,13 @@ module WAMP
 
   private
 
+    def camelize(str)
+      str.to_s.split('_').map {|w| w.capitalize}.join
+    end
+
     def handle_open(websocket, event)
       client = @engine.create_client(websocket)
-              client.websocket.send @protocol.welcome(client.id)
+      client.websocket.send @protocol.welcome(client.id)
 
       trigger(:connect, client)
     end
@@ -105,12 +111,11 @@ module WAMP
     # Handle a message published by a client
     # PUBLISH data structure [TOPIC, DATA, EXCLUDE, INCLUDE]
     def handle_publish(client, data)
-      topic_name, payload, exclude, include = data
-      topic = @engine.find_or_create_topic(topic_name)
+      topic_uri, payload, exclude, include = data
 
-      topic.publish(client, @protocol, payload, exclude, include)
+      @engine.create_event(client, topic_uri, payload, exclude, include)
 
-      trigger(:publish, client, topic.uri, payload, exclude, include)
+      trigger(:publish, client, topic_uri, payload, exclude, include)
     end
 
     def handle_close(websocket, event)

data/lib/wamp/socket.rb

@@ -25,6 +25,14 @@ module WAMP
       prefixes[prefix] = uri
     end
 
+    def to_json
+      {
+        id:       id,
+        topics:   topics,
+        prefixes: prefixes
+      }.to_json
+    end
+
     private
 
     def send_welcome_message

data/wamp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wamp"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brady Love"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/wamp/bindable.rb",
     "lib/wamp/client.rb",
     "lib/wamp/engines/memory.rb",
+    "lib/wamp/engines/redis.rb",
     "lib/wamp/message_type.rb",
     "lib/wamp/protocols/version_1.rb",
     "lib/wamp/server.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wamp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -230,6 +230,7 @@ files:
 - lib/wamp/bindable.rb
 - lib/wamp/client.rb
 - lib/wamp/engines/memory.rb
+- lib/wamp/engines/redis.rb
 - lib/wamp/message_type.rb
 - lib/wamp/protocols/version_1.rb
 - lib/wamp/server.rb
@@ -261,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2829213371230437822
+      hash: 2060316815058376274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: